From e29cf88d1c7ea8115819eb528cbeb9c4e5a6d6ba Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Tue, 15 Oct 2024 23:06:53 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E8=B0=83=E6=95=B4=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E7=9A=84=E6=93=8D=E4=BD=9C=E8=8F=9C=E5=8D=95=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=EF=BC=8C=E7=94=B1=E5=8F=B3=E9=94=AE=E5=BC=B9?=
 =?UTF-8?q?=E5=87=BA=E8=B0=83=E6=95=B4=E4=B8=BA=E7=82=B9=E5=87=BB=E6=9B=B4?=
 =?UTF-8?q?=E5=A4=9A=E6=8C=89=E9=92=AE=E5=BC=B9=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dict/tree/RightMenu.vue | 17 +++---
 src/views/system/dict/tree/index.vue     | 78 +++++++++++++-----------
 2 files changed, 53 insertions(+), 42 deletions(-)

diff --git a/src/views/system/dict/tree/RightMenu.vue b/src/views/system/dict/tree/RightMenu.vue
index 61b2ffd..9f45126 100644
--- a/src/views/system/dict/tree/RightMenu.vue
+++ b/src/views/system/dict/tree/RightMenu.vue
@@ -1,12 +1,9 @@
 <template>
   <a-menu class="right-menu">
     <a-menu-item v-permission="['system:dict:update']" @click="onClick('update')">
-      <template #icon><icon-edit :size="16" :stroke-width="3" /></template>
       <span>修改</span>
     </a-menu-item>
-
-    <a-menu-item v-permission="['system:dict:delete']" :title="data.isSystem ? '系统内置数据不能删除' : undefined" :disabled="data.isSystem" @click="onClick('delete')">
-      <template #icon><icon-delete :size="16" :stroke-width="3" /></template>
+    <a-menu-item v-permission="['system:dict:delete']" class="danger" :title="data.isSystem ? '系统内置数据不能删除' : undefined" :disabled="data.isSystem" @click="onClick('delete')">
       <span>删除</span>
     </a-menu-item>
   </a-menu>
@@ -38,14 +35,18 @@ const onClick = (mode: string) => {
   .arco-menu-item {
     height: 34px;
 
-    &:not(.arco-menu-selected) {
-      color: $color-text-1;
-    }
-
     &:last-child {
       margin-bottom: 0;
     }
   }
+
+  .danger {
+    color: rgb(var(--danger-6));
+  }
+
+  .danger.arco-menu-disabled {
+    color: var(--color-danger-light-3);
+  }
 }
 
 .right-menu {
diff --git a/src/views/system/dict/tree/index.vue b/src/views/system/dict/tree/index.vue
index 6b815ea..5c49df4 100644
--- a/src/views/system/dict/tree/index.vue
+++ b/src/views/system/dict/tree/index.vue
@@ -8,26 +8,36 @@
         <template #icon><icon-plus /></template>
       </a-button>
     </div>
-    <div class="dict-tree__container">
-      <div class="dict-tree__tree">
+    <a class="dict-tree__container">
+      <a class="dict-tree__tree">
         <a-tree :data="(treeData as unknown as TreeNodeData[])" :field-names="{ key: 'id' }" block-node
           @select="select">
           <template #title="node">
-            <a-trigger v-model:popup-visible="node.popupVisible" trigger="contextMenu" align-point
-              animation-name="slide-dynamic-origin" auto-fit-transform-origin position="bl" scroll-to-close>
-              <a-tooltip v-if="node.description" :content="node.description" background-color="rgb(var(--primary-6))" position="right">
-                <div @contextmenu="onContextmenu(node)">{{ node.name }} ({{ node.code }})</div>
-              </a-tooltip>
-              <div v-else @contextmenu="onContextmenu(node)">{{ node.name }} ({{ node.code }})</div>
+            <a-typography-paragraph
+              :ellipsis="{
+                rows: 1,
+                showTooltip: true,
+                css: true,
+              }"
+            >
+              {{ node.name }} ({{ node.code }})
+            </a-typography-paragraph>
+          </template>
+          <template #extra="node">
+            <a-trigger trigger="click" align-point animation-name="slide-dynamic-origin" auto-fit-transform-origin position="bl" scroll-to-close>
+              <icon-more-vertical class="action" />
               <template #content>
-                <RightMenu v-if="has.hasPermOr(['system:dict:update', 'system:dict:delete'])" :data="node"
-                  @on-menu-item-click="onMenuItemClick" />
+                <RightMenu
+                  v-if="has.hasPermOr(['system:dict:update', 'system:dict:delete'])"
+                  :data="node"
+                  @on-menu-item-click="onMenuItemClick"
+                />
               </template>
             </a-trigger>
           </template>
         </a-tree>
-      </div>
-    </div>
+      </a>
+    </a>
   </div>
 
   <DictAddModal ref="DictAddModalRef" @save-success="getTreeData" />
@@ -51,8 +61,14 @@ const props = withDefaults(defineProps<Props>(), {
 const emit = defineEmits<{
   (e: 'node-click', keys: Array<any>): void
 }>()
+
+const selectKey = ref()
 // 选中节点
 const select = (keys: Array<any>) => {
+  if (selectKey.value === keys[0]) {
+    return
+  }
+  selectKey.value = keys[0]
   emit('node-click', keys)
 }
 
@@ -89,28 +105,14 @@ watch(inputValue, (val) => {
   getTreeData()
 })
 
-// 保存当前右键的节点
-const contextmenuNode = ref<TreeItem | null>(null)
-const onContextmenu = (node: TreeItem) => {
-  contextmenuNode.value = node
-}
-
-// 关闭右键菜单弹框
-const closeRightMenuPopup = () => {
-  if (contextmenuNode.value?.popupVisible) {
-    contextmenuNode.value.popupVisible = false
-  }
-}
-
 const DictAddModalRef = ref<InstanceType<typeof DictAddModal>>()
 // 新增
 const onAdd = () => {
   DictAddModalRef.value?.onAdd()
 }
 
-// 右键菜单项点击
+// 点击菜单项
 const onMenuItemClick = (mode: string, node: DictResp) => {
-  closeRightMenuPopup()
   if (mode === 'update') {
     DictAddModalRef.value?.onUpdate(node.id)
   } else if (mode === 'delete') {
@@ -141,16 +143,18 @@ onMounted(() => {
 </script>
 
 <style lang="scss" scoped>
-:deep(.arco-tree-node-title-text) {
-  width: 100%;
-  white-space: nowrap;
-}
-
 :deep(.arco-tree-node) {
   line-height: normal;
   border-radius: var(--border-radius-medium);
+  margin: 5px 0;
+  .action {
+    opacity: 0;
+  }
   &:hover {
     background-color: var(--color-secondary-hover);
+    .action {
+      opacity: 1;
+    }
   }
 
   .arco-tree-node-switcher {
@@ -163,13 +167,19 @@ onMounted(() => {
       background-color: transparent;
     }
   }
+
+  .arco-tree-node-title-text {
+    width: 100%;
+    white-space: normal;
+    overflow-wrap: anywhere;
+  }
 }
 
 :deep(.arco-tree-node-selected) {
   font-weight: bold;
   background-color: rgba(var(--primary-6), 0.1);
-  &:hover {
-    background-color: rgba(var(--primary-6), 0.1);
+  .arco-typography {
+    color: rgb(var(--primary-6));
   }
 }