From 8e619ccae9aba17a326252e6ad56fd23aa306605 Mon Sep 17 00:00:00 2001
From: Xppp0217 <864670955@qq.com>
Date: Wed, 18 Oct 2023 01:52:09 -0700
Subject: [PATCH 1/3] =?UTF-8?q?fix:=E7=89=A9=E6=96=99=E5=8C=BA=E5=9D=97?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=9D=E5=AD=98=E5=88=86=E7=BB=84=EF=BC=8C=E5=BB=BA?=
 =?UTF-8?q?=E8=AE=AE=E5=BC=B9=E5=87=BA=E6=8F=90=E7=A4=BA=E6=A1=86=E6=88=96?=
 =?UTF-8?q?=E8=80=85=E6=B7=BB=E5=8A=A0loading=E5=8A=A8=E6=80=81=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/plugins/materials/src/block/BlockGroupPanel.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/plugins/materials/src/block/BlockGroupPanel.vue b/packages/plugins/materials/src/block/BlockGroupPanel.vue
index d92b8db809..585331bc25 100644
--- a/packages/plugins/materials/src/block/BlockGroupPanel.vue
+++ b/packages/plugins/materials/src/block/BlockGroupPanel.vue
@@ -21,7 +21,7 @@
 </template>
 <script>
 import { nextTick, reactive, watch, inject } from 'vue'
-import { Search } from '@opentiny/vue'
+import { Search, Loading } from '@opentiny/vue'
 import { iconSearch } from '@opentiny/vue-icon'
 import { PluginSetting } from '@opentiny/tiny-engine-common'
 import { useApp, useBlock, useModal, useResource } from '@opentiny/tiny-engine-controller'
@@ -89,6 +89,11 @@ export default {
     })
 
     const addBlocks = () => {
+      let loadingInstance = Loading.service({
+        lock: true,
+        text: '区块分组保存中',
+        background: 'rgba(0, 0, 0, 0.6)'
+      })
       const groupId = selectedGroup.value.groupId
       fetchGroupBlocksById({ groupId })
         .then((data) => {
@@ -127,8 +132,8 @@ export default {
             status: 'error'
           })
         })
+      loadingInstance.close()
       panelState.isBlockGroupPanel = false
-      closePanel()
     }
 
     const closeGroupPanel = () => {

From a204e824e9255fb41458298757c01c63c13401fa Mon Sep 17 00:00:00 2001
From: Xppp0217 <864670955@qq.com>
Date: Wed, 18 Oct 2023 19:00:06 -0700
Subject: [PATCH 2/3] =?UTF-8?q?fix:=E5=8C=BA=E5=9D=97=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E7=A7=BB=E9=99=A4=E5=8C=BA=E5=9D=97=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E7=A1=AE=E8=AE=A4=E5=90=8E=E4=B8=8D=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=88=90=E5=8A=9F=E7=9A=84=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/plugins/materials/src/block/BlockList.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/plugins/materials/src/block/BlockList.vue b/packages/plugins/materials/src/block/BlockList.vue
index 6773d60132..737b93dc22 100644
--- a/packages/plugins/materials/src/block/BlockList.vue
+++ b/packages/plugins/materials/src/block/BlockList.vue
@@ -17,6 +17,7 @@
 
 <script lang="jsx">
 import { computed, inject, reactive, ref } from 'vue'
+import { Notify } from '@opentiny/vue'
 import { useBlock, useResource, useModal, useApp } from '@opentiny/tiny-engine-controller'
 import { PluginBlockList } from '@opentiny/tiny-engine-common'
 import { dragStart, addComponent } from '@opentiny/tiny-engine-canvas'
@@ -141,6 +142,7 @@ export default {
       const groupName = name || selectedGroup.value.groupName
 
       const title = `删除区块${label}`
+      const titleSuccess = `删除区块${label}成功`
       const status = 'error'
       const messageRender = {
         render: () => (
@@ -162,6 +164,11 @@ export default {
             requestUpdateGroup({ id: groupId, blocks, app: appId }).then(() => {
               isRefresh.value = true
             })
+            Notify({
+              type: 'success',
+              message: titleSuccess,
+              position: 'top-right'
+            })
           })
           .catch((error) => {
             message({ message: `删除区块失败: ${error.message || error}`, status: 'error' })

From 9fa4b86bfac79679cd48a6bac3cb2ff1da0ece3f Mon Sep 17 00:00:00 2001
From: Xppp0217 <864670955@qq.com>
Date: Wed, 1 Nov 2023 23:55:59 -0700
Subject: [PATCH 3/3] =?UTF-8?q?fix:=E5=8C=BA=E5=9D=97=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E7=A7=BB=E9=99=A4=E5=8C=BA=E5=9D=97=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E7=A1=AE=E8=AE=A4=E5=90=8E=E4=B8=8D=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=88=90=E5=8A=9F=E7=9A=84=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/plugins/materials/src/block/BlockGroupPanel.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/plugins/materials/src/block/BlockGroupPanel.vue b/packages/plugins/materials/src/block/BlockGroupPanel.vue
index 585331bc25..d2e3be3b83 100644
--- a/packages/plugins/materials/src/block/BlockGroupPanel.vue
+++ b/packages/plugins/materials/src/block/BlockGroupPanel.vue
@@ -134,6 +134,7 @@ export default {
         })
       loadingInstance.close()
       panelState.isBlockGroupPanel = false
+      closePanel()
     }
 
     const closeGroupPanel = () => {