@lemon-fe/components 1.4.28-alpha.1 → 1.4.28-alpha.3

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

@@ -10,6 +10,7 @@ interface Props {
     nodes: Node[];
     groups: ColGroupDef[];
     locale?: DataGridLocale;
+    supportSelectDataFormat?: boolean;
 }
 export default function FieldModal(props: Props): JSX.Element;
 export {};

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

@@ -28,7 +28,8 @@ export default function FieldModal(props) {
     onOk = props.onOk,
     enableSummary = props.enableSummary,
     groups = props.groups,
-    locale = props.locale;
+    locale = props.locale,
+    supportSelectDataFormat = props.supportSelectDataFormat;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
@@ -116,16 +117,18 @@ export default function FieldModal(props) {
             summary: false,
             summaryType: 1,
             decimalPlaces: 2,
-            groupId: undefined
+            groupId: undefined,
+            dataFormatType: 'number'
           });
         }
       } else {
-        var _openProp$decimalPlac;
+        var _openProp$decimalPlac, _openProp$dataFormatT;
         setOpen(true);
         form.setFieldsValue(_objectSpread(_objectSpread({}, openProp), {}, {
           expression: formatExpression(openProp.expression),
           decimalPlaces: (_openProp$decimalPlac = openProp.decimalPlaces) !== null && _openProp$decimalPlac !== void 0 ? _openProp$decimalPlac : 2,
-          groupId: openProp.groupId
+          groupId: openProp.groupId,
+          dataFormatType: (_openProp$dataFormatT = openProp.dataFormatType) !== null && _openProp$dataFormatT !== void 0 ? _openProp$dataFormatT : 'number'
         }));
       }
     } else {
@@ -235,6 +238,17 @@ export default function FieldModal(props) {
       height: 120
     },
     placeholder: fieldModal.customColumnExpressionPlaceholder
+  })), supportSelectDataFormat && /*#__PURE__*/React.createElement(Form.Item, {
+    label: fieldModal.customColumnDataFormatTypeText,
+    name: "dataFormatType"
+  }, /*#__PURE__*/React.createElement(Select, {
+    options: [{
+      label: fieldModal.customColumnDataFormatTypeOptionsNumberText,
+      value: 'number'
+    }, {
+      label: fieldModal.customColumnDataFormatTypeOptionsPercentageText,
+      value: 'percentage'
+    }]
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: fieldModal.customColumnDecimalPlacesText,
     name: "decimalPlaces"

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

@@ -5,4 +5,7 @@ export default function CustomColumnPanel(params: IToolPanelParams & {
     enableSave: boolean;
     enableSummary: boolean;
     locale?: DataGridLocale;
+    customColumnPanelExtra?: {
+        supportSelectDataFormat?: boolean;
+    };
 }): JSX.Element;

package/es/data-grid/components/custom-panel/index.js

@@ -30,7 +30,8 @@ export default function CustomColumnPanel(params) {
     api = params.api,
     enableSave = params.enableSave,
     enableSummary = params.enableSummary,
-    locale = params.locale;
+    locale = params.locale,
+    customColumnPanelExtra = params.customColumnPanelExtra;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     searching = _useState2[0],
@@ -420,6 +421,7 @@ export default function CustomColumnPanel(params) {
     onOk: function onOk(value) {
       grid.setField(value);
     },
-    locale: locale
+    locale: locale,
+    supportSelectDataFormat: customColumnPanelExtra === null || customColumnPanelExtra === void 0 ? void 0 : customColumnPanelExtra.supportSelectDataFormat
   }));
 }

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

@@ -26,4 +26,5 @@ export type FieldCol = {
   name: string;
   decimalPlaces?: number;
   groupId?: string;
+  dataFormatType?: 'number' | 'percentage';
 };

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

@@ -68,7 +68,7 @@ declare class InternalDataGrid<TData extends Record<string, any>> extends Compon
     private getFullColumnDef;
     private getColumnDefs;
     isClientMode(): boolean;
-    private clearReadyQueue;
+    private flushReadyQueue;
     afterReady(cb: () => void): void;
     private isPreserveSelected;
     private updateRowData;

package/es/data-grid/index.js

@@ -180,7 +180,8 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
         toolPanelParams: {
           enableSave: !!_this.props.customColumnPanelStorage,
           enableSummary: _this.isClientMode() || _this.props.enableCustomColumnSummary,
-          locale: _this.props.locale
+          locale: _this.props.locale,
+          customColumnPanelExtra: _this.props.customColumnPanelExtra
         }
       }]
     });
@@ -322,7 +323,7 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
                   });
                 }
               });
-              _this.clearReadyQueue();
+              _this.flushReadyQueue();
             case 20:
             case "end":
               return _context.stop();
@@ -773,6 +774,15 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
   }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
+      if (this.isReady) {
+        // 解决agGrid部分内存泄漏
+
+        this.dataSource = [];
+        this.api.setRowData([]);
+        this.api.setColumnDefs([]);
+        this.api = new GridApi();
+        this.columnApi = new ColumnApi();
+      }
       this.mounted = false;
       this.isReady = false;
       window.removeEventListener('blur', this.handleFocus);
@@ -1297,8 +1307,14 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
             if (params.value !== undefined && params.value !== null) {
               var val = params.value;
               if (typeof val === 'number' || BigNumber.isBigNumber(val)) {
-                var _field$decimalPlaces;
-                val = new BigNumber(val).toFixed((_field$decimalPlaces = field.decimalPlaces) !== null && _field$decimalPlaces !== void 0 ? _field$decimalPlaces : 2);
+                if (field.dataFormatType === 'percentage' && expressionSuffix !== '%') {
+                  var _field$decimalPlaces;
+                  val = new BigNumber(val).multipliedBy(100).toFixed((_field$decimalPlaces = field.decimalPlaces) !== null && _field$decimalPlaces !== void 0 ? _field$decimalPlaces : 2);
+                  return "".concat(val, "%").concat(expressionSuffix);
+                } else {
+                  var _field$decimalPlaces2;
+                  val = new BigNumber(val).toFixed((_field$decimalPlaces2 = field.decimalPlaces) !== null && _field$decimalPlaces2 !== void 0 ? _field$decimalPlaces2 : 2);
+                }
               }
               return "".concat(val).concat(expressionSuffix);
             }
@@ -1389,8 +1405,8 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
       return this.props.fetch === undefined;
     }
   }, {
-    key: "clearReadyQueue",
-    value: function clearReadyQueue() {
+    key: "flushReadyQueue",
+    value: function flushReadyQueue() {
       this.readyQueue.forEach(function (cb) {
         cb();
       });
@@ -1399,6 +1415,9 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
   }, {
     key: "afterReady",
     value: function afterReady(cb) {
+      if (!this.mounted) {
+        return;
+      }
       if (this.isReady) {
         cb();
       } else {
@@ -1510,7 +1529,7 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
             };
           })
         })).then(function (res) {
-          if (id !== _this6.requestId) {
+          if (!_this6.mounted || id !== _this6.requestId) {
             return;
           }
           _this6.loadingChange(false);
@@ -1534,6 +1553,9 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
             fetchError: undefined
           });
         }).catch(function (err) {
+          if (!_this6.mounted) {
+            return;
+          }
           _this6.store.setState({
             fetchError: err
           });

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

@@ -42,7 +42,10 @@ var locale = {
     addFieldText: 'Add Field',
     idTooltip: 'Custom column name is not allowed to be the same as the existing field, if the history has been set with the same name field, it does not support export',
     bottomTooltip: 'Note: Formulas only support calculation on numerical columns',
-    customColumnNameTextRequired: 'Please enter the custom column name'
+    customColumnNameTextRequired: 'Please enter the custom column name',
+    customColumnDataFormatTypeText: 'Data Format',
+    customColumnDataFormatTypeOptionsNumberText: 'Number',
+    customColumnDataFormatTypeOptionsPercentageText: 'Percentage'
   },
   maxWordText: '${headerName} can not exceed ${maxLength} words',
   operationSuccessText: 'Success',

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

@@ -39,7 +39,10 @@ var locale = {
     addFieldText: 'Tambah bidang',
     idTooltip: 'Nama kolom kustom tidak boleh sama dengan nama kolom yang ada, jika kolom dengan nama duplikat telah diatur maka tidak mendukung ekspor',
     bottomTooltip: 'Catatan: Rumus hanya mendukung perhitungan untuk kolom data numerik',
-    customColumnNameTextRequired: 'Silakan masukkan nama kolom kustom'
+    customColumnNameTextRequired: 'Silakan masukkan nama kolom kustom',
+    customColumnDataFormatTypeText: 'Format data',
+    customColumnDataFormatTypeOptionsNumberText: 'Angka',
+    customColumnDataFormatTypeOptionsPercentageText: 'Persentase'
   },
   validate: {
     fieldErrorText: 'Bidang ${field} salah dimasukkan'

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

@@ -22,6 +22,9 @@ export interface DataGridLocale {
         idTooltip: string;
         bottomTooltip: string;
         customColumnNameTextRequired: string;
+        customColumnDataFormatTypeText: string;
+        customColumnDataFormatTypeOptionsNumberText: string;
+        customColumnDataFormatTypeOptionsPercentageText: string;
     };
     maxWordText: string;
     operationSuccessText: string;

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

@@ -39,7 +39,10 @@ var locale = {
     addFieldText: 'Thêm trường',
     idTooltip: 'Tên cột tùy chỉnh không được trùng với tên cột đã có, nếu cột đã có tên trùng đã được thiết lập thì không hỗ trợ xuất',
     bottomTooltip: 'Lưu ý: Công thức chỉ hỗ trợ tính toán cho cột số liệu',
-    customColumnNameTextRequired: 'Vui lòng nhập tên cột tùy chỉnh'
+    customColumnNameTextRequired: 'Vui lòng nhập tên cột tùy chỉnh',
+    customColumnDataFormatTypeText: 'Định dạng dữ liệu',
+    customColumnDataFormatTypeOptionsNumberText: 'Số',
+    customColumnDataFormatTypeOptionsPercentageText: 'Phần trăm'
   },
   validate: {
     fieldErrorText: 'Nhập sai trường ${field}'

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

@@ -39,7 +39,10 @@ var locale = {
     addFieldText: '添加字段',
     idTooltip: '自定义列名不允许和已有字段重复，如果历史已经设置的重名字段不支持导出',
     bottomTooltip: '注：公式仅支持数值列计算',
-    customColumnNameTextRequired: '请输入自定义列名'
+    customColumnNameTextRequired: '请输入自定义列名',
+    customColumnDataFormatTypeText: '数据格式',
+    customColumnDataFormatTypeOptionsNumberText: '数值',
+    customColumnDataFormatTypeOptionsPercentageText: '百分比'
   },
   validate: {
     fieldErrorText: '${field}输入错误'

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

@@ -39,7 +39,10 @@ var locale = {
     addFieldText: '添加字段',
     idTooltip: '自定義列名不允許與已有字段重複，如果歷史已經設置的重名字段不支持導出',
     bottomTooltip: '註：公式僅支持數值列計算',
-    customColumnNameTextRequired: '請輸入自定義列名'
+    customColumnNameTextRequired: '請輸入自定義列名',
+    customColumnDataFormatTypeText: '數據格式',
+    customColumnDataFormatTypeOptionsNumberText: '數值',
+    customColumnDataFormatTypeOptionsPercentageText: '百分比'
   },
   validate: {
     fieldErrorText: '${field}輸入錯誤'

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

@@ -258,6 +258,12 @@ export interface DataGridProps<TData> extends Omit<AgGridReactProps<TData>, 'row
         set: (data: CustomColumnData) => Promise<void> | void;
         get: () => Promise<CustomColumnData | null | undefined> | CustomColumnData | null | undefined;
     };
+    /**
+     * @description 自定义列额外参数
+     */
+    customColumnPanelExtra?: {
+        supportSelectDataFormat?: boolean;
+    };
     /**
      * @descriptioin 列定制启用汇总
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "1.4.28-alpha.1",
+  "version": "1.4.28-alpha.3",
   "description": "> TODO: description",
   "homepage": "",
   "license": "MIT",
@@ -58,5 +58,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "a9ee084ded5af328e89b4e490f2b5c7c4c3d7e0d"
+  "gitHead": "fc120ab90b363e45be5b8b4445b21e84ab2e79b2"
 }