@indfnd/common 0.1.32 → 0.1.34

package/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 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.34](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.33...v0.1.34) (2024-04-10)
+
+
+### Bug Fixes
+
+* 功能说明点确认关闭 ([a358e28](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/a358e2833b0d0efd77bcddc4f8b78121df74ff40))
+* pinnedTopRowData参与单位切换 ([eaa0556](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/eaa0556653b31df16be4f1272153c688803068c3))
+
+### [0.1.33](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.32...v0.1.33) (2024-04-09)
+
+
+### Features
+
+* 计算合计传递列定义参数 ([3246f66](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/3246f66d2a94c7a036ada7375f98400e49e02564))
+
+
+### Bug Fixes
+
+* **panel:** 返回顶部按钮右移 ([6df9080](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/6df9080f78f00353f20748167e488406559e98f5))
+
 ### [0.1.32](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.31...v0.1.32) (2024-04-09)
 
 

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, 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 Vue$1 from "vue";
 const name$1 = "@indfnd/common";
-const version = "0.1.31";
+const version = "0.1.33";
 const author = "huxuetong";
 const publishConfig = {
   registry: "https://registry.npmjs.org/"
@@ -52089,6 +52089,7 @@ const __vue2_script$W = {
       showUnitSwitch: false,
       switchCols: [],
       unitType: this.defaultTableUnitType || this.defaultUnitType || "X",
+      pinnedTopRowDataWithUnit: this.pinnedTopRowData || null,
       topRows: this.pinnedTopRowData || null,
       treeData: false,
       getDataPath: (data) => {
@@ -52195,6 +52196,7 @@ const __vue2_script$W = {
   watch: {
     pinnedTopRowData: {
       handler: function() {
+        this.pinnedTopRowDataWithUnit = _.cloneDeep(this.pinnedTopRowData);
         this.renderSumRow();
       },
       deep: true
@@ -52216,11 +52218,25 @@ const __vue2_script$W = {
           });
         });
       }
-      if (this.dataApi) {
-        this.tableData = datasTmp;
-      } else {
-        this.$emit("input", datasTmp);
+      this.tableData = datasTmp;
+      let pinnedTopRowDataWithUnitTmp = _.cloneDeep(this.pinnedTopRowDataWithUnit);
+      if (val == "X") {
+        pinnedTopRowDataWithUnitTmp.forEach((d) => {
+          this.switchCols.forEach((dd) => {
+            let t2 = _.round(parseFloat(d[dd]), 6);
+            d[dd] = isNaN(t2) ? null : t2 / 5;
+          });
+        });
+      } 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;
+          });
+        });
       }
+      this.pinnedTopRowDataWithUnit = pinnedTopRowDataWithUnitTmp;
+      this.renderSumRow();
     },
     getTheme() {
       this.gridApi.resetRowHeights();
@@ -52973,7 +52989,6 @@ const __vue2_script$W = {
         let sumCols = _.filter(this.flatColumns, (item2) => item2.isSum);
         let sumCalcCols = _.remove(sumCols, (item2) => isString(item2.isSum));
         let sumFuncCols = _.remove(sumCols, (item2) => item2.isSum instanceof Function);
-        console.log("sumCols", sumCols, "sumFuncCols", sumFuncCols);
         const sumCalcRuleMap = {};
         _.forEach(sumCalcCols, (col) => {
           addCalcRuleMap(sumCalcRuleMap, col.isSum, col.field || col.key);
@@ -53012,7 +53027,7 @@ const __vue2_script$W = {
           sumData
         );
         _.forEach(sumFuncCols, (d) => {
-          sumData[d.field || d.key] = d.isSum(this.tableData);
+          sumData[d.field || d.key] = d.isSum(this.tableData, d);
         });
         let sumRows = [sumData];
         let calcRules = {};
@@ -53034,9 +53049,9 @@ const __vue2_script$W = {
         });
         let options = { calcRules: rules };
         calcDatas(sumRows, options);
-        this.topRows = this.pinnedTopRowData ? _.concat(this.pinnedTopRowData, sumRows) : sumRows;
+        this.topRows = this.pinnedTopRowDataWithUnit ? _.concat(this.pinnedTopRowDataWithUnit, sumRows) : sumRows;
       } else {
-        this.topRows = this.pinnedTopRowData;
+        this.topRows = this.pinnedTopRowDataWithUnit;
       }
     },
     async renderTreeData(val) {
@@ -53129,6 +53144,26 @@ const __vue2_script$W = {
     },
     toggleUnitIfNeeded: _.debounce(async function toggleUnitIfNeeded() {
       setTimeout(() => {
+        let pinnedTopRowDataWithUnitTmp = _.cloneDeep(this.pinnedTopRowDataWithUnit);
+        if (this.unitType != this.defaultUnitType) {
+          if (this.unitType == "X") {
+            pinnedTopRowDataWithUnitTmp.forEach((d) => {
+              this.switchCols.forEach((dd) => {
+                let t2 = _.round(parseFloat(d[dd]), 6);
+                d[dd] = isNaN(t2) ? null : t2 / 5;
+              });
+            });
+          } 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;
+              });
+            });
+          }
+        }
+        this.pinnedTopRowDataWithUnit = pinnedTopRowDataWithUnitTmp;
+        this.renderSumRow();
         let datasTmp = _.cloneDeep(this.tableData);
         if (this.unitType != this.defaultUnitType) {
           if (this.unitType == "WZ") {
@@ -54900,7 +54935,7 @@ const __vue2_script$O = {
   props: {
     offsetTop: { type: Number, default: 100 },
     bottom: { type: Number, default: 80 },
-    right: { type: Number, default: 50 },
+    right: { type: Number, default: 20 },
     duration: { type: Number, default: 1e3 },
     container: { type: [String, HTMLElement], default: null }
   },
@@ -57028,6 +57063,8 @@ var render$w = function() {
     _vm.show = true;
   } } }), _c("IndModal", { attrs: { "lazyRender": false, "title": _vm.title, "mask-closable": true, "width": _vm.width, "transfer": "" }, on: { "on-cancel": function($event) {
     _vm.show = false;
+  }, "on-ok": function($event) {
+    _vm.show = false;
   } }, model: { value: _vm.show, callback: function($$v) {
     _vm.show = $$v;
   }, expression: "show" } }, [_vm.menuInfo.menuDesc ? [_c("div", { staticClass: "ind-menu-help-panel" }, [_c("div", { staticClass: "ind-flex" }, [_c("div", { staticClass: "ind-menu-title" }, [_vm._v("\u529F\u80FD\u8BF4\u660E\uFF1A")]), _c("div", { staticClass: "ind-menu-title-content" }, [_vm._v(" " + _vm._s(_vm.menuInfo.menuDesc) + " ")])]), _c("div", { staticClass: "ind-menu-title" }, [_vm._v("\u6307\u6807\u5B9A\u4E49\uFF1A")]), _vm._l(_vm.menuInfo.indexList, function(item2, idx) {