@lemon-fe/components 1.4.5 → 1.4.7-alpha.0

package/es/data-grid/cell-editors/row.d.ts

@@ -3,11 +3,16 @@ import React from 'react';
 import type { ICellEditorParams } from 'ag-grid-community';
 import type { ICellEditorReactComp } from 'ag-grid-react';
 export declare class RowEditorData<T> {
-    private data;
-    constructor(data: T);
-    getValue(): T;
+    data: T;
+    mode?: RowUpdateMode;
+    constructor(data: T, mode?: RowUpdateMode);
 }
-export declare type RowEditorActionType = 'stop' | 'next';
+export declare type RowUpdateMode = 'replace' | 'merge';
+export declare type RowEditorActionType = 'stop' | 'next' | {
+    /** 此次修改是整行数据替换还是合并，默认是合并 */
+    updateMode?: RowUpdateMode;
+    action?: 'stop' | 'next';
+};
 export interface RowEditorParams<T = any, K = any> {
     suppressEnterEvent?: boolean;
     isCancelAfterEnd?: (newValue: T, data: T) => boolean;

package/es/data-grid/cell-editors/row.js

@@ -7,31 +7,24 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import React, { useEffect, useRef } from 'react';
+import React, { useCallback, useEffect, useRef } from 'react';
 import { forwardRef, useImperativeHandle, useState } from 'react';
 import { useGridStore } from "../hooks";
 import EditorWrapper from "./wrapper";
 import { get } from 'lodash';
-export var RowEditorData = /*#__PURE__*/function () {
-  function RowEditorData(data) {
-    _classCallCheck(this, RowEditorData);
-    _defineProperty(this, "data", void 0);
-    this.data = data;
-  }
-  _createClass(RowEditorData, [{
-    key: "getValue",
-    value: function getValue() {
-      return this.data;
-    }
-  }]);
-  return RowEditorData;
-}();
+export var RowEditorData = /*#__PURE__*/_createClass(function RowEditorData(data, mode) {
+  _classCallCheck(this, RowEditorData);
+  _defineProperty(this, "data", void 0);
+  _defineProperty(this, "mode", void 0);
+  this.data = data;
+  this.mode = mode;
+});
 export default /*#__PURE__*/forwardRef(function RowEditor(props, ref) {
   var api = props.api,
     suppressEnterEvent = props.suppressEnterEvent,
@@ -49,14 +42,23 @@ export default /*#__PURE__*/forwardRef(function RowEditor(props, ref) {
     _useState2 = _slicedToArray(_useState, 2),
     prevValue = _useState2[0],
     setPrevValue = _useState2[1];
-  var _useState3 = useState(data),
+  var _useState3 = useState({
+      value: data
+    }),
     _useState4 = _slicedToArray(_useState3, 2),
-    value = _useState4[0],
-    setValue = _useState4[1];
+    result = _useState4[0],
+    setResult = _useState4[1];
   var context = useGridStore(function (state) {
     return state.context;
   });
+  var getRowData = useCallback(function (target, nodeData) {
+    if (target.updateMode === 'replace') {
+      return target.value;
+    }
+    return _objectSpread(_objectSpread({}, nodeData), target.value);
+  }, []);
   var elm = useRef(null);
+  var value = result.value;
   useEffect(function () {
     if (elm.current !== null) {
       if (elm.current.select !== undefined) {
@@ -68,7 +70,10 @@ export default /*#__PURE__*/forwardRef(function RowEditor(props, ref) {
     var handler = function handler(evt) {
       if (evt.update) {
         setPrevValue(api.getValue(column, evt.node));
-        setValue(evt.newData);
+        setResult({
+          value: evt.newData,
+          updateMode: 'replace'
+        });
       }
     };
     node.addEventListener('dataChanged', handler);
@@ -80,7 +85,7 @@ export default /*#__PURE__*/forwardRef(function RowEditor(props, ref) {
     return {
       getValue: function getValue() {
         var nextValue = prevValue;
-        var newData = _objectSpread(_objectSpread({}, data), value);
+        var newData = getRowData(result, data);
         if (field === undefined || value === data || isCancelAfterEnd !== undefined && isCancelAfterEnd(newData, data)) {
           return prevValue;
         }
@@ -90,15 +95,27 @@ export default /*#__PURE__*/forwardRef(function RowEditor(props, ref) {
         if (nextValue == prevValue) {
           return prevValue;
         }
-        return new RowEditorData(value);
+        return new RowEditorData(value, result.updateMode);
       }
     };
   });
   var handleChange = function handleChange(val, action) {
-    setValue(val);
-    if (action !== undefined) {
+    var finishAction;
+    if (_typeof(action) === 'object') {
+      setResult({
+        value: val,
+        updateMode: action.updateMode
+      });
+      finishAction = action.action;
+    } else {
+      setResult({
+        value: val
+      });
+      finishAction = action;
+    }
+    if (finishAction !== undefined) {
       requestAnimationFrame(function () {
-        switch (action) {
+        switch (finishAction) {
           case 'stop':
             stopEditing();
             break;
@@ -114,7 +131,7 @@ export default /*#__PURE__*/forwardRef(function RowEditor(props, ref) {
         api.tabToNextCell();
       }
     }
-  }, render(field ? get(value, field) : prevValue, value === data ? data : _objectSpread(_objectSpread({}, data), value), _objectSpread(_objectSpread({}, props), {}, {
+  }, render(field ? get(value, field) : prevValue, value === data ? data : getRowData(result, data), _objectSpread(_objectSpread({}, props), {}, {
     context: context,
     ref: elm,
     onChange: handleChange

package/es/data-grid/index.js

@@ -1031,8 +1031,9 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
                 var colField = mParams.colDef.field,
                   data = mParams.data,
                   newValue = mParams.newValue,
-                  oldValue = mParams.oldValue;
-                if (!colField || newValue === oldValue) {
+                  oldValue = mParams.oldValue,
+                  node = mParams.node;
+                if (!colField || newValue === oldValue || node === null || node === undefined) {
                   return false;
                 }
                 if (valueSetter !== undefined) {
@@ -1040,7 +1041,12 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
                   set(data, colField, newValue);
                   Object.assign(data, _result);
                 } else if (newValue instanceof RowEditorData) {
-                  Object.assign(data, newValue.getValue());
+                  if (newValue.mode === 'replace') {
+                    Object.keys(data).forEach(function (key) {
+                      set(data, key, undefined);
+                    });
+                  }
+                  Object.assign(data, newValue.data);
                 } else {
                   set(data, colField, newValue);
                 }
@@ -1198,6 +1204,26 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
             return params.value;
           };
         }
+        fieldCol.comparator = function (valueA, valueB) {
+          var convertToNumber = function convertToNumber(value) {
+            if (BigNumber.isBigNumber(value)) {
+              return value.toNumber();
+            }
+            if (typeof value === 'string') {
+              var numValue = parseFloat(value.replace(/,/g, ''));
+              if (!isNaN(numValue)) {
+                return numValue;
+              }
+            }
+            return value;
+          };
+          var numericValueA = convertToNumber(valueA);
+          var numericValueB = convertToNumber(valueB);
+          if (isNaN(numericValueA) || isNaN(numericValueB)) {
+            return ('' + valueA).localeCompare('' + valueB);
+          }
+          return numericValueA - numericValueB;
+        };
         result.push(fieldCol);
       });
       if (rowSelection !== undefined) {

package/es/data-grid/index.less

@@ -446,7 +446,8 @@
     }
 
     .ag-cell-focus & {
-      padding: 0 2px;
+      padding: 2px;
+      line-height: ~'calc(min(var(--ag-internal-calculated-line-height), var(--ag-internal-padded-row-height)) - 4px)';
     }
 
     &-text {

package/es/filter/index.js

@@ -33,7 +33,7 @@ import Modal from "../modal";
 import Select from "../select";
 import { mergeProp, prefixClassName } from "../utils";
 import FieldsConfig from "./fields-config";
-import { useRequest, useUpdateEffect } from '@lemon-fe/hooks';
+import { useDebounce, useRequest, useUpdateEffect } from '@lemon-fe/hooks';
 import classNames from 'classnames';
 import ResizeObserver from 'rc-resize-observer';
 var getInitComponents = function getInitComponents(locale) {
@@ -497,6 +497,12 @@ function Filter(originalProps) {
       handleFinish(form.getFieldsValue(), 'reset');
     }
   };
+  var handleSubmit = useDebounce(function (val) {
+    return handleFinish(val, 'submit');
+  }, 1000, {
+    leading: true,
+    trailing: false
+  });
   var handleChangeFields = useCallback(function (newFields) {
     var next = _toConsumableArray(tabs);
     next[active] = _objectSpread(_objectSpread({}, next[active]), {}, {
@@ -687,9 +693,7 @@ function Filter(originalProps) {
     autoFocus: true
   })))), /*#__PURE__*/React.createElement(Form, {
     initialValues: defaultValue,
-    onFinish: function onFinish(val) {
-      return handleFinish(val, 'submit');
-    },
+    onFinish: handleSubmit,
     form: form,
     style: {
       position: 'relative'

package/es/modal/index.d.ts

@@ -12,5 +12,5 @@ declare const Modal: Pick<React.FC<AntdModalProps> & import("antd/lib/modal/conf
     useModal: typeof import("antd/lib/modal/useModal").default;
     destroyAll: () => void;
     config: typeof import("antd/lib/modal/confirm").modalGlobalConfig;
-}, "success" | "error" | "warning" | "info" | "warn" | "confirm" | "useModal" | "config" | "destroyAll"> & typeof LemonModal;
+}, "warning" | "error" | "success" | "info" | "warn" | "confirm" | "useModal" | "destroyAll" | "config"> & typeof LemonModal;
 export default Modal;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "1.4.5",
+  "version": "1.4.7-alpha.0",
   "description": "> TODO: description",
   "homepage": "",
   "license": "MIT",
@@ -58,5 +58,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "cf78266942bbaffd2c608e32e7e591067abd71df"
+  "gitHead": "09e7aef5d176eb8495585b67e3eb807ff43116b0"
 }