@indfnd/common 0.0.79 → 0.0.80

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.0.80](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.0.79...v0.0.80) (2024-02-04)
+
+
+### Features
+
+* 更新单位切换的默认小数位数 ([1e387c6](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/1e387c6bc1fe82f4ba23078e4c0e12b9c639b47e))
+
+
+### Bug Fixes
+
+* 树选择组件bug修复 ([44e04ac](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/44e04acd4ffdd5fca5ad73a96d8355f393ac8a4c))
+
 ### [0.0.79](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.0.78...v0.0.79) (2024-02-01)
 
 

package/dist/ind-common.es.js

@@ -2,7 +2,7 @@ import { Button as Button$1, ButtonGroup as ButtonGroup$1, Input, Drawer as Draw
 import { isNil, useConfig, getLocalStorage, getQuarterNum, formatQuarter, str2Date, isDate, isArray, checkIdCard, checkVehicleNo, checkPhone, getDictMapApi, formatDate as formatDate$1, axios, isFunction, exportJsonToExcel as exportJsonToExcel$1, importJsonFromExcel, getPriceCode, getPriceSeg, getItem, on as on$1, off as off$1, deleteMenuHistoryApi, deleteMenuCollectApi, getMenuHistoryApi, getMenuCollectApi, getCaptchaURL, guid, setLocalStorage, removeLocalStorage, clearSessionStorage, cryptor, getToken, MIME_TYPE, responseInterceptors, config as config$1, setToken, loginApi, clearUserInfoCache, clearPermissionCache, logoutApi, getUserInfoCache, getUserInfoApi, setUserInfoCache, getSessionStorage, setSessionStorage, getAppListApi, getPermissionCache, getPermissionApi, setPermissionCache, menuHistoryApi, addMenuCollectApi, removeMenuCollectApi } from "@indfnd/utils";
 import Vue$1 from "vue";
 const name$1 = "@indfnd/common";
-const version$1 = "0.0.78";
+const version$1 = "0.0.79";
 const author = "huxuetong";
 const publishConfig = {
   registry: "https://registry.npmjs.org/"
@@ -56313,11 +56313,11 @@ const __vue2_script$N = {
     },
     xScale: {
       type: Number,
-      default: 2
+      default: 4
     },
     wzScale: {
       type: Number,
-      default: 2
+      default: 4
     },
     funId: String
   },
@@ -57906,7 +57906,11 @@ const __vue2_script$J = {
   },
   computed: {
     defaultValueStr() {
-      return JSON.stringify(this.defaultValue);
+      return JSON.stringify(
+        this.defaultValue.map((d) => {
+          return d.id || d;
+        })
+      );
     }
   },
   methods: {
@@ -57943,7 +57947,7 @@ const __vue2_script$J = {
         0
       );
       deepEach2$1(list, []);
-      this.treeData = list;
+      this.treeData = _.cloneDeep(list);
       this.backupTreeData = _.cloneDeep(this.treeData);
       this.defaultValueHandler();
       this.loading = false;
@@ -57997,35 +58001,33 @@ const __vue2_script$J = {
     },
     setDefaultValue2Nodes() {
       deepEach$1(this.treeData, (node) => {
+        node.expand = this.expandAll ? true : node.expand;
+        if (this.defaultExpandLevel != void 0) {
+          node.expand = node.level <= this.defaultExpandLevel;
+        }
         if (this.defaultValueCalc.includes(node.id)) {
-          node.expand = true;
           if (this.showCheckbox) {
             node.checked = true;
           } else {
             node.selected = true;
           }
         } else {
-          node.expand = this.expandAll ? true : false;
-          if (this.defaultExpandLevel != void 0) {
-            node.expand = node.level <= this.defaultExpandLevel;
-          }
           node.checked = false;
           node.selected = false;
         }
       });
       deepEach$1(this.backupTreeData, (node) => {
+        node.expand = this.expandAll ? true : node.expand;
+        if (this.defaultExpandLevel != void 0) {
+          node.expand = node.level <= this.defaultExpandLevel;
+        }
         if (this.defaultValueCalc.includes(node.id)) {
-          node.expand = true;
           if (this.showCheckbox) {
             node.checked = true;
           } else {
             node.selected = true;
           }
         } else {
-          node.expand = this.expandAll ? true : false;
-          if (this.defaultExpandLevel != void 0) {
-            node.expand = node.level <= this.defaultExpandLevel;
-          }
           node.checked = false;
           node.selected = false;
         }
@@ -58074,24 +58076,6 @@ const __vue2_script$J = {
       this.backupTreeData = _.cloneDeep(this.treeData);
     },
     processAncestorNodesExpandStatus() {
-      deepEach$1(this.treeData, (node) => {
-        let matched = false;
-        deepEach$1(node.children, (child) => {
-          if (child.selected || child.checked || child.expand || node.expand) {
-            return matched = true;
-          }
-        });
-        node.expand = matched;
-      });
-      deepEach$1(this.backupTreeData, (node) => {
-        let matched = false;
-        deepEach$1(node.children, (child) => {
-          if (child.selected || child.checked || child.expand || node.expand) {
-            return matched = true;
-          }
-        });
-        node.expand = matched;
-      });
     },
     watchDataProp() {
       if (!this.dataApi) {
@@ -58108,10 +58092,16 @@ const __vue2_script$J = {
         console.log("not inited yet");
         return;
       }
+      if (!this.foldFirstLevel && this.firstLeafByStatus.length < 1 && this.treeData.length) {
+        this.expandFirstLevel();
+      }
       if (this.defaultValue.length) {
         this.setDefaultValue2Nodes();
         this.processAncestorNodesExpandStatus();
         this.scrollToDefaultNode();
+        if (!this.foldFirstLevel && this.firstLeafByStatus.length < 1 && this.treeData.length) {
+          this.expandFirstLevel();
+        }
         this.$nextTick(() => {
           this.$emit(
             "on-default-change",
@@ -58121,8 +58111,7 @@ const __vue2_script$J = {
       } else {
         this.clearCheckedAndSelectedNodes(true);
         if (!this.foldFirstLevel && this.firstLeafByStatus.length < 1 && this.treeData.length) {
-          this.$set(this.treeData[0], "expand", true);
-          this.$set(this.backupTreeData[0], "expand", true);
+          this.expandFirstLevel();
         }
         if (this.selectFirstLeaf) {
           this._selectFirstLeaf();
@@ -58250,7 +58239,6 @@ const __vue2_script$J = {
               checkAll = false;
             }
           });
-          console.log("checkAll", checkAll);
           curNode.indeterminate = false;
           if (checkAll) {
             curNode.checked = false;
@@ -58293,7 +58281,6 @@ const __vue2_script$J = {
             console.log("\u5355\u9009 \u975EleafOnly \u9009\u62E9\u4E86\u8282\u70B9");
             this.$emit("on-select-change", !nodes || nodes.length == 0 ? [curNode] : nodes, curNode);
           }
-          console.log("curNode is", curNode);
           curNode.expand = !curNode.expand;
         } else {
           deepEach$1(nodes, (node) => {
@@ -58309,7 +58296,6 @@ const __vue2_script$J = {
       deepEach$1(this.treeData, (node) => {
         if (selectNodes.includes(node.id)) {
           node.checked = true;
-          node.expand = true;
         } else {
           this.treeData[0].checked = false;
           node.checked = false;
@@ -58325,7 +58311,7 @@ const __vue2_script$J = {
       deepEach$1(this.backupTreeData, (node) => {
         if (selectNodes.includes(node.id)) {
           node.checked = true;
-          node.expand = true;
+          node.expand = node.expand;
         } else {
           this.backupTreeData[0].checked = false;
           node.checked = false;
@@ -58484,11 +58470,11 @@ const __vue2_script$J = {
       }
     },
     highlightNodes(selectedTitles, callback) {
-      if (!selectedTitles) {
-        this.treeData = [];
+      if (!selectedTitles || !selectedTitles[0]) {
+        let checkedNodes2 = this.getCheckedNodes(true);
         this.treeData = _.cloneDeep(this.backupTreeData);
         this.$nextTick(() => {
-          this.$emit("on-check-change");
+          this.$emit("on-check-change", checkedNodes2);
         });
         if (typeof callback === "function") {
           callback(0);
@@ -58522,7 +58508,11 @@ const __vue2_script$J = {
           }
         });
       }
-      this.treeData = this.deleteNoMatchedNodes(data);
+      let checkedNodes = this.getCheckedNodes(true);
+      this.treeData = _.cloneDeep(this.deleteNoMatchedNodes(data));
+      this.$nextTick(() => {
+        this.$emit("on-check-change", checkedNodes);
+      });
       if (typeof callback === "function") {
         callback(num);
       }