@indfnd/common 0.1.20 → 0.1.22

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.22](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.21...v0.1.22) (2024-04-03)
+
+
+### Features
+
+* 行锁定bug修复 ([025868c](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/025868cfe6ad90c377d4a87ab6fce469966c57d6))
+
+### [0.1.21](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.20...v0.1.21) (2024-04-03)
+
+
+### Features
+
+* 计算公式兼容空值计算 ([dcbff12](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/dcbff12bf258670f89468d48e3d8e0a87036dff5))
+* 修改表格合并行的样式; ([decfec6](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/decfec6c016b7839cacec01a8403d99c10e3fdcd))
+
+
+### Bug Fixes
+
+* 修改 ([bb87ebf](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/bb87ebf3cf143e5a33306ec876d4fabd0c666f1c))
+
 ### [0.1.20](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.19...v0.1.20) (2024-03-31)
 
 ### [0.1.19](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.18...v0.1.19) (2024-03-31)

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.19";
+const version = "0.1.21";
 const author = "huxuetong";
 const publishConfig = {
   registry: "https://registry.npmjs.org/"
@@ -51677,7 +51677,8 @@ var traverTreeCalc = function(t2, dataContext) {
     }
     return rltTmp;
   } else {
-    return parseFloat(dataContext[t2.val.val]);
+    let valueRlt = parseFloat(dataContext[t2.val.val] || "0");
+    return isNaN(valueRlt) ? 0 : valueRlt;
   }
 };
 const genAst = function genAst2(input) {
@@ -51765,7 +51766,7 @@ var render$U = function() {
     return _vm.$emit("revertColumnRow");
   } } }, [_vm._v(" \u8F6C\u7F6E ")]) : _vm._e(), !_vm.isIndexManageTable ? _c("IndexManage", { attrs: { "tableRef": _vm.tableRef, "funId": (_vm.funId || "") + "-" + _vm.$route.meta.permissionId }, on: { "resetColumns": _vm.resetColumns } }) : _vm._e(), _c("IndButton", { attrs: { "bizType": "reset" }, on: { "click": function($event) {
     return _vm.tableSettingToggle("3");
-  } } }, [_vm._v(" \u5BFC\u51FA ")])], 1), _c("DropdownMenu", { style: { width: _vm.btnSel != "1" ? "400px" : "200px", padding: "5px 10px" }, attrs: { "slot": "list" }, slot: "list" }, [_vm.btnSel == "3" ? _c("ExportData", { attrs: { "exportFileName": _vm.exportFileName, "paramLeft": _vm.paramLeft, "paramRight": _vm.paramRight, "rowSpanColumns": _vm.rowSpanColumns, "rowSpanIndexCol": _vm.rowSpanIndexCol, "pinnedTopRowData": _vm.topRows, "tableColumns": _vm.tableColumns, "data": _vm.tableData, "dataApi": _vm.dataApi, "searchParams": _vm.searchParams, "sortParams": _vm.sortParams, "paginationParams": _vm.paginationParams, "show-summary": _vm.tableShowSummary, "summary-method": _vm.tableSummaryMethod, "parsedColumns": _vm.parsedColumns, "exportEnum": _vm.exportEnum, "data-children": _vm.dataChildren } }) : _vm.btnSel == "2" ? [_c("div", { staticStyle: { "border-bottom": "1px solid #e9e9e9", "padding-bottom": "6px", "margin-bottom": "6px" } }, [_c("Checkbox", { attrs: { "value": _vm.checkAll }, on: { "on-change": _vm.handleCheckAll } }, [_vm._v("\u5168\u9009")])], 1), _c("CheckboxGroup", { on: { "on-change": _vm.checkAllGroupChange }, model: { value: _vm.checkAllGroup, callback: function($$v) {
+  } } }, [_vm._v(" \u5BFC\u51FA ")])], 1), _c("DropdownMenu", { style: { width: _vm.btnSel != "1" ? "400px" : "200px", padding: "5px 10px" }, attrs: { "slot": "list" }, slot: "list" }, [_vm.btnSel == "3" ? _c("ExportData", { attrs: { "exportFileName": _vm.exportFileName, "paramLeft": _vm.paramLeft, "paramRight": _vm.paramRight || _vm.paramRightUnit, "rowSpanColumns": _vm.rowSpanColumns, "rowSpanIndexCol": _vm.rowSpanIndexCol, "pinnedTopRowData": _vm.topRows, "tableColumns": _vm.tableColumns, "data": _vm.tableData, "dataApi": _vm.dataApi, "searchParams": _vm.searchParams, "sortParams": _vm.sortParams, "paginationParams": _vm.paginationParams, "show-summary": _vm.tableShowSummary, "summary-method": _vm.tableSummaryMethod, "parsedColumns": _vm.parsedColumns, "exportEnum": _vm.exportEnum, "data-children": _vm.dataChildren } }) : _vm.btnSel == "2" ? [_c("div", { staticStyle: { "border-bottom": "1px solid #e9e9e9", "padding-bottom": "6px", "margin-bottom": "6px" } }, [_c("Checkbox", { attrs: { "value": _vm.checkAll }, on: { "on-change": _vm.handleCheckAll } }, [_vm._v("\u5168\u9009")])], 1), _c("CheckboxGroup", { on: { "on-change": _vm.checkAllGroupChange }, model: { value: _vm.checkAllGroup, callback: function($$v) {
     _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()];
@@ -52074,6 +52075,11 @@ const __vue2_script$V = {
     };
   },
   computed: {
+    paramRightUnit() {
+      return _.some(this.flatColumns, (d) => {
+        return d.isSwitchUnit;
+      }) ? "\u5355\u4F4D\uFF1A" + (this.unitType == "X" ? "\u7BB1" : "\u4E07\u652F") : "";
+    },
     isEditTable() {
       return _.some(this.flatColumns, (d) => {
         return ["input", "select", "treeselect"].includes(d.type);
@@ -52363,6 +52369,8 @@ const __vue2_script$V = {
         srcColumn.hide = !d.checked;
         if (d.pinned) {
           srcColumn.pinned = d.pinned;
+        } else {
+          delete srcColumn.pinned;
         }
         if (d.width) {
           srcColumn.width = d.width;
@@ -52477,7 +52485,7 @@ const __vue2_script$V = {
     },
     getRowHeight() {
       let heightEnum = {
-        "ind-default-theme": 44,
+        "ind-default-theme": 42,
         "ind-small-theme": 28
       };
       return heightEnum[this.getTheme];
@@ -53470,7 +53478,7 @@ const __vue2_script$S = {
     height: { type: Number, default: 350 },
     multiSelect: { type: Boolean },
     helpBoxSearchParams: { type: Object, default: () => null },
-    clearText: { type: String, default: "\u6E05\u7A7A" }
+    clearText: { type: String, default: "\u53D6\u6D88" }
   },
   data() {
     return {
@@ -53478,7 +53486,14 @@ const __vue2_script$S = {
       selection: [],
       tableColumnsClone: [],
       form: { searchText: "" },
-      fieldList: [{ title: "\u641C\u7D22", type: "input", formKey: "searchText" }]
+      fieldList: [
+        {
+          title: "\u641C\u7D22",
+          type: "input",
+          formKey: "searchText",
+          props: { placeholder: "\u8BF7\u8F93\u5165\u5173\u952E\u5B57\u641C\u7D22" }
+        }
+      ]
     };
   },
   computed: {
@@ -62231,7 +62246,7 @@ var render$7 = function() {
   var _vm = this;
   var _h = _vm.$createElement;
   var _c = _vm._self._c || _h;
-  return _c("div", [_c("Input", { staticClass: "selected-input", class: { readonly: _vm.readonly }, attrs: { "value": _vm.selectedTitles, "title": _vm.selectedTitles, "readonly": "", "clearable": !_vm.readonly, "placeholder": "\u8BF7\u9009\u62E9" }, on: { "on-focus": _vm.openModal, "on-clear": _vm.doClear } }), _c("Modal", { attrs: { "title": "\u9009\u62E9\u884C\u5C55\u793A", "width": 900, "cancelText": "\u6E05\u9664", "cancelNotClose": "" }, on: { "on-ok": _vm.ok, "on-cancel": _vm.clear }, model: { value: _vm.showPanel, callback: function($$v) {
+  return _c("div", [_c("Input", { staticClass: "selected-input", class: { readonly: _vm.readonly }, attrs: { "value": _vm.selectedTitles, "title": _vm.selectedTitles, "readonly": "", "clearable": !_vm.readonly, "placeholder": "\u8BF7\u9009\u62E9" }, on: { "on-focus": _vm.openModal, "on-clear": _vm.doClear } }), _c("Modal", { attrs: { "title": "\u9009\u62E9\u5377\u70DF", "width": 900, "cancelText": "\u6E05\u9664", "cancelNotClose": "" }, on: { "on-ok": _vm.ok, "on-cancel": _vm.clear }, model: { value: _vm.showPanel, callback: function($$v) {
     _vm.showPanel = $$v;
   }, expression: "showPanel" } }, [_c("ConditionPanel", { attrs: { "conditionDefs": _vm.conditionDefs }, model: { value: _vm.params, callback: function($$v) {
     _vm.params = $$v;