@lemon-fe/components 1.4.28-alpha.4 → 1.4.29

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

@@ -118,7 +118,7 @@ export default function FieldModal(props) {
             summaryType: 1,
             decimalPlaces: 2,
             groupId: undefined,
-            dataFormatType: 'number'
+            dataFormatType: supportSelectDataFormat ? 'number' : undefined
           });
         }
       } else {
@@ -128,7 +128,7 @@ export default function FieldModal(props) {
           expression: formatExpression(openProp.expression),
           decimalPlaces: (_openProp$decimalPlac = openProp.decimalPlaces) !== null && _openProp$decimalPlac !== void 0 ? _openProp$decimalPlac : 2,
           groupId: openProp.groupId,
-          dataFormatType: (_openProp$dataFormatT = openProp.dataFormatType) !== null && _openProp$dataFormatT !== void 0 ? _openProp$dataFormatT : 'number'
+          dataFormatType: supportSelectDataFormat ? (_openProp$dataFormatT = openProp.dataFormatType) !== null && _openProp$dataFormatT !== void 0 ? _openProp$dataFormatT : 'number' : undefined
         }));
       }
     } else {

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

@@ -224,7 +224,12 @@ export default function CustomColumnPanel(params) {
     save = _useRequest.run,
     loading = _useRequest.loading;
   useEffect(function () {
+    var mounted = true;
     var handler = function handler(e) {
+      // 出现了组件卸载后事件还是触发的问题，应该是ag-grid内部时机的问题;
+      if (!mounted) {
+        return;
+      }
       if ((e.type === 'columnMoved' || e.type === 'columnResized') && !e.finished) {
         return;
       }
@@ -240,6 +245,7 @@ export default function CustomColumnPanel(params) {
     api.addEventListener('columnValueChanged', handler);
     api.addEventListener('newColumnsLoaded', handler);
     return function () {
+      mounted = false;
       api.removeEventListener('columnVisible', handler);
       api.removeEventListener('columnMoved', handler);
       api.removeEventListener('columnPinned', handler);

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

@@ -17,7 +17,7 @@ declare const Editors: {
     Text: React.ForwardRefExoticComponent<import("ag-grid-community").ICellEditorParams<any, any, any> & import("..").TextEditorParams<any> & React.RefAttributes<import("ag-grid-react").ICellEditorReactComp>>;
     Date: React.ForwardRefExoticComponent<import("ag-grid-community").ICellEditorParams<any, any, any> & import("..").DateEditorParams<any> & React.RefAttributes<import("ag-grid-react").ICellEditorReactComp>>;
     Number: React.ForwardRefExoticComponent<import("ag-grid-community").ICellEditorParams<any, any, any> & import("..").NumberEditorParams<any> & React.RefAttributes<import("ag-grid-react").ICellEditorReactComp>>;
-    Select: React.ForwardRefExoticComponent<import("ag-grid-community").ICellEditorParams<any, any, any> & Pick<import("antd").SelectProps<any, import("antd/lib/select").BaseOptionType>, "disabled" | "allowClear" | "mode" | "showSearch" | "virtual" | "optionFilterProp" | "options" | "listHeight"> & {
+    Select: React.ForwardRefExoticComponent<import("ag-grid-community").ICellEditorParams<any, any, any> & Pick<import("antd").SelectProps<any, import("antd/lib/select").BaseOptionType>, "disabled" | "mode" | "virtual" | "allowClear" | "showSearch" | "optionFilterProp" | "options" | "listHeight"> & {
         fieldNames?: {
             label: string;
             value: string;

package/es/data-grid/index.js

@@ -780,6 +780,7 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
         this.dataSource = [];
         this.api.setRowData([]);
         this.api.setColumnDefs([]);
+        this.api.destroy();
         var context = this.api.__getContext();
         var gridOptionsService = context.getBean('gridOptionsService');
         for (var field in gridOptionsService.gridOptions) {
@@ -1316,15 +1317,23 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
             }
             if (params.value !== undefined && params.value !== null) {
               var val = params.value;
-              if (typeof val === 'number' || BigNumber.isBigNumber(val)) {
-                if (field.dataFormatType === 'percentage' && expressionSuffix !== '%') {
+              if (field.dataFormatType === 'percentage' && expressionSuffix !== '%') {
+                var bn = new BigNumber(toNumber(val));
+                if (!bn.isNaN() && bn.isFinite()) {
                   var _field$decimalPlaces;
-                  val = new BigNumber(val).multipliedBy(100).toFixed((_field$decimalPlaces = field.decimalPlaces) !== null && _field$decimalPlaces !== void 0 ? _field$decimalPlaces : 2);
+                  val = bn.multipliedBy(100).toFixed((_field$decimalPlaces = field.decimalPlaces) !== null && _field$decimalPlaces !== void 0 ? _field$decimalPlaces : 2);
                   return "".concat(val, "%").concat(expressionSuffix);
-                } else {
+                }
+              } else if (field.dataFormatType === 'number') {
+                var _bn = new BigNumber(toNumber(val));
+                if (!_bn.isNaN() && _bn.isFinite()) {
                   var _field$decimalPlaces2;
-                  val = new BigNumber(val).toFixed((_field$decimalPlaces2 = field.decimalPlaces) !== null && _field$decimalPlaces2 !== void 0 ? _field$decimalPlaces2 : 2);
+                  val = _bn.toFixed((_field$decimalPlaces2 = field.decimalPlaces) !== null && _field$decimalPlaces2 !== void 0 ? _field$decimalPlaces2 : 2);
                 }
+              } else if (typeof val === 'number' || BigNumber.isBigNumber(val)) {
+                var _field$decimalPlaces3;
+                //调整未加任何配置时保持原逻辑
+                val = new BigNumber(val).toFixed((_field$decimalPlaces3 = field.decimalPlaces) !== null && _field$decimalPlaces3 !== void 0 ? _field$decimalPlaces3 : 2);
               }
               return "".concat(val).concat(expressionSuffix);
             }

package/es/filter/index.js

@@ -491,7 +491,7 @@ function Filter(originalProps) {
   var handleTabChange = function handleTabChange(index) {
     if (index !== active) {
       setActive(index);
-      var result = _objectSpread(_objectSpread({}, emptyValue), tabs[index].value);
+      var result = _objectSpread(_objectSpread(_objectSpread({}, emptyValue), defaultValue), tabs[index].value);
       form.setFieldsValue(result);
       handleFinish(form.getFieldsValue(), 'reset');
     }

package/es/select-view/index.d.ts

@@ -78,7 +78,9 @@ export interface SelectViewProps<RecordType, ParamsType> extends Pick<DataGridPr
      * @description 表格顶部header区域自定义
      * @default null
      */
-    header?: ReactElement | null;
+    header?: ReactElement | ((opts: {
+        filter: ReactElement | null;
+    }) => ReactElement) | null;
     /**
      * @description 自定义已选择datagrid
      */

package/es/select-view/index.js

@@ -160,10 +160,9 @@ function SelectView(originalProps, ref) {
   };
   var headerNode = null;
   var siderNode = null;
+  var filterNode = null;
   if (filter && filter.data) {
-    headerNode = /*#__PURE__*/React.createElement(React.Fragment, null, headerProp && /*#__PURE__*/React.createElement("div", {
-      className: prefix('head-wrapper')
-    }, headerProp), /*#__PURE__*/React.createElement(Filter, _extends({
+    filterNode = /*#__PURE__*/React.createElement(Filter, _extends({
       simple: true,
       autoPlaceholder: true,
       form: filterForm
@@ -172,9 +171,16 @@ function SelectView(originalProps, ref) {
       onChange: function onChange(val, actionType) {
         return handleChangeParams(_objectSpread(_objectSpread({}, cParams), val), actionType);
       }
-    })));
-  } else if (headerProp) {
-    headerNode = headerProp;
+    }));
+  }
+  if (headerProp && typeof headerProp === 'function') {
+    headerNode = headerProp({
+      filter: filterNode
+    });
+  } else if (headerProp || filterNode) {
+    headerNode = /*#__PURE__*/React.createElement(React.Fragment, null, headerProp && /*#__PURE__*/React.createElement("div", {
+      className: prefix('head-wrapper')
+    }, headerProp), filterNode);
   }
   if (filter && filter.sider) {
     siderNode = filter.sider({

package/package.json

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