@pisell/materials 1.0.341 → 1.0.342

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

@@ -135,15 +135,14 @@ var TreeItem = function TreeItem(props) {
   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]));
-    console.log('showChildren', childrenProps === null || childrenProps === void 0 ? void 0 : childrenProps.tabKey);
-    var _tabKey = childrenProps === null || childrenProps === void 0 ? void 0 : childrenProps.tabKey;
+    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 _tabKey === 'available' && child !== null && child !== void 0 && child.is_available || !_tabKey ? /*#__PURE__*/React.createElement(TreeItem, {
+      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,

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

@@ -4,7 +4,7 @@ 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, { useState } from 'react';
+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";
@@ -12,6 +12,7 @@ import { restrictToVerticalAxis, restrictToParentElement } from '@dnd-kit/modifi
 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),
@@ -21,6 +22,10 @@ var DragSortTree = function DragSortTree(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     activeId = _useState4[0],
     setActiveId = _useState4[1];
+  useEffect(function () {
+    // 防止切换的时候数据不更新，拖拽之后，如果切换tab，需要用更新之后的数据
+    setItems(value || []);
+  }, [tabKey]);
   var sensors = useSensors(useSensor(PointerSensor, {
     activationConstraint: {
       distance: 5

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

@@ -119,8 +119,7 @@ var TreeItem = (props) => {
   const renderChildren = (0, import_react.useMemo)(() => {
     var _a;
     const showChildren = ((_a = item == null ? void 0 : item.children) == null ? void 0 : _a.length) > 0 && (expandedKeys == null ? void 0 : expandedKeys.includes(item[rowKey]));
-    console.log("showChildren", childrenProps == null ? void 0 : childrenProps.tabKey);
-    const _tabKey = childrenProps == null ? void 0 : childrenProps.tabKey;
+    const _isAvailableTab = (childrenProps == null ? void 0 : childrenProps.tabKey) === "available";
     return showChildren && /* @__PURE__ */ import_react.default.createElement(
       import_sortable2.SortableContext,
       {
@@ -130,7 +129,7 @@ var TreeItem = (props) => {
         strategy: import_sortable2.verticalListSortingStrategy
       },
       item.children.map(
-        (child) => _tabKey === "available" && (child == null ? void 0 : child.is_available) || !_tabKey ? /* @__PURE__ */ import_react.default.createElement(
+        (child) => _isAvailableTab && (child == null ? void 0 : child.is_available) || !_isAvailableTab ? /* @__PURE__ */ import_react.default.createElement(
           TreeItem,
           {
             id: `${item[rowKey]}-${child[rowKey]}`,

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

@@ -38,9 +38,12 @@ 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, onChange } = props;
+  const { value, rowKey, tabKey, onChange } = props;
   const [items, setItems] = (0, import_react.useState)(value || []);
   const [activeId, setActiveId] = (0, import_react.useState)(null);
+  (0, import_react.useEffect)(() => {
+    setItems(value || []);
+  }, [tabKey]);
   const sensors = (0, import_core.useSensors)(
     (0, import_core.useSensor)(import_core.PointerSensor, {
       activationConstraint: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.341",
+  "version": "1.0.342",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -63,8 +63,8 @@
     "react-virtualized-auto-sizer": "^1.0.20",
     "crypto-js": "^4.2.0",
     "@pisell/utils": "1.0.27",
-    "@pisell/date-picker": "1.0.82",
-    "@pisell/icon": "0.0.10"
+    "@pisell/icon": "0.0.10",
+    "@pisell/date-picker": "1.0.82"
   },
   "peerDependencies": {
     "react": "^18.0.0",