@pisell/materials 6.0.12 → 6.0.14

package/es/components/dataSourceComponents/dataSourceForm/provider/formSetting/FormSettingContext.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import { ModeType } from '../../type';
 export interface FormSettingContextType {
-    onDataSourceFinish?: (values: any, result: any) => void;
+    onDataSourceFinish?: (values: any, result: any, form: any) => void;
     renderMode?: ModeType;
     groupInfoPosition?: 'top' | 'side';
     children?: React.ReactNode;

package/es/components/dataSourceComponents/dataSourceForm/submitButton/index.js

@@ -155,7 +155,7 @@ var SubmitButton = function SubmitButton(props) {
             result = _context2.sent;
             // 数据源提交成功
             if (onDataSourceFinish) {
-              onDataSourceFinish(formattedValues, result);
+              onDataSourceFinish(formattedValues, result, form);
             }
             if (refreshData) {
               refreshTableData === null || refreshTableData === void 0 ? void 0 : refreshTableData();

package/es/components/dataSourceComponents/dataSourceForm/utils.js

@@ -170,7 +170,7 @@ export var withFormItem = function withFormItem(WrappedComponent, overlayProps)
           }));
           break;
         case 'phone':
-          rules.push(_objectSpread(_objectSpread({}, typeobj), {}, {
+          rules.push({
             validator: function validator(_, value) {
               // 如果值为空或者只有空格，直接返回成功，不进行校验
               if (!(value !== null && value !== void 0 && value.trim())) {
@@ -189,10 +189,10 @@ export var withFormItem = function withFormItem(WrappedComponent, overlayProps)
                 return Promise.reject(new Error(typeobj.message || getText('pisell-data-source-form-phone-message')));
               }
             }
-          }));
+          });
           break;
         case 'mobile':
-          rules.push(_objectSpread(_objectSpread({}, typeobj), {}, {
+          rules.push({
             validator: function validator(_, value) {
               // 如果值为空或者只有空格，直接返回成功，不进行校验
               if (!(value !== null && value !== void 0 && value.trim())) {
@@ -232,16 +232,13 @@ export var withFormItem = function withFormItem(WrappedComponent, overlayProps)
                 return Promise.resolve();
               }
             }
-          }));
+          });
           break;
         case 'subdomain':
-          rules.push(_objectSpread(_objectSpread({}, typeobj), {}, {
+          rules.push({
             validator: function validator(_, value) {
               if (!value) return Promise.resolve();
               var subdomain = value.split('.')[0];
-              if (!subdomain) {
-                return Promise.resolve();
-              }
               if (!/^[a-z0-9-]+$/.test(subdomain)) {
                 return Promise.reject(new Error(getText('subdomain-error-pattern')));
               }
@@ -256,7 +253,7 @@ export var withFormItem = function withFormItem(WrappedComponent, overlayProps)
               }
               return Promise.resolve();
             }
-          }));
+          });
           break;
       }
     }

package/es/components/dataSourceComponents/dataSourceMenu/Basic.d.ts

@@ -0,0 +1,2 @@
+declare const _default: any;
+export default _default;

package/es/components/dataSourceComponents/dataSourceMenu/Basic.js

@@ -0,0 +1,61 @@
+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); }
+import React, { forwardRef } from 'react';
+import useEngineContext from "../../../hooks/useEngineContext";
+import BaseMenu from "../../pisellMenu";
+/**
+ * @title: 数据源表单组件
+ * @description: 基于数据源动态生成表单，支持编辑、查看、禁用三种模式
+ */
+var DataSourceMenu = /*#__PURE__*/forwardRef(function (props, ref) {
+  var _appHelper$utils, _appHelper$utils$getA2, _appHelper$utils$getA3, _appHelper$utils$getA4;
+  var _useEngineContext = useEngineContext(),
+    appHelper = _useEngineContext.appHelper;
+  var _appHelper$utils$getA = appHelper === null || appHelper === void 0 ? void 0 : (_appHelper$utils = appHelper.utils) === null || _appHelper$utils === void 0 ? void 0 : (_appHelper$utils$getA2 = _appHelper$utils.getApp) === null || _appHelper$utils$getA2 === void 0 ? void 0 : (_appHelper$utils$getA3 = _appHelper$utils$getA2.call(_appHelper$utils)) === null || _appHelper$utils$getA3 === void 0 ? void 0 : (_appHelper$utils$getA4 = _appHelper$utils$getA3.menuManager) === null || _appHelper$utils$getA4 === void 0 ? void 0 : _appHelper$utils$getA4.useMenu(),
+    menuItems = _appHelper$utils$getA.menuItems,
+    selectedKeys = _appHelper$utils$getA.selectedKeys,
+    openKeys = _appHelper$utils$getA.openKeys,
+    setOpenKeys = _appHelper$utils$getA.setOpenKeys,
+    getShowChildren = _appHelper$utils$getA.getShowChildren,
+    handleClick = _appHelper$utils$getA.handleClick;
+  // 递归渲染菜单项
+  var renderMenuItems = function renderMenuItems(items) {
+    return items.map(function (item) {
+      if (item.hide) {
+        return null;
+      }
+      var _children = getShowChildren(item.children || []);
+      if (_children !== null && _children !== void 0 && _children.length) {
+        return /*#__PURE__*/React.createElement(BaseMenu.SubMenu, {
+          key: item.key,
+          title: item.label,
+          icon: item.icon,
+          router: item.path
+        }, renderMenuItems(_children));
+      }
+      return /*#__PURE__*/React.createElement(BaseMenu.Item, {
+        key: item.key,
+        icon: item.icon,
+        router: item.path
+      }, item.label);
+    });
+  };
+  return /*#__PURE__*/React.createElement(BaseMenu, _extends({
+    ref: ref,
+    mode: "inline"
+    // theme="dark"
+    ,
+    selectedKeys: selectedKeys,
+    openKeys: openKeys,
+    onOpenChange: setOpenKeys,
+    onClick: function onClick(_ref) {
+      var _item$props;
+      var item = _ref.item;
+      handleClick((_item$props = item.props) === null || _item$props === void 0 ? void 0 : _item$props.router);
+    }
+  }, props, {
+    other: {
+      items: undefined
+    }
+  }), renderMenuItems(menuItems));
+});
+export default DataSourceMenu;

package/es/components/dataSourceComponents/dataSourceMenu/index.js

@@ -1,19 +1,48 @@
-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); }
-import React, { forwardRef } from 'react';
-import BaseMenu from "../../pisellMenu";
+import React, { useMemo } from 'react';
+import useEngineContext from "../../../hooks/useEngineContext";
+import PisellMenu from "../../pisellMenu";
 import useVariables from "../hooks/useVariables";
-
+import BaseMenu from "./Basic";
 /**
  * @title: 数据源表单组件
  * @description: 基于数据源动态生成表单，支持编辑、查看、禁用三种模式
  */
-var DataSourceMenu = /*#__PURE__*/forwardRef(function (props, ref) {
+var DataSourceMenu = function DataSourceMenu(props, ref) {
+  var _appHelper$utils, _appHelper$utils$getA, _appHelper$utils$getA2, _appHelper$utils$getA3;
   var dataSource = props.dataSource;
   var _useVariables = useVariables(),
     parseVariable = _useVariables.parseVariable;
-  return /*#__PURE__*/React.createElement(BaseMenu, _extends({}, props, {
-    dataSource: parseVariable === null || parseVariable === void 0 ? void 0 : parseVariable(dataSource),
-    ref: ref
-  }));
-});
+  var _useEngineContext = useEngineContext(),
+    appHelper = _useEngineContext.appHelper;
+  var _dataSource = useMemo(function () {
+    if (Array.isArray(dataSource)) {
+      return dataSource;
+    }
+    if (props.__designMode === 'design') {
+      return [{
+        label: '菜单项1',
+        key: 'item-1',
+        path: '/item-1'
+      }, {
+        label: '菜单项2',
+        key: 'item-2',
+        path: '/item-2'
+      }];
+    }
+    if (typeof dataSource === 'string') {
+      return parseVariable === null || parseVariable === void 0 ? void 0 : parseVariable(dataSource);
+    }
+    return [];
+  }, [dataSource]);
+
+  // 设计模式下使用PisellMenu, 否则缺少app注入导致报错
+  if (props.__designMode === 'design') {
+    return /*#__PURE__*/React.createElement(PisellMenu, props);
+  }
+  var MenuProvider = appHelper === null || appHelper === void 0 ? void 0 : (_appHelper$utils = appHelper.utils) === null || _appHelper$utils === void 0 ? void 0 : (_appHelper$utils$getA = _appHelper$utils.getApp) === null || _appHelper$utils$getA === void 0 ? void 0 : (_appHelper$utils$getA2 = _appHelper$utils$getA.call(_appHelper$utils)) === null || _appHelper$utils$getA2 === void 0 ? void 0 : (_appHelper$utils$getA3 = _appHelper$utils$getA2.menuManager) === null || _appHelper$utils$getA3 === void 0 ? void 0 : _appHelper$utils$getA3.MenuProvider;
+  console.log('MenuProvider11', appHelper);
+  return /*#__PURE__*/React.createElement(MenuProvider, {
+    menus: _dataSource
+  }, /*#__PURE__*/React.createElement(BaseMenu, props));
+};
 export default DataSourceMenu;

package/es/components/dataSourceComponents/dataSourceTable/hooks/useDrawerState.d.ts

@@ -9,7 +9,7 @@ declare const useDrawerState: (operationContent?: {
     openDrawer: (item: OperationItem) => void;
     closeDrawer: () => void;
     drawerContent: import("react").ReactNode;
-    Container: typeof Drawer | {
+    Container: {
         (props: import("../../../pisellModal").PisellModalProps): import("react").JSX.Element;
         confirm: (props: import("../../../pisellModal/components/functions").PisellModalFuncProps) => {
             destroy: () => void;
@@ -33,7 +33,7 @@ declare const useDrawerState: (operationContent?: {
             update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
         };
         Information: (props: import("../../../pisellModal/components/Information").InformationProps) => import("react").JSX.Element;
-    };
+    } | typeof Drawer;
     containerProps: {};
 };
 export default useDrawerState;

package/es/components/dataSourceComponents/dataSourceTable/hooks/useFormat.d.ts

@@ -9,12 +9,16 @@ export declare type UseFormatParams = {
     dataSourceKey: string;
     fields: Field[];
 };
-export declare type FormatListResultParams = {
+export declare type ApiListResult = {
     list: any[];
     count: number;
-    page: number;
     size: number;
+} & ({
+    page: number;
 } | {
+    skip: number;
+});
+export declare type FormatListResultParams = ApiListResult | {
     data: any[];
     meta: {
         count: number;

package/es/components/dataSourceComponents/dataSourceTable/hooks/useFormat.js

@@ -122,7 +122,7 @@ var useFormat = function useFormat(_ref4) {
     fields = _ref4.fields;
   // list接口请求 结果格式化
   var formatListResult = useMemoizedFn(function (res) {
-    if (dataSourceKey === 'pisell2-api' && 'list' in res) {
+    if (dataSourceKey === 'pisell2-api' && 'list' in res && 'page' in res) {
       return {
         data: res.list,
         count: res.count,
@@ -130,6 +130,15 @@ var useFormat = function useFormat(_ref4) {
         pageSize: res.size
       };
     }
+    if (dataSourceKey === 'mypisell-api' && 'list' in res && 'skip' in res) {
+      var skip = typeof res.skip === 'number' ? res.skip : 1;
+      return {
+        data: res.list,
+        count: res.count,
+        page: skip - 1 || 1,
+        pageSize: res.size
+      };
+    }
     if ('meta' in res) {
       return {
         data: res.data,
@@ -156,6 +165,12 @@ var useFormat = function useFormat(_ref4) {
         size: (params === null || params === void 0 ? void 0 : params.pageSize) || 10
       }, customApiFormatFilter(params.filter || {}));
     }
+    if (dataSourceKey === 'mypisell-api') {
+      return _objectSpread({
+        skip: (params === null || params === void 0 ? void 0 : params.page) || 1,
+        num: (params === null || params === void 0 ? void 0 : params.pageSize) || 10
+      }, customApiFormatFilter(params.filter || {}));
+    }
     return params;
   });
   var formatCreateUpdateParams = useMemoizedFn(function (params) {

package/es/components/dataSourceComponents/dataSourceTable/hooks/useTableProps.d.ts

@@ -17,7 +17,7 @@ interface UseTablePropsProps {
  * @returns
  */
 declare const useTableProps: (props: UseTablePropsProps) => {
-    title: number | boolean | React.JSX.Element | Iterable<React.ReactNode> | (() => React.ReactNode) | null | undefined;
+    title: number | boolean | Iterable<React.ReactNode> | React.JSX.Element | (() => React.ReactNode) | null | undefined;
     pagination: {
         total: number;
         current: number;
@@ -26,7 +26,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         showSizeChanger: boolean;
     };
     columns: import("./useColumns").Column[];
-    subTitle: number | boolean | React.JSX.Element | Iterable<React.ReactNode> | (() => React.ReactNode) | null | undefined;
+    subTitle: number | boolean | Iterable<React.ReactNode> | React.JSX.Element | (() => React.ReactNode) | null | undefined;
     buttons: any[] | null;
     filter: React.JSX.Element | null;
     onRow: (record: any) => any;
@@ -65,7 +65,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         useCustomAction: boolean;
         actionType: string;
         openMode: "modal" | "drawer";
-        openContentSize: "small" | "middle" | "large";
+        openContentSize: "small" | "large" | "middle";
         openTitle: string;
         key: string;
     } | undefined;

package/es/components/dataSourceComponents/fields/DatePicker/ReadPretty.d.ts

@@ -1,5 +1,5 @@
-import React from 'react';
+import type { FC } from 'react';
 import { DatePickerProps } from './type';
 import './ReadPretty.less';
-declare const DatePickerReadPretty: (props: DatePickerProps) => React.JSX.Element;
+declare const DatePickerReadPretty: FC<DatePickerProps>;
 export default DatePickerReadPretty;

package/es/components/dataSourceComponents/fields/DatePicker/ReadPretty.js

@@ -1,14 +1,51 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import classNames from 'classnames';
 import dayjs from 'dayjs';
+import usePisellConfig from "../../../pisell-config-provider/hooks/usePisellConfig";
 import "./ReadPretty.less";
-var DatePickerReadPretty = function DatePickerReadPretty(props) {
-  var value = props.value,
-    renderMode = props.renderMode;
+var DEFAULT_FORMAT = 'YYYY-MM-DD HH:mm:ss';
+var DATE_FORMATS = {
+  'zh-CN': {
+    withTime: 'YYYY-MM-DD HH:mm:ss',
+    withoutTime: 'YYYY-MM-DD'
+  },
+  'en-US': {
+    withTime: 'HH:mm:ss YYYY-MM-DD',
+    withoutTime: 'YYYY-MM-DD'
+  }
+};
+var DatePickerReadPretty = function DatePickerReadPretty(_ref) {
+  var value = _ref.value,
+    renderMode = _ref.renderMode,
+    showTime = _ref.showTime;
+  var _usePisellConfig = usePisellConfig(),
+    _usePisellConfig$loca = _usePisellConfig.locale,
+    locale = _usePisellConfig$loca === void 0 ? 'zh-CN' : _usePisellConfig$loca;
+  var dateFormat = useMemo(function () {
+    if (locale in DATE_FORMATS) {
+      var formats = DATE_FORMATS[locale];
+      return showTime ? formats.withTime : formats.withoutTime;
+    }
+    if (process.env.NODE_ENV !== 'production') {
+      console.warn("Unsupported locale: ".concat(locale, ", falling back to default format"));
+    }
+    return DEFAULT_FORMAT;
+  }, [locale, showTime]);
+  var formattedDate = useMemo(function () {
+    if (!value) return '';
+    try {
+      return dayjs(value).format(dateFormat);
+    } catch (error) {
+      if (process.env.NODE_ENV !== 'production') {
+        console.error('Error formatting date:', error);
+      }
+      return '';
+    }
+  }, [value, dateFormat]);
   return /*#__PURE__*/React.createElement("span", {
     className: classNames('pisell-date-picker-read-pretty', {
       'pisell-date-picker-read-pretty-table-view': renderMode === 'tableView'
     })
-  }, value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : '');
+  }, formattedDate);
 };
 export default DatePickerReadPretty;

package/es/components/dataSourceComponents/fields/DatePicker/WithMode.js

@@ -11,7 +11,7 @@ import ReadPretty from "./ReadPretty";
 import { withMode } from "../../dataSourceForm/utils";
 var DatePickerWithMode = withMode(DatePickerCpt, ReadPretty, function (props) {
   return _objectSpread(_objectSpread({}, props), {}, {
-    value: isString(props.value) ? dayjs(props.value) : props.value
+    value: isString(props.value) && props.value ? dayjs(props.value) : props.value
   });
 });
 export default DatePickerWithMode;

package/es/components/dataSourceComponents/fields/DatePicker/type.d.ts

@@ -2,4 +2,5 @@ import { DatePickerProps as AntDatePickerProps } from 'antd';
 import { ModeType } from '../../dataSourceForm/type';
 export interface DatePickerProps extends Omit<AntDatePickerProps, 'renderMode'> {
     renderMode: ModeType;
+    showTime?: boolean;
 }

package/es/components/dataSourceComponents/fields/Input.Subdomain/WithMode.js

@@ -171,7 +171,8 @@ var Subdomain = function Subdomain(props) {
       var _parseExternalValue2 = parseExternalValue(inputValue),
         newSubdomain = _parseExternalValue2.subdomain;
       setSubdomain(newSubdomain);
-      propsOnChange === null || propsOnChange === void 0 ? void 0 : propsOnChange(newSubdomain + suffix);
+      // 当输入为空时，传递空字符串而不是带后缀的值
+      propsOnChange === null || propsOnChange === void 0 ? void 0 : propsOnChange(newSubdomain ? newSubdomain + suffix : '');
     } catch (error) {
       console.error('Error handling change:', error);
     }
@@ -181,7 +182,8 @@ var Subdomain = function Subdomain(props) {
   var onBlur = useCallback(function (e) {
     try {
       propsOnBlur === null || propsOnBlur === void 0 ? void 0 : propsOnBlur(e);
-      propsOnChange === null || propsOnChange === void 0 ? void 0 : propsOnChange(subdomain + suffix);
+      // 当输入为空时，传递空字符串而不是带后缀的值
+      propsOnChange === null || propsOnChange === void 0 ? void 0 : propsOnChange(subdomain ? subdomain + suffix : '');
     } catch (error) {
       console.error('Error handling blur:', error);
     }

package/es/components/dataSourceComponents/fields/index.d.ts

@@ -58,7 +58,7 @@ declare const formFieldMap: {
     FormItemUpload: import("react").FC<import("./Upload/type").UploadProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     FormItemTranslation: import("react").FC<import("./Translation/type").TranslationProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
 };
-declare const getFieldComponent: (fieldComponent: string) => import("react").FC<any> | import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps> | (import("react").FC<{}> & {
+declare const getFieldComponent: (fieldComponent: string) => import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps> | import("react").FC<any> | (import("react").FC<{}> & {
     Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
 } & {
     Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;

package/es/components/dataSourceComponents/hooks/useActions.js

@@ -116,13 +116,19 @@ var useActions = function useActions() {
             case 2:
               result = _context.sent;
               if (!['pisell2-api', 'mypisell-api'].includes(dataSourceKey)) {
-                _context.next = 5;
+                _context.next = 7;
+                break;
+              }
+              if (!('mypisell-api' === dataSourceKey && designMode === 'design')) {
+                _context.next = 6;
                 break;
               }
-              return _context.abrupt("return", result.data);
-            case 5:
               return _context.abrupt("return", result);
             case 6:
+              return _context.abrupt("return", result.data);
+            case 7:
+              return _context.abrupt("return", result);
+            case 8:
             case "end":
               return _context.stop();
           }

package/es/components/date-picker/datePickerCpt.js

@@ -84,7 +84,8 @@ var DatePickerCpt = function DatePickerCpt(props) {
     setValue(value);
   }, [value]);
   useEffect(function () {
-    setValueStr((_value === null || _value === void 0 ? void 0 : _value.format(format || 'YYYY-MM-DD')) || '');
+    var _value$format;
+    setValueStr((_value === null || _value === void 0 ? void 0 : (_value$format = _value.format) === null || _value$format === void 0 ? void 0 : _value$format.call(_value, format || 'YYYY-MM-DD')) || '');
   }, [_value]);
   var customPresetItems = useMemo(function () {
     var preset = [{
@@ -218,6 +219,7 @@ var DatePickerCpt = function DatePickerCpt(props) {
     });
   };
   var timeInputProps = useMemo(function () {
+    var _value$format2;
     var step = 1;
     var _format = '';
     if ((showTime === null || showTime === void 0 ? void 0 : showTime.format) === 'HH:mm') {
@@ -233,7 +235,7 @@ var DatePickerCpt = function DatePickerCpt(props) {
         var val = e.target.value;
         handleTimeChange(window.dayjs(val, _format));
       },
-      value: _value === null || _value === void 0 ? void 0 : _value.format(_format)
+      value: _value === null || _value === void 0 ? void 0 : (_value$format2 = _value.format) === null || _value$format2 === void 0 ? void 0 : _value$format2.call(_value, _format)
     };
   }, [showTime, _value]);
   if (!picker || picker === 'date') {

package/es/components/pisellDraggable/components/TreeItem/TreeItem.d.ts

@@ -17,5 +17,6 @@ export interface Props extends Omit<HTMLAttributes<HTMLLIElement>, 'id'> {
     wrapperRef?(node: HTMLLIElement): void;
     item: TreeItemType;
     renderItem?(item: TreeItemType): React.ReactNode;
+    isBlocked?: boolean;
 }
 export declare const TreeItem: React.ForwardRefExoticComponent<Props & React.RefAttributes<HTMLDivElement>>;

package/es/components/pisellDraggable/components/TreeItem/TreeItem.js

@@ -1,4 +1,4 @@
-var _excluded = ["childCount", "clone", "depth", "disableSelection", "disableInteraction", "ghost", "handleProps", "indentationWidth", "indicator", "collapsed", "onCollapse", "onRemove", "style", "wrapperRef", "item", "renderItem"];
+var _excluded = ["childCount", "clone", "depth", "disableSelection", "disableInteraction", "ghost", "handleProps", "indentationWidth", "indicator", "collapsed", "onCollapse", "onRemove", "style", "wrapperRef", "item", "renderItem", "isBlocked"];
 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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
@@ -23,6 +23,7 @@ export var TreeItem = /*#__PURE__*/forwardRef(function (props, ref) {
     wrapperRef = props.wrapperRef,
     item = props.item,
     renderItem = props.renderItem,
+    isBlocked = props.isBlocked,
     otherProps = _objectWithoutProperties(props, _excluded);
   if (renderItem) {
     return renderItem(props);

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

@@ -21,7 +21,9 @@ interface Props {
     onChange?: (items: TreeItems) => void;
     /** 删除节点前 */
     onRemoveBefore?: (item: TreeItem) => Promise<boolean>;
+    /** 最大层级 */
+    maxLevel?: number;
 }
-export declare function SortableTree({ collapsible, value, indicator, indentationWidth, removable, renderItem, onChange, onRemoveBefore, }: Props): React.JSX.Element;
+export declare function SortableTree({ collapsible, value, indicator, indentationWidth, removable, renderItem, onChange, onRemoveBefore, maxLevel, }: Props): React.JSX.Element;
 declare const Demo: () => React.JSX.Element;
 export default Demo;

package/es/components/pisellDraggable/index.js

@@ -50,7 +50,8 @@ var initialItems = [{
     children: []
   }, {
     id: 'Winter',
-    children: []
+    children: [],
+    disabledDrop: true
   }]
 }, {
   id: 'About Us',
@@ -120,7 +121,9 @@ export function SortableTree(_ref3) {
     removable = _ref3$removable === void 0 ? true : _ref3$removable,
     renderItem = _ref3.renderItem,
     onChange = _ref3.onChange,
-    onRemoveBefore = _ref3.onRemoveBefore;
+    onRemoveBefore = _ref3.onRemoveBefore,
+    _ref3$maxLevel = _ref3.maxLevel,
+    maxLevel = _ref3$maxLevel === void 0 ? 3 : _ref3$maxLevel;
   // 状态管理
   /** 当前树形数据 */
   var _useState = useState([]),
@@ -146,6 +149,9 @@ export function SortableTree(_ref3) {
     console.log('初始化', value);
     setItems(value);
   }, [value]);
+  var flattenTreeData = useMemo(function () {
+    return flattenTree(items);
+  }, [items]);
 
   /**
    * 扁平化处理树形数据
@@ -154,16 +160,15 @@ export function SortableTree(_ref3) {
    * 3. 移除被折叠节点的子节点
    */
   var flattenedItems = useMemo(function () {
-    var flattenedTree = flattenTree(items);
-    var collapsedItems = flattenedTree.reduce(function (acc, _ref4) {
+    var collapsedItems = flattenTreeData.reduce(function (acc, _ref4) {
       var children = _ref4.children,
         collapsed = _ref4.collapsed,
         id = _ref4.id;
       return collapsed && children.length ? [].concat(_toConsumableArray(acc), [id]) : acc;
     }, []);
-    return removeChildrenOf(flattenedTree, activeId != null ? [activeId].concat(_toConsumableArray(collapsedItems)) : collapsedItems);
-  }, [activeId, items]);
-
+    return removeChildrenOf(flattenTreeData, activeId != null ? [activeId].concat(_toConsumableArray(collapsedItems)) : collapsedItems);
+  }, [activeId, flattenTreeData]);
+  console.log('flattenedItems', flattenedItems);
   /**
    * 计算拖拽投影
    * 根据当前拖拽状态计算目标位置和深度
@@ -198,6 +203,39 @@ export function SortableTree(_ref3) {
   useEffect(function () {
     document.body.id = 'body';
   }, []);
+
+  /**
+   * 检查子树是否超过最大深度限制
+   * @param items 当前项目列表
+   * @param itemId 要检查的项目ID
+   * @param baseDepth 基础深度
+   * @returns 是否超过限制
+   */
+  function checkSubtreeDepth(items, itemId, baseDepth) {
+    var item = items.find(function (i) {
+      return i.id === itemId;
+    });
+    if (!item) return false;
+
+    // 首先检查目标位置的深度
+    if (baseDepth >= maxLevel) return true;
+
+    // 获取所有子节点
+    var children = items.filter(function (i) {
+      return i.parentId === itemId;
+    });
+
+    // 如果当前节点已经是最大深度，且尝试添加子节点，则返回 true
+    if (baseDepth >= maxLevel - 1 && children.length > 0) return true;
+
+    // 递归检查所有子节点
+    return children.some(function (child) {
+      // 计算子节点在新位置的深度
+      var childNewDepth = baseDepth + 1;
+      // 如果子节点深度超过限制，或者子节点的子树超过限制，则返回 true
+      return childNewDepth >= maxLevel || checkSubtreeDepth(items, child.id, childNewDepth);
+    });
+  }
   return /*#__PURE__*/React.createElement(DndContext, {
     sensors: sensors,
     collisionDetection: closestCenter,
@@ -264,9 +302,32 @@ export function SortableTree(_ref3) {
     setOffsetLeft(delta.x);
   }
   function handleDragOver(_ref9) {
-    var _over$id;
     var over = _ref9.over;
-    setOverId((_over$id = over === null || over === void 0 ? void 0 : over.id) !== null && _over$id !== void 0 ? _over$id : null);
+    if (!projected || !over) {
+      var _over$id;
+      setOverId((_over$id = over === null || over === void 0 ? void 0 : over.id) !== null && _over$id !== void 0 ? _over$id : null);
+      return;
+    }
+
+    // 检查目标父节点是否禁止拖入
+    var targetParent = projected.parentId ? flattenedItems.find(function (item) {
+      return item.id === projected.parentId;
+    }) : null;
+    if (targetParent !== null && targetParent !== void 0 && targetParent.disabledDrop) {
+      return;
+    }
+
+    // 检查目标深度是否超过最大层级限制
+    if (projected.depth >= maxLevel) {
+      return;
+    }
+
+    // 检查整个子树的深度是否会超过限制
+    var willExceedLimit = checkSubtreeDepth(flattenTreeData, activeId, projected.depth);
+    if (willExceedLimit) {
+      return;
+    }
+    setOverId(over.id);
   }
 
   /**
@@ -282,6 +343,25 @@ export function SortableTree(_ref3) {
     if (projected && over) {
       var depth = projected.depth,
         parentId = projected.parentId;
+
+      // 检查目标父节点是否禁止拖入
+      var targetParent = parentId ? flattenedItems.find(function (item) {
+        return item.id === parentId;
+      }) : null;
+      if (targetParent !== null && targetParent !== void 0 && targetParent.disabledDrop) {
+        return;
+      }
+
+      // 检查是否超过最大层级限制
+      if (depth >= maxLevel) {
+        return;
+      }
+
+      // 检查整个子树的深度是否会超过限制
+      var willExceedLimit = checkSubtreeDepth(flattenTreeData, active.id, depth);
+      if (willExceedLimit) {
+        return;
+      }
       var clonedItems = JSON.parse(JSON.stringify(flattenTree(items)));
       var overIndex = clonedItems.findIndex(function (_ref11) {
         var id = _ref11.id;