@indfnd/common 1.0.13 → 1.0.15

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.
 
+### [1.0.15](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.14...v1.0.15) (2024-07-08)
+
+
+### Features
+
+* 表格计算逻辑修改`` ([21a6a95](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/21a6a958528a6cb3c678bfa1b898aa8b1b8d6485))
+
+### [1.0.14](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.13...v1.0.14) (2024-06-29)
+
+
+### Bug Fixes
+
+* 导出excel支持百分比格式 ([2e3fc6c](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/2e3fc6cb0d32c94a2382d37f2a96e32f1f9700c5))
+
 ### [1.0.13](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.12...v1.0.13) (2024-06-28)
 
 

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, getQuarterNum, formatQuarter, str2Date, isDate, isArray, checkIdCard, checkVehicleNo, checkPhone, getDictMapApi, axios, isFunction, isString, uuid, exportJsonToExcel as exportJsonToExcel$1, importJsonFromExcel, on, off, deleteMenuHistoryApi, deleteMenuCollectApi, getMenuHistoryApi, getMenuCollectApi, getPermissionCache, listItemTreeApi, getPriceInfo, MIME_TYPE, base64ToBlob, putOssFileApi, isEqual, getCaptchaURL, getLocalStorage, guid, setLocalStorage, removeLocalStorage, clearSessionStorage, cryptor, getToken, putOssFileUrl, getOssFileUrl, responseInterceptors, config as config$1, setToken, loginApi, clearUserInfoCache, clearPermissionCache, logoutApi, getUserInfoCache, getUserInfoApi, setUserInfoCache, getSessionStorage, setSessionStorage, getAppListApi, getPermissionApi, setPermissionCache, menuHistoryApi, addMenuCollectApi, removeMenuCollectApi, getIndexDescCache, listIndexDescApi, setIndexDescCache } from "@indfnd/utils";
 import Vue$1 from "vue";
 const name$1 = "@indfnd/common";
-const version = "1.0.12";
+const version = "1.0.14";
 const author = "huxuetong";
 const publishConfig = {
   registry: "https://registry.npmjs.org/"
@@ -43160,14 +43160,16 @@ function getAgColumnTitleAndData({ columns, datas }) {
   }
   calcColumns(columnsClo, columnsCalc);
   var columnAlign = columnsCalc.map((d) => d.align || "left");
-  var columnType = columnsCalc.map((d) => d.align == "right" || d.align == "rightNum" ? "n" : "s");
+  var columnType = columnsCalc.map((d) => d.dataType == "percent" ? "p" : d.align == "right" || d.align == "rightNum" ? "n" : "s");
   var columnWidth = columnsCalc.map(
     (d) => d.excelWidth ? d.excelWidth : d.width ? Math.floor(d.width / 10) : 10
   );
   var numberFormat = columnsCalc.map((d) => {
     var _a;
     let scale = (_a = d == null ? void 0 : d.cellRendererParams) == null ? void 0 : _a.scale;
-    if (scale !== void 0) {
+    if (d.dataType == "percent") {
+      return "0.00%";
+    } else if (scale !== void 0) {
       return "#,##0." + _.range(scale).fill(0).join("");
     } else {
       return d.align == "rightNum" ? "#,##0.0000" : d.align == "right" ? "#,##0.00" : "";
@@ -43394,14 +43396,17 @@ function exportJsonToExcel(excelData) {
     for (var i = 0; i < jsonData.length; i++) {
       var lineData = jsonData[i];
       for (var j = 0; j < lineData.length; j++) {
-        if (columnType[j] === "s" && lineData[j]) {
-          sheet.cell(rowsNow + i, j + 1).value(lineData[j]);
-          dataCellStyle.numberFormat = "";
+        if (columnType[j] === "p" && lineData[j]) {
+          sheet.cell(rowsNow + i, j + 1).value(parseFloat(lineData[j] / 100));
+          dataCellStyle.numberFormat = numberFormat[j];
         } else if (columnType[j] === "n" && lineData[j]) {
           sheet.cell(rowsNow + i, j + 1).value(parseFloat(lineData[j]));
           dataCellStyle.numberFormat = numberFormat[j];
+        } else if (columnType[j] === "s" && lineData[j]) {
+          sheet.cell(rowsNow + i, j + 1).value(lineData[j]);
+          dataCellStyle.numberFormat = "";
         } else {
-          if (columnType[j] === "n") {
+          if (columnType[j] === "p" || columnType[j] === "n") {
             dataCellStyle.numberFormat = numberFormat[j];
           } else {
             sheet.cell(rowsNow + i, j + 1).value("");
@@ -53143,6 +53148,9 @@ const __vue2_script$_ = {
         if (column.align) {
           agColumn.align = column.align;
         }
+        if (column.dataType) {
+          agColumn.dataType = column.dataType;
+        }
         if (column.headerTooltip) {
           agColumn.headerTooltip = agColumn.headerTooltip || column.headerTooltip;
         }
@@ -53543,70 +53551,57 @@ const __vue2_script$_ = {
     },
     renderSumRow: _.debounce(async function() {
       var _a;
-      let hasSumRow = _.some(this.flatColumns, (item2) => item2.isSum);
+      let hasSumRow = this.flatColumns.some((item2) => item2.isSum);
       if (hasSumRow) {
         console.time("calcSum");
-        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);
-        const sumCalcRuleMap = {};
-        _.forEach(sumCalcCols, (col) => {
-          addCalcRuleMap(sumCalcRuleMap, col.isSum, col.field || col.key);
-        });
         let sumData = {};
-        for (let i = 0; i < this.flatColumns.length; i++) {
-          if (!["checkbox", "radios", "index"].includes((_a = this.flatColumns[i]) == null ? void 0 : _a.type)) {
-            let colTmp = this.flatColumns[i];
-            sumData[colTmp.field || colTmp.key] = "\u5408\u8BA1";
+        for (let col of this.flatColumns) {
+          if (!["checkbox", "radios", "index"].includes(col.type)) {
+            sumData[col.field || col.key] = "\u5408\u8BA1";
             break;
           }
         }
-        sumCols.forEach((d) => sumData[d.field || d.key] = 0);
-        sumData = _.reduce(
-          this.rowDataFiltered,
-          (s, d, idx) => {
-            sumCols.forEach((dd) => {
-              if (isString(dd.isSum))
-                return;
-              let field = dd.field || dd.key;
-              let rowMergeInfo = this.tableRowSpanMergeIndexMap[field];
-              let mergedRows = [];
-              _.forEach(rowMergeInfo, (v, k) => {
-                let rows2 = _.range(k, parseInt(k) + v);
-                mergedRows.push(...rows2.slice(1));
-              });
-              if (!mergedRows.includes(idx)) {
-                sumData[field] = _.round(
-                  sumData[field] + (!d[field] || isNaN(d[field]) ? 0 : parseFloat(d[field])),
-                  6
-                );
-              }
-            });
-            return s;
-          },
-          sumData
-        );
-        _.forEach(sumFuncCols, (d) => {
-          sumData[d.field || d.key] = d.isSum(this.rowDataFiltered, d);
+        let sumCols = this.flatColumns.filter((item2) => item2.isSum);
+        let sumCalcCols = [], sumFuncCols = [];
+        sumCols.forEach((col) => {
+          if (typeof col.isSum === "string")
+            sumCalcCols.push(col);
+          else if (col.isSum instanceof Function)
+            sumFuncCols.push(col);
         });
-        let sumRows = [sumData];
-        let calcRules = {};
-        _.forEach(sumCalcRuleMap, (v, k) => {
-          _.merge(calcRules, v);
+        const sumCalcRuleMap = {};
+        sumCalcCols.forEach((col) => {
+          addCalcRuleMap(sumCalcRuleMap, col.isSum, col.field || col.key);
         });
-        let rules = [];
-        _.forEach(calcRules, (v, k) => {
-          var _a2;
-          let column = _.find(sumCalcCols, (d) => {
-            return d.field == k || d.key == k;
+        sumCols.forEach((col) => {
+          if (!(col.field || col.key) in sumData)
+            sumData[col.field || col.key] = 0;
+        });
+        this.rowDataFiltered.forEach((d) => {
+          sumCols.forEach((dd) => {
+            if (typeof dd.isSum === "string")
+              return;
+            let field = dd.field || dd.key;
+            let value = d[field];
+            if (typeof value === "number" && !isNaN(value)) {
+              sumData[field] = (sumData[field] || 0) + value;
+            }
           });
+        });
+        sumFuncCols.forEach((col) => {
+          sumData[col.field || col.key] = col.isSum(this.rowDataFiltered, col);
+        });
+        let sumRows = [sumData];
+        let rules = [];
+        for (let key in sumCalcRuleMap) {
+          let column = sumCalcCols.find((col) => col.field === key || col.key === key);
           rules.push({
-            rltKey: k,
-            ast: v,
-            precision: ((_a2 = column == null ? void 0 : column.cellRendererParams) == null ? void 0 : _a2.scale) || 2,
+            rltKey: key,
+            ast: sumCalcRuleMap[key],
+            precision: ((_a = column == null ? void 0 : column.cellRendererParams) == null ? void 0 : _a.scale) || 2,
             errRtn: 0
           });
-        });
+        }
         let options = { calcRules: rules };
         calcDatas(sumRows, options);
         this.topRows = this.pinnedTopRowDataWithUnit ? _.concat(this.pinnedTopRowDataWithUnit, sumRows) : sumRows;