From 5465fd153ea4229742e3907c484fa068e1208583 Mon Sep 17 00:00:00 2001
From: gene9831 <pacify.98@gmail.com>
Date: Thu, 28 Dec 2023 18:38:28 -0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=BC=80=E6=94=BE=E5=8C=BA=E5=9D=97?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/canvas/src/components/container/CanvasMenu.vue | 3 ++-
 packages/common/component/PluginBlockList.vue           | 4 ++--
 packages/plugins/block/src/Main.vue                     | 4 +++-
 packages/plugins/materials/src/block/BlockGroup.vue     | 3 +--
 packages/plugins/materials/src/block/BlockList.vue      | 5 +++--
 packages/plugins/materials/src/block/Main.vue           | 2 +-
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/packages/canvas/src/components/container/CanvasMenu.vue b/packages/canvas/src/components/container/CanvasMenu.vue
index c03ee387d8..b85b0c03aa 100644
--- a/packages/canvas/src/components/container/CanvasMenu.vue
+++ b/packages/canvas/src/components/container/CanvasMenu.vue
@@ -106,7 +106,8 @@ export default {
       },
       { name: '删除', code: 'del' },
       { name: '复制', code: 'copy' },
-      { name: '绑定事件', code: 'bindEvent' }
+      { name: '绑定事件', code: 'bindEvent' },
+      { name: '新建区块', code: 'createBlock' }
     ])
 
     const boxVisibility = ref(false)
diff --git a/packages/common/component/PluginBlockList.vue b/packages/common/component/PluginBlockList.vue
index 548867dcc9..29dd19641b 100644
--- a/packages/common/component/PluginBlockList.vue
+++ b/packages/common/component/PluginBlockList.vue
@@ -446,7 +446,7 @@ export default {
           color: var(--ti-lowcode-component-block-list-setting-btn-color);
           display: block;
           &:hover {
-            cursor: not-allowed;
+            cursor: pointer;
             color: var(--ti-lowcode-component-block-list-setting-btn-hover-color);
           }
         }
@@ -553,7 +553,7 @@ export default {
       .block-detail-icon {
         color: var(--ti-lowcode-component-block-list-setting-btn-color);
         &:hover {
-          cursor: not-allowed;
+          cursor: pointer;
           color: var(--ti-lowcode-component-block-list-setting-btn-hover-color);
         }
       }
diff --git a/packages/plugins/block/src/Main.vue b/packages/plugins/block/src/Main.vue
index f4531d5b37..1c9772a412 100644
--- a/packages/plugins/block/src/Main.vue
+++ b/packages/plugins/block/src/Main.vue
@@ -2,7 +2,7 @@
   <plugin-panel class="block-manage" title="区块管理" :isCloseLeft="false" @close="closePanel">
     <template #header>
       <link-button :href="docsUrl"></link-button>
-      <svg-button name="add-page" placement="bottom" tips="新建区块" style="cursor: not-allowed"></svg-button>
+      <svg-button name="add-page" placement="bottom" tips="新建区块" @click="openBlockAdd"></svg-button>
     </template>
     <template #content>
       <div class="app-manage-search">
@@ -78,6 +78,8 @@
         :blockStyle="state.layout"
         default-icon-tip="查看区块"
         :externalBlock="externalBlock"
+        @click="editBlock"
+        @iconClick="openSettingPanel"
       ></plugin-block-list>
       <block-setting></block-setting>
       <div class="block-footer">
diff --git a/packages/plugins/materials/src/block/BlockGroup.vue b/packages/plugins/materials/src/block/BlockGroup.vue
index 2e93fa7efe..35f377f531 100644
--- a/packages/plugins/materials/src/block/BlockGroup.vue
+++ b/packages/plugins/materials/src/block/BlockGroup.vue
@@ -276,7 +276,7 @@ export default {
     }
 
     const handleAddGroup = () => {
-      return
+      state.showCreateGroupForm = true
     }
 
     const handleClickOption = ({ value: { groupId, groupName } }) => {
@@ -426,7 +426,6 @@ export default {
     }
   }
   .add-group-btn {
-    cursor: not-allowed;
     font-size: 16px;
     width: 32px;
     height: 32px;
diff --git a/packages/plugins/materials/src/block/BlockList.vue b/packages/plugins/materials/src/block/BlockList.vue
index 6773d60132..107ed07212 100644
--- a/packages/plugins/materials/src/block/BlockList.vue
+++ b/packages/plugins/materials/src/block/BlockList.vue
@@ -59,8 +59,9 @@ export default {
     const { message, confirm } = useModal()
     const appId = useApp().appInfoState.selectedId
 
-    const openVersionPanel = async () => {
-      return
+    const openVersionPanel = async ({ item }) => {
+      selectedBlock.value = item
+      setBlockVersionPanelVisible(true)
     }
 
     const state = reactive({
diff --git a/packages/plugins/materials/src/block/Main.vue b/packages/plugins/materials/src/block/Main.vue
index 0075b8fcc8..62145e121f 100644
--- a/packages/plugins/materials/src/block/Main.vue
+++ b/packages/plugins/materials/src/block/Main.vue
@@ -4,7 +4,7 @@
     <tiny-search v-model="state.searchValue" placeholder="请输入关键字搜索">
       <template #prefix> <tiny-icon-search /> </template>
     </tiny-search>
-    <block-list v-model:blockList="filterBlocks" :show-add-button="false" :show-block-shot="true"></block-list>
+    <block-list v-model:blockList="filterBlocks" :show-add-button="true" :show-block-shot="true"></block-list>
   </div>
 </template>