From 32ebe84d704f32842fdc8b5b23038dccb67234ff Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 18 三月 2024 18:25:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue      |    6 +++---
 Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue |    9 ++++++++-
 Source/UBCS-WEB/src/util/func.js                            |    2 ++
 Source/UBCS-WEB/src/util/validate.js                        |    5 +++--
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index 5e11c79..b31faac 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -876,7 +876,7 @@
           },
           {
             label: "鍙",
-            prop: "readonlyFlag",
+            prop: "readOnlyFlag",
           },
           {
             label: "鍒楄〃鎺掑簭",
@@ -1386,7 +1386,7 @@
           },
           {
             label: "鍙",
-            prop: "readonlyFlag",
+            prop: "readOnlyFlag",
             cell: false,
             edit: "switch"
           },
@@ -1613,7 +1613,7 @@
         value: 'tableDisplayFlag',
         label: '鍒楄〃鏄剧ず'
       }, {
-        value: 'readonlyFlag',
+        value: 'readOnlyFlag',
         label: '鍙'
       }, {
         value: 'sortAttrFlag',
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index 9b9671d..d90f2a2 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;">
+        <div style="height: calc(100vh - 144px);!important;" @click="clearNode">
           <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,6 +62,7 @@
                 </el-tooltip>
               </template>
             </avue-tree>
+            <div style="height: 25px"></div>
           </div>
 
         </div>
@@ -796,6 +797,12 @@
   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) {
diff --git a/Source/UBCS-WEB/src/util/func.js b/Source/UBCS-WEB/src/util/func.js
index 9d6d017..7919dfd 100644
--- a/Source/UBCS-WEB/src/util/func.js
+++ b/Source/UBCS-WEB/src/util/func.js
@@ -6,6 +6,7 @@
    * 涓嶄负绌�
    * @param val
    * @returns {boolean}
+   * 涓嶈兘鍒ゆ柇鏁扮粍鍜屽璞� 濡傚垽鏂�"null"銆�"undefined"浼氳繑鍥炰笉涓虹┖
    */
   static notEmpty(val) {
     return !this.isEmpty(val);
@@ -24,6 +25,7 @@
    * 涓虹┖
    * @param val
    * @returns {boolean}
+   * 涓嶈兘鍒ゆ柇鏁扮粍鍜屽璞� 濡傚垽鏂�"null"銆�"undefined"浼氳繑鍥炰笉涓虹┖
    */
   static isEmpty(val) {
     if (
diff --git a/Source/UBCS-WEB/src/util/validate.js b/Source/UBCS-WEB/src/util/validate.js
index a774710..fb407d8 100644
--- a/Source/UBCS-WEB/src/util/validate.js
+++ b/Source/UBCS-WEB/src/util/validate.js
@@ -179,7 +179,7 @@
     let result = true;
     let msg = '';
     var isPhone = /^0\d{2,3}-?\d{7,8}$/;
-    //澧炲姞134 鍑忓皯|1349[0-9]{7}锛屽鍔�181,澧炲姞145锛屽鍔�17[678]  
+    //澧炲姞134 鍑忓皯|1349[0-9]{7}锛屽鍔�181,澧炲姞145锛屽鍔�17[678]
     if (!validatenull(phone)) {
         if (phone.length == 11) {
             if (isPhone.test(phone)) {
@@ -233,6 +233,7 @@
 }
 /**
  * 鍒ゆ柇鏄惁涓虹┖
+ * 鍙互鍒ゆ柇鏁扮粍鍜屽璞� 濡傚垽鏂�"null"銆�"undefined"涔熶細杩斿洖鏄┖
  */
 export function validatenull(val) {
     if (typeof val == 'boolean') {
@@ -250,4 +251,4 @@
         return false;
     }
     return false;
-}
\ No newline at end of file
+}

--
Gitblit v1.9.3