@indfnd/common 0.0.76 → 0.0.78

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.0.78](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.0.77...v0.0.78) (2024-02-01)
+
+
+### Bug Fixes
+
+* 表格小数位展现问题修复 ([998300b](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/998300b7b178209d4be202dc1e0439902aadb804))
+
+### [0.0.77](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.0.76...v0.0.77) (2024-02-01)
+
+
+### Features
+
+* 表单和表格的数值增加输入格式限制 ([2316393](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/2316393b24fceee9fd636e592d64c264ab30f00d))
+* 优化数字格式化 ([e244122](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/e2441227b20a1abf4b6ca08bcb6dbb6e1cda9567))
+
+
+### Bug Fixes
+
+* **detail-view:** 修改样式 ([1ef5941](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/1ef594129d256919d5759f2e8a18a0d12e78acab))
+
 ### [0.0.76](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.0.75...v0.0.76) (2024-01-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, useConfig, getLocalStorage, getQuarterNum, formatQuarter, str2Date, isDate, isArray, checkIdCard, checkVehicleNo, checkPhone, getDictMapApi, formatDate as formatDate$1, axios, isFunction, exportJsonToExcel as exportJsonToExcel$1, importJsonFromExcel, getPriceCode, getPriceSeg, getItem, on as on$1, off as off$1, deleteMenuHistoryApi, deleteMenuCollectApi, getMenuHistoryApi, getMenuCollectApi, getCaptchaURL, guid, setLocalStorage, removeLocalStorage, clearSessionStorage, cryptor, getToken, MIME_TYPE, responseInterceptors, config as config$1, setToken, loginApi, clearUserInfoCache, clearPermissionCache, logoutApi, getUserInfoCache, getUserInfoApi, setUserInfoCache, getSessionStorage, setSessionStorage, getAppListApi, getPermissionCache, getPermissionApi, setPermissionCache, menuHistoryApi, addMenuCollectApi, removeMenuCollectApi } from "@indfnd/utils";
 import Vue$1 from "vue";
 const name$1 = "@indfnd/common";
-const version$1 = "0.0.75";
+const version$1 = "0.0.77";
 const author = "huxuetong";
 const publishConfig = {
   registry: "https://registry.npmjs.org/"
@@ -41,7 +41,7 @@ const scripts = {
   "release-major": "standard-version --release-as major",
   "release-minor": "standard-version --release-as minor",
   "release-patch": "standard-version --release-as patch",
-  "re-publish": "yarn public --access public"
+  "re-publish": "yarn publish --access public"
 };
 const dependencies = {
   classnames: "^2.5.1",
@@ -43138,9 +43138,15 @@ function getAgColumnTitleAndData({ columns, datas }) {
   var columnWidth = columnsCalc.map(
     (d) => d.excelWidth ? d.excelWidth : d.width ? Math.floor(d.width / 10) : 10
   );
-  var numberFormat = columnsCalc.map(
-    (d) => d.align == "rightNum" ? "#,##0.0000" : d.align == "right" ? "#,##0.00" : ""
-  );
+  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) {
+      return "#,##0." + _.range(scale).fill(0).join("");
+    } else {
+      return d.align == "rightNum" ? "#,##0.0000" : d.align == "right" ? "#,##0.00" : "";
+    }
+  });
   columnsCalc.map((d, idx) => {
     d.field = d.field ? d.field : d.key;
     var t2 = d.excelName || d.headerName || d.title;
@@ -48335,6 +48341,9 @@ var FormImpl = {
             message: d.title + "\u4E0D\u80FD\u4E3A\u7A7A",
             trigger: "blur"
           };
+          if (d.validate) {
+            validateTmp.validator = d.validate;
+          }
           if (["number"].includes(d.type)) {
             validateTmp.type = "number";
           } else if (["checkbox", "treeselect", "fileUpload", "imgUpload"].includes(d.type) || "select" === d.type && ((_a = d.props) == null ? void 0 : _a.multiple)) {
@@ -48357,22 +48366,13 @@ var FormImpl = {
             validateTmp.trigger = "custom";
           }
           validateList[d.formKey] = [validateTmp];
-        } else if (d.validate) {
-          validateList[d.formKey] = [
-            {
-              required: true,
-              validator: d.validate,
-              trigger: "blur"
-            }
-          ];
         }
         if (d.type == "idcard") {
           validateList[d.formKey] = validateList[d.formKey] || [];
           validateList[d.formKey].push({
-            required: true,
             validator: (rule, value, callback) => {
               let checkRlt = checkIdCard(value);
-              if (checkRlt == "\u9A8C\u8BC1\u901A\u8FC7!") {
+              if (!value || checkRlt == "\u9A8C\u8BC1\u901A\u8FC7!") {
                 callback();
               } else {
                 callback(new Error(checkRlt));
@@ -48383,9 +48383,8 @@ var FormImpl = {
         } else if (d.type == "vehicleNo") {
           validateList[d.formKey] = validateList[d.formKey] || [];
           validateList[d.formKey].push({
-            required: true,
             validator: (rule, value, callback) => {
-              if (checkVehicleNo(value)) {
+              if (!value || checkVehicleNo(value)) {
                 callback();
               } else {
                 callback(new Error("\u8BF7\u8F93\u5165\u6B63\u786E\u7684\u8F66\u724C\u53F7\u683C\u5F0F"));
@@ -48396,9 +48395,8 @@ var FormImpl = {
         } else if (d.type == "phone") {
           validateList[d.formKey] = validateList[d.formKey] || [];
           validateList[d.formKey].push({
-            required: true,
             validator: (rule, value, callback) => {
-              if (checkPhone(value)) {
+              if (!value || checkPhone(value)) {
                 callback();
               } else {
                 callback(new Error("\u8BF7\u8F93\u5165\u6B63\u786E\u7684\u7535\u8BDD\u683C\u5F0F"));
@@ -48546,18 +48544,30 @@ var FormImpl = {
           case "number": {
             itemInner = h("Input", {
               ref: d.formKey,
+              attrs: {
+                title: ""
+              },
               props: {
                 placeholder: `\u8BF7\u8F93\u5165\u6570\u5B57`,
                 ...d.props,
-                number: true,
                 value: this.form[d.formKey],
                 disabled,
                 type: "number"
               },
               on: {
-                input: (val) => {
-                  this.form[d.formKey] = val;
+                "on-blur": (event) => {
+                  var _a2;
+                  let v = event.target.value;
+                  let formatRlt = /(-?)(\d{1,10})(\d{0,999})(\.\d{1,6})?/.exec(v);
+                  if (formatRlt && formatRlt.length) {
+                    v = (((_a2 = d == null ? void 0 : d.props) == null ? void 0 : _a2.enableNegative) ? formatRlt[1] : "") + formatRlt[2] + (formatRlt[4] || "");
+                  }
+                  this.form[d.formKey] = Infinity;
                   this.$emit("input", this.form);
+                  this.$nextTick(() => {
+                    this.form[d.formKey] = parseFloat(v);
+                    this.$emit("input", this.form);
+                  });
                 }
               }
             });
@@ -55229,12 +55239,30 @@ var AgTooltip = /* @__PURE__ */ function() {
 }();
 const __vue2_script$V = {
   render(h) {
-    var _a, _b;
+    var _a, _b, _c;
     const rNode = this.params.api.getRowNode(this.params.rowIndex);
     const props = ((_b = (_a = this.params.column.colDef) == null ? void 0 : _a.cellRendererParams) == null ? void 0 : _b.props) || {};
     const { type, disabled: disabledDef, textCondition } = props;
     const disabled = disabledDef instanceof Function ? disabledDef(this.params.data) : disabledDef;
     const isText = textCondition instanceof Function ? textCondition(this.params.data) : textCondition;
+    let { scale } = ((_c = this.params.column.colDef) == null ? void 0 : _c.cellRendererParams) || {};
+    if (this.params.formatCols) {
+      _.forEach(this.params.formatCols, (v, k) => {
+        if (!isNaN(v) && this.params.column.colDef.field == k) {
+          scale = v;
+        }
+      });
+    }
+    const value = this.params.value;
+    let renderVal = value;
+    if (scale == 0) {
+      renderVal = value ? parseInt(value) : value;
+    } else {
+      let cellV = parseFloat(value);
+      if (!isNaN(cellV)) {
+        renderVal = cellV.toFixed(scale);
+      }
+    }
     if (isText) {
       return h(
         "span",
@@ -55248,15 +55276,24 @@ const __vue2_script$V = {
         props: {
           type: "text",
           ...props,
-          value: this.params.value,
+          value: renderVal,
           disabled
         },
         on: {
           "on-blur": (event) => {
-            rNode.setDataValue(
-              this.params.column,
-              type == "number" ? parseFloat(event.target.value) : event.target.value
-            );
+            let v = event.target.value;
+            let formatRlt = /(-?)(\d{1,10})(\d{0,999})(\.\d{1,6})?/.exec(v);
+            if (formatRlt && formatRlt.length) {
+              v = ((props == null ? void 0 : props.enableNegative) ? formatRlt[1] : "") + formatRlt[2] + (formatRlt[4] || "");
+            }
+            if (type == "number") {
+              rNode.setDataValue(this.params.column, Infinity);
+              this.$nextTick(() => {
+                rNode.setDataValue(this.params.column, parseFloat(v));
+              });
+            } else {
+              rNode.setDataValue(this.params.column, v);
+            }
           }
         },
         class: "ag-input"
@@ -56046,7 +56083,6 @@ const calcData = function(data, options) {
   var astHash = {};
   var precisionHash = {};
   var errRtnHash = {};
-  console.log("data", data, "options", options);
   if (options && options.calcRules) {
     options.calcRules.forEach((n) => {
       astHash[n.rltKey] = n.ast;
@@ -56629,16 +56665,7 @@ const __vue2_script$N = {
       if (!_.isEmpty(this.formatCols)) {
         _.forEach(datasClone, (d) => {
           _.forEach(this.formatCols, (v, k) => {
-            if (!isNaN(v)) {
-              if (v == 0) {
-                d[k] = d[k] ? parseInt(d[k]) : d[k];
-              } else {
-                let cellV = parseFloat(d[k]);
-                if (!isNaN(cellV)) {
-                  d[k] = cellV.toFixed(v);
-                }
-              }
-            } else if (v == "dateFormat") {
+            if (v == "dateFormat") {
               let rltFormat = formatDate$1(d[k] || "");
               d[k] = rltFormat || d[k];
             }
@@ -56742,7 +56769,7 @@ const __vue2_script$N = {
       this.optionDropdownVisible = false;
     },
     tableColumnsInner(columns, isChildren) {
-      var _a, _b;
+      var _a, _b, _c;
       let rlt = [];
       for (let i = 0; i < columns.length; i++) {
         let column = columns[i];
@@ -56875,7 +56902,10 @@ const __vue2_script$N = {
                 } else {
                   return {
                     component: agRenderEnum[column.type],
-                    params: column.cellRendererParams
+                    params: {
+                      ...column.cellRendererParams,
+                      formatCols: this.formatCols
+                    }
                   };
                 }
               };
@@ -56886,13 +56916,16 @@ const __vue2_script$N = {
                 } else {
                   return {
                     component: agRenderEnum[column.type],
-                    params: column.cellRendererParams
+                    params: {
+                      ...column.cellRendererParams,
+                      formatCols: this.formatCols
+                    }
                   };
                 }
               };
             }
           }
-          if (!column.type && column.isSum) {
+          if (!column.type && (column.isSum || ((_a = column == null ? void 0 : column.cellRendererParams) == null ? void 0 : _a.scale) !== void 0 || column.isSwitchUnit)) {
             agColumn.cellRendererSelector = (params) => {
               var _a2;
               if (params.node.rowPinned) {
@@ -56901,17 +56934,26 @@ const __vue2_script$N = {
                 } else {
                   return {
                     component: "AgFormat",
-                    params: column.cellRendererParams
+                    params: {
+                      ...column.cellRendererParams,
+                      formatCols: this.formatCols
+                    }
                   };
                 }
               } else {
-                return void 0;
+                return {
+                  component: "AgFormat",
+                  params: {
+                    ...column.cellRendererParams,
+                    formatCols: this.formatCols
+                  }
+                };
               }
             };
           }
           if (column.cellRendererParams) {
             agColumn.cellRendererParams = column.cellRendererParams;
-            if (column.type == "input" && ((_b = (_a = column.cellRendererParams) == null ? void 0 : _a.props) == null ? void 0 : _b.number)) {
+            if (column.type == "input" && ((_c = (_b = column.cellRendererParams) == null ? void 0 : _b.props) == null ? void 0 : _c.number)) {
               agColumn.cellDataType = "number";
             }
           }
@@ -57299,7 +57341,7 @@ const __vue2_script$N = {
             });
           });
         }
-        this.topRows = _.concat(this.pinnedTopRowData, sumRows);
+        this.topRows = this.pinnedTopRowData ? _.concat(this.pinnedTopRowData, sumRows) : sumRows;
       } else {
         this.topRows = this.pinnedTopRowData;
       }
@@ -63398,9 +63440,9 @@ var render$c = function() {
   var _vm = this;
   var _h = _vm.$createElement;
   var _c = _vm._self._c || _h;
-  return _c("div", { ref: "detailView", staticClass: "ind-detail-view ind-flex-column" }, [_vm.isShowHeader ? _c("div", { staticClass: "ind-flex-no-shrink header" }, [_vm.isShowBackBtn ? _c("Button", { attrs: { "bizType": "back" }, on: { "click": function($event) {
+  return _c("div", { ref: "detailView", staticClass: "ind-detail-view ind-flex-column" }, [_vm.isShowHeader ? _c("div", { staticClass: "ind-flex-no-shrink header" }, [_vm.isShowBackBtn ? _c("Button", { staticClass: "back-btn", attrs: { "bizType": "back" }, on: { "click": function($event) {
     _vm.useGoBack ? _vm.goBack() : _vm.$backToMenu();
-  } } }, [_vm._v("\u8FD4\u56DE")]) : _vm._e(), _c("span", { staticClass: "title" }, [_vm._v(_vm._s(_vm.customTitle || _vm.title))]), _c("div", [_vm._t("headerButton")], 2)], 1) : _vm._e(), _c("BackTopPanel", { staticClass: "ind-flex-column ind-flex-grow content" }, [_vm._t("default")], 2), _c("div", { staticClass: "ind-flex-no-shrink function-wrapper" }, [_vm._t("footer")], 2)], 1);
+  } } }, [_vm._v("\u8FD4\u56DE")]) : _vm._e(), _c("span", { staticClass: "title" }, [_vm._v(_vm._s(_vm.customTitle || _vm.title))]), _c("div", { staticClass: "header-buttons" }, [_vm._t("headerButton")], 2)], 1) : _vm._e(), _c("BackTopPanel", { staticClass: "ind-flex-column ind-flex-grow content" }, [_vm._t("default")], 2), _c("div", { staticClass: "ind-flex-no-shrink function-wrapper" }, [_vm._t("footer")], 2)], 1);
 };
 var staticRenderFns$c = [];
 const __vue2_script$d = {
@@ -63456,7 +63498,7 @@ var render$b = function() {
   var _vm = this;
   var _h = _vm.$createElement;
   var _c = _vm._self._c || _h;
-  return _c("div", { staticClass: "ind-page-view ind-flex-column" }, [_vm.isShowHeader ? _c("div", { staticClass: "ind-flex-no-shrink header" }, [_vm.isShowBackBtn ? _c("Button", { attrs: { "bizType": "back" }, on: { "click": _vm.$backToMenu } }, [_vm._v("\u8FD4\u56DE")]) : _vm._e(), _c("span", { staticClass: "title" }, [_vm._v(_vm._s(_vm.customTitle || _vm.title))]), _c("div", { staticClass: "function-wrapper" }, [_vm._t("headerButton")], 2)], 1) : _vm._e(), _c("LoadingPanel", { staticClass: "ind-flex-column ind-flex-grow content", attrs: { "loading": _vm.loading } }, [_c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.topSearch, expression: "$slots.topSearch" }], staticClass: "ind-flex-no-shrink ind-panel top-search-content search" }, [_vm._t("topSearch")], 2), _c("div", { staticClass: "ind-flex-grow body-content" }, [_c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.leftContent, expression: "$slots.leftContent" }], staticClass: "ind-panel body-left-content" }, [_vm._t("leftContent")], 2), _c("div", { staticClass: "ind-panel ind-flex-column body-right-content" }, [_c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.search, expression: "$slots.search" }], staticClass: "ind-flex-no-shrink search" }, [_vm._t("search")], 2), _c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.tip, expression: "$slots.tip" }], staticClass: "tip" }, [_vm._t("tip")], 2), _c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots["important-tip"], expression: "$slots['important-tip']" }], staticClass: "important-tip" }, [_c("Icons", { attrs: { "type": "md-information-circle" } }), _vm._t("important-tip")], 2), _c("div", { staticClass: "ind-flex-grow main-content" }, [_vm._t("default")], 2), _c("div", { staticClass: "ind-flex-no-shrink body-right-content-footer" }, [_vm._t("footer")], 2)])]), _c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.bottom, expression: "$slots.bottom" }], staticClass: "ind-flex-no-shrink ind-panel bottom" }, [_vm._t("bottom")], 2)])], 1);
+  return _c("div", { staticClass: "ind-page-view ind-flex-column" }, [_vm.isShowHeader ? _c("div", { staticClass: "ind-flex-no-shrink header" }, [_vm.isShowBackBtn ? _c("Button", { staticClass: "back-btn", attrs: { "bizType": "back" }, on: { "click": _vm.$backToMenu } }, [_vm._v("\u8FD4\u56DE")]) : _vm._e(), _c("span", { staticClass: "title" }, [_vm._v(_vm._s(_vm.customTitle || _vm.title))]), _c("div", { staticClass: "function-wrapper" }, [_vm._t("headerButton")], 2)], 1) : _vm._e(), _c("LoadingPanel", { staticClass: "ind-flex-column ind-flex-grow content", attrs: { "loading": _vm.loading } }, [_c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.topSearch, expression: "$slots.topSearch" }], staticClass: "ind-flex-no-shrink ind-panel top-search-content search" }, [_vm._t("topSearch")], 2), _c("div", { staticClass: "ind-flex-grow body-content" }, [_c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.leftContent, expression: "$slots.leftContent" }], staticClass: "ind-panel body-left-content" }, [_vm._t("leftContent")], 2), _c("div", { staticClass: "ind-panel ind-flex-column body-right-content" }, [_c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.search, expression: "$slots.search" }], staticClass: "ind-flex-no-shrink search" }, [_vm._t("search")], 2), _c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.tip, expression: "$slots.tip" }], staticClass: "tip" }, [_vm._t("tip")], 2), _c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots["important-tip"], expression: "$slots['important-tip']" }], staticClass: "important-tip" }, [_c("Icons", { attrs: { "type": "md-information-circle" } }), _vm._t("important-tip")], 2), _c("div", { staticClass: "ind-flex-grow main-content" }, [_vm._t("default")], 2), _c("div", { staticClass: "ind-flex-no-shrink body-right-content-footer" }, [_vm._t("footer")], 2)])]), _c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.bottom, expression: "$slots.bottom" }], staticClass: "ind-flex-no-shrink ind-panel bottom" }, [_vm._t("bottom")], 2)])], 1);
 };
 var staticRenderFns$b = [];
 const __vue2_script$c = {