@pisell/materials 6.0.12 → 6.0.14

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

@@ -122,7 +122,7 @@ var customApiFormatFilter = (filter) => {
 var useFormat = ({ dataSourceKey, fields }) => {
   const formatListResult = (0, import_ahooks.useMemoizedFn)(
     (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 = ({ dataSourceKey, fields }) => {
           pageSize: res.size
         };
       }
+      if (dataSourceKey === "mypisell-api" && "list" in res && "skip" in res) {
+        const 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,13 @@ var useFormat = ({ dataSourceKey, fields }) => {
         ...customApiFormatFilter(params.filter || {})
       };
     }
+    if (dataSourceKey === "mypisell-api") {
+      return {
+        skip: (params == null ? void 0 : params.page) || 1,
+        num: (params == null ? void 0 : params.pageSize) || 10,
+        ...customApiFormatFilter(params.filter || {})
+      };
+    }
     return params;
   });
   const formatCreateUpdateParams = (0, import_ahooks.useMemoizedFn)((params) => {

package/lib/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/lib/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/lib/components/dataSourceComponents/fields/DatePicker/ReadPretty.js

@@ -35,9 +35,43 @@ module.exports = __toCommonJS(ReadPretty_exports);
 var import_react = __toESM(require("react"));
 var import_classnames = __toESM(require("classnames"));
 var import_dayjs = __toESM(require("dayjs"));
+var import_usePisellConfig = __toESM(require("../../../pisell-config-provider/hooks/usePisellConfig"));
 var import_ReadPretty = require("./ReadPretty.less");
-var DatePickerReadPretty = (props) => {
-  const { value, renderMode } = props;
+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 = ({ value, renderMode, showTime }) => {
+  const { locale = "zh-CN" } = (0, import_usePisellConfig.default)();
+  const dateFormat = (0, import_react.useMemo)(() => {
+    if (locale in DATE_FORMATS) {
+      const formats = DATE_FORMATS[locale];
+      return showTime ? formats.withTime : formats.withoutTime;
+    }
+    if (process.env.NODE_ENV !== "production") {
+      console.warn(`Unsupported locale: ${locale}, falling back to default format`);
+    }
+    return DEFAULT_FORMAT;
+  }, [locale, showTime]);
+  const formattedDate = (0, import_react.useMemo)(() => {
+    if (!value)
+      return "";
+    try {
+      return (0, import_dayjs.default)(value).format(dateFormat);
+    } catch (error) {
+      if (process.env.NODE_ENV !== "production") {
+        console.error("Error formatting date:", error);
+      }
+      return "";
+    }
+  }, [value, dateFormat]);
   return /* @__PURE__ */ import_react.default.createElement(
     "span",
     {
@@ -45,7 +79,7 @@ var DatePickerReadPretty = (props) => {
         "pisell-date-picker-read-pretty-table-view": renderMode === "tableView"
       })
     },
-    value ? (0, import_dayjs.default)(value).format("YYYY-MM-DD HH:mm:ss") : ""
+    formattedDate
   );
 };
 var ReadPretty_default = DatePickerReadPretty;

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

@@ -43,7 +43,7 @@ var DatePickerWithMode = (0, import_utils2.withMode)(
   (props) => {
     return {
       ...props,
-      value: (0, import_utils.isString)(props.value) ? (0, import_dayjs.default)(props.value) : props.value
+      value: (0, import_utils.isString)(props.value) && props.value ? (0, import_dayjs.default)(props.value) : props.value
     };
   }
 );

package/lib/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/lib/components/dataSourceComponents/fields/Input.Subdomain/WithMode.js

@@ -132,7 +132,7 @@ var Subdomain = (props) => {
       const inputValue = e.target.value.toLowerCase();
       const { subdomain: newSubdomain } = parseExternalValue(inputValue);
       setSubdomain(newSubdomain);
-      propsOnChange == null ? void 0 : propsOnChange(newSubdomain + suffix);
+      propsOnChange == null ? void 0 : propsOnChange(newSubdomain ? newSubdomain + suffix : "");
     } catch (error) {
       console.error("Error handling change:", error);
     }
@@ -140,7 +140,7 @@ var Subdomain = (props) => {
   const onBlur = (0, import_react.useCallback)((e) => {
     try {
       propsOnBlur == null ? void 0 : propsOnBlur(e);
-      propsOnChange == null ? void 0 : propsOnChange(subdomain + suffix);
+      propsOnChange == null ? void 0 : propsOnChange(subdomain ? subdomain + suffix : "");
     } catch (error) {
       console.error("Error handling blur:", error);
     }

package/lib/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/lib/components/dataSourceComponents/hooks/useActions.js

@@ -107,6 +107,9 @@ var useActions = ({
           body
         });
         if (["pisell2-api", "mypisell-api"].includes(dataSourceKey)) {
+          if ("mypisell-api" === dataSourceKey && designMode === "design") {
+            return result;
+          }
           return result.data;
         }
         return result;

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

@@ -81,7 +81,8 @@ var DatePickerCpt = (props) => {
     setValue(value);
   }, [value]);
   (0, import_react.useEffect)(() => {
-    setValueStr((_value == null ? void 0 : _value.format(format || "YYYY-MM-DD")) || "");
+    var _a;
+    setValueStr(((_a = _value == null ? void 0 : _value.format) == null ? void 0 : _a.call(_value, format || "YYYY-MM-DD")) || "");
   }, [_value]);
   const customPresetItems = (0, import_react.useMemo)(() => {
     const preset = [
@@ -229,6 +230,7 @@ var DatePickerCpt = (props) => {
     );
   };
   const timeInputProps = (0, import_react.useMemo)(() => {
+    var _a;
     let step = 1;
     let _format = "";
     if ((showTime == null ? void 0 : showTime.format) === "HH:mm") {
@@ -244,7 +246,7 @@ var DatePickerCpt = (props) => {
         const val = e.target.value;
         handleTimeChange(window.dayjs(val, _format));
       },
-      value: _value == null ? void 0 : _value.format(_format)
+      value: (_a = _value == null ? void 0 : _value.format) == null ? void 0 : _a.call(_value, _format)
     };
   }, [showTime, _value]);
   if (!picker || picker === "date") {

package/lib/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/lib/components/pisellDraggable/components/TreeItem/TreeItem.js

@@ -54,6 +54,7 @@ var TreeItem = (0, import_react.forwardRef)((props, ref) => {
     wrapperRef,
     item,
     renderItem,
+    isBlocked,
     ...otherProps
   } = props;
   if (renderItem) {

package/lib/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/lib/components/pisellDraggable/index.js

@@ -51,7 +51,7 @@ var initialItems = [
       { id: "Spring", children: [] },
       { id: "Summer", children: [] },
       { id: "Fall", children: [] },
-      { id: "Winter", children: [] }
+      { id: "Winter", children: [], disabledDrop: true }
     ]
   },
   {
@@ -101,7 +101,8 @@ function SortableTree({
   removable = true,
   renderItem,
   onChange,
-  onRemoveBefore
+  onRemoveBefore,
+  maxLevel = 3
 }) {
   const [items, setItems] = (0, import_react.useState)([]);
   const [activeId, setActiveId] = (0, import_react.useState)(null);
@@ -111,17 +112,20 @@ function SortableTree({
     console.log("初始化", value);
     setItems(value);
   }, [value]);
+  const flattenTreeData = (0, import_react.useMemo)(() => {
+    return (0, import_utilities2.flattenTree)(items);
+  }, [items]);
   const flattenedItems = (0, import_react.useMemo)(() => {
-    const flattenedTree = (0, import_utilities2.flattenTree)(items);
-    const collapsedItems = flattenedTree.reduce(
+    const collapsedItems = flattenTreeData.reduce(
       (acc, { children, collapsed, id }) => collapsed && children.length ? [...acc, id] : acc,
       []
     );
     return (0, import_utilities2.removeChildrenOf)(
-      flattenedTree,
+      flattenTreeData,
       activeId != null ? [activeId, ...collapsedItems] : collapsedItems
     );
-  }, [activeId, items]);
+  }, [activeId, flattenTreeData]);
+  console.log("flattenedItems", flattenedItems);
   const projected = activeId && overId ? (0, import_utilities2.getProjection)(
     flattenedItems,
     activeId,
@@ -148,6 +152,20 @@ function SortableTree({
   (0, import_react.useEffect)(() => {
     document.body.id = "body";
   }, []);
+  function checkSubtreeDepth(items2, itemId, baseDepth) {
+    const item = items2.find((i) => i.id === itemId);
+    if (!item)
+      return false;
+    if (baseDepth >= maxLevel)
+      return true;
+    const children = items2.filter((i) => i.parentId === itemId);
+    if (baseDepth >= maxLevel - 1 && children.length > 0)
+      return true;
+    return children.some((child) => {
+      const childNewDepth = baseDepth + 1;
+      return childNewDepth >= maxLevel || checkSubtreeDepth(items2, child.id, childNewDepth);
+    });
+  }
   return /* @__PURE__ */ import_react.default.createElement(
     import_core.DndContext,
     {
@@ -209,12 +227,46 @@ function SortableTree({
     setOffsetLeft(delta.x);
   }
   function handleDragOver({ over }) {
-    setOverId((over == null ? void 0 : over.id) ?? null);
+    if (!projected || !over) {
+      setOverId((over == null ? void 0 : over.id) ?? null);
+      return;
+    }
+    const targetParent = projected.parentId ? flattenedItems.find((item) => item.id === projected.parentId) : null;
+    if (targetParent == null ? void 0 : targetParent.disabledDrop) {
+      return;
+    }
+    if (projected.depth >= maxLevel) {
+      return;
+    }
+    const willExceedLimit = checkSubtreeDepth(
+      flattenTreeData,
+      activeId,
+      projected.depth
+    );
+    if (willExceedLimit) {
+      return;
+    }
+    setOverId(over.id);
   }
   function handleDragEnd({ active, over }) {
     resetState();
     if (projected && over) {
       const { depth, parentId } = projected;
+      const targetParent = parentId ? flattenedItems.find((item) => item.id === parentId) : null;
+      if (targetParent == null ? void 0 : targetParent.disabledDrop) {
+        return;
+      }
+      if (depth >= maxLevel) {
+        return;
+      }
+      const willExceedLimit = checkSubtreeDepth(
+        flattenTreeData,
+        active.id,
+        depth
+      );
+      if (willExceedLimit) {
+        return;
+      }
       const clonedItems = JSON.parse(
         JSON.stringify((0, import_utilities2.flattenTree)(items))
       );

package/lib/components/pisellDraggable/types.d.ts

@@ -4,6 +4,7 @@ export interface TreeItem {
     id: UniqueIdentifier;
     children: TreeItem[];
     collapsed?: boolean;
+    disabledDrop?: boolean;
 }
 export declare type TreeItems = TreeItem[];
 export interface FlattenedItem extends TreeItem {

package/lib/components/pisellLayout/content.d.ts

@@ -3,6 +3,8 @@ import React from 'react';
 export interface PisellContentProps extends Omit<LayoutProps, 'prefixCls'> {
     children?: React.ReactNode;
     __designMode?: string;
+    height?: number;
+    scroll?: boolean;
 }
 declare const PisellContent: React.FC<PisellContentProps>;
 export default PisellContent;

package/lib/components/pisellLayout/content.js

@@ -33,18 +33,29 @@ __export(content_exports, {
 });
 module.exports = __toCommonJS(content_exports);
 var import_antd = require("antd");
+var import_classnames = __toESM(require("classnames"));
 var import_react = __toESM(require("react"));
 var import_useEngineContext = __toESM(require("../../hooks/useEngineContext"));
 var { Content } = import_antd.Layout;
 var PisellContent = (props) => {
-  const { children, ...rest } = props;
+  const { children, className, height, scroll, ...rest } = props;
   const lowCodeProps = (0, import_useEngineContext.default)();
   const pageContent = (0, import_react.useMemo)(() => {
+    var _a, _b;
     if (props.__designMode === "design") {
       return "Page content";
     }
-    return lowCodeProps.children;
+    return (_b = (_a = lowCodeProps == null ? void 0 : lowCodeProps.engine) == null ? void 0 : _a.props) == null ? void 0 : _b.children;
   }, [props.__designMode]);
-  return /* @__PURE__ */ import_react.default.createElement(Content, { ...rest }, children, pageContent);
+  const contentStyle = (0, import_react.useMemo)(() => {
+    return {
+      height,
+      ...rest.style
+    };
+  }, [height, rest.style]);
+  const contentClassName = (0, import_classnames.default)("pisell-layout-content", className, {
+    "pisell-layout-content-scroll": scroll
+  });
+  return /* @__PURE__ */ import_react.default.createElement(Content, { ...rest, style: contentStyle, className: contentClassName }, children, pageContent);
 };
 var content_default = PisellContent;

package/lib/components/pisellLayout/footer.d.ts

@@ -2,6 +2,7 @@ import type { LayoutProps } from 'antd';
 import React from 'react';
 export interface PisellFooterProps extends Omit<LayoutProps, 'prefixCls'> {
     children?: React.ReactNode;
+    height?: number;
 }
 declare const PisellFooter: React.FC<PisellFooterProps>;
 export default PisellFooter;

package/lib/components/pisellLayout/footer.js

@@ -36,7 +36,13 @@ var import_antd = require("antd");
 var import_react = __toESM(require("react"));
 var { Footer } = import_antd.Layout;
 var PisellFooter = (props) => {
-  const { children, ...rest } = props;
-  return /* @__PURE__ */ import_react.default.createElement(Footer, { ...rest }, children);
+  const { children, height, ...rest } = props;
+  const footerStyle = (0, import_react.useMemo)(() => {
+    return {
+      height,
+      ...rest.style
+    };
+  }, [height, rest.style]);
+  return /* @__PURE__ */ import_react.default.createElement(Footer, { ...rest, style: footerStyle }, children);
 };
 var footer_default = PisellFooter;

package/lib/components/pisellLayout/header.d.ts

@@ -1,7 +1,10 @@
 import type { LayoutProps } from 'antd';
 import React from 'react';
+import './index.less';
 export interface PisellHeaderProps extends Omit<LayoutProps, 'prefixCls'> {
     children?: React.ReactNode;
+    height?: number;
+    fixed?: boolean;
 }
 declare const PisellHeader: React.FC<PisellHeaderProps>;
 export default PisellHeader;

package/lib/components/pisellLayout/header.js

@@ -33,10 +33,21 @@ __export(header_exports, {
 });
 module.exports = __toCommonJS(header_exports);
 var import_antd = require("antd");
+var import_classnames = __toESM(require("classnames"));
 var import_react = __toESM(require("react"));
+var import_index = require("./index.less");
 var { Header } = import_antd.Layout;
 var PisellHeader = (props) => {
-  const { children, ...rest } = props;
-  return /* @__PURE__ */ import_react.default.createElement(Header, { ...rest }, children);
+  const { children, className, height, fixed, ...rest } = props;
+  const headerStyle = (0, import_react.useMemo)(() => {
+    return {
+      height,
+      ...rest.style
+    };
+  }, [height, rest.style]);
+  const headerClassName = (0, import_classnames.default)("pisell-layout-header", className, {
+    // 'pisell-layout-header-fixed': fixed,
+  });
+  return /* @__PURE__ */ import_react.default.createElement(Header, { ...rest, style: headerStyle, className: headerClassName }, children);
 };
 var header_default = PisellHeader;

package/lib/components/pisellLayout/index.js

@@ -36,6 +36,9 @@ var import_antd = require("antd");
 var import_react = __toESM(require("react"));
 var PisellLayout = (props) => {
   const { children, ...rest } = props;
+  (0, import_react.useEffect)(() => {
+    document.body.id = "body";
+  }, []);
   return /* @__PURE__ */ import_react.default.createElement(import_antd.Layout, { ...rest }, children);
 };
 PisellLayout.Header = import_antd.Layout.Header;

package/lib/components/pisellLayout/index.less

@@ -0,0 +1,23 @@
+.pisell-layout {
+  position: relative;
+}
+
+.pisell-layout-header {}
+
+.pisell-layout-header-fixed {
+  position: sticky;
+  top: 0;
+  z-index: 100;
+}
+
+.pisell-layout-content {}
+
+.pisell-layout-content-scroll {
+  overflow-y: auto;
+}
+
+.pisell-layout-sider {}
+
+.pisell-lowcode-layout-sider-trigger {
+  position: unset;
+}

package/lib/components/pisellLayout/sider.d.ts

@@ -1,5 +1,6 @@
 import type { SiderProps } from 'antd/es/layout/Sider';
 import React from 'react';
+import './index.less';
 export interface PisellSiderProps extends SiderProps {
     children?: React.ReactNode;
 }

package/lib/components/pisellLayout/sider.js

@@ -33,10 +33,38 @@ __export(sider_exports, {
 });
 module.exports = __toCommonJS(sider_exports);
 var import_antd = require("antd");
+var import_classnames = __toESM(require("classnames"));
 var import_react = __toESM(require("react"));
+var import_index = require("./index.less");
 var { Sider } = import_antd.Layout;
 var PisellSider = (props) => {
-  const { children, ...rest } = props;
-  return /* @__PURE__ */ import_react.default.createElement(Sider, { ...rest }, children);
+  const { children, collapsible, collapsed, onCollapse, ...rest } = props;
+  const [collapsedState, setCollapsedState] = (0, import_react.useState)(collapsed);
+  const className = (0, import_classnames.default)("pisell-layout-sider", props.className);
+  const _onCollapse = (val, type) => {
+    onCollapse == null ? void 0 : onCollapse(val, type);
+    setCollapsedState(val);
+  };
+  (0, import_react.useEffect)(() => {
+    setCollapsedState(collapsed);
+  }, [collapsed]);
+  return /* @__PURE__ */ import_react.default.createElement(
+    Sider,
+    {
+      ...rest,
+      collapsible,
+      collapsed: collapsedState,
+      onCollapse: _onCollapse,
+      className
+    },
+    /* @__PURE__ */ import_react.default.createElement(
+      "div",
+      {
+        className: "pisell-layout-sider-content",
+        style: { overflowY: "auto", height: "100%" }
+      },
+      children
+    )
+  );
 };
 var sider_default = PisellSider;

package/lib/components/pisellMenu/PisellMenu.d.ts

@@ -1,5 +1,9 @@
 import React from 'react';
 import './PisellMenu.less';
 import type { PisellMenuProps } from './types';
-declare const PisellMenu: React.FC<PisellMenuProps>;
+declare const PisellMenu: {
+    ({ className, style, mode, theme, defaultOpenKeys, defaultSelectedKeys, inlineCollapsed, openKeys, selectedKeys, onOpenChange, onSelect, dataSource, __designMode, children, other, ...restProps }: PisellMenuProps): React.JSX.Element;
+    Item: Omit<React.FunctionComponent<import("antd").MenuItemProps>, ""> & (<T extends import("antd").MenuItemProps>(props: T extends infer U extends import("antd").MenuItemProps ? unknown extends U ? import("antd").MenuItemProps : U : import("antd").MenuItemProps, context?: any) => React.ReactElement<any, any> | null);
+    SubMenu: React.FC<import("antd").SubMenuProps>;
+};
 export default PisellMenu;

package/lib/components/pisellMenu/PisellMenu.js

@@ -49,6 +49,8 @@ var PisellMenu = ({
   onSelect,
   dataSource,
   __designMode,
+  children,
+  other,
   ...restProps
 }) => {
   const _dataSource = (0, import_react.useMemo)(() => {
@@ -59,11 +61,13 @@ var PisellMenu = ({
       return [
         {
           label: "菜单项1",
-          key: "item-1"
+          key: "item-1",
+          path: "/item-1"
         },
         {
           label: "菜单项2",
-          key: "item-2"
+          key: "item-2",
+          path: "/item-2"
         }
       ];
     }
@@ -84,8 +88,12 @@ var PisellMenu = ({
       selectedKeys,
       onOpenChange,
       onSelect,
-      ...restProps
-    }
+      ...restProps,
+      ...other
+    },
+    children
   );
 };
+PisellMenu.Item = import_antd.Menu.Item;
+PisellMenu.SubMenu = import_antd.Menu.SubMenu;
 var PisellMenu_default = PisellMenu;

package/lib/components/pisellMenu/types.d.ts

@@ -1,5 +1,5 @@
+/// <reference types="react" />
 import type { MenuProps } from 'antd';
-import type { ReactNode } from 'react';
 export interface PisellMenuProps extends Omit<MenuProps, 'items'> {
     className?: string;
     style?: React.CSSProperties;
@@ -11,20 +11,16 @@ export interface PisellMenuProps extends Omit<MenuProps, 'items'> {
     openKeys?: string[];
     selectedKeys?: string[];
     onOpenChange?: (openKeys: string[]) => void;
-    onSelect?: (info: {
-        key: string;
-        keyPath: string[];
-        item: ReactNode;
-        domEvent: Event;
-        selectedKeys: string[];
-    }) => void;
     dataSource?: any;
     __designMode?: string;
+    other?: PisellMenuProps;
 }
 export interface MenuItemType {
-    label: ReactNode;
     key: string;
-    icon?: ReactNode;
+    label: string;
+    path: string;
     children?: MenuItemType[];
+    icon?: string | React.ReactNode;
+    hide?: boolean;
     type?: 'group' | 'divider';
 }

package/lib/components/table/Table/utils.d.ts

@@ -155,7 +155,7 @@ export declare const getSettingKeyArrByMode: ({ filter, columnSetting, dataSourc
     sort?: SortType | undefined;
     mode: "" | "localStorage" | "remote";
     currentViewMode: ModeType;
-}) => ("filter_setting" | "column_setting" | "gallery_setting" | "view_mode" | "group_by" | "order_by")[];
+}) => ("view_mode" | "column_setting" | "order_by" | "group_by" | "gallery_setting" | "filter_setting")[];
 export declare const omit: (obj: Record<string, any>, keys: string[]) => Record<string, any>;
 export declare const stringify: (obj: Record<string, any>) => string;
 export {};