@lemon-fe/components 1.2.16 → 1.2.18-alpha.0

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/es/filter/fields-config.d.ts

@@ -0,0 +1,24 @@
+import React from 'react';
+import type { FilterItemType, FilterView } from './typings';
+declare type FieldValue = FilterView<any>['fields'][0];
+export declare type Value = FieldValue & {
+    label?: string;
+    /**
+     * 禁止设置是否可见
+     */
+    lockVisible?: boolean;
+    /**
+     * 在设置内是否可见
+     */
+    hiddenInFields: boolean;
+};
+interface Props {
+    originData: FilterItemType<any>[];
+    value: Value[];
+    onChange: (value: FieldValue[]) => void;
+    onSave: () => void;
+    classNamePrefix: (value?: string) => string;
+}
+declare function FieldsConfig(props: Props): JSX.Element;
+declare const _default: React.MemoExoticComponent<typeof FieldsConfig>;
+export default _default;

package/es/filter/fields-config.js

@@ -0,0 +1,261 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+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); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+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 _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+import { Button, Checkbox, Input, message, Popover } from 'antd';
+import React, { memo, useRef, useState } from 'react';
+import Empty from "../empty";
+import Icons from "../icons";
+import { useLocaleReceiver } from "../locale-receiver";
+import { DndContext, DragOverlay, closestCenter, useDraggable, useDroppable } from '@dnd-kit/core';
+import { useDebounce } from '@lemon-fe/hooks';
+import classNames from 'classnames';
+function SortItem(props) {
+  var item = props.data,
+    index = props.index,
+    prefix = props.classNamePrefix,
+    dragActive = props.dragActive,
+    onHiddenChange = props.onHiddenChange;
+  var _useDraggable = useDraggable({
+      id: item.key,
+      data: {
+        index: index,
+        data: item
+      }
+    }),
+    attributes = _useDraggable.attributes,
+    listeners = _useDraggable.listeners,
+    setDragRef = _useDraggable.setNodeRef;
+  var _useDroppable = useDroppable({
+      id: item.key,
+      data: {
+        index: index,
+        data: item
+      }
+    }),
+    setDropRef = _useDroppable.setNodeRef;
+  return /*#__PURE__*/React.createElement("div", {
+    key: item.key,
+    className: classNames(prefix('item'), dragActive ? prefix("item-active-".concat(dragActive)) : undefined),
+    ref: setDropRef
+  }, /*#__PURE__*/React.createElement("div", _extends({
+    ref: setDragRef
+  }, listeners, attributes), /*#__PURE__*/React.createElement(Icons.Drag, null)), /*#__PURE__*/React.createElement(Checkbox, {
+    disabled: item.lockVisible,
+    checked: !item.hidden,
+    onChange: function onChange(e) {
+      onHiddenChange(!e.target.checked);
+    }
+  }), /*#__PURE__*/React.createElement("span", null, item.label));
+}
+function FieldsConfig(props) {
+  var prefix = props.classNamePrefix;
+  var items = props.value;
+  var _useLocaleReceiver = useLocaleReceiver('Filter'),
+    _useLocaleReceiver2 = _slicedToArray(_useLocaleReceiver, 1),
+    filterLocale = _useLocaleReceiver2[0];
+  var _useState = useState(''),
+    _useState2 = _slicedToArray(_useState, 2),
+    keywords = _useState2[0],
+    setKeywords = _useState2[1];
+  var _useState3 = useState(''),
+    _useState4 = _slicedToArray(_useState3, 2),
+    overlay = _useState4[0],
+    setOverlay = _useState4[1];
+  var _useState5 = useState(),
+    _useState6 = _slicedToArray(_useState5, 2),
+    dragActive = _useState6[0],
+    setDragActive = _useState6[1];
+  var _useState7 = useState(false),
+    _useState8 = _slicedToArray(_useState7, 2),
+    open = _useState8[0],
+    setOpen = _useState8[1];
+  var prevValue = useRef(props.value);
+  var handleChangeKeywords = useDebounce(setKeywords, 300);
+  var handleHiddenChange = function handleHiddenChange(index, hidden) {
+    var newValue = _toConsumableArray(props.value);
+    newValue[index] = _objectSpread(_objectSpread({}, newValue[index]), {}, {
+      hidden: hidden
+    });
+    var visibleCount = newValue.reduce(function (prev, item) {
+      return prev + (item.hidden ? 0 : 1);
+    }, 0);
+    if (visibleCount) {
+      props.onChange(newValue);
+    } else {
+      message.warning(filterLocale.hideOptionKeepOne);
+    }
+  };
+  return /*#__PURE__*/React.createElement(Popover, {
+    trigger: "click",
+    overlayClassName: prefix('popover'),
+    destroyTooltipOnHide: true,
+    open: open,
+    onOpenChange: function onOpenChange(openStatus) {
+      if (openStatus) {
+        prevValue.current = props.value;
+      }
+      setOpen(openStatus);
+    },
+    content: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+      className: prefix('items-search')
+    }, /*#__PURE__*/React.createElement(Input, {
+      placeholder: filterLocale.searchOptionText,
+      allowClear: true,
+      prefix: /*#__PURE__*/React.createElement(Icons.Search, null),
+      onChange: function onChange(e) {
+        return handleChangeKeywords(e.currentTarget.value);
+      }
+    })), /*#__PURE__*/React.createElement(DndContext, {
+      onDragStart: function onDragStart(e) {
+        var _e$active$data$curren;
+        setOverlay((_e$active$data$curren = e.active.data.current) === null || _e$active$data$curren === void 0 ? void 0 : _e$active$data$curren.data.label);
+      },
+      collisionDetection: closestCenter,
+      onDragMove: function onDragMove(e) {
+        var active = e.active,
+          over = e.over;
+        var drop;
+        if (active.rect.current.translated && over && !over.disabled) {
+          var overlayRect = active.rect.current.translated;
+          var targetRect = over.rect;
+          var overlayCenter = {
+            x: overlayRect.left + overlayRect.width / 2,
+            y: overlayRect.top + overlayRect.height / 2
+          };
+          var node = over.data.current;
+          var dragIndex = active.data.current.index;
+          var targetIndex = node.index;
+          if (dragIndex !== targetIndex) {
+            var targetCenter = {
+              x: targetRect.left + targetRect.width / 2,
+              y: targetRect.top + targetRect.height / 2
+            };
+            if (overlayCenter.y >= targetCenter.y) {
+              if (dragIndex >= targetIndex) {
+                drop = {
+                  indicator: 'bottom',
+                  index: targetIndex + 1,
+                  node: node
+                };
+              } else {
+                drop = {
+                  indicator: 'bottom',
+                  index: targetIndex,
+                  node: node
+                };
+              }
+            } else {
+              if (dragIndex >= targetIndex) {
+                drop = {
+                  indicator: 'top',
+                  index: targetIndex,
+                  node: node
+                };
+              } else {
+                drop = {
+                  indicator: 'top',
+                  index: targetIndex - 1,
+                  node: node
+                };
+              }
+            }
+          }
+        }
+        setDragActive(drop);
+      },
+      onDragEnd: function onDragEnd(e) {
+        if (dragActive) {
+          var dragIndex = e.active.data.current.index;
+          var dropIndex = dragActive.index;
+          if (dragIndex !== dropIndex) {
+            var newItems = _toConsumableArray(props.value);
+            var target = newItems[dragIndex];
+            newItems.splice(dragIndex, 1);
+            newItems.splice(dropIndex, 0, target);
+            props.onChange(newItems);
+          }
+        }
+        setOverlay('');
+        setDragActive(undefined);
+      },
+      onDragCancel: function onDragCancel() {
+        setOverlay('');
+        setDragActive(undefined);
+      }
+    }, /*#__PURE__*/React.createElement("div", {
+      className: prefix('items')
+    }, items.length > 0 ? items.map(function (item, index) {
+      var str = keywords.trim();
+      if (!item.label || str && !item.label.includes(str) || item.hiddenInFields) {
+        return;
+      }
+      return /*#__PURE__*/React.createElement(SortItem, {
+        key: item.key,
+        data: item,
+        index: index,
+        classNamePrefix: prefix,
+        onHiddenChange: function onHiddenChange(hidden) {
+          handleHiddenChange(index, hidden);
+        },
+        dragActive: (dragActive === null || dragActive === void 0 ? void 0 : dragActive.node.data.key) === item.key ? dragActive.indicator : undefined
+      });
+    }) : /*#__PURE__*/React.createElement(Empty, {
+      image: Empty.PRESENTED_IMAGE_SIMPLE
+    })), /*#__PURE__*/React.createElement(DragOverlay, {
+      dropAnimation: null
+    }, overlay ? /*#__PURE__*/React.createElement("div", {
+      className: prefix('drag-item')
+    }, overlay) : null)), /*#__PURE__*/React.createElement("div", {
+      className: prefix('popover-footer')
+    }, /*#__PURE__*/React.createElement(Button, {
+      onClick: function onClick() {
+        props.onChange(props.originData.map(function (item) {
+          return {
+            key: item.key,
+            hidden: false
+          };
+        }));
+      },
+      size: "small"
+    }, filterLocale.resetText), /*#__PURE__*/React.createElement(Button, {
+      style: {
+        marginLeft: 'auto'
+      },
+      size: "small",
+      onClick: function onClick() {
+        props.onChange(prevValue.current);
+        setOpen(false);
+      }
+    }, filterLocale.cancel), /*#__PURE__*/React.createElement(Button, {
+      size: "small",
+      type: "primary",
+      onClick: function onClick() {
+        prevValue.current = props.value;
+        setOpen(false);
+        props.onSave();
+      }
+    }, filterLocale.save))),
+    placement: "bottomRight"
+  }, /*#__PURE__*/React.createElement(Button, {
+    className: prefix('btn'),
+    onClick: function onClick() {
+      setKeywords('');
+    },
+    icon: /*#__PURE__*/React.createElement(Icons.LookUp, null)
+  }));
+}
+export default /*#__PURE__*/memo(FieldsConfig);

package/es/filter/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import type { ComponentOption, FilterProps } from './typings';
+import type { ComponentOption, FilterProps } from './typings.d';
 declare function Filter<T extends Record<string, any> = Record<string, any>>(originalProps: FilterProps<T>): JSX.Element;
 declare namespace Filter {
     var setComponents: (items: ComponentOption[]) => void;