@pisell/materials 6.0.12 → 6.0.14

package/es/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/es/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/es/components/pisellLayout/content.js

@@ -1,15 +1,25 @@
-var _excluded = ["children"];
+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); }
+var _excluded = ["children", "className", "height", "scroll"];
+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 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 _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; }
 import { Layout } from 'antd';
+import classNames from 'classnames';
 import React, { useMemo } from 'react';
 import useEngineContext from "../../hooks/useEngineContext";
 var Content = Layout.Content;
 var PisellContent = function PisellContent(props) {
   var children = props.children,
+    className = props.className,
+    height = props.height,
+    scroll = props.scroll,
     rest = _objectWithoutProperties(props, _excluded);
   var lowCodeProps = useEngineContext();
-
   /**
    * @title: 内容
    * @description: 该组件的children默认注入页面内容
@@ -18,12 +28,24 @@ var PisellContent = function PisellContent(props) {
    * @Author: zhiwei.Wang
    */
   var pageContent = useMemo(function () {
+    var _lowCodeProps$engine, _lowCodeProps$engine$;
     // 引擎模式下没有页面内容, 只展示提示
     if (props.__designMode === 'design') {
       return 'Page content';
     }
-    return lowCodeProps.children;
+    return lowCodeProps === null || lowCodeProps === void 0 ? void 0 : (_lowCodeProps$engine = lowCodeProps.engine) === null || _lowCodeProps$engine === void 0 ? void 0 : (_lowCodeProps$engine$ = _lowCodeProps$engine.props) === null || _lowCodeProps$engine$ === void 0 ? void 0 : _lowCodeProps$engine$.children;
   }, [props.__designMode]);
-  return /*#__PURE__*/React.createElement(Content, rest, children, pageContent);
+  var contentStyle = useMemo(function () {
+    return _objectSpread({
+      height: height
+    }, rest.style);
+  }, [height, rest.style]);
+  var contentClassName = classNames('pisell-layout-content', className, {
+    'pisell-layout-content-scroll': scroll
+  });
+  return /*#__PURE__*/React.createElement(Content, _extends({}, rest, {
+    style: contentStyle,
+    className: contentClassName
+  }), children, pageContent);
 };
 export default PisellContent;

package/es/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/es/components/pisellLayout/footer.js

@@ -1,12 +1,27 @@
-var _excluded = ["children"];
+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); }
+var _excluded = ["children", "height"];
+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 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 _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; }
 import { Layout } from 'antd';
-import React from 'react';
+import React, { useMemo } from 'react';
 var Footer = Layout.Footer;
 var PisellFooter = function PisellFooter(props) {
   var children = props.children,
+    height = props.height,
     rest = _objectWithoutProperties(props, _excluded);
-  return /*#__PURE__*/React.createElement(Footer, rest, children);
+  var footerStyle = useMemo(function () {
+    return _objectSpread({
+      height: height
+    }, rest.style);
+  }, [height, rest.style]);
+  return /*#__PURE__*/React.createElement(Footer, _extends({}, rest, {
+    style: footerStyle
+  }), children);
 };
 export default PisellFooter;

package/es/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/es/components/pisellLayout/header.js

@@ -1,12 +1,35 @@
-var _excluded = ["children"];
+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); }
+var _excluded = ["children", "className", "height", "fixed"];
+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 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 _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; }
 import { Layout } from 'antd';
-import React from 'react';
+import classNames from 'classnames';
+import React, { useMemo } from 'react';
+import "./index.less";
 var Header = Layout.Header;
 var PisellHeader = function PisellHeader(props) {
   var children = props.children,
+    className = props.className,
+    height = props.height,
+    fixed = props.fixed,
     rest = _objectWithoutProperties(props, _excluded);
-  return /*#__PURE__*/React.createElement(Header, rest, children);
+  var headerStyle = useMemo(function () {
+    return _objectSpread({
+      height: height
+    }, rest.style);
+  }, [height, rest.style]);
+  var headerClassName = classNames('pisell-layout-header', className, {
+    // 'pisell-layout-header-fixed': fixed,
+  });
+  return /*#__PURE__*/React.createElement(Header, _extends({}, rest, {
+    style: headerStyle,
+    className: headerClassName
+  }), children);
 };
 export default PisellHeader;

package/es/components/pisellLayout/index.js

@@ -2,10 +2,13 @@ var _excluded = ["children"];
 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; }
 import { Layout } from 'antd';
-import React from 'react';
+import React, { useEffect } from 'react';
 var PisellLayout = function PisellLayout(props) {
   var children = props.children,
     rest = _objectWithoutProperties(props, _excluded);
+  useEffect(function () {
+    document.body.id = 'body';
+  }, []);
   return /*#__PURE__*/React.createElement(Layout, rest, children);
 };
 PisellLayout.Header = Layout.Header;

package/es/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/es/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/es/components/pisellLayout/sider.js

@@ -1,12 +1,47 @@
-var _excluded = ["children"];
+var _excluded = ["children", "collapsible", "collapsed", "onCollapse"];
+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 _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); }
+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; }
 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; }
 import { Layout } from 'antd';
-import React from 'react';
+import classNames from 'classnames';
+import React, { useEffect, useState } from 'react';
+import "./index.less";
 var Sider = Layout.Sider;
 var PisellSider = function PisellSider(props) {
   var children = props.children,
+    collapsible = props.collapsible,
+    collapsed = props.collapsed,
+    onCollapse = props.onCollapse,
     rest = _objectWithoutProperties(props, _excluded);
-  return /*#__PURE__*/React.createElement(Sider, rest, children);
+  var _useState = useState(collapsed),
+    _useState2 = _slicedToArray(_useState, 2),
+    collapsedState = _useState2[0],
+    setCollapsedState = _useState2[1];
+  var className = classNames('pisell-layout-sider', props.className);
+  var _onCollapse = function _onCollapse(val, type) {
+    onCollapse === null || onCollapse === void 0 ? void 0 : onCollapse(val, type);
+    setCollapsedState(val);
+  };
+  useEffect(function () {
+    setCollapsedState(collapsed);
+  }, [collapsed]);
+  return /*#__PURE__*/React.createElement(Sider, _extends({}, rest, {
+    collapsible: collapsible,
+    collapsed: collapsedState,
+    onCollapse: _onCollapse,
+    className: className
+  }), /*#__PURE__*/React.createElement("div", {
+    className: 'pisell-layout-sider-content',
+    style: {
+      overflowY: 'auto',
+      height: '100%'
+    }
+  }, children));
 };
 export default PisellSider;

package/es/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/es/components/pisellMenu/PisellMenu.js

@@ -1,4 +1,4 @@
-var _excluded = ["className", "style", "mode", "theme", "defaultOpenKeys", "defaultSelectedKeys", "inlineCollapsed", "openKeys", "selectedKeys", "onOpenChange", "onSelect", "dataSource", "__designMode"];
+var _excluded = ["className", "style", "mode", "theme", "defaultOpenKeys", "defaultSelectedKeys", "inlineCollapsed", "openKeys", "selectedKeys", "onOpenChange", "onSelect", "dataSource", "__designMode", "children", "other"];
 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; }
@@ -21,6 +21,8 @@ var PisellMenu = function PisellMenu(_ref) {
     onSelect = _ref.onSelect,
     dataSource = _ref.dataSource,
     __designMode = _ref.__designMode,
+    children = _ref.children,
+    other = _ref.other,
     restProps = _objectWithoutProperties(_ref, _excluded);
   var _dataSource = useMemo(function () {
     if (Array.isArray(dataSource)) {
@@ -29,10 +31,12 @@ var PisellMenu = function PisellMenu(_ref) {
     if (__designMode === 'design') {
       return [{
         label: '菜单项1',
-        key: 'item-1'
+        key: 'item-1',
+        path: '/item-1'
       }, {
         label: '菜单项2',
-        key: 'item-2'
+        key: 'item-2',
+        path: '/item-2'
       }];
     }
     return [];
@@ -50,6 +54,8 @@ var PisellMenu = function PisellMenu(_ref) {
     selectedKeys: selectedKeys,
     onOpenChange: onOpenChange,
     onSelect: onSelect
-  }, restProps));
+  }, restProps, other), children);
 };
+PisellMenu.Item = AntdMenu.Item;
+PisellMenu.SubMenu = AntdMenu.SubMenu;
 export default PisellMenu;

package/es/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/es/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 {};

package/es/hooks/useEngineContext.js

@@ -1,7 +1,18 @@
+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 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); }
 import { createContext, useContext } from "react";
 var defaultContext = /*#__PURE__*/createContext({});
 var useEngineContext = function useEngineContext() {
   var context = useContext(window.__appContext || defaultContext);
+  if ((context === null || context === void 0 ? void 0 : context.appHelper) === undefined) {
+    return _objectSpread(_objectSpread({}, context), {}, {
+      appHelper: window.__appHelper
+    });
+  }
   return context || {};
 };
 export default useEngineContext;

package/lib/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/lib/components/dataSourceComponents/dataSourceForm/submitButton/index.js

@@ -119,7 +119,7 @@ var SubmitButton = (props) => {
       const formattedValues = formatSubmitValues ? formatSubmitValues(filteredValues) : filteredValues;
       const result = await onSubmit(formattedValues);
       if (onDataSourceFinish) {
-        onDataSourceFinish(formattedValues, result);
+        onDataSourceFinish(formattedValues, result, form);
       }
       if (refreshData) {
         refreshTableData == null ? void 0 : refreshTableData();

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

@@ -182,7 +182,6 @@ var withFormItem = (WrappedComponent, overlayProps) => {
           break;
         case "phone":
           rules.push({
-            ...typeobj,
             validator: (_, value) => {
               if (!(value == null ? void 0 : value.trim())) {
                 return Promise.resolve();
@@ -210,7 +209,6 @@ var withFormItem = (WrappedComponent, overlayProps) => {
           break;
         case "mobile":
           rules.push({
-            ...typeobj,
             validator: (_, value) => {
               if (!(value == null ? void 0 : value.trim())) {
                 return Promise.resolve();
@@ -259,14 +257,10 @@ var withFormItem = (WrappedComponent, overlayProps) => {
           break;
         case "subdomain":
           rules.push({
-            ...typeobj,
             validator: (_, value) => {
               if (!value)
                 return Promise.resolve();
               const subdomain = value.split(".")[0];
-              if (!subdomain) {
-                return Promise.resolve();
-              }
               if (!/^[a-z0-9-]+$/.test(subdomain)) {
                 return Promise.reject(
                   new Error((0, import_locales.getText)("subdomain-error-pattern"))

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

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

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

@@ -0,0 +1,92 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/dataSourceComponents/dataSourceMenu/Basic.tsx
+var Basic_exports = {};
+__export(Basic_exports, {
+  default: () => Basic_default
+});
+module.exports = __toCommonJS(Basic_exports);
+var import_react = __toESM(require("react"));
+var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext"));
+var import_pisellMenu = __toESM(require("../../pisellMenu"));
+var DataSourceMenu = (0, import_react.forwardRef)(
+  (props, ref) => {
+    var _a, _b, _c, _d;
+    const { appHelper } = (0, import_useEngineContext.default)();
+    const {
+      menuItems,
+      selectedKeys,
+      openKeys,
+      setOpenKeys,
+      getShowChildren,
+      handleClick
+    } = (_d = (_c = (_b = (_a = appHelper == null ? void 0 : appHelper.utils) == null ? void 0 : _a.getApp) == null ? void 0 : _b.call(_a)) == null ? void 0 : _c.menuManager) == null ? void 0 : _d.useMenu();
+    const renderMenuItems = (items) => {
+      return items.map((item) => {
+        if (item.hide) {
+          return null;
+        }
+        const _children = getShowChildren(item.children || []);
+        if (_children == null ? void 0 : _children.length) {
+          return /* @__PURE__ */ import_react.default.createElement(
+            import_pisellMenu.default.SubMenu,
+            {
+              key: item.key,
+              title: item.label,
+              icon: item.icon,
+              router: item.path
+            },
+            renderMenuItems(_children)
+          );
+        }
+        return /* @__PURE__ */ import_react.default.createElement(import_pisellMenu.default.Item, { key: item.key, icon: item.icon, router: item.path }, item.label);
+      });
+    };
+    return /* @__PURE__ */ import_react.default.createElement(
+      import_pisellMenu.default,
+      {
+        ref,
+        mode: "inline",
+        selectedKeys,
+        openKeys,
+        onOpenChange: setOpenKeys,
+        onClick: ({ item }) => {
+          var _a2;
+          handleClick((_a2 = item.props) == null ? void 0 : _a2.router);
+        },
+        ...props,
+        other: {
+          items: void 0
+        }
+      },
+      renderMenuItems(menuItems)
+    );
+  }
+);
+var Basic_default = DataSourceMenu;

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

@@ -33,13 +33,43 @@ __export(dataSourceMenu_exports, {
 });
 module.exports = __toCommonJS(dataSourceMenu_exports);
 var import_react = __toESM(require("react"));
+var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext"));
 var import_pisellMenu = __toESM(require("../../pisellMenu"));
 var import_useVariables = __toESM(require("../hooks/useVariables"));
-var DataSourceMenu = (0, import_react.forwardRef)(
-  (props, ref) => {
-    const { dataSource } = props;
-    const { parseVariable } = (0, import_useVariables.default)();
-    return /* @__PURE__ */ import_react.default.createElement(import_pisellMenu.default, { ...props, dataSource: parseVariable == null ? void 0 : parseVariable(dataSource), ref });
+var import_Basic = __toESM(require("./Basic"));
+var DataSourceMenu = (props, ref) => {
+  var _a, _b, _c, _d;
+  const { dataSource } = props;
+  const { parseVariable } = (0, import_useVariables.default)();
+  const { appHelper } = (0, import_useEngineContext.default)();
+  const _dataSource = (0, import_react.useMemo)(() => {
+    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 ? void 0 : parseVariable(dataSource);
+    }
+    return [];
+  }, [dataSource]);
+  if (props.__designMode === "design") {
+    return /* @__PURE__ */ import_react.default.createElement(import_pisellMenu.default, { ...props });
   }
-);
+  const MenuProvider = (_d = (_c = (_b = (_a = appHelper == null ? void 0 : appHelper.utils) == null ? void 0 : _a.getApp) == null ? void 0 : _b.call(_a)) == null ? void 0 : _c.menuManager) == null ? void 0 : _d.MenuProvider;
+  console.log("MenuProvider11", appHelper);
+  return /* @__PURE__ */ import_react.default.createElement(MenuProvider, { menus: _dataSource }, /* @__PURE__ */ import_react.default.createElement(import_Basic.default, { ...props }));
+};
 var dataSourceMenu_default = DataSourceMenu;

package/lib/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/lib/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;