From 424ec3037c0f56a761121c60678e68c7ed1bc559 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 19 三月 2024 21:06:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index d90f2a2..c472550 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -4,7 +4,7 @@
     <!--    宸︿晶鑿滃崟-->
     <el-aside>
       <basic-container>
-        <div style="height: calc(100vh - 144px);!important;" @click="clearNode">
+        <div ref="TreeBox" style="height: calc(100vh - 144px);!important;">
           <div class="headerCon" style="display: flex; flex-wrap: wrap;margin-bottom: 5px">
             <el-button v-if="permissionList.TreeAddStatus" plain size="small" type="primary" @click="TreeAdd">娣诲姞
             </el-button>
@@ -62,7 +62,6 @@
                 </el-tooltip>
               </template>
             </avue-tree>
-            <div style="height: 25px"></div>
           </div>
 
         </div>
@@ -699,16 +698,25 @@
   mounted() {
     this.type = this.tabOption.column[0] || {label: '鍩烘湰淇℃伅', prop: 'tab1'};
     this.getAttr();
-    const treeEle = this.$refs.tree.$el
-    treeEle.addEventListener('click', (e) => {
-      if (e.target.nodeName !== 'SPAN') {
+    // const treeEle = this.$refs.tree.$el;
+    const TreeBox = this.$refs.TreeBox;
+    // console.log(this.$refs.TreeBox)
+    // treeEle.addEventListener('click', (e) => {
+    //   console.log('2')
+    //   if (e.target.nodeName !== 'SPAN') {
+    //     this.$refs.tree.setCurrentKey(null);
+    //     this.nodeClickList = {};
+    //     this.TreeFlagCode = true;
+    //     this.allButtons = false;
+    //   }
+    // }, true)
+    TreeBox.addEventListener('click', (e) => {
+      console.log(e.target.nodeName)
+      if (e.target.nodeName !== 'SPAN' && e.target.nodeName !== 'BUTTON') {
         this.$refs.tree.setCurrentKey(null);
         this.nodeClickList = {};
         this.TreeFlagCode = true;
         this.allButtons = false;
-        // this.$nextTick(()=>{
-        //   this.btnAuthList = [];
-        // })
       }
     }, true)
   },
@@ -797,12 +805,6 @@
   created() {
   },
   methods: {
-    clearNode(){
-      this.$refs.tree.setCurrentKey(null);
-      this.nodeClickList = {};
-      this.TreeFlagCode = true;
-      this.allButtons = false;
-    },
     // 鍒嗙被鎺堟潈瀵硅瘽妗嗘墦寮�
     classifyAuthHandler() {
       if (this.nodeClickList.oid === '' || this.nodeClickList.oid === undefined) {

--
Gitblit v1.9.3