@pisell/materials 1.0.346 → 1.0.348

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/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

@@ -15,11 +15,14 @@ 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(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 React, { 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
     }),
@@ -46,17 +45,16 @@ var TreeItem = function TreeItem(props) {
     setNodeRef = _useSortable.setNodeRef,
     transform = _useSortable.transform,
     transition = _useSortable.transition;
-  useEffect(function () {
-    // 拖拽的时候将节点收起
-    if (activeId) {
-      setExpandedKeys([]);
-    }
-  }, [activeId]);
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    isDragging = _useState2[0],
+    setIsDragging = _useState2[1];
   var style = {
     transform: CSS.Transform.toString(transform && _objectSpread(_objectSpread({}, transform), {}, {
       scaleY: 1
     })),
-    transition: transition
+    transition: transition,
+    cursor: isDragging ? 'grabbing' : 'grab'
   };
   var rowKey = useMemo(function () {
     return (childrenProps === null || childrenProps === void 0 ? void 0 : childrenProps.rowKey) || 'id';
@@ -67,10 +65,11 @@ var TreeItem = function TreeItem(props) {
     if (!over || !active || !lists.length) return;
     try {
       var _active$id, _over$id;
+      setIsDragging(false);
       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 +77,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 +121,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 +143,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,28 +160,39 @@ 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]);
   return /*#__PURE__*/React.createElement(DndContext, {
     sensors: sensors,
     modifiers: [restrictToVerticalAxis, restrictToParentElement],
-    onDragEnd: handleDragEnd
+    onDragEnd: handleDragEnd,
+    onDragStart: function onDragStart() {
+      setIsDragging(true);
+    }
   }, /*#__PURE__*/React.createElement("div", _extends({
     ref: setNodeRef,
     style: style
   }, attributes, listeners), /*#__PURE__*/React.createElement("div", {
     style: {
-      paddingLeft: !depth ? '8px' : "".concat(depth * 20, "px")
+      paddingLeft: !depth ? '10px' : "".concat(depth * 40, "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", {
+  }, !(childrenProps !== null && childrenProps !== void 0 && childrenProps.hiddenDraggableIcon) ? /*#__PURE__*/React.createElement(DotsSix, {
+    className: classNames("".concat(prefix, "-drag-sort-tree-item-dot-icon"))
+  }) : 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,63 @@
     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;
+      cursor: grab;
+    }
   }
 
-  &-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;
+  }
 }
 
   

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); }
@@ -15,15 +19,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 || []);
@@ -34,25 +49,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);
@@ -72,19 +95,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/locales/en-US.d.ts

@@ -96,5 +96,6 @@ declare const _default: {
     'table-action-export-import-log-err-log': string;
     'table-action-export-import-log-copy': string;
     'table-action-export-import-table-success-copy': string;
+    'drag-sort-tree-unavailable-today-tip': string;
 };
 export default _default;

package/es/locales/en-US.js

@@ -117,5 +117,6 @@ export default {
   'table-action-export-import-log-detail-title': 'Import Details',
   'table-action-export-import-log-err-log': 'Failure Log',
   'table-action-export-import-log-copy': 'Copy',
-  'table-action-export-import-table-success-copy': 'Copy Success'
+  'table-action-export-import-table-success-copy': 'Copy Success',
+  'drag-sort-tree-unavailable-today-tip': 'Unavailable today'
 };

package/es/locales/zh-CN.d.ts

@@ -96,5 +96,6 @@ declare const _default: {
     'table-action-export-import-log-err-log': string;
     'table-action-export-import-log-copy': string;
     'table-action-export-import-table-success-copy': string;
+    'drag-sort-tree-unavailable-today-tip': string;
 };
 export default _default;

package/es/locales/zh-CN.js

@@ -117,5 +117,6 @@ export default {
   'table-action-export-import-log-detail-title': '导入详情',
   'table-action-export-import-log-err-log': '失败日志',
   'table-action-export-import-log-copy': '复制',
-  'table-action-export-import-table-success-copy': '复制成功'
+  'table-action-export-import-table-success-copy': '复制成功',
+  'drag-sort-tree-unavailable-today-tip': '今日不可用'
 };

package/es/locales/zh-TW.d.ts

@@ -96,5 +96,6 @@ declare const _default: {
     'table-action-export-import-log-err-log': string;
     'table-action-export-import-log-copy': string;
     'table-action-export-import-table-success-copy': string;
+    'drag-sort-tree-unavailable-today-tip': string;
 };
 export default _default;

package/es/locales/zh-TW.js

@@ -117,5 +117,6 @@ export default {
   'table-action-export-import-log-detail-title': '導入詳情',
   'table-action-export-import-log-err-log': '失敗日誌',
   'table-action-export-import-log-copy': '復製',
-  'table-action-export-import-table-success-copy': '復製成功'
+  'table-action-export-import-table-success-copy': '復製成功',
+  'drag-sort-tree-unavailable-today-tip': '今日不可用'
 };

package/lib/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/lib/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/lib/components/drag-sort-tree/TreeItem/index.js

@@ -35,6 +35,9 @@ module.exports = __toCommonJS(TreeItem_exports);
 var import_react = __toESM(require("react"));
 var import_sortable = require("@dnd-kit/sortable");
 var import_core = require("@dnd-kit/core");
+var import_antd = require("antd");
+var import_DotsSix = __toESM(require("@pisell/icon/es/DotsSix"));
+var import_locales = require("../../../locales");
 var import_utilities = require("@dnd-kit/utilities");
 var import_icons = require("@ant-design/icons");
 var import_sortable2 = require("@dnd-kit/sortable");
@@ -43,17 +46,22 @@ var import_classnames = __toESM(require("classnames"));
 var import_index = require("./index.less");
 var prefix = "pisell-lowcode";
 var TreeItem = (props) => {
-  const { id, item, depth, activeId, sensors, childrenProps, lists, onChange } = props;
-  const [expandedKeys, setExpandedKeys] = (0, import_react.useState)([]);
+  const {
+    id,
+    item,
+    depth,
+    sensors,
+    childrenProps,
+    lists,
+    expandedKeys,
+    onChange
+  } = props;
   const { attributes, listeners, setNodeRef, transform, transition } = (0, import_sortable.useSortable)({ id });
-  (0, import_react.useEffect)(() => {
-    if (activeId) {
-      setExpandedKeys([]);
-    }
-  }, [activeId]);
+  const [isDragging, setIsDragging] = (0, import_react.useState)(false);
   const style = {
     transform: import_utilities.CSS.Transform.toString(transform && { ...transform, scaleY: 1 }),
-    transition
+    transition,
+    cursor: isDragging ? "grabbing" : "grab"
   };
   const rowKey = (0, import_react.useMemo)(() => {
     return (childrenProps == null ? void 0 : childrenProps.rowKey) || "id";
@@ -64,14 +72,15 @@ var TreeItem = (props) => {
     if (!over || !active || !lists.length)
       return;
     try {
-      let [activeParentId, activeId2] = (_a = active == null ? void 0 : active.id) == null ? void 0 : _a.split("-");
+      setIsDragging(false);
+      let [activeParentId, activeId] = (_a = active == null ? void 0 : active.id) == null ? void 0 : _a.split("-");
       let [overParentId, overId] = (_b = over == null ? void 0 : over.id) == null ? void 0 : _b.split("-");
       const parentIndex = lists.findIndex(
         (item2) => item2[rowKey] == activeParentId
       );
-      if (activeId2 !== overId && activeParentId === overParentId && parentIndex !== -1) {
+      if (activeId !== overId && activeParentId === overParentId && parentIndex !== -1) {
         const activeIndex = item.children.findIndex(
-          (item2) => item2[rowKey] == activeId2
+          (item2) => item2[rowKey] == activeId
         );
         const overIndex = item.children.findIndex(
           (item2) => item2[rowKey] == overId
@@ -108,12 +117,7 @@ var TreeItem = (props) => {
     var _a;
     if (depth === 0 && ((_a = item.children) == null ? void 0 : _a.length)) {
       const key = item[rowKey];
-      if (expandedKeys.includes(key)) {
-        const _ids = expandedKeys.filter((id2) => id2 !== key);
-        setExpandedKeys(_ids);
-      } else {
-        setExpandedKeys([...expandedKeys, key]);
-      }
+      (childrenProps == null ? void 0 : childrenProps.onHiddenChange) && (childrenProps == null ? void 0 : childrenProps.onHiddenChange(key));
     }
   };
   const renderChildren = (0, import_react.useMemo)(() => {
@@ -142,7 +146,14 @@ var TreeItem = (props) => {
         ) : null
       )
     );
-  }, [item.children, expandedKeys, rowKey, lists, childrenProps == null ? void 0 : childrenProps.tabKey]);
+  }, [
+    item.children,
+    expandedKeys,
+    rowKey,
+    lists,
+    childrenProps == null ? void 0 : childrenProps.tabKey,
+    isDragging
+  ]);
   const rightIcon = (0, import_react.useMemo)(() => {
     const hiddenRightIcon = childrenProps == null ? void 0 : childrenProps.hiddenRightIcon;
     return !hiddenRightIcon ? /* @__PURE__ */ import_react.default.createElement(
@@ -156,26 +167,44 @@ var TreeItem = (props) => {
   }, [childrenProps == null ? void 0 : childrenProps.hiddenRightIcon, item == null ? void 0 : item.show, lists]);
   const warningIcon = (0, import_react.useMemo)(() => {
     const hiddenWarningIcon = childrenProps == null ? void 0 : childrenProps.hiddenWarningIcon;
-    return !hiddenWarningIcon && !(item == null ? void 0 : item.is_available) ? /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)(`${prefix}-drag-sort-tree-item-icon`) }, /* @__PURE__ */ import_react.default.createElement(import_icons.WarningOutlined, { style: { color: "red" } })) : null;
+    return !hiddenWarningIcon && !(item == null ? void 0 : item.is_available) ? /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)(`${prefix}-drag-sort-tree-item-icon`) }, /* @__PURE__ */ import_react.default.createElement(
+      import_antd.Tooltip,
+      {
+        title: (0, import_locales.getText)("drag-sort-tree-unavailable-today-tip"),
+        color: "#ffffff",
+        overlayInnerStyle: { color: "#344054" }
+      },
+      /* @__PURE__ */ import_react.default.createElement(import_icons.WarningOutlined, { style: { color: "#FF2020" } })
+    )) : null;
   }, [childrenProps == null ? void 0 : childrenProps.hiddenWarningIcon, item == null ? void 0 : item.is_available]);
   return /* @__PURE__ */ import_react.default.createElement(
     import_core.DndContext,
     {
       sensors,
       modifiers: [import_modifiers.restrictToVerticalAxis, import_modifiers.restrictToParentElement],
-      onDragEnd: handleDragEnd
+      onDragEnd: handleDragEnd,
+      onDragStart: () => {
+        setIsDragging(true);
+      }
     },
     /* @__PURE__ */ import_react.default.createElement("div", { ref: setNodeRef, style, ...attributes, ...listeners }, /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
-        style: { paddingLeft: !depth ? "8px" : `${depth * 20}px` },
+        style: {
+          paddingLeft: !depth ? "10px" : `${depth * 40}px`
+        },
         className: (0, import_classnames.default)(
           `${prefix}-drag-sort-tree`,
           childrenProps == null ? void 0 : childrenProps.className
         ),
         onClick: onSelect
       },
-      /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)(`${prefix}-drag-sort-tree-item`) }, !(childrenProps == null ? void 0 : childrenProps.hiddenDraggableIcon) ? /* @__PURE__ */ import_react.default.createElement(import_icons.HolderOutlined, null) : null, /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}-drag-sort-tree-title` }, (childrenProps == null ? void 0 : childrenProps.titleRender) || (item == null ? void 0 : item.title))),
+      /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)(`${prefix}-drag-sort-tree-item`) }, !(childrenProps == null ? void 0 : childrenProps.hiddenDraggableIcon) ? /* @__PURE__ */ import_react.default.createElement(
+        import_DotsSix.default,
+        {
+          className: (0, import_classnames.default)(`${prefix}-drag-sort-tree-item-dot-icon`)
+        }
+      ) : null, /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}-drag-sort-tree-title` }, (childrenProps == null ? void 0 : childrenProps.titleRender) || (item == null ? void 0 : item.title))),
       !depth ? rightIcon : warningIcon
     ), renderChildren)
   );