@indfnd/common 0.0.88 → 0.0.89

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 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.89](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.0.88...v0.0.89) (2024-03-13)
+
+
+### Features
+
+* 表头样式 ([05d3c9a](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/05d3c9acb155f7b4823a16114125c830017808e4))
+* 修改表格样式，calcRule初始化计算 ([12f8446](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/12f8446bb86cb7394d3cbf4284a70f1549a36657))
+* 样式 ([44c6a4c](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/44c6a4c10ec85ac107c5298a7cb9f80dcbdc9d7a))
+* 允许修改表头高度 ([c5e3dfb](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/c5e3dfb14c1fa93fc4f78c564df6d6b1cef3452a))
+
+
+### Bug Fixes
+
+* 修改样式 ([e074565](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/e074565e33e8a11c7f22c03cbbf8c397d34040ca))
+
 ### [0.0.88](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.0.87...v0.0.88) (2024-03-12)
 
 

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, exportJsonToExcel as exportJsonToExcel$1, importJsonFromExcel, on as on$1, off as off$1, deleteMenuHistoryApi, deleteMenuCollectApi, getMenuHistoryApi, getMenuCollectApi, MIME_TYPE, base64ToBlob, putOssFileApi, getPriceInfo, getItem, 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$1 = "0.0.87";
+const version$1 = "0.0.88";
 const author = "huxuetong";
 const publishConfig = {
   registry: "https://registry.npmjs.org/"
@@ -62,7 +62,7 @@ const dependencies = {
   "xlsx-populate": "^1.11.0"
 };
 const devDependencies = {
-  "@indfnd/utils": "^0.0.39",
+  "@indfnd/utils": "^0.0.40",
   "ag-grid-community": "^30.1.0",
   "ag-grid-enterprise": "^30.1.0",
   "ag-grid-vue": "^30.1.0",
@@ -56199,6 +56199,32 @@ const doCalc = function doCalc2(ast, data, errRtn) {
     }
   }
 };
+const calcDatas = function(datas, options) {
+  var astHash = {};
+  var precisionHash = {};
+  var errRtnHash = {};
+  if (options && options.calcRules) {
+    options.calcRules.forEach((n) => {
+      astHash[n.rltKey] = n.ast;
+      precisionHash[n.rltKey] = n.precision || 0;
+      errRtnHash[n.rltKey] = n.errRtn || 0;
+    });
+    datas.forEach((d) => {
+      Object.keys(astHash).forEach((k) => {
+        d[k] = doCalc(astHash[k], d, errRtnHash[k]);
+        if (isNaN(d[k])) {
+          d[k] = "-";
+          return;
+        }
+        if (precisionHash[k]) {
+          d[k] = !!d[k] ? d[k].toFixed(precisionHash[k]) : d[k];
+        } else {
+          d[k] = parseInt(d[k]);
+        }
+      });
+    });
+  }
+};
 const calcData = function(data, options) {
   var astHash = {};
   var precisionHash = {};
@@ -56237,7 +56263,7 @@ var render$O = function() {
     _vm.checkAllGroup = $$v;
   }, expression: "checkAllGroup" } }, [_vm._l(_vm.columns, function(item2) {
     return [item2.title ? _c("Checkbox", { key: item2.field, attrs: { "label": item2.title } }, [_vm._v(_vm._s(item2.title))]) : _vm._e()];
-  }), _c("br"), _c("br"), _vm._v(" \xA0 "), _c("Button", { staticClass: "table-column-select-btn", attrs: { "type": "default" }, on: { "click": _vm.columnSave } }, [_vm._v("\u4FDD \u5B58")]), _vm._v(" \xA0 "), _c("Button", { staticClass: "table-column-select-btn", attrs: { "type": "default" }, on: { "click": _vm.columnClear } }, [_vm._v("\u6E05 \u9664")])], 2)] : _vm._e(), _vm.btnSel != "1" ? _c("Button", { staticStyle: { "position": "absolute", "top": "10px", "right": "10px" }, attrs: { "type": "primary", "icon": "md-close", "size": "small", "title": "\u5173\u95ED" }, on: { "click": _vm.closeTableSettingDropdown } }) : _vm._e()], 2)], 1) : _vm._e()], 2)]) : _vm._e()], 2)], 1), _c("IndLoadingPanel", { attrs: { "loading": _vm.tableLoading } }, [!_vm.refreshTable ? _c("ag-grid-vue", _vm._g(_vm._b({ ref: "tableRef", staticClass: "ag-theme-balham", style: { height: _vm.height && !_vm.fullSreen ? _vm.height + "px" : "100%" }, attrs: { "id": "agTable", "suppressCellFocus": true, "suppressMenu": true, "suppressContextMenu": true, "defaultColDef": _vm.defaultColDef, "getRowHeight": _vm.getRowHeight, "rowData": _vm.tableData, "rowSelection": _vm.rowSelection, "columnDefs": _vm.tableColumns, "localeText": _vm.localeText, "singleClickEdit": true, "pinnedTopRowData": _vm.topRows, "pinnedBottomRowData": _vm.pinnedBottomRowData, "suppressRowClickSelection": _vm.suppressRowClickSelection, "suppressRowTransform": true, "stopEditingWhenCellsLoseFocus": true, "getRowClass": _vm.getRowClass, "getRowId": _vm.getRowId, "tooltipShowDelay": 500, "overlayNoRowsTemplate": _vm.noRowsTemplate || _vm.overlayNoRowsTemplate, "treeData": _vm.treeData, "getDataPath": _vm.getDataPath, "autoGroupColumnDef": _vm.autoGroupColumnDef, "groupDisplayType": _vm.groupDisplayType, "groupSelectsChildren": _vm.groupSelectsChildren, "groupDefaultExpanded": _vm.groupDefaultExpanded }, on: { "sortChanged": _vm.sortChanged, "selection-changed": _vm.selectionChanged, "grid-ready": _vm.onGridReady, "cellClicked": _vm.cellClicked, "cellDoubleClicked": _vm.cellDoubleClicked } }, "ag-grid-vue", _vm.$attrs, false), _vm.$listeners)) : _vm._e()], 1), _vm.showBottom ? _c("div", { ref: "bottom" }, [_c("Row", { staticStyle: { "margin-top": "10px" } }, [_c("i-col", { staticStyle: { "text-align": "left" }, attrs: { "span": "18" } }, [_c("Page", { directives: [{ name: "show", rawName: "v-show", value: !_vm.disablePage, expression: "!disablePage" }], attrs: { "size": "small", "total": _vm.totalNumber, "current": _vm.currentPage, "page-size": _vm.limitNumber, "show-sizer": "", "show-total": "", "show-elevator": "" }, on: { "on-change": _vm.onPageChange, "on-page-size-change": _vm.onPageSizeChange } }), _c("span", { directives: [{ name: "show", rawName: "v-show", value: _vm.disablePage, expression: "disablePage" }] }, [_vm._v("\u5171 " + _vm._s(_vm.tableData.length) + " \u6761\u6570\u636E")])], 1)], 1)], 1) : _vm._e()], 1);
+  }), _c("br"), _c("br"), _vm._v(" \xA0 "), _c("Button", { staticClass: "table-column-select-btn", attrs: { "type": "default" }, on: { "click": _vm.columnSave } }, [_vm._v("\u4FDD \u5B58")]), _vm._v(" \xA0 "), _c("Button", { staticClass: "table-column-select-btn", attrs: { "type": "default" }, on: { "click": _vm.columnClear } }, [_vm._v("\u6E05 \u9664")])], 2)] : _vm._e(), _vm.btnSel != "1" ? _c("Button", { staticStyle: { "position": "absolute", "top": "10px", "right": "10px" }, attrs: { "type": "primary", "icon": "md-close", "size": "small", "title": "\u5173\u95ED" }, on: { "click": _vm.closeTableSettingDropdown } }) : _vm._e()], 2)], 1) : _vm._e()], 2)]) : _vm._e()], 2)], 1), _c("IndLoadingPanel", { attrs: { "loading": _vm.tableLoading } }, [!_vm.refreshTable ? _c("ag-grid-vue", _vm._g(_vm._b({ ref: "tableRef", staticClass: "ag-theme-balham", style: { height: _vm.height && !_vm.fullSreen ? _vm.height + "px" : "100%" }, attrs: { "id": "agTable", "rowMultiSelectWithClick": _vm.rowSelection == "multiple" || _vm.rowMultiSelectWithClick, "suppressCellFocus": true, "suppressMenu": true, "suppressContextMenu": true, "defaultColDef": _vm.defaultColDef, "headerHeight": _vm.headerHeight || (_vm.getTheme == "ind-small-theme" ? null : 38), "getRowHeight": _vm.getRowHeight, "rowData": _vm.tableData, "rowSelection": _vm.rowSelection, "columnDefs": _vm.tableColumns, "localeText": _vm.localeText, "singleClickEdit": true, "pinnedTopRowData": _vm.topRows, "pinnedBottomRowData": _vm.pinnedBottomRowData, "suppressRowClickSelection": _vm.suppressRowClickSelection, "suppressRowTransform": true, "stopEditingWhenCellsLoseFocus": true, "getRowClass": _vm.getRowClass, "getRowId": _vm.getRowId, "tooltipShowDelay": 500, "overlayNoRowsTemplate": _vm.noRowsTemplate || _vm.overlayNoRowsTemplate, "treeData": _vm.treeData, "getDataPath": _vm.getDataPath, "autoGroupColumnDef": _vm.autoGroupColumnDef, "groupDisplayType": _vm.groupDisplayType, "groupSelectsChildren": _vm.groupSelectsChildren, "groupDefaultExpanded": _vm.groupDefaultExpanded }, on: { "sortChanged": _vm.sortChanged, "selection-changed": _vm.selectionChanged, "grid-ready": _vm.onGridReady, "cellClicked": _vm.cellClicked, "cellDoubleClicked": _vm.cellDoubleClicked } }, "ag-grid-vue", _vm.$attrs, false), _vm.$listeners)) : _vm._e()], 1), _vm.showBottom ? _c("div", { ref: "bottom" }, [_c("Row", { staticStyle: { "margin-top": "10px" } }, [_c("i-col", { staticStyle: { "text-align": "left" }, attrs: { "span": "18" } }, [_c("Page", { directives: [{ name: "show", rawName: "v-show", value: !_vm.disablePage, expression: "!disablePage" }], attrs: { "size": "small", "total": _vm.totalNumber, "current": _vm.currentPage, "page-size": _vm.limitNumber, "show-sizer": "", "show-total": "", "show-elevator": "" }, on: { "on-change": _vm.onPageChange, "on-page-size-change": _vm.onPageSizeChange } }), _c("span", { directives: [{ name: "show", rawName: "v-show", value: _vm.disablePage, expression: "disablePage" }] }, [_vm._v("\u5171 " + _vm._s(_vm.tableData.length) + " \u6761\u6570\u636E")])], 1)], 1)], 1) : _vm._e()], 1);
 };
 var staticRenderFns$O = [];
 function suppressNavigation(params) {
@@ -56327,6 +56353,8 @@ const __vue2_script$P = {
     AgFormat
   },
   props: {
+    headerHeight: Number,
+    rowMultiSelectWithClick: Boolean,
     pinnedTopRowData: Array,
     pinnedBottomRowData: Array,
     rowSpanColumns: Array,
@@ -56478,8 +56506,8 @@ const __vue2_script$P = {
     return {
       tableRef: null,
       refreshTable: false,
-      rowSelection: null,
-      suppressRowClickSelection: !this.rowClick,
+      rowSelection: "single",
+      suppressRowClickSelection: false,
       localeText: AG_GRID_LOCALE_ZH,
       btnSel: "",
       tableDataSrc: [],
@@ -56515,19 +56543,6 @@ const __vue2_script$P = {
         autoHeight: ((_d = (_c = this.$store) == null ? void 0 : _c.getters) == null ? void 0 : _d.getTheme) != "theme1",
         suppressKeyboardEvent: (params) => {
           return suppressNavigation(params);
-        },
-        headerComponentParams: {
-          template: `<div class="ag-cell-label-container" role="presentation">
-                <span ref="eMenu" class="ag-header-icon ag-header-cell-menu-button" aria-hidden="true"></span>
-                <span ref="eSortAsc" class="ag-header-icon ag-header-label-icon ag-sort-ascending-icon ag-hidden" aria-hidden="true"></span>
-                <span ref="eSortDesc" class="ag-header-icon ag-header-label-icon ag-sort-descending-icon ag-hidden" aria-hidden="true"></span>
-                <span ref="eSortNone" class="ag-header-icon ag-header-label-icon ag-sort-none-icon ag-hidden" aria-hidden="true"></span>
-                <div ref="eLabel" class="ag-header-cell-label" role="presentation">
-                  <span ref="eText" class="ag-header-cell-text"></span>
-                  <span ref="eFilter" class="ag-header-icon ag-header-label-icon ag-filter-icon" aria-hidden="true"></span>
-                  <span ref="eSortOrder" class="ag-header-icon ag-header-label-icon ag-sort-order" aria-hidden="true"></span>
-                </div>
-            </div>`
         }
       },
       gridApi: null,
@@ -56558,7 +56573,7 @@ const __vue2_script$P = {
     },
     columnCalcMap() {
       let rlt = {};
-      _.forEach(this.columns, (d) => {
+      _.forEach(this.flatColumns, (d) => {
         if (d.calcRule) {
           let ast = genAst(d.calcRule);
           let ruleVars = getVarsByAst(ast);
@@ -56716,8 +56731,7 @@ const __vue2_script$P = {
           })) {
             val = await this.renderTreeData(val);
           }
-          this.tableData = _.cloneDeep(val);
-          this.totalNumber = val.length;
+          this.calcRulesData();
         }
       },
       deep: true
@@ -56725,6 +56739,7 @@ const __vue2_script$P = {
     tableData: {
       async handler(val) {
         this.overlayNoRowsTemplate = '<span style="padding: 10px;">\u6570\u636E\u4E3A\u7A7A</span>';
+        console.log("tableData tigger", val);
         this.updating = true;
         this.renderSumRow();
         this.$emit("input", _.cloneDeep(val));
@@ -56734,6 +56749,13 @@ const __vue2_script$P = {
       },
       deep: true
     },
+    columnCalcMap: {
+      handler: function() {
+        this.calcRulesData();
+      },
+      deep: true,
+      immediate: true
+    },
     showSummary: {
       handler(val) {
         this.tableShowSummary = val;
@@ -56785,6 +56807,35 @@ const __vue2_script$P = {
     this.optionDropdownVisible = false;
   },
   methods: {
+    calcRulesData() {
+      if (!_.isEmpty(this.columnCalcMap)) {
+        let valueClone = _.cloneDeep(this.value);
+        let calcRules = {};
+        _.forEach(this.columnCalcMap, (v, k) => {
+          _.merge(calcRules, v);
+        });
+        let rules = [];
+        _.forEach(calcRules, (v, k) => {
+          var _a;
+          let column = _.find(this.flatColumns, (d) => {
+            return d.field == k || d.key == k;
+          });
+          rules.push({
+            rltKey: k,
+            ast: v,
+            precision: ((_a = column == null ? void 0 : column.cellRendererParams) == null ? void 0 : _a.scale) || 2,
+            errRtn: 0
+          });
+        });
+        let options = { calcRules: rules };
+        calcDatas(valueClone, options);
+        this.tableData = valueClone;
+        this.totalNumber = valueClone.length;
+      } else {
+        this.tableData = _.cloneDeep(this.value);
+        this.totalNumber = this.value.length;
+      }
+    },
     resetColumns(columns) {
       columns.forEach((d) => {
         d.hide = !d.checked;
@@ -56895,7 +56946,7 @@ const __vue2_script$P = {
     },
     getRowHeight() {
       let heightEnum = {
-        "ind-default-theme": 42,
+        "ind-default-theme": 44,
         "ind-small-theme": 28
       };
       return heightEnum[this.getTheme];
@@ -57030,7 +57081,7 @@ const __vue2_script$P = {
           agColumn.showDisabledCheckboxes = true;
           this.rowSelection = "multiple";
           agColumn.cellClass = agColumn.cellClass + " ag-center-aligned-cell ind-ag-check-cell";
-          this.suppressRowClickSelection = this.rowClick ? false : true;
+          this.suppressRowClickSelection = false;
         } else if (column.type == "radio") {
           agColumn.headerCheckboxSelection = false;
           agColumn.checkboxSelection = column.checkboxSelection || true;