@pisell/materials 1.0.340 → 1.0.342

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

@@ -1,14 +1,14 @@
 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 _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); }
@@ -53,7 +53,9 @@ var TreeItem = function TreeItem(props) {
     }
   }, [activeId]);
   var style = {
-    transform: CSS.Transform.toString(transform),
+    transform: CSS.Transform.toString(transform && _objectSpread(_objectSpread({}, transform), {}, {
+      scaleY: 1
+    })),
     transition: transition
   };
   var rowKey = useMemo(function () {
@@ -64,15 +66,15 @@ var TreeItem = function TreeItem(props) {
       over = event.over;
     if (!over || !active || !lists.length) return;
     try {
-      var _active$rowKey, _over$rowKey;
-      var _active$rowKey$split = (_active$rowKey = active[rowKey]) === null || _active$rowKey === void 0 ? void 0 : _active$rowKey.split('-'),
-        _active$rowKey$split2 = _slicedToArray(_active$rowKey$split, 2),
-        activeParentId = _active$rowKey$split2[0],
-        _activeId = _active$rowKey$split2[1];
-      var _over$rowKey$split = (_over$rowKey = over[rowKey]) === null || _over$rowKey === void 0 ? void 0 : _over$rowKey.split('-'),
-        _over$rowKey$split2 = _slicedToArray(_over$rowKey$split, 2),
-        overParentId = _over$rowKey$split2[0],
-        overId = _over$rowKey$split2[1];
+      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;
       });
@@ -132,22 +134,24 @@ var TreeItem = function TreeItem(props) {
   };
   var renderChildren = useMemo(function () {
     var _item$children2;
-    return (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])) && /*#__PURE__*/React.createElement(SortableContext, {
+    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 /*#__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,
         lists: lists,
         depth: depth + 1,
         childrenProps: childrenProps
-      });
+      }) : null;
     }));
-  }, [item.children, expandedKeys, rowKey, lists]);
+  }, [item.children, expandedKeys, rowKey, lists, childrenProps === null || childrenProps === void 0 ? void 0 : childrenProps.tabKey]);
 
   // 右侧图标
   var rightIcon = useMemo(function () {
@@ -179,7 +183,7 @@ var TreeItem = function TreeItem(props) {
     style: style
   }, attributes, listeners), /*#__PURE__*/React.createElement("div", {
     style: {
-      paddingLeft: "".concat(depth * 20, "px")
+      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

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

@@ -6,9 +6,12 @@
     align-items: center;
     justify-content: space-between;
     font-size: 16px;
-    padding: 6px;
     cursor: pointer;
     touch-action: none !important;
+    width: 100%;
+    color: #101828;
+    height: 40px;
+    line-height: 40px;
   }
 
   &-drag-sort-tree:hover {
@@ -22,6 +25,7 @@
 
   &-drag-sort-tree &-drag-sort-tree-title {
     margin-left: 10px;
+    font-size: 14px;
   }
 
   &-drag-sort-tree-icon,

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
@@ -28,17 +33,18 @@ var DragSortTree = function DragSortTree(props) {
   }));
   var handleDragStart = function handleDragStart(event) {
     var active = event.active;
-    setActiveId(active[rowKey]);
+    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[rowKey];
-      var overId = over[rowKey];
+      var _activeId = active.id;
+      var overId = over.id;
       if (_activeId !== overId) {
         var activeIndex = items.findIndex(function (item) {
           return item[rowKey] === _activeId;

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

@@ -15,5 +15,6 @@ export declare type SortType = {
     hiddenDraggableIcon?: boolean;
     hiddenRightIcon?: boolean;
     hiddenWarningIcon?: boolean;
+    tabKey?: string;
     onChange?: (value: ValueProps[]) => void;
 };

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

@@ -52,7 +52,7 @@ var TreeItem = (props) => {
     }
   }, [activeId]);
   const style = {
-    transform: import_utilities.CSS.Transform.toString(transform),
+    transform: import_utilities.CSS.Transform.toString(transform && { ...transform, scaleY: 1 }),
     transition
   };
   const rowKey = (0, import_react.useMemo)(() => {
@@ -64,8 +64,8 @@ var TreeItem = (props) => {
     if (!over || !active || !lists.length)
       return;
     try {
-      let [activeParentId, activeId2] = (_a = active[rowKey]) == null ? void 0 : _a.split("-");
-      let [overParentId, overId] = (_b = over[rowKey]) == null ? void 0 : _b.split("-");
+      let [activeParentId, activeId2] = (_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
       );
@@ -118,7 +118,9 @@ var TreeItem = (props) => {
   };
   const renderChildren = (0, import_react.useMemo)(() => {
     var _a;
-    return ((_a = item == null ? void 0 : item.children) == null ? void 0 : _a.length) > 0 && (expandedKeys == null ? void 0 : expandedKeys.includes(item[rowKey])) && /* @__PURE__ */ import_react.default.createElement(
+    const showChildren = ((_a = item == null ? void 0 : item.children) == null ? void 0 : _a.length) > 0 && (expandedKeys == null ? void 0 : expandedKeys.includes(item[rowKey]));
+    const _isAvailableTab = (childrenProps == null ? void 0 : childrenProps.tabKey) === "available";
+    return showChildren && /* @__PURE__ */ import_react.default.createElement(
       import_sortable2.SortableContext,
       {
         items: item.children.map(
@@ -126,19 +128,21 @@ var TreeItem = (props) => {
         ),
         strategy: import_sortable2.verticalListSortingStrategy
       },
-      item.children.map((child) => /* @__PURE__ */ import_react.default.createElement(
-        TreeItem,
-        {
-          id: `${item[rowKey]}-${child[rowKey]}`,
-          key: `${item[rowKey]}-${child[rowKey]}`,
-          item: child,
-          lists,
-          depth: depth + 1,
-          childrenProps
-        }
-      ))
+      item.children.map(
+        (child) => _isAvailableTab && (child == null ? void 0 : child.is_available) || !_isAvailableTab ? /* @__PURE__ */ import_react.default.createElement(
+          TreeItem,
+          {
+            id: `${item[rowKey]}-${child[rowKey]}`,
+            key: `${item[rowKey]}-${child[rowKey]}`,
+            item: child,
+            lists,
+            depth: depth + 1,
+            childrenProps
+          }
+        ) : null
+      )
     );
-  }, [item.children, expandedKeys, rowKey, lists]);
+  }, [item.children, expandedKeys, rowKey, lists, childrenProps == null ? void 0 : childrenProps.tabKey]);
   const rightIcon = (0, import_react.useMemo)(() => {
     const hiddenRightIcon = childrenProps == null ? void 0 : childrenProps.hiddenRightIcon;
     return !hiddenRightIcon ? /* @__PURE__ */ import_react.default.createElement(
@@ -164,7 +168,7 @@ var TreeItem = (props) => {
     /* @__PURE__ */ import_react.default.createElement("div", { ref: setNodeRef, style, ...attributes, ...listeners }, /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
-        style: { paddingLeft: `${depth * 20}px` },
+        style: { paddingLeft: !depth ? "8px" : `${depth * 20}px` },
         className: (0, import_classnames.default)(
           `${prefix}-drag-sort-tree`,
           childrenProps == null ? void 0 : childrenProps.className

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

@@ -6,9 +6,12 @@
     align-items: center;
     justify-content: space-between;
     font-size: 16px;
-    padding: 6px;
     cursor: pointer;
     touch-action: none !important;
+    width: 100%;
+    color: #101828;
+    height: 40px;
+    line-height: 40px;
   }
 
   &-drag-sort-tree:hover {
@@ -22,6 +25,7 @@
 
   &-drag-sort-tree &-drag-sort-tree-title {
     margin-left: 10px;
+    font-size: 14px;
   }
 
   &-drag-sort-tree-icon,

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: {
@@ -50,7 +53,7 @@ var DragSortTree = (props) => {
   );
   const handleDragStart = (event) => {
     const { active } = event;
-    setActiveId(active[rowKey]);
+    setActiveId(active == null ? void 0 : active.id);
   };
   const handleDragEnd = (event) => {
     const { active, over } = event;
@@ -58,8 +61,8 @@ var DragSortTree = (props) => {
     if (!over || !active)
       return;
     try {
-      const activeId2 = active[rowKey];
-      const overId = over[rowKey];
+      const activeId2 = active.id;
+      const overId = over.id;
       if (activeId2 !== overId) {
         const activeIndex = items.findIndex(
           (item) => item[rowKey] === activeId2

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

@@ -15,5 +15,6 @@ export declare type SortType = {
     hiddenDraggableIcon?: boolean;
     hiddenRightIcon?: boolean;
     hiddenWarningIcon?: boolean;
+    tabKey?: string;
     onChange?: (value: ValueProps[]) => void;
 };

package/lowcode/drag-sort-tree/meta.ts

@@ -62,6 +62,11 @@ export default {
         },
       ]
     },
+    {
+      name: "tabKey",
+      title: { label: 'tabKey', tip: 'tabKey | 标识当前选中的tab' },
+      propType: 'string',
+    },
     {
       name: "titleRender",
       title: { label: '标题', tip: '是否自定义标题内容 | node/func' },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.340",
+  "version": "1.0.342",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",