@indfnd/common 1.0.0 → 1.0.4

package/CHANGELOG.md

@@ -2,6 +2,28 @@
 
 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.4](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.3...v1.0.4) (2024-06-16)
+
+### [1.0.3](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.0...v1.0.3) (2024-06-16)
+
+
+### Features
+
+* 版本 ([9d36971](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/9d36971e2c89e254ba25838b28ae1ebf56426753))
+* 去掉计算合计的加载中 ([1681d1f](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/1681d1fd84be60bc1e567577597fd1727d3232b7))
+* 修复bug ([5e1f438](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/5e1f438b774df3672c98e13cee52215d84487636))
+* init ([64af2d3](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/64af2d3bef0403be82662191bd6153165ac99b0b))
+
+### [1.0.2](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.1...v1.0.2) (2024-06-15)
+
+### [1.0.1](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.0...v1.0.1) (2024-06-15)
+
+
+### Features
+
+* 版本 ([9d36971](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/9d36971e2c89e254ba25838b28ae1ebf56426753))
+* init ([64af2d3](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/64af2d3bef0403be82662191bd6153165ac99b0b))
+
 ## [1.0.0](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.107...v1.0.0) (2024-06-15)
 
 ### [0.1.107](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.106...v0.1.107) (2024-06-15)

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 = "0.1.107";
+const version = "1.0.3";
 const author = "huxuetong";
 const publishConfig = {
   registry: "https://registry.npmjs.org/"
@@ -46,7 +46,7 @@ const scripts = {
   build: "yarn build:prod && yarn build:style",
   "type-check": "vue-tsc --noEmit -p tsconfig.check.json --composite false",
   dts: "vue-tsc -p tsconfig.types.json",
-  release: "node build/auto-build.js && yarn release-major && git push --follow-tags && yarn re-publish",
+  release: "node build/auto-build.js && yarn release-patch && git push --follow-tags && yarn re-publish",
   "release-major": "standard-version --release-as major",
   "release-minor": "standard-version --release-as minor",
   "release-patch": "standard-version --release-as patch",
@@ -53348,8 +53348,19 @@ const __vue2_script$Z = {
             agColumn.cellClass = agColumn.cellClass + (column.align == "right" ? " ag-right-aligned-cell" : column.align == "center" ? " ag-center-aligned-cell" : "");
           }
         }
-        if (column.autoMergeRow)
-          ;
+        if (column.autoMergeRow) {
+          agColumn.rowSpan = (params) => {
+            if (params.node.rowPinned) {
+              return 0;
+            }
+            return this.tableRowSpanMergeIndexMap[params.colDef.field] ? this.tableRowSpanMergeIndexMap[params.colDef.field][params.node.rowIndex + ""] || 0 : 0;
+          };
+          agColumn.cellClassRules = {
+            "cell-span": (params) => {
+              return this.tableRowSpanMergeIndexMap[params.colDef.field] && this.tableRowSpanMergeIndexMap[params.colDef.field][params.node.rowIndex + ""];
+            }
+          };
+        }
         agColumn.cellClass = agColumn.cellClass + " " + column.type + " autoMergeRow-" + column.autoMergeRow;
         if (column.cellClassRules) {
           if (agColumn.cellClassRules) {
@@ -53516,12 +53527,6 @@ const __vue2_script$Z = {
       let hasSumRow = _.some(this.flatColumns, (item2) => item2.isSum);
       if (hasSumRow) {
         console.time("calcSum");
-        this.tableLoading = true;
-        await new Promise((resolve) => {
-          setTimeout(() => {
-            resolve();
-          }, 1);
-        });
         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);
@@ -53587,12 +53592,6 @@ const __vue2_script$Z = {
         calcDatas(sumRows, options);
         this.topRows = this.pinnedTopRowDataWithUnit ? _.concat(this.pinnedTopRowDataWithUnit, sumRows) : sumRows;
         console.timeEnd("calcSum");
-        await new Promise((resolve) => {
-          setTimeout(() => {
-            resolve();
-          }, 1);
-        });
-        this.tableLoading = false;
       } else {
         this.topRows = this.pinnedTopRowDataWithUnit;
       }