@lemon-fe/components 1.4.8 → 1.4.9-alpha.0

package/es/data-grid/components/custom-panel/field-modal.js

@@ -17,6 +17,7 @@ import { Checkbox, Form, Input, Modal, Select } from 'antd';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import FormLayout from "../../../form-layout";
 import Icons from "../../../icons";
+import InputNumber from "../../../input-number";
 import { useLocaleReceiver } from "../../../locale-receiver";
 import TipMark from "../../../tip-mark";
 import { isCustomField, prefix } from "../../utils";
@@ -111,13 +112,16 @@ export default function FieldModal(props) {
             name: '',
             expression: '',
             summary: false,
-            summaryType: 1
+            summaryType: 1,
+            decimalPlaces: 2
           });
         }
       } else {
+        var _openProp$decimalPlac;
         setOpen(true);
         form.setFieldsValue(_objectSpread(_objectSpread({}, openProp), {}, {
-          expression: formatExpression(openProp.expression)
+          expression: formatExpression(openProp.expression),
+          decimalPlaces: (_openProp$decimalPlac = openProp.decimalPlaces) !== null && _openProp$decimalPlac !== void 0 ? _openProp$decimalPlac : 2
         }));
       }
     } else {
@@ -185,10 +189,17 @@ export default function FieldModal(props) {
   }, /*#__PURE__*/React.createElement(Input.TextArea, {
     ref: ref,
     maxLength: 300,
-    showCount: true,
     style: {
       height: 120
-    }
+    },
+    placeholder: fieldModal.customColumnExpressionPlaceholder
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    label: fieldModal.customColumnDecimalPlacesText,
+    name: "decimalPlaces"
+  }, /*#__PURE__*/React.createElement(InputNumber, {
+    min: 0,
+    max: 10,
+    precision: 0
   })), enableSummary ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Form.Item, {
     label: " ",
     name: "summary",

package/es/data-grid/components/custom-panel/typings.d.ts

@@ -24,4 +24,5 @@ export type FieldCol = {
   expression: string;
   id: string;
   name: string;
+  decimalPlaces?: number;
 };

package/es/data-grid/index.js

@@ -1197,7 +1197,8 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
             if (params.value !== undefined && params.value !== null) {
               var val = params.value;
               if (typeof val === 'number' || BigNumber.isBigNumber(val)) {
-                val = new BigNumber(val).dp(2);
+                var _field$decimalPlaces;
+                val = new BigNumber(val).toFixed((_field$decimalPlaces = field.decimalPlaces) !== null && _field$decimalPlaces !== void 0 ? _field$decimalPlaces : 2);
               }
               return "".concat(val).concat(expressionSuffix);
             }

package/es/data-grid/locale/en_US.js

@@ -30,6 +30,8 @@ var locale = {
     addCustomColumnText: 'Add Custom Column',
     customColumnNameText: 'Name',
     customColumnExpressionText: 'Expression',
+    customColumnExpressionPlaceholder: 'Custom Expression length limit of 300',
+    customColumnDecimalPlacesText: 'Decimal places',
     summaryText: 'Summary or not',
     summaryTypeText: 'Rule',
     summaryTypeContentText: "\n      <div>\n        <p>1. The sum of custom column data values to get the total value</p>\n        <p>\n          2. The total value is calculated based on the formula from the data source\n          <br />\n          Fields added in the formula are summed first, then the total is calculated based on the formula\n        </p>\n      </div>\n      ",

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

@@ -9,6 +9,8 @@ export interface DataGridLocale {
         addCustomColumnText: string;
         customColumnNameText: string;
         customColumnExpressionText: string;
+        customColumnExpressionPlaceholder: string;
+        customColumnDecimalPlacesText: string;
         summaryText: string;
         summaryTypeText: string;
         summaryTypeContentText: string;

package/es/data-grid/locale/zh_CN.js

@@ -27,6 +27,8 @@ var locale = {
     addCustomColumnText: '添加自定义列',
     customColumnNameText: '自定义列名',
     customColumnExpressionText: '自定义公式',
+    customColumnExpressionPlaceholder: '自定义公式长度上限300',
+    customColumnDecimalPlacesText: '小数位数',
     summaryText: '是否统计合计',
     summaryTypeText: '合计规则',
     summaryTypeContentText: "\n    <div>\n      <p>1\u3001\u81EA\u5B9A\u4E49\u5217\u6570\u636E\u503C\u6C42\u548C\u5F97\u51FA\u5408\u8BA1\u503C</p>\n      <p>\n        2\u3001\u6570\u636E\u6E90\u6839\u636E\u8BA1\u7B97\u516C\u5F0F\u5F97\u51FA\u5408\u8BA1\u503C\n        <br />\n        \u516C\u5F0F\u4E2D\u6DFB\u52A0\u7684\u5B57\u6BB5\u5148\u6C42\u548C\uFF0C\u518D\u6839\u636E\u8BA1\u7B97\u516C\u5F0F\u8BA1\u7B97\u51FA\u5408\u8BA1\n      </p>\n    </div>\n    ",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "1.4.8",
+  "version": "1.4.9-alpha.0",
   "description": "> TODO: description",
   "homepage": "",
   "license": "MIT",
@@ -58,5 +58,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "5efd8dc6fe627450229c376bea96040c882ac430"
+  "gitHead": "29faa8aacec00efe7765a91c10f83cf302affca7"
 }