@pisell/materials 2.2.10 → 2.2.12

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

@@ -5,7 +5,7 @@ export declare const paginationConfig: {
     className: string;
     defaultCurrent: number;
     showTotal: (total: number, range: [number, number]) => string;
-    itemRender: (page: number, type: "page" | "next" | "prev" | "jump-prev" | "jump-next", element: React.ReactNode) => React.ReactNode;
+    itemRender: (page: number, type: "next" | "page" | "prev" | "jump-prev" | "jump-next", element: React.ReactNode) => React.ReactNode;
     responsive: boolean;
     size: string;
 };

package/es/components/date-picker/index.js

@@ -1,7 +1,7 @@
 import { DatePicker as OriginalDatePicker } from 'antd';
 import { withMomentProps } from "../../utils/hoc";
 import dayjs from 'dayjs';
-import { RangePicker } from "@pisell/date-picker";
+import { RangePicker, OldPisellDateRangePicker } from "@pisell/date-picker";
 import localeData from 'dayjs/plugin/localeData';
 import weekday from 'dayjs/plugin/weekday';
 dayjs.extend(weekday);
@@ -19,4 +19,5 @@ var DatePicker = withMomentProps(OriginalDatePicker, ['defaultPickerValue', 'def
 // ]);
 
 DatePicker.RangePicker = RangePicker;
+DatePicker.OldRangePicker = OldPisellDateRangePicker;
 export default DatePicker;

package/es/components/drag-sort-tree/TreeItem/index.d.ts

@@ -1,15 +1,18 @@
 import React from 'react';
 import './index.less';
 import { ValueProps, SortType } from '../types';
+declare type IdType = string | number;
 declare type TreeItemProps = {
     id: string | number;
     key: string | number;
     item: ValueProps | any;
     depth: number;
     lists: any[];
-    activeId?: string | null;
     childrenProps?: SortType;
     sensors?: any;
+    expandedKeys?: IdType[];
+    setExpandedKeys?: any;
+    onSelectKeys?: (ids: IdType) => void;
     onChange?: (value: any[]) => void;
 };
 declare const TreeItem: (props: TreeItemProps) => React.JSX.Element;

package/es/components/drag-sort-tree/TreeItem/index.js

@@ -18,8 +18,11 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useMemo, useState } from 'react';
 import { useSortable } from '@dnd-kit/sortable';
 import { DndContext } from '@dnd-kit/core';
+import { Tooltip } from 'antd';
+import DotsSix from '@pisell/icon/es/DotsSix';
+import { getText } from "../../../locales";
 import { CSS } from '@dnd-kit/utilities';
-import { HolderOutlined, EyeOutlined, EyeInvisibleOutlined, WarningOutlined } from '@ant-design/icons';
+import { EyeOutlined, EyeInvisibleOutlined, WarningOutlined } from '@ant-design/icons';
 import { SortableContext, verticalListSortingStrategy, arrayMove } from '@dnd-kit/sortable';
 import { restrictToVerticalAxis, restrictToParentElement } from '@dnd-kit/modifiers';
 import classNames from 'classnames';
@@ -29,15 +32,11 @@ var TreeItem = function TreeItem(props) {
   var id = props.id,
     item = props.item,
     depth = props.depth,
-    activeId = props.activeId,
     sensors = props.sensors,
     childrenProps = props.childrenProps,
     lists = props.lists,
+    expandedKeys = props.expandedKeys,
     onChange = props.onChange;
-  var _useState = useState([]),
-    _useState2 = _slicedToArray(_useState, 2),
-    expandedKeys = _useState2[0],
-    setExpandedKeys = _useState2[1];
   var _useSortable = useSortable({
       id: id
     }),
@@ -45,13 +44,12 @@ var TreeItem = function TreeItem(props) {
     listeners = _useSortable.listeners,
     setNodeRef = _useSortable.setNodeRef,
     transform = _useSortable.transform,
-    transition = _useSortable.transition;
-  useEffect(function () {
-    // 拖拽的时候将节点收起
-    if (activeId) {
-      setExpandedKeys([]);
-    }
-  }, [activeId]);
+    transition = _useSortable.transition,
+    isDragging = _useSortable.isDragging;
+  var _useState = useState(window.innerWidth < 600),
+    _useState2 = _slicedToArray(_useState, 2),
+    isMobile = _useState2[0],
+    setIsMobile = _useState2[1];
   var style = {
     transform: CSS.Transform.toString(transform && _objectSpread(_objectSpread({}, transform), {}, {
       scaleY: 1
@@ -70,7 +68,7 @@ var TreeItem = function TreeItem(props) {
       var _active$id$split = active === null || active === void 0 ? void 0 : (_active$id = active.id) === null || _active$id === void 0 ? void 0 : _active$id.split('-'),
         _active$id$split2 = _slicedToArray(_active$id$split, 2),
         activeParentId = _active$id$split2[0],
-        _activeId = _active$id$split2[1];
+        activeId = _active$id$split2[1];
       var _over$id$split = over === null || over === void 0 ? void 0 : (_over$id = over.id) === null || _over$id === void 0 ? void 0 : _over$id.split('-'),
         _over$id$split2 = _slicedToArray(_over$id$split, 2),
         overParentId = _over$id$split2[0],
@@ -78,9 +76,9 @@ var TreeItem = function TreeItem(props) {
       var parentIndex = lists.findIndex(function (item) {
         return item[rowKey] == activeParentId;
       });
-      if (_activeId !== overId && activeParentId === overParentId && parentIndex !== -1) {
+      if (activeId !== overId && activeParentId === overParentId && parentIndex !== -1) {
         var activeIndex = item.children.findIndex(function (item) {
-          return item[rowKey] == _activeId;
+          return item[rowKey] == activeId;
         });
         var overIndex = item.children.findIndex(function (item) {
           return item[rowKey] == overId;
@@ -122,14 +120,7 @@ var TreeItem = function TreeItem(props) {
     var _item$children;
     if (depth === 0 && (_item$children = item.children) !== null && _item$children !== void 0 && _item$children.length) {
       var key = item[rowKey];
-      if (expandedKeys.includes(key)) {
-        var _ids = expandedKeys.filter(function (id) {
-          return id !== key;
-        });
-        setExpandedKeys(_ids);
-      } else {
-        setExpandedKeys([].concat(_toConsumableArray(expandedKeys), [key]));
-      }
+      (childrenProps === null || childrenProps === void 0 ? void 0 : childrenProps.onHiddenChange) && (childrenProps === null || childrenProps === void 0 ? void 0 : childrenProps.onHiddenChange(key));
     }
   };
   var renderChildren = useMemo(function () {
@@ -151,7 +142,7 @@ var TreeItem = function TreeItem(props) {
         childrenProps: childrenProps
       }) : null;
     }));
-  }, [item.children, expandedKeys, rowKey, lists, childrenProps === null || childrenProps === void 0 ? void 0 : childrenProps.tabKey]);
+  }, [item.children, expandedKeys, rowKey, lists, childrenProps === null || childrenProps === void 0 ? void 0 : childrenProps.tabKey, isDragging]);
 
   // 右侧图标
   var rightIcon = useMemo(function () {
@@ -168,12 +159,29 @@ var TreeItem = function TreeItem(props) {
     var hiddenWarningIcon = childrenProps === null || childrenProps === void 0 ? void 0 : childrenProps.hiddenWarningIcon;
     return !hiddenWarningIcon && !(item !== null && item !== void 0 && item.is_available) ? /*#__PURE__*/React.createElement("div", {
       className: classNames("".concat(prefix, "-drag-sort-tree-item-icon"))
+    }, /*#__PURE__*/React.createElement(Tooltip, {
+      title: getText('drag-sort-tree-unavailable-today-tip'),
+      color: "#ffffff",
+      overlayInnerStyle: {
+        color: '#344054'
+      }
     }, /*#__PURE__*/React.createElement(WarningOutlined, {
       style: {
-        color: 'red'
+        color: '#FF2020'
       }
-    })) : null;
+    }))) : null;
   }, [childrenProps === null || childrenProps === void 0 ? void 0 : childrenProps.hiddenWarningIcon, item === null || item === void 0 ? void 0 : item.is_available]);
+  var handleWindowResize = function handleWindowResize() {
+    // 获取当前窗口的宽度
+    var windowWidth = window.innerWidth;
+    setIsMobile(windowWidth < 600);
+  };
+  useEffect(function () {
+    window.addEventListener('resize', handleWindowResize);
+    return function () {
+      window.removeEventListener('resize', handleWindowResize);
+    };
+  }, []);
   return /*#__PURE__*/React.createElement(DndContext, {
     sensors: sensors,
     modifiers: [restrictToVerticalAxis, restrictToParentElement],
@@ -181,15 +189,21 @@ var TreeItem = function TreeItem(props) {
   }, /*#__PURE__*/React.createElement("div", _extends({
     ref: setNodeRef,
     style: style
-  }, attributes, listeners), /*#__PURE__*/React.createElement("div", {
+  }, attributes, !isMobile ? listeners : {}), /*#__PURE__*/React.createElement("div", {
+    className: classNames("".concat(prefix, "-drag-sort-tree"), childrenProps === null || childrenProps === void 0 ? void 0 : childrenProps.className, isMobile ? "".concat(prefix, "-drag-sort-phone-tree") : ''),
     style: {
-      paddingLeft: !depth ? '8px' : "".concat(depth * 20, "px")
+      paddingLeft: !depth ? '10px' : "".concat(depth * 40, "px"),
+      cursor: isDragging ? 'grabbing' : 'grab'
     },
-    className: classNames("".concat(prefix, "-drag-sort-tree"), childrenProps === null || childrenProps === void 0 ? void 0 : childrenProps.className),
     onClick: onSelect
   }, /*#__PURE__*/React.createElement("div", {
     className: classNames("".concat(prefix, "-drag-sort-tree-item"))
-  }, !(childrenProps !== null && childrenProps !== void 0 && childrenProps.hiddenDraggableIcon) ? /*#__PURE__*/React.createElement(HolderOutlined, null) : null, /*#__PURE__*/React.createElement("div", {
+  }, !(childrenProps !== null && childrenProps !== void 0 && childrenProps.hiddenDraggableIcon) ? /*#__PURE__*/React.createElement(DotsSix, _extends({}, isMobile ? listeners : {}, {
+    className: classNames("".concat(prefix, "-drag-sort-tree-item-dot-icon")),
+    style: {
+      left: isMobile ? !depth ? '-14px' : '12px' : 0
+    }
+  })) : null, /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefix, "-drag-sort-tree-title")
   }, (childrenProps === null || childrenProps === void 0 ? void 0 : childrenProps.titleRender) || (item === null || item === void 0 ? void 0 : item.title))), !depth ? rightIcon : warningIcon), renderChildren));
 };

package/es/components/drag-sort-tree/TreeItem/index.less

@@ -5,38 +5,69 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
-    font-size: 16px;
-    cursor: pointer;
+    font-size: 14px;
     touch-action: none !important;
     width: 100%;
     color: #101828;
-    height: 38px;
-    line-height: 38px;
+    padding: 9px 10px;
+    height: auto;
+    position: relative;
+    display: flex;
+    &:hover {
+      background: #F9FAFB;
+      border-radius: 6px;
+    }
   }
 
-  &-drag-sort-tree:hover {
-    background: #F9FAFB;
-    border-radius: 6px;
+  &-drag-sort-tree-item{
+    flex: 1;
   }
 
   &-drag-sort-tree-item {
     display: flex;
     align-items: center;
   }
-
+  
   &-drag-sort-tree &-drag-sort-tree-title {
     margin-left: 10px;
     font-size: 14px;
+    line-height: 20px;
+    margin-right: 30px;
   }
 
   &-drag-sort-tree-icon,
-  &-drag-sort-tree-item-icon {
-    height: 30px;
-    width: 30px;
+  &-drag-sort-tree-item-icon,
+  &-drag-sort-tree-item-dot-icon {
     display: flex;
     align-items: center;
     justify-content: center;
   }
-}
 
-  
+  &-drag-sort-tree-icon,
+  &-drag-sort-tree-item-icon{
+    height: 40px;
+    width: 40px;
+    position: absolute;
+    right: 0;
+    cursor: pointer;
+  }
+
+  &-drag-sort-tree-icon{
+    cursor: pointer;
+  }
+
+  &-drag-sort-tree-item-dot-icon{
+    height: 20px;
+    width: 20px;
+    color: #344054;
+  }
+
+  // 移动端
+  &-drag-sort-phone-tree &-drag-sort-tree-item-dot-icon {
+    position: absolute;
+    color: #344054;
+    top: 0;
+    width: 40px;
+    height: 40px;
+  }
+}

package/es/components/drag-sort-tree/index.js

@@ -1,3 +1,7 @@
+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); }
@@ -14,15 +18,26 @@ var DragSortTree = function DragSortTree(props) {
   var value = props.value,
     rowKey = props.rowKey,
     tabKey = props.tabKey,
+    hiddenKeys = props.hiddenKeys,
     onChange = props.onChange;
   var _useState = useState(value || []),
     _useState2 = _slicedToArray(_useState, 2),
     items = _useState2[0],
     setItems = _useState2[1];
-  var _useState3 = useState(null),
+  var _useState3 = useState([]),
     _useState4 = _slicedToArray(_useState3, 2),
-    activeId = _useState4[0],
-    setActiveId = _useState4[1];
+    expandedKeys = _useState4[0],
+    setExpandedKeys = _useState4[1];
+  useEffect(function () {
+    var keys = value === null || value === void 0 ? void 0 : value.map(function (item) {
+      return item[rowKey];
+    });
+    // 过滤需要折叠起来的key
+    keys = keys.filter(function (key) {
+      return hiddenKeys !== null && hiddenKeys !== void 0 && hiddenKeys.length ? !hiddenKeys.includes(key) : key;
+    });
+    setExpandedKeys(_toConsumableArray(keys));
+  }, [hiddenKeys]);
   useEffect(function () {
     // 防止切换的时候数据不更新，拖拽之后，如果切换tab，需要用更新之后的数据
     setItems(value || []);
@@ -33,25 +48,33 @@ var DragSortTree = function DragSortTree(props) {
     }
   }));
   var handleDragStart = function handleDragStart(event) {
+    var _active$id, _active$id$split;
     var active = event.active;
-    setActiveId(active === null || active === void 0 ? void 0 : active.id);
+    var activeId = active === null || active === void 0 ? void 0 : (_active$id = active.id) === null || _active$id === void 0 ? void 0 : (_active$id$split = _active$id.split('-')) === null || _active$id$split === void 0 ? void 0 : _active$id$split[1];
+    var _keys = expandedKeys === null || expandedKeys === void 0 ? void 0 : expandedKeys.filter(function (key) {
+      return key != activeId;
+    });
+    setExpandedKeys(_toConsumableArray(_keys));
   };
   var handleDragEnd = function handleDragEnd(event) {
     var active = event.active,
       over = event.over;
-
-    // 拖拽结束将这个值设置为空，防止第二次拖拽同一个节点，监听不到这个变化
-    setActiveId(null);
     if (!over || !active) return;
     try {
-      var _activeId = active.id;
-      var overId = over.id;
-      if (_activeId !== overId) {
+      var _active$id2, _active$id2$split, _over$id, _over$id$split;
+      var activeId = active === null || active === void 0 ? void 0 : (_active$id2 = active.id) === null || _active$id2 === void 0 ? void 0 : (_active$id2$split = _active$id2.split('-')) === null || _active$id2$split === void 0 ? void 0 : _active$id2$split[1];
+      var overId = over === null || over === void 0 ? void 0 : (_over$id = over.id) === null || _over$id === void 0 ? void 0 : (_over$id$split = _over$id.split('-')) === null || _over$id$split === void 0 ? void 0 : _over$id$split[1];
+      if (activeId !== overId) {
+        // 如果没有自动点击折叠则拖动结束再次打开
+        if (!(hiddenKeys !== null && hiddenKeys !== void 0 && hiddenKeys.includes(Number(activeId)))) {
+          var _keys = [].concat(_toConsumableArray(expandedKeys), [Number(activeId)]);
+          setExpandedKeys(_toConsumableArray(_keys));
+        }
         var activeIndex = items.findIndex(function (item) {
-          return item[rowKey] === _activeId;
+          return item[rowKey] == activeId;
         });
         var overIndex = items.findIndex(function (item) {
-          return item[rowKey] === overId;
+          return item[rowKey] == overId;
         });
         var _lists = arrayMove(items, activeIndex, overIndex);
         handleChange(_lists);
@@ -71,19 +94,20 @@ var DragSortTree = function DragSortTree(props) {
     modifiers: [restrictToVerticalAxis, restrictToParentElement]
   }, /*#__PURE__*/React.createElement(SortableContext, {
     items: items.map(function (item) {
-      return item[rowKey];
+      return "0-".concat(item[rowKey]);
     }),
     strategy: verticalListSortingStrategy
   }, items.map(function (item) {
     return /*#__PURE__*/React.createElement(TreeItem, {
-      key: item[rowKey],
-      id: item[rowKey],
+      key: "0-".concat(item[rowKey]),
+      id: "0-".concat(item[rowKey]),
       item: item,
       depth: 0,
       sensors: sensors,
-      activeId: activeId,
       childrenProps: props,
       lists: items,
+      expandedKeys: expandedKeys,
+      setExpandedKeys: setExpandedKeys,
       onChange: handleChange
     });
   }))));

package/es/components/drag-sort-tree/types.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="react" />
+declare type IdType = string | number;
 export declare type ValueProps = {
-    id: number | string;
+    id: IdType;
     title: string;
     show?: boolean;
     is_available?: boolean;
@@ -16,5 +17,8 @@ export declare type SortType = {
     hiddenRightIcon?: boolean;
     hiddenWarningIcon?: boolean;
     tabKey?: string;
+    hiddenKeys?: IdType[];
+    onHiddenChange?: (value: IdType[]) => void;
     onChange?: (value: ValueProps[]) => void;
 };
+export {};

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

@@ -1,5 +1,5 @@
-import React from "react";
-import { SortListProps } from "./types";
-import "./index.less";
+import React from 'react';
+import { SortListProps } from './types';
+import './index.less';
 declare const Sort: React.FC<SortListProps>;
 export default Sort;

package/es/components/sort/index.js

@@ -2,16 +2,16 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "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(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-import React, { useMemo } from "react";
-import { Button, Dropdown, Popover } from "antd";
-import classNames from "classnames";
-import { CheckOutlined } from "@ant-design/icons";
-import SwitchVertical01 from "@pisell/icon/es/SwitchVertical01";
+import React, { useMemo } from 'react';
+import { Button, Dropdown, Popover } from 'antd';
+import classNames from 'classnames';
+import { CheckOutlined } from '@ant-design/icons';
+import SwitchVertical01 from '@pisell/icon/es/SwitchVertical01';
 import { isMobile } from "../../utils/platform";
 import { getText } from "../../locales";
 import InlineMenu from "./components/InlineMenu";
 import "./index.less";
-var prefix = "pisell-lowcode-";
+var prefix = 'pisell-lowcode-';
 var Label = function Label(_ref) {
   var content = _ref.content;
   return /*#__PURE__*/React.createElement("div", {
@@ -21,53 +21,53 @@ var Label = function Label(_ref) {
 var sortChildrenMap = {
   date: function date(key, isLocal) {
     return [{
-      key: "".concat(key, ":desc").concat(isLocal ? ":date" : ""),
+      key: "".concat(key, ":asc").concat(isLocal ? ':date' : ''),
       label: /*#__PURE__*/React.createElement(Label, {
-        content: getText("sort-oldest-to-newest")
+        content: getText('sort-oldest-to-newest')
       })
     }, {
-      key: "".concat(key, ":asc").concat(isLocal ? ":date" : ""),
+      key: "".concat(key, ":desc").concat(isLocal ? ':date' : ''),
       label: /*#__PURE__*/React.createElement(Label, {
-        content: getText("sort-newest-to-oldest")
+        content: getText('sort-newest-to-oldest')
       })
     }];
   },
   time: function time(key, isLocal) {
     return [{
-      key: "".concat(key, ":desc").concat(isLocal ? ":time" : ""),
+      key: "".concat(key, ":desc").concat(isLocal ? ':time' : ''),
       label: /*#__PURE__*/React.createElement(Label, {
-        content: getText("sort-from-morning-to-night")
+        content: getText('sort-from-morning-to-night')
       })
     }, {
-      key: "".concat(key, ":asc").concat(isLocal ? ":time" : ""),
+      key: "".concat(key, ":asc").concat(isLocal ? ':time' : ''),
       label: /*#__PURE__*/React.createElement(Label, {
-        content: getText("sort-from-evening-to-morning")
+        content: getText('sort-from-evening-to-morning')
       })
     }];
   },
   string: function string(key, isLocal) {
     return [{
-      key: "".concat(key, ":asc").concat(isLocal ? ":string" : ""),
+      key: "".concat(key, ":asc").concat(isLocal ? ':string' : ''),
       label: /*#__PURE__*/React.createElement(Label, {
-        content: getText("sort-a-z")
+        content: getText('sort-a-z')
       })
     }, {
-      key: "".concat(key, ":desc").concat(isLocal ? ":string" : ""),
+      key: "".concat(key, ":desc").concat(isLocal ? ':string' : ''),
       label: /*#__PURE__*/React.createElement(Label, {
-        content: getText("sort-z-a")
+        content: getText('sort-z-a')
       })
     }];
   },
   number: function number(key, isLocal) {
     return [{
-      key: "".concat(key, ":asc").concat(isLocal ? ":number" : ""),
+      key: "".concat(key, ":asc").concat(isLocal ? ':number' : ''),
       label: /*#__PURE__*/React.createElement(Label, {
-        content: getText("sort-0-9")
+        content: getText('sort-0-9')
       })
     }, {
-      key: "".concat(key, ":desc").concat(isLocal ? ":number" : ""),
+      key: "".concat(key, ":desc").concat(isLocal ? ':number' : ''),
       label: /*#__PURE__*/React.createElement(Label, {
-        content: getText("sort-9-0")
+        content: getText('sort-9-0')
       })
     }];
   }
@@ -89,14 +89,14 @@ var Sort = function Sort(_ref2) {
         children: sortChildrenMap[d.type](d.name, !!(d !== null && d !== void 0 && d.localFilter)),
         popupClassName: "".concat(prefix, "sort-sub-menu-popup-wrap"),
         // 增加显示隐藏配置
-        className: "".concat(d.isHidden ? "".concat(prefix, "sort-menu-wrap-hide") : "")
+        className: "".concat(d.isHidden ? "".concat(prefix, "sort-menu-wrap-hide") : '')
       };
     });
   }, [list, localPagination]);
   var onClick = function onClick(detail) {
     var _detail$keyPath, _detail$keyPath2;
     if (((_detail$keyPath = detail.keyPath) === null || _detail$keyPath === void 0 ? void 0 : _detail$keyPath[0]) === value) {
-      onChange === null || onChange === void 0 ? void 0 : onChange("", detail);
+      onChange === null || onChange === void 0 ? void 0 : onChange('', detail);
       return;
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(detail === null || detail === void 0 ? void 0 : (_detail$keyPath2 = detail.keyPath) === null || _detail$keyPath2 === void 0 ? void 0 : _detail$keyPath2[0], detail);
@@ -108,12 +108,12 @@ var Sort = function Sort(_ref2) {
       style: style,
       className: classNames(_defineProperty({}, "".concat(prefix, "sort-button-active"), !!value)),
       size: "large"
-    }, isMobileBool ? null : getText("sort-button-text"));
+    }, isMobileBool ? null : getText('sort-button-text'));
   }, [button, style, value, isMobileBool]);
   var content = useMemo(function () {
     return /*#__PURE__*/React.createElement(InlineMenu, {
       items: sortItems,
-      value: value || "",
+      value: value || '',
       onChange: onChange
     });
   }, [value, sortItems, onChange]);
@@ -123,11 +123,11 @@ var Sort = function Sort(_ref2) {
       content: content,
       arrow: false,
       overlayClassName: "".concat(prefix, "mobile-sort-overlay"),
-      trigger: ["click"]
+      trigger: ['click']
     }, btnContent);
   }
   return /*#__PURE__*/React.createElement(Dropdown, {
-    trigger: ["click"],
+    trigger: ['click'],
     placement: placement,
     menu: {
       items: sortItems,

package/es/components/table/BasicTable/index.d.ts

@@ -1,4 +1,4 @@
-import { TableProps } from "antd";
-import React from "react";
+import { TableProps } from 'antd';
+import React from 'react';
 declare const BasicTable: (props: TableProps<any>) => React.JSX.Element;
 export default BasicTable;

package/es/components/table/BasicTable/index.js

@@ -14,13 +14,13 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import { Table, Form } from "antd";
-import React, { useState, useMemo, useCallback, useEffect } from "react";
+import { Table, Form } from 'antd';
+import React, { useState, useMemo, useCallback, useEffect } from 'react';
 import { FormPagination } from "../../Pagination";
 import { calcFilterSort } from "../Table/utils";
 import { useSharedState } from "../../../hooks";
 import { Context } from "../model";
-import { isArr } from "@pisell/utils";
+import { isArr } from '@pisell/utils';
 var BasicTable = function BasicTable(props) {
   var _pagination$pageSizeO;
   var dataSource = props.dataSource,
@@ -37,14 +37,14 @@ var BasicTable = function BasicTable(props) {
     sort = _useState4[0],
     setSort = _useState4[1];
   var form = Form.useFormInstance();
-  var formPagination = Form.useWatch("pagination", {
+  var formPagination = Form.useWatch('pagination', {
     form: form,
     preserve: true
   }) || {
     page: 1,
     size: 10
   };
-  var group = Form.useWatch("group_by", {
+  var group = Form.useWatch('group_by', {
     form: form,
     preserve: true
   });
@@ -84,6 +84,7 @@ var BasicTable = function BasicTable(props) {
       total: _total
     };
   }, [localPagination, dataSource, formPagination === null || formPagination === void 0 ? void 0 : formPagination.page, formPagination === null || formPagination === void 0 ? void 0 : formPagination.size, filter, sort, other.columns]);
+  console.log(pagination, 'wh8888');
 
   // 总数
   var total = useMemo(function () {
@@ -99,19 +100,19 @@ var BasicTable = function BasicTable(props) {
     var _expandedRowKeys = [];
     _dataSource === null || _dataSource === void 0 ? void 0 : (_dataSource$list = _dataSource.list) === null || _dataSource$list === void 0 ? void 0 : _dataSource$list.forEach(function (item) {
       if (item.__is_group) {
-        _expandedRowKeys.push(item["__rowKey"]);
+        _expandedRowKeys.push(item['__rowKey']);
       }
     });
     return _expandedRowKeys;
   }, [_dataSource === null || _dataSource === void 0 ? void 0 : _dataSource.list]);
   useEffect(function () {
     dispatch({
-      type: "setCurrentDataSource",
+      type: 'setCurrentDataSource',
       payload: (_dataSource === null || _dataSource === void 0 ? void 0 : _dataSource.list) || []
     });
   }, [_dataSource === null || _dataSource === void 0 ? void 0 : _dataSource.list]);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Table, _extends({
-    key: defaultExpandedRowKeys.join("-")
+    key: defaultExpandedRowKeys.join('-')
   }, other, {
     // 开启分组条件后关闭行选择功能
     rowSelection: isGroup ? false : other === null || other === void 0 ? void 0 : other.rowSelection,
@@ -132,13 +133,13 @@ var BasicTable = function BasicTable(props) {
       return _objectSpread(_objectSpread({}, (other === null || other === void 0 ? void 0 : (_other$onRow = other.onRow) === null || _other$onRow === void 0 ? void 0 : _other$onRow.call(other, record, index)) || {}), {}, {
         __is_group: record.__is_group,
         __is_drag_sort: other.dragSort,
-        className: record.__is_group ? "pisell-lowcode-table-group-row-wrap" : ""
+        className: record.__is_group ? 'pisell-lowcode-table-group-row-wrap' : ''
       });
     },
     expandable: {
       defaultExpandAllRows: true
     }
-  })), total > ((pagination === null || pagination === void 0 ? void 0 : pagination.pageSize) || (pagination === null || pagination === void 0 ? void 0 : (_pagination$pageSizeO = pagination.pageSizeOptions) === null || _pagination$pageSizeO === void 0 ? void 0 : _pagination$pageSizeO[0]) || 10) ? /*#__PURE__*/React.createElement(Form.Item, {
+  })), total > ((pagination === null || pagination === void 0 ? void 0 : pagination.pageSize) || (pagination === null || pagination === void 0 ? void 0 : (_pagination$pageSizeO = pagination.pageSizeOptions) === null || _pagination$pageSizeO === void 0 ? void 0 : _pagination$pageSizeO[0]) || 10) || pagination !== null && pagination !== void 0 && pagination.showPagination && total > 10 ? /*#__PURE__*/React.createElement(Form.Item, {
     name: "pagination"
   }, /*#__PURE__*/React.createElement(FormPagination, _extends({}, pagination, {
     showTotal: _showTotal,