From cfe05553a964bb0056551f56369e576bafa9bde0 Mon Sep 17 00:00:00 2001
From: chilingling <michaelchiling1024@gmail.com>
Date: Tue, 24 Dec 2024 00:29:39 -0800
Subject: [PATCH 1/3] fix: resolve some schema update issue
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 调整画布宽度时，画布选中框不及时更新的 bug
2. 空页面的时候，拖拽组件到画布提示两次新建页面的 bug
3. importSchema 的时候，清空选择
4. 页面 schema 保存的时候，设置保存状态为 false
5. 增强 AdvanceConfig 配置对 props 的容错
---
 packages/canvas/DesignCanvas/src/DesignCanvas.vue     |  2 +-
 packages/canvas/DesignCanvas/src/api/useCanvas.js     |  2 ++
 .../canvas/container/src/components/CanvasResize.vue  | 11 ++++++++++-
 packages/plugins/schema/src/Main.vue                  |  6 +++++-
 .../settings/events/src/components/AdvanceConfig.vue  |  2 +-
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/packages/canvas/DesignCanvas/src/DesignCanvas.vue b/packages/canvas/DesignCanvas/src/DesignCanvas.vue
index 295c6fde6..d01d5254a 100644
--- a/packages/canvas/DesignCanvas/src/DesignCanvas.vue
+++ b/packages/canvas/DesignCanvas/src/DesignCanvas.vue
@@ -99,7 +99,7 @@ export default {
 
         const showConfirm = !isSaved || pageSchema !== oldPageSchema
 
-        if (!showConfirm || showModal) {
+        if (!showConfirm || showModal || useHistory().historyState?.index === 0) {
           return
         }
 
diff --git a/packages/canvas/DesignCanvas/src/api/useCanvas.js b/packages/canvas/DesignCanvas/src/api/useCanvas.js
index 9c0c6a3b8..dfe347fd8 100644
--- a/packages/canvas/DesignCanvas/src/api/useCanvas.js
+++ b/packages/canvas/DesignCanvas/src/api/useCanvas.js
@@ -518,6 +518,8 @@ const importSchema = (data) => {
   resetCanvasState({
     pageSchema: importData
   })
+
+  canvasApi.value?.clearSelect?.()
 }
 
 const exportSchema = () => {
diff --git a/packages/canvas/container/src/components/CanvasResize.vue b/packages/canvas/container/src/components/CanvasResize.vue
index 68a11894d..4655f026e 100644
--- a/packages/canvas/container/src/components/CanvasResize.vue
+++ b/packages/canvas/container/src/components/CanvasResize.vue
@@ -11,7 +11,7 @@
 </template>
 <script>
 import { ref, computed, watch, nextTick } from 'vue'
-import { useLayout } from '@opentiny/tiny-engine-meta-register'
+import { useLayout, useCanvas } from '@opentiny/tiny-engine-meta-register'
 import { canvasState } from '../container'
 
 export default {
@@ -106,6 +106,15 @@ export default {
       { flush: 'post' }
     )
 
+    watch(
+      () => sizeStyle.value,
+      async () => {
+        await nextTick()
+
+        useCanvas().canvasApi.value?.updateRect?.()
+      }
+    )
+
     return {
       onMouseDown,
       onMouseMove,
diff --git a/packages/plugins/schema/src/Main.vue b/packages/plugins/schema/src/Main.vue
index 5047a535a..8bdef930a 100644
--- a/packages/plugins/schema/src/Main.vue
+++ b/packages/plugins/schema/src/Main.vue
@@ -102,7 +102,11 @@ export default {
         componentName: pageState.pageSchema.componentName
       }
 
-      useCanvas().importSchema(value)
+      const { importSchema, setSaved } = useCanvas()
+
+      importSchema(value)
+      setSaved(false)
+
       // TODO: 历史堆栈
       // useHistory().addHistory()
       state.pageData = ''
diff --git a/packages/settings/events/src/components/AdvanceConfig.vue b/packages/settings/events/src/components/AdvanceConfig.vue
index a3674d225..889c370d1 100644
--- a/packages/settings/events/src/components/AdvanceConfig.vue
+++ b/packages/settings/events/src/components/AdvanceConfig.vue
@@ -135,7 +135,7 @@ export default {
       }
 
       const isNumber = Number(value).toString() !== 'NaN'
-      let newPropsKey = schema.props.key
+      let newPropsKey = schema.props?.key
 
       if (value && !isNumber) {
         newPropsKey = {

From a4777d428cb1ff4b81ce7c8c5ab7f27fb0cd9ba8 Mon Sep 17 00:00:00 2001
From: chilingling <michaelchiling1024@gmail.com>
Date: Tue, 24 Dec 2024 01:04:11 -0800
Subject: [PATCH 2/3] fix: updateRect async change to callback style

---
 packages/canvas/container/src/components/CanvasResize.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/canvas/container/src/components/CanvasResize.vue b/packages/canvas/container/src/components/CanvasResize.vue
index 4655f026e..87da4c0cc 100644
--- a/packages/canvas/container/src/components/CanvasResize.vue
+++ b/packages/canvas/container/src/components/CanvasResize.vue
@@ -108,10 +108,10 @@ export default {
 
     watch(
       () => sizeStyle.value,
-      async () => {
-        await nextTick()
-
-        useCanvas().canvasApi.value?.updateRect?.()
+      () => {
+        nextTick(() => {
+          useCanvas().canvasApi.value?.updateRect?.()
+        })
       }
     )
 

From 1c1a65af74ec5a0fd683d8370d939591dd4a045d Mon Sep 17 00:00:00 2001
From: chilingling <michaelchiling1024@gmail.com>
Date: Tue, 24 Dec 2024 19:39:05 -0800
Subject: [PATCH 3/3] fix: first time enter app should show empty page warning

---
 packages/canvas/DesignCanvas/src/DesignCanvas.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/canvas/DesignCanvas/src/DesignCanvas.vue b/packages/canvas/DesignCanvas/src/DesignCanvas.vue
index d01d5254a..bb34022cd 100644
--- a/packages/canvas/DesignCanvas/src/DesignCanvas.vue
+++ b/packages/canvas/DesignCanvas/src/DesignCanvas.vue
@@ -96,10 +96,11 @@ export default {
         // 1. 页面或区块状态是未保存状态（尝试编辑）
         // 2. 页面刷新或第一次进入页面(含从别的页面或区块切换到别的页面或区块)
         // 3. 页面上已经有弹窗，不允许重复弹窗
+        // 4. 当前历史堆栈为0，且当前未保存状态和上一次未保存状态不一致，不重复弹窗
 
         const showConfirm = !isSaved || pageSchema !== oldPageSchema
 
-        if (!showConfirm || showModal || useHistory().historyState?.index === 0) {
+        if (!showConfirm || showModal || (useHistory().historyState?.index === 0 && isSaved !== oldIsSaved)) {
           return
         }