@lemon-fe/components 1.1.2 → 1.1.3-alpha.0

package/es/data-grid/index.d.ts

@@ -19,6 +19,7 @@ export default class DataGrid<TData extends Record<string, any>> extends Compone
     private searchRef;
     private prevFocusedCell;
     private fields;
+    private fieldSuffix;
     static contextType?: React.Context<any> | undefined;
     static defaultProps: Partial<DataGridProps<any>>;
     static SummaryFlag: symbol;

package/es/data-grid/index.js

@@ -150,6 +150,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
     _defineProperty(_assertThisInitialized(_this), "searchRef", /*#__PURE__*/createRef());
     _defineProperty(_assertThisInitialized(_this), "prevFocusedCell", null);
     _defineProperty(_assertThisInitialized(_this), "fields", []);
+    _defineProperty(_assertThisInitialized(_this), "fieldSuffix", /(%)$/);
     _defineProperty(_assertThisInitialized(_this), "getFieldsSummary", memoizeOne(function (dataSource, fields) {
       var summaryField = fields.filter(function (field) {
         return field.summary;
@@ -188,7 +189,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
           if (summary[field.id] === undefined) {
             summary[field.id] = new BigNumber(0);
           }
-          summary[field.id] = summary[field.id].plus(value);
+          summary[field.id] = summary[field.id].plus(typeof value === 'string' ? value.replace(_this.fieldSuffix, '') : value);
         });
       });
       return summary;
@@ -991,12 +992,14 @@ var DataGrid = /*#__PURE__*/function (_Component) {
         if (suppressFieldValueGetter) {
           fieldCol.field = field.id;
         } else {
+          var _this5$fieldSuffix$ex;
           /**
            * 预校验是否可以进行四则运算，可能会有边界情况没考虑到
            */
           var scopeMap = {};
           var reg = /\$\{([^{}]+)\}/g;
-          var expression = field.expression.replace(reg, function (match, p1) {
+          var expressionSuffix = ((_this5$fieldSuffix$ex = _this5.fieldSuffix.exec(field.expression)) === null || _this5$fieldSuffix$ex === void 0 ? void 0 : _this5$fieldSuffix$ex[1]) || '';
+          var expression = field.expression.replace(_this5.fieldSuffix, '').replace(reg, function (match, p1) {
             if (p1) {
               var mapKey = "a".concat(Object.keys(scopeMap).length);
               scopeMap[mapKey] = p1;
@@ -1066,7 +1069,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
                   return null;
                 }
               } else {
-                return field.expression.replace(reg, function (match, p1) {
+                return field.expression.replace(_this5.fieldSuffix, '').replace(reg, function (match, p1) {
                   if (p1) {
                     return getValue(p1) || '';
                   }
@@ -1077,9 +1080,16 @@ var DataGrid = /*#__PURE__*/function (_Component) {
             return null;
           };
           fieldCol.valueFormatter = function (params) {
-            if (Number.isNaN(params.value) || typeof params.value === 'number' && !Number.isFinite(params.value) || BigNumber.isBigNumber(params.value) && (params.value.isNaN() || !params.value.isFinite())) {
+            if (typeof params.value === 'number' && (Number.isNaN(params.value) || !Number.isFinite(params.value)) || BigNumber.isBigNumber(params.value) && (params.value.isNaN() || !params.value.isFinite())) {
               return '-';
             }
+            if (params.value !== undefined && params.value !== null) {
+              var val = params.value;
+              if (typeof val === 'number' || BigNumber.isBigNumber(val)) {
+                val = new BigNumber(val).dp(2);
+              }
+              return "".concat(val).concat(expressionSuffix);
+            }
             return params.value;
           };
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "1.1.2",
+  "version": "1.1.3-alpha.0",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -62,5 +62,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "37ad5368a2c745b0bea0bfe9e5ad2c4aeffe1635"
+  "gitHead": "53c287f2fc2ebd1251b38ac587eab8f648f73c85"
 }