gcs-ui-lib 1.2.35 → 1.2.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gcs-ui-lib",
-  "version": "1.2.35",
+  "version": "1.2.37",
   "private": false,
   "main": "./lib/gcs-ui-lib.common.js",
   "scripts": {

package/packages/AutoFillService/src/components/paymentCategoryT.vue

@@ -19,8 +19,9 @@
 </template>
 
 <script>
-import { getCashflow, getPaymentCategory, getRecUnit } from "@/api/common";
-import { SelectTree } from "n20-common-lib";
+import {getCashflow, getPaymentCategory, getRecUnit} from "@/api/common";
+import {SelectTree} from "n20-common-lib";
+
 export default {
   props: {
     value: {
@@ -197,10 +198,34 @@ export default {
       }
       let res = await this.Api(params);
       res = this.tranData(res);
-      this.type == "cashflow" && this.handleData(res);
-      this.treeData = res;
+      if (this.type === "paymentCategory"){
+        const res1 = await getPaymentCategory({ ...params, direction: "2" })
+        this.treeData = this.mergeTree(res, res1);
+      } else {
+        this.type == "cashflow" && this.handleData(res);
+        this.treeData = res;
+      }
     },
 
+    // 递归合并两棵款项类别树（按paymentCategoryNo去重）
+    mergeTree(arr1, arr2) {
+      const map = new Map();
+      arr1?.forEach((item) => {
+        map.set(item.paymentCategoryNo, item);
+      });
+      arr2?.forEach((item) => {
+        if (map.has(item.paymentCategoryNo)) {
+          const existing = map.get(item.paymentCategoryNo);
+          existing.children = this.mergeTree(
+              existing.children,
+              item.children
+          );
+        } else {
+          map.set(item.paymentCategoryNo, item);
+        }
+      });
+      return Array.from(map.values());
+    },
     tranData(res) {
       const eachItem = (parent, list) => {
         list.forEach((item) => {

package/packages/SelectTreeUnit/src/Tree/index.vue

@@ -14,6 +14,7 @@
   >
     <div
       slot-scope="{ node, data }"
+      :class="data.disabled ? 'nstc-tree-disabled' : ''"
       class="flex-box flex-lr flex-v w-100p cl-tree-item"
       @mouseenter="mouseenterTree(node, data)"
       @mouseleave="checkFlag = false"

package/packages/SelectTreeUnit/src/main.vue

@@ -626,10 +626,14 @@ export default {
           // } else {
           this.getTreeData("1", { resolve, expandFlag: true });
           // }
-        }).then((data) => {
-          if (data) {
-            //默认展开节点
-            this.defaultExpandedKeys = [data.id];
+        }).then(() => {
+          if (this.searchKey) {
+            //搜索时展开所有有子节点的父级路径
+            let expandKeys = [];
+            this.collectExpandKeys(this.data, expandKeys);
+            this.defaultExpandedKeys = expandKeys;
+          } else {
+            this.defaultExpandedKeys = [];
           }
         });
       }
@@ -1135,6 +1139,15 @@ export default {
         }
       });
     },
+    collectExpandKeys(arr, keys) {
+      if (!arr) return;
+      arr.forEach((a) => {
+        if (a.children && Array.isArray(a.children) && a.children.length > 0) {
+          keys.push(a.id);
+          this.collectExpandKeys(a.children, keys);
+        }
+      });
+    },
   },
 };
 </script>

package/packages/SelectTreeUnitForm/src/main.vue

@@ -613,10 +613,14 @@ export default {
           } else {
             this.getTreeData("1", { resolve, expandFlag: true });
           }
-        }).then((data) => {
-          if (data) {
-            //默认展开节点
-            this.defaultExpandedKeys = [data.id];
+        }).then(() => {
+          if (this.searchKey) {
+            //搜索时展开所有有子节点的父级路径
+            let expandKeys = [];
+            this.collectExpandKeys(this.data, expandKeys);
+            this.defaultExpandedKeys = expandKeys;
+          } else {
+            this.defaultExpandedKeys = [];
           }
         });
       }
@@ -907,6 +911,15 @@ export default {
         }
       });
     },
+    collectExpandKeys(arr, keys) {
+      if (!arr) return;
+      arr.forEach((a) => {
+        if (a.children && Array.isArray(a.children) && a.children.length > 0) {
+          keys.push(a.id);
+          this.collectExpandKeys(a.children, keys);
+        }
+      });
+    },
     nodeClick(data) {
       this.$refs.tree.showDropMenu = null;
       //单选才会进入