@lemon-fe/kits 1.0.0-200 → 1.0.0-202

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

@@ -46,7 +46,11 @@ export default function FieldModal(props) {
       form = _Form$useForm2[0];
 
   var ref = useRef(null);
-  var map = useRef({});
+  var map = useMemo(function () {
+    return Object.fromEntries(nodes.map(function (item) {
+      return [item.title || '', item.id];
+    }));
+  }, []);
 
   var handleAddExp = function handleAddExp(data) {
     var _ref$current, _ref$current$resizabl;
@@ -62,7 +66,6 @@ export default function FieldModal(props) {
     var _form$getFieldsValue = form.getFieldsValue(),
         prev = _form$getFieldsValue.expression;
 
-    map.current = _objectSpread(_objectSpread({}, map.current), {}, _defineProperty({}, data.title || '', data.id));
     form.setFieldsValue({
       expression: prev.slice(0, pos) + "${".concat(data.title, "}") + prev.slice(pos)
     });
@@ -113,7 +116,7 @@ export default function FieldModal(props) {
   var parseExpression = function parseExpression(expression) {
     return expression.replace(/\$\{([^{}]+)\}/g, function (match, p1) {
       if (p1) {
-        var id = map.current[p1];
+        var id = map[p1];
 
         if (id !== undefined) {
           return "${".concat(id, "}");
@@ -137,7 +140,6 @@ export default function FieldModal(props) {
             summary: false,
             summaryType: 1
           });
-          map.current = {};
         }
       } else {
         setOpen(true);

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

@@ -74,12 +74,14 @@ var Item = /*#__PURE__*/memo(function (props) {
     }
   });
 
-  var _useState = useState(getChecked.current()),
+  var _useState = useState(0),
       _useState2 = _slicedToArray(_useState, 2),
       visible = _useState2[0],
       setVisible = _useState2[1];
 
   useEffect(function () {
+    setVisible(getChecked.current());
+
     var handler = function handler() {
       setVisible(getChecked.current());
     };
@@ -88,7 +90,7 @@ var Item = /*#__PURE__*/memo(function (props) {
     return function () {
       api.removeEventListener('columnVisible', handler);
     };
-  }, []);
+  }, [node.column]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     style: {
       paddingLeft: level * 20 + 8

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, divideDependencies } from 'mathjs';
+import { create, parseDependencies, factory } from 'mathjs';
 import memoizeOne from 'memoize-one';
 import React, { Component, createRef } from 'react';
 import shallowEqual from 'shallowequal';
@@ -100,9 +100,36 @@ import DetailCellRenderer from "./renderer/DetailCellRenderer";
 import HeaderRenderer from "./renderer/HeaderRenderer";
 import { prefix, getColField, isColumn, withSyncRender, Store, Selection, columnTypes } from "./utils";
 
+var add = function add(a, b) {
+  return new BigNumber(a).plus(b);
+};
+
+var subtract = function subtract(a, b) {
+  return new BigNumber(a).minus(b);
+};
+
+var multiply = function multiply(a, b) {
+  return new BigNumber(a).times(b);
+};
+
+var divide = function divide(a, b) {
+  return new BigNumber(a).div(b);
+};
+
 var _create = create({
   parseDependencies: parseDependencies,
-  divideDependencies: divideDependencies
+  createAdd: factory('add', [], function () {
+    return add;
+  }),
+  createSubtract: factory('subtract', [], function () {
+    return subtract;
+  }),
+  createMultiply: factory('multiply', [], function () {
+    return multiply;
+  }),
+  createDivide: factory('divide', [], function () {
+    return divide;
+  })
 }),
     parse = _create.parse;
 

package/es/components/DataGrid/index.less

@@ -140,6 +140,9 @@
       &-title {
         flex: 1;
         margin-left: 8px;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
       }
 
       &-drag {

package/es/components/Filter/index.js

@@ -533,6 +533,7 @@ function Filter(props) {
       return handleFinish(val, 'submit');
     },
     form: form,
+    component: false,
     onValuesChange: handleValuesChange
   }, !simple && /*#__PURE__*/React.createElement(TabBar, {
     tabs: tabs,
@@ -545,7 +546,7 @@ function Filter(props) {
     direction: "row",
     style: !width ? {
       maxHeight: 72,
-      overflowY: 'hidden'
+      overflow: 'hidden'
     } : undefined
   }, data.map(function (item) {
     if (!preserveFields && isFieldHidden(item)) {

package/es/components/SiderTree/index.less

@@ -52,13 +52,8 @@
     .scrollBar();
 
     .@{ant-prefix}-tree {
-      &-list-holder-inner {
-        align-items: stretch;
-      }
-
       &-node-content-wrapper {
         min-width: 0;
-        overflow-x: hidden;
       }
 
       &-title {
@@ -66,7 +61,6 @@
         flex: 1;
         align-items: center;
         justify-content: space-between;
-        min-width: 56px;
         border-radius: 4px;
         cursor: pointer;
         transition: background-color 0.2s;

package/es/styles/overrides.less

@@ -253,6 +253,10 @@ a[title='站长统计'] {
   & &-treenode-leaf-last &-switcher-leaf-line::before {
     height: (@tree-title-height / 2) !important;
   }
+
+  & &-treenode-draggable &-draggable-icon {
+    width: @tree-node-indent-width;
+  }
 }
 
 /** button **/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/kits",
-  "version": "1.0.0-200",
+  "version": "1.0.0-202",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",