@lemon-fe/kits 1.0.3 → 1.0.4-0

package/es/components/DataGrid/components/CustomColumnPanel/FieldModal.js

@@ -153,7 +153,7 @@ export default function FieldModal(props) {
   }, [openProp]);
   return /*#__PURE__*/React.createElement(Modal, {
     title: "",
-    width: 551,
+    width: 600,
     open: open,
     onCancel: function onCancel() {
       setOpen(false);
@@ -214,6 +214,8 @@ export default function FieldModal(props) {
     }]
   }, /*#__PURE__*/React.createElement(Input.TextArea, {
     ref: ref,
+    maxLength: 300,
+    showCount: true,
     style: {
       height: 120
     }
@@ -246,7 +248,9 @@ export default function FieldModal(props) {
     return /*#__PURE__*/React.createElement("div", {
       className: prefix('column-panel-modal-field'),
       key: item.id
-    }, /*#__PURE__*/React.createElement("span", null, item.title), /*#__PURE__*/React.createElement("div", {
+    }, /*#__PURE__*/React.createElement("span", {
+      title: item.title
+    }, item.title), /*#__PURE__*/React.createElement("div", {
       className: prefix('column-panel-modal-field-add'),
       onClick: function onClick() {
         handleAddExp(item);

package/es/components/DataGrid/index.d.ts

@@ -52,7 +52,7 @@ export default class DataGrid<TData extends Record<string, any>> extends Compone
         Text: React.ForwardRefExoticComponent<import("@ag-grid-community/core").ICellEditorParams<any, any, any> & import("./typings").TextEditorParams<any> & React.RefAttributes<import("@ag-grid-community/react").ICellEditorReactComp>>;
         Date: React.ForwardRefExoticComponent<import("@ag-grid-community/core").ICellEditorParams<any, any, any> & import("./typings").DateEditorParams<any> & React.RefAttributes<import("@ag-grid-community/react").ICellEditorReactComp>>;
         Number: React.ForwardRefExoticComponent<import("@ag-grid-community/core").ICellEditorParams<any, any, any> & import("./typings").NumberEditorParams<any> & React.RefAttributes<import("@ag-grid-community/react").ICellEditorReactComp>>;
-        Select: React.ForwardRefExoticComponent<import("@ag-grid-community/core").ICellEditorParams<any, any, any> & Pick<import("antd").SelectProps<any, import("antd/lib/select").BaseOptionType>, "disabled" | "allowClear" | "mode" | "options" | "virtual" | "showSearch" | "listHeight"> & {
+        Select: React.ForwardRefExoticComponent<import("@ag-grid-community/core").ICellEditorParams<any, any, any> & Pick<import("antd").SelectProps<any, import("antd/lib/select").BaseOptionType>, "disabled" | "mode" | "allowClear" | "options" | "virtual" | "showSearch" | "listHeight"> & {
             fieldNames?: {
                 label: string;
                 value: string;

package/es/components/DataGrid/index.js

@@ -72,7 +72,7 @@ import Scheme from 'async-validator';
 import BigNumber from 'bignumber.js';
 import classNames from 'classnames';
 import { get, set } from 'lodash';
-import { create, parseDependencies, factory } from 'mathjs';
+import { create, parseDependencies, factory, evaluateDependencies } from 'mathjs';
 import memoizeOne from 'memoize-one';
 import React, { Component, createRef } from 'react';
 import shallowEqual from 'shallowequal';
@@ -125,6 +125,7 @@ var divide = function divide(a, b) {
 };
 
 var _create = create({
+  evaluateDependencies: evaluateDependencies,
   parseDependencies: parseDependencies,
   createAdd: factory('add', [], function () {
     return add;
@@ -139,6 +140,7 @@ var _create = create({
     return divide;
   })
 }),
+    evaluate = _create.evaluate,
     parse = _create.parse;
 
 ModuleRegistry.registerModules([ClientSideRowModelModule, RowGroupingModule, InfiniteRowModelModule, ClipboardModule, MenuModule, SideBarModule, ColumnsToolPanelModule, MasterDetailModule], false);
@@ -1203,17 +1205,9 @@ var DataGrid = /*#__PURE__*/function (_Component) {
       };
 
       var result = map(columns);
-      var suppressFieldsValueGetter = !!((_this$props$customCol = this.props.customColumnPanelStorage) !== null && _this$props$customCol !== void 0 && _this$props$customCol.suppressFieldValueGetter);
+      var suppressFieldValueGetter = !!((_this$props$customCol = this.props.customColumnPanelStorage) !== null && _this$props$customCol !== void 0 && _this$props$customCol.suppressFieldValueGetter);
       this.fields.forEach(function (field) {
-        var expression = field.expression.replace(/\$\{([^{}]+)\}/g, function (match, p1) {
-          if (p1) {
-            return p1;
-          }
-
-          return match;
-        });
         leafColIds.push(field.id);
-        var code = parse(expression).compile();
         var fieldCol = {
           colId: field.id,
           headerName: field.name,
@@ -1222,9 +1216,36 @@ var DataGrid = /*#__PURE__*/function (_Component) {
           type: 'rightAligned'
         };
 
-        if (suppressFieldsValueGetter) {
+        if (suppressFieldValueGetter) {
           fieldCol.field = field.id;
         } else {
+          /**
+           * 预校验是否可以进行四则运算，可能会有边界情况没考虑到
+           */
+          var scopeMap = {};
+          var reg = /\$\{([^{}]+)\}/g;
+          var expression = field.expression.replace(reg, function (match, p1) {
+            if (p1) {
+              var mapKey = "a".concat(Object.keys(scopeMap).length);
+              scopeMap[mapKey] = p1;
+              return mapKey;
+            }
+
+            return match;
+          });
+          var code = null;
+
+          try {
+            var mCode = parse(expression).compile();
+            mCode.evaluate(Object.fromEntries(Object.entries(scopeMap).map(function (_ref3) {
+              var _ref4 = _slicedToArray(_ref3, 1),
+                  k = _ref4[0];
+
+              return [k, 1];
+            })));
+            code = mCode;
+          } catch (_unused) {}
+
           fieldCol.valueGetter = function (params) {
             var api = params.api,
                 node = params.node,
@@ -1239,48 +1260,51 @@ var DataGrid = /*#__PURE__*/function (_Component) {
                 return get(summary, field.id);
               }
 
-              var scope = {
-                get: function get(key) {
-                  var col = columnApi.getColumn(key);
+              var getValue = function getValue(colId) {
+                var col = columnApi.getColumn(colId);
 
-                  if (col === null) {
-                    return NaN;
-                  }
+                if (col === null) {
+                  return null;
+                }
 
-                  var colDef = col.getColDef();
-                  var value = api.getValue(key, node);
+                var colDef = col.getColDef();
+                var value = api.getValue(colId, node);
 
-                  if (typeof colDef.valueFormatter === 'function') {
-                    value = colDef.valueFormatter(_objectSpread(_objectSpread({}, params), {}, {
-                      value: value
-                    }));
-                  }
+                if (typeof colDef.valueFormatter === 'function') {
+                  value = colDef.valueFormatter(_objectSpread(_objectSpread({}, params), {}, {
+                    value: value
+                  }));
+                }
 
-                  return value;
-                },
-                set: function set() {},
-                has: function has(key) {
-                  return columnApi.getColumn(key) !== null;
-                },
-                keys: function keys() {
-                  var currentColumns = columnApi.getColumns();
-
-                  if (currentColumns === null) {
-                    return [];
-                  }
+                return value;
+              };
 
-                  return currentColumns.map(function (col) {
-                    var def = col.getColDef();
-                    return def.field || def.colId;
+              if (code) {
+                try {
+                  return code.evaluate({
+                    get: function get(p1) {
+                      return getValue(scopeMap[p1]);
+                    },
+                    set: function set() {},
+                    has: function has(key) {
+                      return columnApi.getColumn(scopeMap[key]) !== null;
+                    },
+                    keys: function keys() {
+                      return Object.keys(scopeMap);
+                    }
                   });
+                } catch (err) {
+                  // console.warn('DataGrid field evaluate', err);
+                  return null;
                 }
-              };
+              } else {
+                return field.expression.replace(reg, function (match, p1) {
+                  if (p1) {
+                    return getValue(p1) || '';
+                  }
 
-              try {
-                return code.evaluate(scope);
-              } catch (err) {
-                console.warn('DataGrid field evaluate', err);
-                return null;
+                  return match;
+                });
               }
             }
 
@@ -1614,8 +1638,8 @@ var DataGrid = /*#__PURE__*/function (_Component) {
         _this10.store.setState({
           errors: errors
         });
-      }).catch(function (_ref3) {
-        var fields = _ref3.fields;
+      }).catch(function (_ref5) {
+        var fields = _ref5.fields;
         var errors = new Map(_this10.store.getState().errors);
         var error = new Map();
         Object.entries(fields).forEach(function (item) {
@@ -1656,8 +1680,8 @@ var DataGrid = /*#__PURE__*/function (_Component) {
                   if (_this11.validator === null) {
                     promises.push(Promise.resolve(true));
                   } else {
-                    promises.push(_this11.validator.validate(record).catch(function (_ref4) {
-                      var fields = _ref4.fields;
+                    promises.push(_this11.validator.validate(record).catch(function (_ref6) {
+                      var fields = _ref6.fields;
                       return Promise.reject({
                         id: rowId,
                         fields: fields
@@ -1675,14 +1699,14 @@ var DataGrid = /*#__PURE__*/function (_Component) {
                 failed = [];
                 result.forEach(function (item) {
                   if (item.status === 'rejected') {
-                    var _ref5 = item.reason,
-                        id = _ref5.id,
-                        fields = _ref5.fields;
+                    var _ref7 = item.reason,
+                        id = _ref7.id,
+                        fields = _ref7.fields;
                     var error = new Map();
-                    Object.entries(fields).forEach(function (_ref6) {
-                      var _ref7 = _slicedToArray(_ref6, 2),
-                          field = _ref7[0],
-                          errs = _ref7[1];
+                    Object.entries(fields).forEach(function (_ref8) {
+                      var _ref9 = _slicedToArray(_ref8, 2),
+                          field = _ref9[0],
+                          errs = _ref9[1];
 
                       error.set(field, errs.map(function (err) {
                         return err.message || "".concat(field, "\u8F93\u5165\u9519\u8BEF");
@@ -1922,8 +1946,8 @@ var DataGrid = /*#__PURE__*/function (_Component) {
     }
   }], [{
     key: "isSummaryRow",
-    value: function isSummaryRow(_ref8) {
-      var node = _ref8.node;
+    value: function isSummaryRow(_ref10) {
+      var node = _ref10.node;
 
       if (node && node.data && node.data[DataGrid.SummaryFlag]) {
         return true;

package/es/components/DataGrid/index.less

@@ -233,7 +233,7 @@
 
       &-fields {
         min-height: 0px;
-        max-height: 232px;
+        max-height: 300px;
         overflow-x: hidden;
         overflow-y: auto;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/kits",
-  "version": "1.0.3",
+  "version": "1.0.4-0",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",