@pisell/materials 1.0.346 → 1.0.347

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

@@ -38,9 +38,16 @@ var import_sortable = require("@dnd-kit/sortable");
 var import_TreeItem = __toESM(require("./TreeItem"));
 var import_modifiers = require("@dnd-kit/modifiers");
 var DragSortTree = (props) => {
-  const { value, rowKey, tabKey, onChange } = props;
+  const { value, rowKey, tabKey, hiddenKeys, onChange } = props;
   const [items, setItems] = (0, import_react.useState)(value || []);
-  const [activeId, setActiveId] = (0, import_react.useState)(null);
+  const [expandedKeys, setExpandedKeys] = (0, import_react.useState)([]);
+  (0, import_react.useEffect)(() => {
+    let keys = value == null ? void 0 : value.map((item) => item[rowKey]);
+    keys = keys.filter(
+      (key) => (hiddenKeys == null ? void 0 : hiddenKeys.length) ? !hiddenKeys.includes(key) : key
+    );
+    setExpandedKeys([...keys]);
+  }, [hiddenKeys]);
   (0, import_react.useEffect)(() => {
     setItems(value || []);
   }, [tabKey]);
@@ -52,23 +59,30 @@ var DragSortTree = (props) => {
     })
   );
   const handleDragStart = (event) => {
+    var _a, _b;
     const { active } = event;
-    setActiveId(active == null ? void 0 : active.id);
+    const activeId = (_b = (_a = active == null ? void 0 : active.id) == null ? void 0 : _a.split("-")) == null ? void 0 : _b[1];
+    const _keys = expandedKeys == null ? void 0 : expandedKeys.filter((key) => key != activeId);
+    setExpandedKeys([..._keys]);
   };
   const handleDragEnd = (event) => {
+    var _a, _b, _c, _d;
     const { active, over } = event;
-    setActiveId(null);
     if (!over || !active)
       return;
     try {
-      const activeId2 = active.id;
-      const overId = over.id;
-      if (activeId2 !== overId) {
+      let activeId = (_b = (_a = active == null ? void 0 : active.id) == null ? void 0 : _a.split("-")) == null ? void 0 : _b[1];
+      let overId = (_d = (_c = over == null ? void 0 : over.id) == null ? void 0 : _c.split("-")) == null ? void 0 : _d[1];
+      if (activeId !== overId) {
+        if (!(hiddenKeys == null ? void 0 : hiddenKeys.includes(Number(activeId)))) {
+          const _keys = [...expandedKeys, Number(activeId)];
+          setExpandedKeys([..._keys]);
+        }
         const activeIndex = items.findIndex(
-          (item) => item[rowKey] === activeId2
+          (item) => item[rowKey] == activeId
         );
         const overIndex = items.findIndex(
-          (item) => item[rowKey] === overId
+          (item) => item[rowKey] == overId
         );
         const _lists = (0, import_sortable.arrayMove)(items, activeIndex, overIndex);
         handleChange(_lists);
@@ -91,20 +105,21 @@ var DragSortTree = (props) => {
     /* @__PURE__ */ import_react.default.createElement(
       import_sortable.SortableContext,
       {
-        items: items.map((item) => item[rowKey]),
+        items: items.map((item) => `0-${item[rowKey]}`),
         strategy: import_sortable.verticalListSortingStrategy
       },
       items.map((item) => /* @__PURE__ */ import_react.default.createElement(
         import_TreeItem.default,
         {
-          key: item[rowKey],
-          id: item[rowKey],
+          key: `0-${item[rowKey]}`,
+          id: `0-${item[rowKey]}`,
           item,
           depth: 0,
           sensors,
-          activeId,
           childrenProps: props,
           lists: items,
+          expandedKeys,
+          setExpandedKeys,
           onChange: handleChange
         }
       ))

package/lib/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/lib/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/lib/locales/en-US.js

@@ -123,5 +123,6 @@ var en_US_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/lib/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/lib/locales/zh-CN.js

@@ -123,5 +123,6 @@ var zh_CN_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/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/lib/locales/zh-TW.js

@@ -123,5 +123,6 @@ var zh_TW_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/lowcode/drag-sort-tree/meta.ts

@@ -67,6 +67,11 @@ export default {
       title: { label: 'tabKey', tip: 'tabKey | 标识当前选中的tab' },
       propType: 'string',
     },
+    {
+      name: "hiddenKeys",
+      title: { label: '折叠当前项', tip: 'hiddenKeys | 折叠当前项的keys' },
+      propType: 'array',
+    },
     {
       name: "titleRender",
       title: { label: '标题', tip: '是否自定义标题内容 | node/func' },
@@ -102,6 +107,10 @@ export default {
           name: 'onChange',
           template: 'onChange(value,${extParams}){\n// 排序 改变的回调\n}',
         },
+        {
+          name: 'onHiddenChange',
+          template: 'onHiddenChange(value,${extParams}){\n// 折叠当前项的回调\n}',
+        },
       ]
     },
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.346",
+  "version": "1.0.347",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -62,9 +62,9 @@
     "react-window": "^1.8.10",
     "react-virtualized-auto-sizer": "^1.0.20",
     "crypto-js": "^4.2.0",
+    "@pisell/utils": "1.0.27",
     "@pisell/icon": "0.0.10",
-    "@pisell/date-picker": "1.0.83",
-    "@pisell/utils": "1.0.27"
+    "@pisell/date-picker": "1.0.83"
   },
   "peerDependencies": {
     "react": "^18.0.0",