From d43b739a9655d110fbc5cec23cead888df2ff4b1 Mon Sep 17 00:00:00 2001
From: SonyLeo <746591437@qq.com>
Date: Mon, 6 Jan 2025 19:44:16 -0800
Subject: [PATCH 1/5] fix: resolve the block publish logic

---
 .../common/component/BlockDeployDialog.vue    |  5 +-
 .../plugins/block/src/js/blockSetting.jsx     | 65 ++++++++++---------
 2 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/packages/common/component/BlockDeployDialog.vue b/packages/common/component/BlockDeployDialog.vue
index dd2b911f7..0c87db0c9 100644
--- a/packages/common/component/BlockDeployDialog.vue
+++ b/packages/common/component/BlockDeployDialog.vue
@@ -81,7 +81,7 @@ import {
   Popover as TinyPopover,
   FormItem as TinyFormItem
 } from '@opentiny/vue'
-import { useNotify, getMetaApi, META_APP } from '@opentiny/tiny-engine-meta-register'
+import { useCanvas, useNotify, getMetaApi, META_APP } from '@opentiny/tiny-engine-meta-register'
 import { constants } from '@opentiny/tiny-engine-utils'
 import VueMonaco from './VueMonaco.vue'
 
@@ -172,6 +172,8 @@ export default {
 
     const setVisible = (visible) => emit('update:visible', visible)
 
+    const { setSaved } = useCanvas()
+
     const deployBlock = async () => {
       deployBlockRef.value.validate((valid) => {
         const { publishBlock } = getMetaApi(META_APP.BlockManage)
@@ -186,6 +188,7 @@ export default {
           }
           publishBlock(params)
           setVisible(false)
+          setSaved(true)
           formState.deployInfo = ''
           formState.version = ''
           formState.needToSave = true
diff --git a/packages/plugins/block/src/js/blockSetting.jsx b/packages/plugins/block/src/js/blockSetting.jsx
index ab7c5c844..4b59a0049 100644
--- a/packages/plugins/block/src/js/blockSetting.jsx
+++ b/packages/plugins/block/src/js/blockSetting.jsx
@@ -646,42 +646,43 @@ const updateBlock = (block = {}) => {
  * @returns
  */
 const generateBlockDeps = (children, deps = { scripts: [], styles: new Set() }) => {
-  children.forEach((child) => {
-    const component = useMaterial().getMaterial(child.componentName)
-
-    if (!component) return
-
-    const { npm, component: componentName } = component
-
-    if (npm) {
-      const { package: pkg, exportName, css, version, script } = npm
-      const currentPkg = deps.scripts.find((item) => item.package === pkg)
+  if (Array.isArray(children)) {
+    children.forEach((child) => {
+      const component = useMaterial().getMaterial(child.componentName)
+
+      if (!component) return
+
+      const { npm, component: componentName } = component
+
+      if (npm) {
+        const { package: pkg, exportName, css, version, script } = npm
+        const currentPkg = deps.scripts.find((item) => item.package === pkg)
+
+        if (currentPkg) {
+          currentPkg.components[componentName] = exportName
+        } else {
+          deps.scripts.push({
+            package: pkg,
+            version,
+            script,
+            css,
+            components: {
+              [componentName]: exportName
+            }
+          })
+        }
 
-      if (currentPkg) {
-        currentPkg.components[componentName] = exportName
-      } else {
-        deps.scripts.push({
-          package: pkg,
-          version,
-          script,
-          css,
-          components: {
-            [componentName]: exportName
-          }
-        })
+        if (css) {
+          deps.styles.add(css)
+        }
       }
 
-      if (css) {
-        deps.styles.add(css)
+      // 递归查找子区块或子组件
+      if (child.children) {
+        generateBlockDeps(child.children, deps)
       }
-    }
-
-    // 递归查找子区块或子组件
-    if (child.children) {
-      generateBlockDeps(child.children, deps)
-    }
-  })
-
+    })
+  }
   return deps
 }
 

From acca71f2af3e099e74c977ca9917d380fe9a7af4 Mon Sep 17 00:00:00 2001
From: SonyLeo <746591437@qq.com>
Date: Mon, 6 Jan 2025 22:20:01 -0800
Subject: [PATCH 2/5] fix: add judgment conditions.

---
 packages/common/component/BlockDeployDialog.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/common/component/BlockDeployDialog.vue b/packages/common/component/BlockDeployDialog.vue
index 0c87db0c9..a03841b92 100644
--- a/packages/common/component/BlockDeployDialog.vue
+++ b/packages/common/component/BlockDeployDialog.vue
@@ -188,7 +188,9 @@ export default {
           }
           publishBlock(params)
           setVisible(false)
-          setSaved(true)
+          if (formState.needToSave) {
+            setSaved(true)
+          }
           formState.deployInfo = ''
           formState.version = ''
           formState.needToSave = true

From 2b2a8af3460787dadeb1b1b1302de9400eb0670c Mon Sep 17 00:00:00 2001
From: SonyLeo <746591437@qq.com>
Date: Tue, 7 Jan 2025 04:33:48 -0800
Subject: [PATCH 3/5] fix: optimize judgement condition and return code

---
 .../common/component/BlockDeployDialog.vue    | 11 ++-
 .../plugins/block/src/js/blockSetting.jsx     | 69 ++++++++++---------
 2 files changed, 44 insertions(+), 36 deletions(-)

diff --git a/packages/common/component/BlockDeployDialog.vue b/packages/common/component/BlockDeployDialog.vue
index a03841b92..4dbf80dfd 100644
--- a/packages/common/component/BlockDeployDialog.vue
+++ b/packages/common/component/BlockDeployDialog.vue
@@ -71,7 +71,7 @@
 </template>
 
 <script>
-import { reactive, ref, watch } from 'vue'
+import { reactive, ref, watch, computed } from 'vue'
 import {
   Checkbox as TinyCheckbox,
   Input as TinyInput,
@@ -81,7 +81,7 @@ import {
   Popover as TinyPopover,
   FormItem as TinyFormItem
 } from '@opentiny/vue'
-import { useCanvas, useNotify, getMetaApi, META_APP } from '@opentiny/tiny-engine-meta-register'
+import { useBlock, useCanvas, useNotify, getMetaApi, META_APP } from '@opentiny/tiny-engine-meta-register'
 import { constants } from '@opentiny/tiny-engine-utils'
 import VueMonaco from './VueMonaco.vue'
 
@@ -174,6 +174,11 @@ export default {
 
     const { setSaved } = useCanvas()
 
+    const isSameBlock = computed(() => {
+      const currentBlock = useBlock().getCurrentBlock()
+      return props.block?.id && props.block?.id === currentBlock?.id
+    })
+
     const deployBlock = async () => {
       deployBlockRef.value.validate((valid) => {
         const { publishBlock } = getMetaApi(META_APP.BlockManage)
@@ -188,7 +193,7 @@ export default {
           }
           publishBlock(params)
           setVisible(false)
-          if (formState.needToSave) {
+          if (formState.needToSave && isSameBlock.value) {
             setSaved(true)
           }
           formState.deployInfo = ''
diff --git a/packages/plugins/block/src/js/blockSetting.jsx b/packages/plugins/block/src/js/blockSetting.jsx
index 4b59a0049..bfa4ac51a 100644
--- a/packages/plugins/block/src/js/blockSetting.jsx
+++ b/packages/plugins/block/src/js/blockSetting.jsx
@@ -646,43 +646,46 @@ const updateBlock = (block = {}) => {
  * @returns
  */
 const generateBlockDeps = (children, deps = { scripts: [], styles: new Set() }) => {
-  if (Array.isArray(children)) {
-    children.forEach((child) => {
-      const component = useMaterial().getMaterial(child.componentName)
-
-      if (!component) return
-
-      const { npm, component: componentName } = component
-
-      if (npm) {
-        const { package: pkg, exportName, css, version, script } = npm
-        const currentPkg = deps.scripts.find((item) => item.package === pkg)
-
-        if (currentPkg) {
-          currentPkg.components[componentName] = exportName
-        } else {
-          deps.scripts.push({
-            package: pkg,
-            version,
-            script,
-            css,
-            components: {
-              [componentName]: exportName
-            }
-          })
-        }
+  if (!Array.isArray(children)) {
+    return
+  }
 
-        if (css) {
-          deps.styles.add(css)
-        }
+  children.forEach((child) => {
+    const component = useMaterial().getMaterial(child.componentName)
+
+    if (!component) return
+
+    const { npm, component: componentName } = component
+
+    if (npm) {
+      const { package: pkg, exportName, css, version, script } = npm
+      const currentPkg = deps.scripts.find((item) => item.package === pkg)
+
+      if (currentPkg) {
+        currentPkg.components[componentName] = exportName
+      } else {
+        deps.scripts.push({
+          package: pkg,
+          version,
+          script,
+          css,
+          components: {
+            [componentName]: exportName
+          }
+        })
       }
 
-      // 递归查找子区块或子组件
-      if (child.children) {
-        generateBlockDeps(child.children, deps)
+      if (css) {
+        deps.styles.add(css)
       }
-    })
-  }
+    }
+
+    // 递归查找子区块或子组件
+    if (child.children) {
+      generateBlockDeps(child.children, deps)
+    }
+  })
+
   return deps
 }
 

From b7e350fcb391013923983140df7061beac96de61 Mon Sep 17 00:00:00 2001
From: SonyLeo <746591437@qq.com>
Date: Tue, 7 Jan 2025 18:11:23 -0800
Subject: [PATCH 4/5] fix: simplify judgement conditions

---
 packages/common/component/BlockDeployDialog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/common/component/BlockDeployDialog.vue b/packages/common/component/BlockDeployDialog.vue
index 4dbf80dfd..bcb15bd37 100644
--- a/packages/common/component/BlockDeployDialog.vue
+++ b/packages/common/component/BlockDeployDialog.vue
@@ -176,7 +176,7 @@ export default {
 
     const isSameBlock = computed(() => {
       const currentBlock = useBlock().getCurrentBlock()
-      return props.block?.id && props.block?.id === currentBlock?.id
+      return props.block?.id === currentBlock?.id
     })
 
     const deployBlock = async () => {

From a8701233ad611bbcef42f58500bbc931eb8ef38a Mon Sep 17 00:00:00 2001
From: SonyLeo <746591437@qq.com>
Date: Wed, 8 Jan 2025 23:07:24 -0800
Subject: [PATCH 5/5] fix: optimize the function writing.

---
 packages/common/component/BlockDeployDialog.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/common/component/BlockDeployDialog.vue b/packages/common/component/BlockDeployDialog.vue
index bcb15bd37..c86793e3c 100644
--- a/packages/common/component/BlockDeployDialog.vue
+++ b/packages/common/component/BlockDeployDialog.vue
@@ -71,7 +71,7 @@
 </template>
 
 <script>
-import { reactive, ref, watch, computed } from 'vue'
+import { reactive, ref, watch } from 'vue'
 import {
   Checkbox as TinyCheckbox,
   Input as TinyInput,
@@ -174,10 +174,10 @@ export default {
 
     const { setSaved } = useCanvas()
 
-    const isSameBlock = computed(() => {
+    const isSameBlock = () => {
       const currentBlock = useBlock().getCurrentBlock()
       return props.block?.id === currentBlock?.id
-    })
+    }
 
     const deployBlock = async () => {
       deployBlockRef.value.validate((valid) => {
@@ -193,7 +193,7 @@ export default {
           }
           publishBlock(params)
           setVisible(false)
-          if (formState.needToSave && isSameBlock.value) {
+          if (formState.needToSave && isSameBlock()) {
             setSaved(true)
           }
           formState.deployInfo = ''