@indfnd/common 0.1.34 → 0.1.36

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 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.1.36](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.35...v0.1.36) (2024-04-11)
+
+
+### Features
+
+* 重置样式修复 ([3dbef66](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/3dbef66d9b3989221de6e2580321e08513e9a58d))
+
+### [0.1.35](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.34...v0.1.35) (2024-04-11)
+
+
+### Features
+
+* 表格去掉小数位；列展现设置bug修复 ([e9e2a7e](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/e9e2a7e178a927742a50f9e0470ee79b59872613))
+
 ### [0.1.34](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.33...v0.1.34) (2024-04-10)
 
 

package/dist/ind-common.es.js

@@ -1,8 +1,8 @@
 import { Button as Button$1, ButtonGroup as ButtonGroup$1, Input, Drawer as Drawer$1, Dropdown as Dropdown$1, Modal as Modal$1, Form, FormItem, Select as Select$1, Option, Row, Col, Menu, MenuItem, Badge, DropdownMenu, DropdownItem, Submenu, Tag, Header, Layout, Content, Spin, Poptip as Poptip$1, CheckboxGroup, Checkbox, RadioGroup, Radio, Card, Message, LoadingBar } from "view-design";
-import { isNil, formatDate as formatDate$1, useConfig, getLocalStorage, getQuarterNum, formatQuarter, str2Date, isDate, isArray, checkIdCard, checkVehicleNo, checkPhone, getDictMapApi, axios, isFunction, isString, exportJsonToExcel as exportJsonToExcel$1, importJsonFromExcel, on, off, deleteMenuHistoryApi, deleteMenuCollectApi, getMenuHistoryApi, getMenuCollectApi, listItemTreeApi, getPriceInfo, MIME_TYPE, base64ToBlob, putOssFileApi, isEqual, getCaptchaURL, guid, setLocalStorage, removeLocalStorage, clearSessionStorage, cryptor, getToken, putOssFileUrl, getOssFileUrl, responseInterceptors, config as config$1, setToken, loginApi, clearUserInfoCache, clearPermissionCache, logoutApi, getUserInfoCache, getUserInfoApi, setUserInfoCache, getSessionStorage, setSessionStorage, getAppListApi, getPermissionCache, getPermissionApi, setPermissionCache, menuHistoryApi, addMenuCollectApi, removeMenuCollectApi, getIndexDescCache, listIndexDescApi, setIndexDescCache } from "@indfnd/utils";
+import { isNil, formatDate as formatDate$1, useConfig, getLocalStorage, getQuarterNum, formatQuarter, str2Date, isDate, isArray, checkIdCard, checkVehicleNo, checkPhone, getDictMapApi, axios, isFunction, isString, uuid, exportJsonToExcel as exportJsonToExcel$1, importJsonFromExcel, on, off, deleteMenuHistoryApi, deleteMenuCollectApi, getMenuHistoryApi, getMenuCollectApi, listItemTreeApi, getPriceInfo, MIME_TYPE, base64ToBlob, putOssFileApi, isEqual, getCaptchaURL, guid, setLocalStorage, removeLocalStorage, clearSessionStorage, cryptor, getToken, putOssFileUrl, getOssFileUrl, responseInterceptors, config as config$1, setToken, loginApi, clearUserInfoCache, clearPermissionCache, logoutApi, getUserInfoCache, getUserInfoApi, setUserInfoCache, getSessionStorage, setSessionStorage, getAppListApi, getPermissionCache, getPermissionApi, setPermissionCache, menuHistoryApi, addMenuCollectApi, removeMenuCollectApi, getIndexDescCache, listIndexDescApi, setIndexDescCache } from "@indfnd/utils";
 import Vue$1 from "vue";
 const name$1 = "@indfnd/common";
-const version = "0.1.33";
+const version = "0.1.35";
 const author = "huxuetong";
 const publishConfig = {
   registry: "https://registry.npmjs.org/"
@@ -48363,6 +48363,7 @@ var FormImpl = {
     formType: { type: String, default: "form" },
     searchLoading: Boolean,
     queryBtn: { type: Boolean, default: true },
+    resetBtn: { type: Boolean, default: true },
     formCacheList: Array,
     curCacheId: String,
     formEnumData: Object
@@ -48985,6 +48986,7 @@ var FormImpl = {
                 {
                   props: { bizType: "reset" },
                   attrs: { loading: this.searchLoading },
+                  style: { display: this.resetBtn ? "inline-block" : "none" },
                   on: {
                     click: () => {
                       this.$emit("reset");
@@ -50242,14 +50244,14 @@ var render$X = function() {
   var _c = _vm._self._c || _h;
   return _c("div", { staticClass: "index-manager" }, [_c("IndButton", { attrs: { "bizType": "reset" }, on: { "click": _vm.manageIndex } }, [_vm._v(" \u5217\u7B5B\u9009 ")]), _c("IndDrawer", { staticClass: "index-manager", attrs: { "width": "800", "title": "\u9884\u7F6E\u5217\u7BA1\u7406", "lazyRender": false }, model: { value: _vm.showManager, callback: function($$v) {
     _vm.showManager = $$v;
-  }, expression: "showManager" } }, [_c("div", { staticClass: "ind-flex-column height100" }, [_c("IndTable", { ref: "mangeTable", staticStyle: { "padding": "0" }, attrs: { "columns": _vm.manageColumns, "disablePage": "", "showTableOption": false, "isIndexManageTable": "", "rowKey": "headerName" }, model: { value: _vm.curIndex.columnList, callback: function($$v) {
+  }, expression: "showManager" } }, [_c("div", { staticClass: "ind-flex-column height100" }, [_c("IndTable", { ref: "mangeTable", staticStyle: { "padding": "0" }, attrs: { "columns": _vm.manageColumns, "disablePage": "", "showTableOption": false, "isIndexManageTable": "", "rowKey": "uuid" }, model: { value: _vm.curIndex.columnList, callback: function($$v) {
     _vm.$set(_vm.curIndex, "columnList", $$v);
   }, expression: "curIndex.columnList" } })], 1), _c("IndButtonGroup", { attrs: { "slot": "footer", "split": "", "right": "" }, slot: "footer" }, [_c("IndButton", { attrs: { "bizType": "save", "loading": _vm.saving }, on: { "click": _vm.apply } }, [_vm._v(" \u786E\u8BA4 ")]), _c("IndButton", { attrs: { "bizType": "save", "ghost": "", "loading": _vm.saving }, on: { "click": function($event) {
     _vm.showManager = false;
   } } }, [_vm._v(" \u53D6\u6D88 ")])], 1)], 1)], 1);
 };
 var staticRenderFns$X = [];
-function deepEach$4(parentNode, list, callback) {
+function deepEach$5(parentNode, list, callback) {
   if (Array.isArray(list) && list.length) {
     _.forEach(list, (node, idx) => {
       let breakDeep = false;
@@ -50264,7 +50266,7 @@ function deepEach$4(parentNode, list, callback) {
         }
       }
       if (!breakDeep) {
-        deepEach$4(node, node.children, callback);
+        deepEach$5(node, node.children, callback);
       }
     });
   }
@@ -50314,7 +50316,7 @@ const __vue2_script$15 = {
     if (cacheData) {
       let cacheList = JSON.parse(cacheData);
       cacheList.forEach((d) => {
-        deepEach$4(null, d.columnList, (dd) => {
+        deepEach$5(null, d.columnList, (dd) => {
           dd.checked = dd.checked == "1";
           dd.pinned = dd.pinned || "none";
         });
@@ -50329,7 +50331,7 @@ const __vue2_script$15 = {
     async syncToStorage() {
       let dataToCache = _.cloneDeep(this.indexCacheList);
       dataToCache.forEach((d) => {
-        deepEach$4(null, d.columnList, (dd) => {
+        deepEach$5(null, d.columnList, (dd) => {
           dd.checked = dd.checked ? "1" : "0";
           if (dd.pinned == "none") {
             delete dd.pinned;
@@ -50436,7 +50438,7 @@ const __vue2_script$15 = {
     apply() {
       let curIndexClone = _.cloneDeep(this.curIndex);
       let checkRows = this.$refs.mangeTable.getSelection();
-      deepEach$4(null, curIndexClone.columnList, (dd) => {
+      deepEach$5(null, curIndexClone.columnList, (dd) => {
         dd.checked = _.some(checkRows, { field: dd.field });
       });
       this.$emit("resetColumns", _.cloneDeep(curIndexClone.columnList));
@@ -50472,10 +50474,13 @@ const __vue2_script$15 = {
       let cloneData = _.cloneDeep(this.curIndex);
       if (!cloneData.id) {
         let columns = _.cloneDeep(this.tableRef.columns);
-        deepEach$4(null, columns, (dd) => {
+        deepEach$5(null, columns, (dd) => {
+          var _a;
           dd.field = dd.field || dd.key;
           dd.headerName = dd.headerName || dd.title;
-          dd.checked = !dd.hide;
+          if (!((_a = dd.children) == null ? void 0 : _a.length)) {
+            dd.checked = !dd.hide;
+          }
           dd.pinned = dd.fixed || dd.pinned || "none";
         });
         cloneData.columnList = columns;
@@ -50497,7 +50502,7 @@ const __vue2_script$15 = {
     async setTableSelected() {
       setTimeout(() => {
         let initSelected = [];
-        deepEach$4(null, this.curIndex.columnList, (dd) => {
+        deepEach$5(null, this.curIndex.columnList, (dd) => {
           if (dd.checked) {
             initSelected.push(dd);
           }
@@ -51780,6 +51785,70 @@ function addCalcRuleMap(ruleMap = {}, calcRule, columnField) {
     });
   }
 }
+function deepEach$4(parentNode, list, callback) {
+  if (Array.isArray(list) && list.length) {
+    _.forEach(list, (node, idx) => {
+      let breakDeep = false;
+      if (typeof callback === "function") {
+        try {
+          const callbackResult = callback(node, parentNode, idx);
+          if (typeof callbackResult === "boolean") {
+            breakDeep = callbackResult;
+          }
+        } catch (error) {
+          console.error(error);
+        }
+      }
+      if (!breakDeep) {
+        deepEach$4(node, node.children, callback);
+      }
+    });
+  }
+}
+function addNodeToTree$1(tree, node) {
+  function addNodeToTreeInner(subTree, path2) {
+    if (!(path2 == null ? void 0 : path2.length)) {
+      return;
+    }
+    let midPathNode = path2.shift();
+    let midNode = _.find(subTree, { uuid: midPathNode });
+    if (!midNode) {
+      if (path2.length == 0) {
+        midNode = {
+          ...node,
+          children: []
+        };
+      } else {
+        midNode = {
+          ...node,
+          children: node.children || []
+        };
+      }
+      subTree.push(midNode);
+    }
+    addNodeToTreeInner(midNode.children, path2);
+  }
+  let path = _.cloneDeep(node.path);
+  addNodeToTreeInner(tree, path);
+}
+function generateTreeByNodes$1(nodes) {
+  deepEach$4({}, nodes, (d) => {
+    var _a;
+    if ((_a = d.children) == null ? void 0 : _a.length) {
+      delete d.children;
+    }
+  });
+  let rlt = [];
+  nodes.forEach((d) => addNodeToTree$1(rlt, d));
+  rlt = _.orderBy(rlt, ["seq"], ["asc"]);
+  deepEach$4({}, rlt, (d) => {
+    var _a;
+    if ((_a = d.children) == null ? void 0 : _a.length) {
+      d.children = _.orderBy(d.children, ["seq"], ["asc"]);
+    }
+  });
+  return rlt;
+}
 var render$V = function() {
   var _vm = this;
   var _h = _vm.$createElement;
@@ -52021,11 +52090,11 @@ const __vue2_script$W = {
     },
     xScale: {
       type: Number,
-      default: 4
+      default: null
     },
     wzScale: {
       type: Number,
-      default: 4
+      default: null
     },
     funId: String,
     groupDefaultExpanded: {
@@ -52207,14 +52276,14 @@ const __vue2_script$W = {
         datasTmp.forEach((d) => {
           this.switchCols.forEach((dd) => {
             let t2 = _.round(parseFloat(d[dd]), 6);
-            d[dd] = isNaN(t2) ? null : t2 / 5;
+            d[dd] = isNaN(t2) ? null : _.round(t2 / 5, 6);
           });
         });
       } else if (val == "WZ") {
         datasTmp.forEach((d) => {
           this.switchCols.forEach((dd) => {
             let t2 = _.round(parseFloat(d[dd]), 6);
-            d[dd] = isNaN(t2) ? null : t2 * 5;
+            d[dd] = isNaN(t2) ? null : _.round(t2 * 5, 6);
           });
         });
       }
@@ -52224,14 +52293,14 @@ const __vue2_script$W = {
         pinnedTopRowDataWithUnitTmp.forEach((d) => {
           this.switchCols.forEach((dd) => {
             let t2 = _.round(parseFloat(d[dd]), 6);
-            d[dd] = isNaN(t2) ? null : t2 / 5;
+            d[dd] = isNaN(t2) ? null : _.round(t2 / 5, 6);
           });
         });
       } else if (val == "WZ") {
         pinnedTopRowDataWithUnitTmp.forEach((d) => {
           this.switchCols.forEach((dd) => {
             let t2 = _.round(parseFloat(d[dd]), 6);
-            d[dd] = isNaN(t2) ? null : t2 * 5;
+            d[dd] = isNaN(t2) ? null : _.round(t2 * 5, 6);
           });
         });
       }
@@ -52286,7 +52355,15 @@ const __vue2_script$W = {
         this.overlayNoRowsTemplate = '<span style="padding: 10px;">\u6570\u636E\u4E3A\u7A7A</span>';
         this.updating = true;
         this.renderSumRow();
-        this.$emit("input", _.cloneDeep(val));
+        let isTreeTable = _.some(this.columns, { tree: true });
+        if (isTreeTable) {
+          let treeDataClone = _.cloneDeep(val);
+          let rlt = generateTreeByNodes$1(treeDataClone);
+          console.log("treedatarendered is", rlt);
+          this.$emit("input", rlt);
+        } else {
+          this.$emit("input", _.cloneDeep(val));
+        }
         this.$nextTick(() => {
           this.updating = false;
         });
@@ -52421,14 +52498,14 @@ const __vue2_script$W = {
     resetColumns(columns) {
       const columnDataMap = {};
       deepEach$3(null, this.columns || [], (item2) => {
-        let field = item2.field || item2.key || item2.type;
+        let field = item2.field || item2.key || item2.type || item2.headerName || item2.title;
         Object.assign(columnDataMap, { [field]: item2 });
       });
-      deepEach$3(null, columns, (d) => {
-        let srcColumn = columnDataMap[d.field || d.key || d.type];
+      deepEach$3(null, columns, (d, p) => {
+        let srcColumn = columnDataMap[d.field || d.key || d.type || d.headerName || d.title];
         srcColumn.hide = !d.checked;
-        if (d.pinned) {
-          srcColumn.pinned = d.pinned;
+        if (d.pinned && d.pinned != "none" || (p == null ? void 0 : p.pinned) && (p == null ? void 0 : p.pinned) != "none") {
+          srcColumn.pinned = d.pinned == "none" ? (p == null ? void 0 : p.pinned) == "none" ? void 0 : p == null ? void 0 : p.pinned : d.pinned;
         } else {
           delete srcColumn.pinned;
         }
@@ -52568,7 +52645,7 @@ const __vue2_script$W = {
         return column.cellRendererParams.scale;
       if (column.isSwitchUnit) {
         const unitType = this.unitType.toLowerCase();
-        return this[`${unitType}Scale`] || 4;
+        return this[`${unitType}Scale`] || null;
       }
       return null;
     },
@@ -53062,11 +53139,13 @@ const __vue2_script$W = {
       if (this.treeData) {
         this.renderTreeFlag(val);
         let rlt = [];
-        deepEach$3(null, val, (d) => {
+        deepEach$3(null, val, (d, p, idx) => {
+          d.seq = idx;
           rlt.push(d);
         });
         val = rlt;
       }
+      console.log("renderTreeData is", val);
       return val;
     },
     renderTreeFlag(datas) {
@@ -53075,9 +53154,20 @@ const __vue2_script$W = {
         return;
       }
       let treeCol = (treeColDef == null ? void 0 : treeColDef.field) || (treeColDef == null ? void 0 : treeColDef.key);
+      deepEach$3(null, datas, (d, parentNode, idx) => {
+        d.uuid = d.uuid || uuid();
+      });
       deepEach$3(null, datas, (d, parentNode, idx) => {
         d.treeLevelFlag = parentNode ? [...parentNode.treeLevelFlag, d[treeCol]] : [d[treeCol]];
+        if (parentNode) {
+          let pPath = parentNode.path ? _.cloneDeep(parentNode.path) : [parentNode.uuid];
+          pPath.push(d.uuid);
+          d.path = pPath;
+        } else {
+          d.path = [d.uuid];
+        }
       });
+      console.log("renderTreeFlag datas", datas);
     },
     tableRefresh: _.debounce(function(noQuery) {
       var _a;
@@ -53112,14 +53202,14 @@ const __vue2_script$W = {
                 data.forEach((d) => {
                   this.switchCols.forEach((dd) => {
                     let t2 = _.round(parseFloat(d[dd]), 6);
-                    d[dd] = isNaN(t2) ? null : t2 * 5;
+                    d[dd] = isNaN(t2) ? null : _.round(t2 * 5, 6);
                   });
                 });
               } else {
                 data.forEach((d) => {
                   this.switchCols.forEach((dd) => {
                     let t2 = _.round(parseFloat(d[dd]), 6);
-                    d[dd] = isNaN(t2) ? null : t2 / 5;
+                    d[dd] = isNaN(t2) ? null : _.round(t2 / 5, 6);
                   });
                 });
               }
@@ -53150,14 +53240,14 @@ const __vue2_script$W = {
             pinnedTopRowDataWithUnitTmp.forEach((d) => {
               this.switchCols.forEach((dd) => {
                 let t2 = _.round(parseFloat(d[dd]), 6);
-                d[dd] = isNaN(t2) ? null : t2 / 5;
+                d[dd] = isNaN(t2) ? null : _.round(t2 / 5, 6);
               });
             });
           } else if (this.unitType == "WZ") {
             pinnedTopRowDataWithUnitTmp.forEach((d) => {
               this.switchCols.forEach((dd) => {
                 let t2 = _.round(parseFloat(d[dd]), 6);
-                d[dd] = isNaN(t2) ? null : t2 * 5;
+                d[dd] = isNaN(t2) ? null : _.round(t2 * 5, 6);
               });
             });
           }
@@ -53170,14 +53260,14 @@ const __vue2_script$W = {
             datasTmp.forEach((d) => {
               this.switchCols.forEach((dd) => {
                 let t2 = parseFloat(d[dd]);
-                d[dd] = isNaN(t2) ? null : t2 * 5;
+                d[dd] = isNaN(t2) ? null : _.round(t2 * 5, 6);
               });
             });
           } else {
             datasTmp.forEach((d) => {
               this.switchCols.forEach((dd) => {
                 let t2 = parseFloat(d[dd]);
-                d[dd] = isNaN(t2) ? null : t2 / 5;
+                d[dd] = isNaN(t2) ? null : _.round(t2 / 5, 6);
               });
             });
           }
@@ -53220,7 +53310,7 @@ const __vue2_script$W = {
         datasTmp.forEach((d) => {
           this.switchCols.forEach((dd) => {
             let t2 = _.round(parseFloat(d[dd]), 6);
-            d[dd] = isNaN(t2) ? null : t2 / 5;
+            d[dd] = isNaN(t2) ? null : _.round(t2 / 5, 6);
           });
         });
         return datasTmp;
@@ -53234,7 +53324,7 @@ const __vue2_script$W = {
         datasTmp.forEach((d) => {
           this.switchCols.forEach((dd) => {
             let t2 = _.round(parseFloat(d[dd]), 6);
-            d[dd] = isNaN(t2) ? null : t2 * 5;
+            d[dd] = isNaN(t2) ? null : _.round(t2 * 5, 6);
           });
         });
         return datasTmp;
@@ -53248,7 +53338,7 @@ const __vue2_script$W = {
         datasTmp.forEach((d) => {
           this.switchCols.forEach((dd) => {
             let t2 = _.round(parseFloat(d[dd]), 6);
-            d[dd] = isNaN(t2) ? null : t2 / 5;
+            d[dd] = isNaN(t2) ? null : _.round(t2 / 5, 6);
           });
         });
         return datasTmp;
@@ -53262,7 +53352,7 @@ const __vue2_script$W = {
         datasTmp.forEach((d) => {
           this.switchCols.forEach((dd) => {
             let t2 = _.round(parseFloat(d[dd]), 6);
-            d[dd] = isNaN(t2) ? null : t2 * 5;
+            d[dd] = isNaN(t2) ? null : _.round(t2 * 5, 6);
           });
         });
         return datasTmp;
@@ -57101,8 +57191,12 @@ const __vue2_script$x = {
         permissions = sessionStorage.getItem("ibp-sc-permission");
       }
       permissions = JSON.parse(permissions);
-      let curPermission = _.find(permissions, { permissionId: this.$route.meta.permissionId });
-      this.menuInfo = JSON.parse(curPermission.extendProps) || {};
+      let curPermission = _.find(permissions, { permissionId: this.$route.meta.permissionId }) || {};
+      try {
+        this.menuInfo = JSON.parse(curPermission.extendProps) || {};
+      } catch (e) {
+        console.log("\u672A\u53D6\u5230\u6570\u636E");
+      }
       console.log("this.menuInfo is", this.menuInfo);
     }
   }