gcs-ui-lib 1.2.36 → 1.2.38

package/package.json

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

package/packages/AutoFillList/src/components/config.js

@@ -524,7 +524,7 @@ const AutoFillListHeader = [
     align: "center",
     width: "120",
     formatter: ({ row }) => {
-      return row.isAutoConfirm ? "是" : "否";
+      return row.isAutoConfirm ?  $l("是") : $l("否");
     },
   },
   {

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

@@ -188,7 +188,7 @@ export default {
       } else if (this.type == "paymentCategory") {
         params = {
           activeFlag: 1,
-          direction:  this.settingSource == '1' ? 1 : 0,
+          directionList:  [this.settingSource == '1' ? 1 : 0, 2].join(','),
           resultType: 2,
         };
       } else {
@@ -198,33 +198,8 @@ export default {
       }
       let res = await this.Api(params);
       res = this.tranData(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());
+      this.type == "cashflow" && this.handleData(res);
+      this.treeData = res;
     },
     tranData(res) {
       const eachItem = (parent, list) => {

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;
       //单选才会进入

package/src/lang/i18n.json

@@ -381,7 +381,7 @@
     "en": "name of opposite Dep. bank"
   },
   "对方户名": {
-    "en": "Counterparty Acct Name"
+    "en": "Beneficiary Name"
   },
   "对方账号": {
     "en": "Opposite Account"