@pisell/materials 2.2.6 → 2.2.8

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

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

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

@@ -0,0 +1,196 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+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); }
+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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+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); }
+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(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+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 { CSS } from '@dnd-kit/utilities';
+import { HolderOutlined, 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';
+import "./index.less";
+var prefix = 'pisell-lowcode';
+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,
+    onChange = props.onChange;
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    expandedKeys = _useState2[0],
+    setExpandedKeys = _useState2[1];
+  var _useSortable = useSortable({
+      id: id
+    }),
+    attributes = _useSortable.attributes,
+    listeners = _useSortable.listeners,
+    setNodeRef = _useSortable.setNodeRef,
+    transform = _useSortable.transform,
+    transition = _useSortable.transition;
+  useEffect(function () {
+    // 拖拽的时候将节点收起
+    if (activeId) {
+      setExpandedKeys([]);
+    }
+  }, [activeId]);
+  var style = {
+    transform: CSS.Transform.toString(transform && _objectSpread(_objectSpread({}, transform), {}, {
+      scaleY: 1
+    })),
+    transition: transition
+  };
+  var rowKey = useMemo(function () {
+    return (childrenProps === null || childrenProps === void 0 ? void 0 : childrenProps.rowKey) || 'id';
+  }, [childrenProps === null || childrenProps === void 0 ? void 0 : childrenProps.rowKey]);
+  var handleDragEnd = function handleDragEnd(event) {
+    var active = event.active,
+      over = event.over;
+    if (!over || !active || !lists.length) return;
+    try {
+      var _active$id, _over$id;
+      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];
+      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],
+        overId = _over$id$split2[1];
+      var parentIndex = lists.findIndex(function (item) {
+        return item[rowKey] == activeParentId;
+      });
+      if (_activeId !== overId && activeParentId === overParentId && parentIndex !== -1) {
+        var activeIndex = item.children.findIndex(function (item) {
+          return item[rowKey] == _activeId;
+        });
+        var overIndex = item.children.findIndex(function (item) {
+          return item[rowKey] == overId;
+        });
+
+        // 移动数据
+        if (activeIndex !== -1 && overIndex !== -1) {
+          var _lists$parentIndex;
+          var newChildren = arrayMove((_lists$parentIndex = lists[parentIndex]) === null || _lists$parentIndex === void 0 ? void 0 : _lists$parentIndex.children, activeIndex, overIndex);
+          var _lists = [].concat(_toConsumableArray(lists.slice(0, parentIndex)), [_objectSpread(_objectSpread({}, lists === null || lists === void 0 ? void 0 : lists[parentIndex]), {}, {
+            children: newChildren
+          })], _toConsumableArray(lists.slice(parentIndex + 1)));
+          onChange && onChange(_toConsumableArray(_lists));
+        }
+      }
+    } catch (error) {}
+  };
+
+  /**
+   * @title: 点击切换眼睛
+   * @description:
+   * @param {any} e
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2024-07-19 22:43
+   */
+  var handleShow = function handleShow(e) {
+    e.stopPropagation(); // 阻止事件冒泡
+    e.preventDefault(); // 阻止默认行为
+    var index = lists === null || lists === void 0 ? void 0 : lists.findIndex(function (node) {
+      return node[rowKey] === item[rowKey];
+    });
+    if (index !== -1) {
+      lists[index].show = !lists[index].show;
+      onChange === null || onChange === void 0 ? void 0 : onChange(_toConsumableArray(lists));
+    }
+  };
+  var onSelect = function onSelect() {
+    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]));
+      }
+    }
+  };
+  var renderChildren = useMemo(function () {
+    var _item$children2;
+    var showChildren = (item === null || item === void 0 ? void 0 : (_item$children2 = item.children) === null || _item$children2 === void 0 ? void 0 : _item$children2.length) > 0 && (expandedKeys === null || expandedKeys === void 0 ? void 0 : expandedKeys.includes(item[rowKey]));
+    var _isAvailableTab = (childrenProps === null || childrenProps === void 0 ? void 0 : childrenProps.tabKey) === 'available';
+    return showChildren && /*#__PURE__*/React.createElement(SortableContext, {
+      items: item.children.map(function (child) {
+        return "".concat(item[rowKey], "-").concat(child[rowKey]);
+      }),
+      strategy: verticalListSortingStrategy
+    }, item.children.map(function (child) {
+      return _isAvailableTab && child !== null && child !== void 0 && child.is_available || !_isAvailableTab ? /*#__PURE__*/React.createElement(TreeItem, {
+        id: "".concat(item[rowKey], "-").concat(child[rowKey]),
+        key: "".concat(item[rowKey], "-").concat(child[rowKey]),
+        item: child,
+        lists: lists,
+        depth: depth + 1,
+        childrenProps: childrenProps
+      }) : null;
+    }));
+  }, [item.children, expandedKeys, rowKey, lists, childrenProps === null || childrenProps === void 0 ? void 0 : childrenProps.tabKey]);
+
+  // 右侧图标
+  var rightIcon = useMemo(function () {
+    // 右侧子级图标
+    var hiddenRightIcon = childrenProps === null || childrenProps === void 0 ? void 0 : childrenProps.hiddenRightIcon;
+    return !hiddenRightIcon ? /*#__PURE__*/React.createElement("div", {
+      className: classNames("".concat(prefix, "-drag-sort-tree-icon")),
+      onClick: handleShow
+    }, item.show ? /*#__PURE__*/React.createElement(EyeOutlined, null) : /*#__PURE__*/React.createElement(EyeInvisibleOutlined, null)) : null;
+  }, [childrenProps === null || childrenProps === void 0 ? void 0 : childrenProps.hiddenRightIcon, item === null || item === void 0 ? void 0 : item.show, lists]);
+
+  // 警告图标
+  var warningIcon = useMemo(function () {
+    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(WarningOutlined, {
+      style: {
+        color: 'red'
+      }
+    })) : null;
+  }, [childrenProps === null || childrenProps === void 0 ? void 0 : childrenProps.hiddenWarningIcon, item === null || item === void 0 ? void 0 : item.is_available]);
+  return /*#__PURE__*/React.createElement(DndContext, {
+    sensors: sensors,
+    modifiers: [restrictToVerticalAxis, restrictToParentElement],
+    onDragEnd: handleDragEnd
+  }, /*#__PURE__*/React.createElement("div", _extends({
+    ref: setNodeRef,
+    style: style
+  }, attributes, listeners), /*#__PURE__*/React.createElement("div", {
+    style: {
+      paddingLeft: !depth ? '8px' : "".concat(depth * 20, "px")
+    },
+    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", {
+    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));
+};
+export default TreeItem;

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

@@ -0,0 +1,41 @@
+@pisell-prefix: pisell-lowcode;
+
+.@{pisell-prefix} {
+  &-drag-sort-tree{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    font-size: 16px;
+    cursor: pointer;
+    touch-action: none !important;
+    width: 100%;
+    color: #101828;
+    height: 40px;
+    line-height: 40px;
+  }
+
+  &-drag-sort-tree:hover {
+    background: rgb(237, 238, 238);
+  }
+
+  &-drag-sort-tree-item {
+    display: flex;
+    align-items: center;
+  }
+
+  &-drag-sort-tree &-drag-sort-tree-title {
+    margin-left: 10px;
+    font-size: 14px;
+  }
+
+  &-drag-sort-tree-icon,
+  &-drag-sort-tree-item-icon {
+    height: 30px;
+    width: 30px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+}
+
+  

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

@@ -0,0 +1,5 @@
+import React from 'react';
+import './index.less';
+import { SortType } from './types';
+declare const DragSortTree: (props: SortType) => React.JSX.Element;
+export default DragSortTree;

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

@@ -0,0 +1,91 @@
+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(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import React, { useEffect, useState } from 'react';
+import { DndContext, useSensor, useSensors, PointerSensor } from '@dnd-kit/core';
+import { SortableContext, verticalListSortingStrategy, arrayMove } from '@dnd-kit/sortable';
+import TreeItem from "./TreeItem";
+import { restrictToVerticalAxis, restrictToParentElement } from '@dnd-kit/modifiers';
+import "./index.less";
+var DragSortTree = function DragSortTree(props) {
+  var value = props.value,
+    rowKey = props.rowKey,
+    tabKey = props.tabKey,
+    onChange = props.onChange;
+  var _useState = useState(value || []),
+    _useState2 = _slicedToArray(_useState, 2),
+    items = _useState2[0],
+    setItems = _useState2[1];
+  var _useState3 = useState(null),
+    _useState4 = _slicedToArray(_useState3, 2),
+    activeId = _useState4[0],
+    setActiveId = _useState4[1];
+  useEffect(function () {
+    // 防止切换的时候数据不更新，拖拽之后，如果切换tab，需要用更新之后的数据
+    setItems(value || []);
+  }, [tabKey]);
+  var sensors = useSensors(useSensor(PointerSensor, {
+    activationConstraint: {
+      distance: 5
+    }
+  }));
+  var handleDragStart = function handleDragStart(event) {
+    var active = event.active;
+    setActiveId(active === null || active === void 0 ? void 0 : active.id);
+  };
+  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 activeIndex = items.findIndex(function (item) {
+          return item[rowKey] === _activeId;
+        });
+        var overIndex = items.findIndex(function (item) {
+          return item[rowKey] === overId;
+        });
+        var _lists = arrayMove(items, activeIndex, overIndex);
+        handleChange(_lists);
+      }
+    } catch (error) {}
+  };
+  var handleChange = function handleChange(value) {
+    setItems(value);
+    onChange && onChange(value);
+  };
+  return /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode-drag-sort-tree-wrap"
+  }, /*#__PURE__*/React.createElement(DndContext, {
+    sensors: sensors,
+    onDragEnd: handleDragEnd,
+    onDragStart: handleDragStart,
+    modifiers: [restrictToVerticalAxis, restrictToParentElement]
+  }, /*#__PURE__*/React.createElement(SortableContext, {
+    items: items.map(function (item) {
+      return item[rowKey];
+    }),
+    strategy: verticalListSortingStrategy
+  }, items.map(function (item) {
+    return /*#__PURE__*/React.createElement(TreeItem, {
+      key: item[rowKey],
+      id: item[rowKey],
+      item: item,
+      depth: 0,
+      sensors: sensors,
+      activeId: activeId,
+      childrenProps: props,
+      lists: items,
+      onChange: handleChange
+    });
+  }))));
+};
+export default DragSortTree;

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

@@ -0,0 +1,4 @@
+.pisell-lowcode-drag-sort-tree-wrap{
+  overflow-y: auto;
+  overflow-x: hidden;
+}

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

@@ -0,0 +1,20 @@
+/// <reference types="react" />
+export declare type ValueProps = {
+    id: number | string;
+    title: string;
+    show?: boolean;
+    is_available?: boolean;
+    type_id?: number;
+    children?: ValueProps[];
+};
+export declare type SortType = {
+    value: ValueProps[];
+    rowKey: string;
+    className?: string | Function;
+    titleRender?: string | React.ReactElement;
+    hiddenDraggableIcon?: boolean;
+    hiddenRightIcon?: boolean;
+    hiddenWarningIcon?: boolean;
+    tabKey?: string;
+    onChange?: (value: ValueProps[]) => void;
+};

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

@@ -0,0 +1 @@
+export {};

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

@@ -1,3 +1,3 @@
-import "./index.less";
+import './index.less';
 declare const Drawer: any;
 export default Drawer;

package/es/components/drawer/index.js

@@ -1,6 +1,8 @@
 var _excluded = ["others"];
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 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); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 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); }
@@ -12,15 +14,15 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 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, { useLayoutEffect, useMemo } from "react";
-import { Drawer as OriginalDrawer } from "antd";
-import { useControllableValue, useUpdateEffect } from "ahooks";
-import classNames from "classnames";
-import { isBoolean, isUndefined } from "@pisell/utils";
-import XClose from "@pisell/icon/es/XClose";
-import Pin02 from "@pisell/icon/es/Pin02";
+import React, { useLayoutEffect, useMemo } from 'react';
+import { Drawer as OriginalDrawer } from 'antd';
+import { useControllableValue, useUpdateEffect } from 'ahooks';
+import classNames from 'classnames';
+import { isBoolean, isUndefined } from '@pisell/utils';
+import XClose from '@pisell/icon/es/XClose';
+import Pin02 from '@pisell/icon/es/Pin02';
 import "./index.less";
-var prefix = "pisell-lowcode-";
+var prefix = 'pisell-lowcode-';
 var Title = function Title(props) {
   var placement = props.placement,
     onClose = props.onClose,
@@ -51,8 +53,8 @@ var Drawer = function Drawer(props) {
     getContainer = props.getContainer,
     open = props.open;
   var _useControllableValue = useControllableValue(props, {
-      trigger: "onPersistentChange",
-      valuePropName: "persistent"
+      trigger: 'onPersistentChange',
+      valuePropName: 'persistent'
     }),
     _useControllableValue2 = _slicedToArray(_useControllableValue, 2),
     persistentState = _useControllableValue2[0],
@@ -60,17 +62,17 @@ var Drawer = function Drawer(props) {
   var currentDrawerId = props.__id;
   var storageKey = "drawer-".concat(currentDrawerId);
   var innerProps = {};
-  if (props.__designMode === "design") {
+  if (props.__designMode === 'design') {
     // 低代码编辑态中强制显示，将控制权交给引擎侧
     innerProps.open = true;
   }
   useLayoutEffect(function () {
     if (isBoolean(persistentState) && isUndefined(getContainer) && showPin) {
       document.body.style.transition = 'all 0.3s';
-      document.body.style["padding-".concat(placement)] = persistentState && open ? "".concat(width || 378, "px") : "0";
+      document.body.style["padding-".concat(placement)] = persistentState && open ? "".concat(width || 378, "px") : '0';
     }
     return function () {
-      document.body.style["padding-".concat(placement)] = "0";
+      document.body.style["padding-".concat(placement)] = '0';
       document.body.style.transition = 'none';
     };
   }, [persistentState, width, showPin, placement, open]);
@@ -81,14 +83,14 @@ var Drawer = function Drawer(props) {
   }, [persistentState, storageKey, showPin]);
   useLayoutEffect(function () {
     if (!isBoolean(persistentState) && showPin) {
-      setPersistentState(localStorage.getItem(storageKey) === "true");
+      setPersistentState(localStorage.getItem(storageKey) === 'true');
     }
   }, [persistentState, storageKey, showPin]);
   var otherProps = useMemo(function () {
-    if (operateMode === "outside") {
+    if (operateMode === 'outside') {
       return {
         headerStyle: {
-          border: "none",
+          border: 'none',
           height: 0,
           padding: 0
         },
@@ -101,7 +103,11 @@ var Drawer = function Drawer(props) {
         })
       };
     }
-    return headerStyle;
+    return _objectSpread({
+      closeIcon: /*#__PURE__*/React.createElement(XClose, {
+        className: "".concat(prefix, "drawer-header-close-icon")
+      })
+    }, headerStyle);
   }, [operateMode, placement, onClose, persistentState, setPersistentState]);
   return /*#__PURE__*/React.createElement(OriginalDrawer, _extends({}, resetProps, innerProps, otherProps, others));
 };

package/es/components/drawer/index.less

@@ -1,6 +1,24 @@
 @pisell-prefix: pisell-lowcode;
 
 .@{pisell-prefix} {
+  &-drawer-header {
+    position: relative;
+  }
+
+  &-drawer-header-close-icon {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    width: 50px;
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 20px;
+    z-index: 1;
+  }
+
   &-drawer-outside-wrap {
     position: absolute;
     padding: 10px;
@@ -8,9 +26,11 @@
     display: flex;
     flex-direction: column;
   }
+
   &-drawer-outside-wrap-right {
     left: -82px;
   }
+
   &-drawer-outside-action-wrap {
     width: 56px;
     height: 56px;
@@ -24,17 +44,21 @@
     justify-content: center;
     margin-bottom: 20px;
     cursor: pointer;
+
     &:hover {
       background: #e8e8ee;
     }
+
     .anticon {
       font-size: 20px;
     }
   }
+
   &-drawer-outside-action-wrap:last-child {
     margin-bottom: 0;
   }
+
   &-drawer-outside-action-active {
     background: var(--Primary-200, #E9D7FE) !important;
   }
-}
+}

package/es/components/table/Actions/component/ColumnsSetting/PopoverContent.less

@@ -22,7 +22,7 @@
   }
   &-table-action-column-drag-item {
     display: flex;
-    height: 36px;
+    min-height: 36px;
     border-radius: 4px;
     align-items: center;
     &:hover {
@@ -39,6 +39,7 @@
     padding-right: 6px;
     display: flex;
     justify-content: space-between;
+    align-items: center;
     flex: 1;
   }
   &-table-action-column-drag-item-right-text {

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

@@ -37,7 +37,10 @@ var BasicTable = function BasicTable(props) {
     sort = _useState4[0],
     setSort = _useState4[1];
   var form = Form.useFormInstance();
-  var formPagination = Form.useWatch("pagination", form) || {
+  var formPagination = Form.useWatch("pagination", {
+    form: form,
+    preserve: true
+  }) || {
     page: 1,
     size: 10
   };
@@ -135,7 +138,7 @@ var BasicTable = function BasicTable(props) {
     expandable: {
       defaultExpandAllRows: true
     }
-  })), total > ((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) ? /*#__PURE__*/React.createElement(Form.Item, {
     name: "pagination"
   }, /*#__PURE__*/React.createElement(FormPagination, _extends({}, pagination, {
     showTotal: _showTotal,

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

@@ -1,6 +1,6 @@
-import React, { Component } from "react";
-import { TabsProps } from "antd";
-import "./index.less";
+import React, { Component } from 'react';
+import { TabsProps } from 'antd';
+import './index.less';
 declare class Tabs extends Component<any> {
     state: {
         activeKey: any;
@@ -8,7 +8,7 @@ declare class Tabs extends Component<any> {
     private _handleChange;
     setActiveKey: (key: string) => void;
     getActiveKey: () => any;
-    renderIconLabelTabBar: TabsProps["renderTabBar"];
+    renderIconLabelTabBar: TabsProps['renderTabBar'];
     filterHiddenTabs: (tabs: any[]) => any[];
     render(): React.JSX.Element;
 }