From 0c58baf477c15d2783109f919a6a5a8e64554e03 Mon Sep 17 00:00:00 2001
From: chilingling <michaelchiling1024@gmail.com>
Date: Wed, 25 Sep 2024 19:33:44 -0700
Subject: [PATCH 1/2] fix: page or block save update breadcrumb uncorrectly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 修复页面名称更新时，面包屑页名称没有同步更新的 bug
2. 修复区块保存更新时，强行切换当前画布到正在编辑区块的 bug
3. 修复区块保存更新时，如果画布不是当前编辑的区块，仍取截图的 bug
---
 packages/controller/js/http.js                 | 13 +++++++++----
 packages/plugins/block/src/BlockSetting.vue    |  9 ++++++---
 packages/plugins/block/src/js/blockSetting.jsx |  9 ++++++++-
 packages/plugins/page/src/PageSetting.vue      |  3 ++-
 4 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/packages/controller/js/http.js b/packages/controller/js/http.js
index c3315a066e..2ca39fe303 100644
--- a/packages/controller/js/http.js
+++ b/packages/controller/js/http.js
@@ -14,6 +14,7 @@ import { useHttp } from '@opentiny/tiny-engine-http'
 import usePage from '../src/usePage'
 import useCanvas from '../src/useCanvas'
 import useNotify from '../src/useNotify'
+import useBreadcrumb from '../src/useBreadcrumb'
 import { isVsCodeEnv } from './environments'
 import { generateRouter, generatePage } from './vscodeGenerateFile'
 
@@ -39,7 +40,7 @@ export const requestEvent = (url, params) => {
  * @returns { Promise }
  *
  */
-export const handlePageUpdate = (pageId, params, routerChange) => {
+export const handlePageUpdate = (pageId, params, routerChange, isCurEditPage) => {
   return http
     .post(`/app-center/api/pages/update/${pageId}`, params)
     .then((res) => {
@@ -60,14 +61,18 @@ export const handlePageUpdate = (pageId, params, routerChange) => {
         }
       }
 
-      if (routerChange) {
-        pageSettingState.updateTreeData()
-      }
+      pageSettingState.updateTreeData()
       pageSettingState.isNew = false
       useNotify({ message: '保存成功!', type: 'success' })
 
       // 更新 页面状态 标志
       setSaved(true)
+
+      if (isCurEditPage) {
+        const { setBreadcrumbPage } = useBreadcrumb()
+        setBreadcrumbPage([params.name])
+      }
+
       return res
     })
     .catch((err) => {
diff --git a/packages/plugins/block/src/BlockSetting.vue b/packages/plugins/block/src/BlockSetting.vue
index 3dc43e94b6..8180127b99 100644
--- a/packages/plugins/block/src/BlockSetting.vue
+++ b/packages/plugins/block/src/BlockSetting.vue
@@ -78,7 +78,7 @@
 <script lang="jsx">
 import { reactive, ref, watch, watchEffect, computed } from 'vue'
 import { Button as TinyButton, Collapse as TinyCollapse, CollapseItem as TinyCollapseItem } from '@opentiny/vue'
-import { getGlobalConfig, useModal } from '@opentiny/tiny-engine-controller'
+import { getGlobalConfig, useModal, useBlock } from '@opentiny/tiny-engine-controller'
 import { BlockHistoryList, PluginSetting, CloseIcon, SvgButton } from '@opentiny/tiny-engine-common'
 import { previewBlock } from '@opentiny/tiny-engine-controller/js/preview'
 import { LifeCycles } from '@opentiny/tiny-engine-common'
@@ -212,8 +212,11 @@ export default {
           status,
           message,
           exec: async () => {
-            // 获取区块截图
-            block.screenshot = await getBlockBase64()
+            const currentId = useBlock().getCurrentBlock()?.id
+            if (block.id === currentId) {
+              // 获取区块截图
+              block.screenshot = await getBlockBase64()
+            }
             saveBlock(block)
           }
         })
diff --git a/packages/plugins/block/src/js/blockSetting.jsx b/packages/plugins/block/src/js/blockSetting.jsx
index 98680f88c1..df5dbe09ba 100644
--- a/packages/plugins/block/src/js/blockSetting.jsx
+++ b/packages/plugins/block/src/js/blockSetting.jsx
@@ -659,7 +659,14 @@ const updateBlock = (block = {}) => {
   )
     .then((data) => {
       setSaved(true)
-      useBlock().initBlock(data, {}, true)
+
+      const currentId = useBlock().getCurrentBlock()?.id
+
+      // 如果是当前正在编辑的区块，需要同步更新画布
+      if (currentId === id) {
+        useBlock().initBlock(data, {}, true)
+      }
+
       // 弹出保存区块成功
       message({ message: '保存区块成功！', status: 'success' })
       // 本地生成区块服务
diff --git a/packages/plugins/page/src/PageSetting.vue b/packages/plugins/page/src/PageSetting.vue
index 4302459e79..168a09c7e3 100644
--- a/packages/plugins/page/src/PageSetting.vue
+++ b/packages/plugins/page/src/PageSetting.vue
@@ -195,8 +195,9 @@ export default {
 
     const updatePage = (id, params) => {
       const routerChange = pageSettingState.currentPageDataCopy.route !== pageSettingState.currentPageData.route
+      const isCurEditPage = pageState?.currentPage?.id === id
 
-      return handlePageUpdate(id, params, routerChange)
+      return handlePageUpdate(id, params, routerChange, isCurEditPage)
     }
 
     const restorePage = (pageData) => {

From 3bec411ee221183f64d77bbf66c0bf6b8451c4fd Mon Sep 17 00:00:00 2001
From: chilingling <michaelchiling1024@gmail.com>
Date: Wed, 25 Sep 2024 19:59:21 -0700
Subject: [PATCH 2/2] fix: add handlePageUpdate mehtod missing params

---
 packages/toolbars/save/src/js/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/toolbars/save/src/js/index.js b/packages/toolbars/save/src/js/index.js
index 7346e0a387..a9872e565c 100644
--- a/packages/toolbars/save/src/js/index.js
+++ b/packages/toolbars/save/src/js/index.js
@@ -51,7 +51,7 @@ const savePage = async (pageSchema) => {
   }
 
   isLoading.value = true
-  await handlePageUpdate(currentPage.id, { ...currentPage, ...params })
+  await handlePageUpdate(currentPage.id, { ...currentPage, ...params }, false, true)
   isLoading.value = false
 }