@lemon-fe/components 1.2.16 → 1.2.17

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

@@ -64,17 +64,19 @@ export default function CustomColumnPanel(params) {
   var handleChangeKeywords = useDebounce(setKeywords, 200);
   useEffect(function () {
     var handler = function handler(e) {
-      if (e.type === 'columnMoved' && !e.finished) {
+      if ((e.type === 'columnMoved' || e.type === 'columnResized') && !e.finished) {
         return;
       }
       handleColumnState();
     };
+    api.addEventListener('columnVisible', handler);
     api.addEventListener('columnMoved', handler);
     api.addEventListener('columnPinned', handler);
     api.addEventListener('columnResized', handler);
     api.addEventListener('columnValueChanged', handler);
     api.addEventListener('newColumnsLoaded', handler);
     return function () {
+      api.removeEventListener('columnVisible', handler);
       api.removeEventListener('columnMoved', handler);
       api.removeEventListener('columnPinned', handler);
       api.removeEventListener('columnResized', handler);
@@ -108,7 +110,9 @@ export default function CustomColumnPanel(params) {
         column: column,
         title: title,
         children: [],
-        leaf: []
+        leaf: [],
+        disabled: def.lockVisible || false,
+        visible: column.isVisible() ? 1 : 0
       };
       var node = originNode;
       var path = [node];
@@ -126,7 +130,9 @@ export default function CustomColumnPanel(params) {
           id: id,
           children: [node],
           title: groupDef.headerName,
-          leaf: [originNode]
+          leaf: [originNode],
+          disabled: originNode.disabled,
+          visible: originNode.visible
         };
         node = parentNode;
         path.unshift(node);
@@ -138,6 +144,8 @@ export default function CustomColumnPanel(params) {
         if (node1 !== undefined && node2 !== undefined && node1.id === node2.id) {
           node1.children = [].concat(_toConsumableArray(node1.children), _toConsumableArray(node2.children));
           node1.leaf = [].concat(_toConsumableArray(node1.leaf), _toConsumableArray(node2.leaf));
+          node1.disabled = node1.disabled && node2.disabled;
+          node1.visible = node1.visible === 1 && node2.visible === 1 ? 1 : node1.visible === 1 || node2.visible === 1 ? 2 : 0;
           path[i] = node1;
           continue;
         }
@@ -229,7 +237,7 @@ export default function CustomColumnPanel(params) {
     autoFocus: true,
     placeholder: dataGridLocale.searchText,
     onChange: function onChange(e) {
-      handleChangeKeywords(e.target.value);
+      handleChangeKeywords(e.target.value.trim());
     },
     onKeyUp: function onKeyUp(e) {
       if (e.key === 'Enter') {

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

@@ -5,18 +5,16 @@ 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; }
-import React, { memo, useContext, useEffect, useState } from 'react';
+import React, { memo, useContext } from 'react';
 import Dropdown from "../../../dropdown";
 import Icons from "../../../icons";
 import { useLocaleReceiver } from "../../../locale-receiver";
 import { isCustomField, prefix } from "../../utils";
 import DragContext from "./drag-context";
 import { useDraggable, useDroppable } from '@dnd-kit/core';
-import { useLastestRef } from '@lemon-fe/hooks';
 import classNames from 'classnames';
 var Item = /*#__PURE__*/memo(function (props) {
   var node = props.node,
-    api = props.api,
     columnApi = props.columnApi,
     level = props.level,
     dragActive = props.dragActive,
@@ -39,43 +37,7 @@ var Item = /*#__PURE__*/memo(function (props) {
       disabled: colDef.lockPosition === true
     }),
     setDropRef = _useDroppable.setNodeRef;
-  var getChecked = useLastestRef(function () {
-    if (column) {
-      if (column.isVisible()) {
-        return 1;
-      }
-      return 0;
-    }
-    var count = 0;
-    node.leaf.forEach(function (item) {
-      if (item.column) {
-        if (item.column.isVisible()) {
-          count += 1;
-        }
-      }
-    });
-    if (count === 0) {
-      return 0;
-    } else if (count === node.leaf.length) {
-      return 1;
-    } else {
-      return 2;
-    }
-  });
-  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());
-    };
-    api.addEventListener('columnVisible', handler);
-    return function () {
-      api.removeEventListener('columnVisible', handler);
-    };
-  }, [node.column]);
+  var visible = node.visible;
   var _useLocaleReceiver = useLocaleReceiver('DataGrid'),
     _useLocaleReceiver2 = _slicedToArray(_useLocaleReceiver, 1),
     dataGridLocale = _useLocaleReceiver2[0];
@@ -88,18 +50,19 @@ var Item = /*#__PURE__*/memo(function (props) {
   }, /*#__PURE__*/React.createElement("div", {
     className: classNames('ag-wrapper ag-input-wrapper ag-checkbox-input-wrapper', {
       'ag-checked': visible === 1,
-      'ag-indeterminate': visible === 2
+      'ag-indeterminate': visible === 2,
+      'ag-disabled': node.disabled
     }),
     role: "presentation"
   }, /*#__PURE__*/React.createElement("input", {
     className: "ag-input-field-input ag-checkbox-input",
     type: "checkbox",
     tabIndex: -1,
-    disabled: colDef.lockVisible,
+    disabled: node.disabled,
     checked: visible === 1,
     onChange: function onChange() {
       var hide;
-      if (visible === 1) {
+      if (node.visible === 1) {
         hide = true;
       } else {
         hide = false;
@@ -113,7 +76,9 @@ var Item = /*#__PURE__*/memo(function (props) {
         });
       } else {
         columnApi.applyColumnState({
-          state: node.leaf.map(function (item) {
+          state: node.leaf.filter(function (item) {
+            return !item.disabled;
+          }).map(function (item) {
             return {
               colId: item.column.getColId(),
               hide: hide

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

@@ -8,6 +8,8 @@ export type Node = {
   column?: Column;
   children: Node[];
   leaf: Node[];
+  disabled: boolean;
+  visible: number;
 };
 
 export type DragActive = {

package/es/data-grid/components/search.js

@@ -36,7 +36,8 @@ export default /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function Search(props,
   var _useLocaleReceiver = useLocaleReceiver('DataGrid'),
     _useLocaleReceiver2 = _slicedToArray(_useLocaleReceiver, 1),
     dataGridLocale = _useLocaleReceiver2[0];
-  var handleSearch = useDebounce(function (keywords) {
+  var handleSearch = useDebounce(function (str) {
+    var keywords = str.trim();
     if (keywords.length <= 0) {
       setState(defaultState);
       return;

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

@@ -16,7 +16,7 @@ declare const Editors: {
     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" | "showSearch" | "optionFilterProp" | "options" | "virtual" | "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" | "showSearch" | "optionFilterProp" | "options" | "virtual" | "listHeight"> & {
         fieldNames?: {
             label: string;
             value: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "1.2.16",
+  "version": "1.2.17",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -67,5 +67,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "37caaf402464a0549212f7f485de34103b53694f"
+  "gitHead": "68fa367d4c6f606248238f645cd0ee5a0d37d995"
 }