@quansitech/antd-admin 1.1.3 → 1.1.5

package/dist/components/Form/Actions.js

@@ -5,35 +5,24 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-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(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { lazy, useEffect, useState } from "react";
+import React, { Suspense, useMemo } from "react";
 import { Badge, Space } from "antd";
 import container from "../../lib/container";
 import { upperFirst } from "es-toolkit";
 export default function (props) {
-  var _useState = useState([]),
-    _useState2 = _slicedToArray(_useState, 2),
-    components = _useState2[0],
-    setComponents = _useState2[1];
-  useEffect(function () {
+  var components = useMemo(function () {
     var _props$actions;
-    setComponents(((_props$actions = props.actions) === null || _props$actions === void 0 ? void 0 : _props$actions.map(function (a) {
+    return ((_props$actions = props.actions) === null || _props$actions === void 0 ? void 0 : _props$actions.map(function (a) {
       return {
-        Component: /*#__PURE__*/lazy(function () {
-          return container.get('Form.Action.' + upperFirst(a.type));
-        }),
+        Component: container.get('Form.Action.' + upperFirst(a.type)),
         props: _objectSpread({}, a)
       };
-    })) || []);
-  }, []);
+    })) || [];
+  }, [props.actions]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, null, components.map(function (item) {
-    return item.props.badge ? /*#__PURE__*/React.createElement(Badge, {
-      key: item.props.title,
+    return /*#__PURE__*/React.createElement(Suspense, {
+      key: item.props.title
+    }, item.props.badge ? /*#__PURE__*/React.createElement(Badge, {
       count: item.props.badge,
       style: {
         zIndex: 100
@@ -41,8 +30,7 @@ export default function (props) {
     }, /*#__PURE__*/React.createElement(item.Component, _extends({
       loading: props.loading
     }, item.props))) : /*#__PURE__*/React.createElement(item.Component, _extends({
-      key: item.props.title,
       loading: props.loading
-    }, item.props));
+    }, item.props)));
   })));
 }

package/dist/components/Form.d.ts

@@ -16,5 +16,8 @@ export default function (props: FormSchema & {
     columns?: ProFormColumnsType[];
     submitRequest?: SubmitRequestType;
     extraRenderValues?: Record<string, any>;
+    readonly?: boolean;
+    initialValues?: any;
+    colProps?: any;
 }): React.JSX.Element;
 export {};

package/dist/components/Form.js

@@ -8,36 +8,28 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { BetaSchemaForm, ProSkeleton } from "@ant-design/pro-components";
-import React, { lazy, Suspense, useContext, useEffect, useRef, useState } from "react";
-import { cloneDeep, upperFirst } from "es-toolkit";
+import { BetaSchemaForm } from "@ant-design/pro-components";
+import React, { useContext, useMemo, useRef, useState } from "react";
+import { cloneDeep } from "es-toolkit";
 import container from "../lib/container";
 import Actions from "./Form/Actions";
 import { FormContext } from "./FormContext";
-import { Col, Row, Spin } from "antd";
+import { Col, Row } from "antd";
 import http from "../lib/http";
 import customRule from "../lib/customRule";
 import { ModalContext } from "./ModalContext";
 import { TableContext } from "./TableContext";
 import { commonHandler } from "../lib/schemaHandler";
 export default function (props) {
-  var _useState = useState([]),
-    _useState2 = _slicedToArray(_useState, 2),
-    columns = _useState2[0],
-    setColumns = _useState2[1];
   var formRef = useRef();
-  var _useState3 = useState(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    initialized = _useState4[0],
-    setInitialized = _useState4[1];
-  var _useState5 = useState(false),
-    _useState6 = _slicedToArray(_useState5, 2),
-    loading = _useState6[0],
-    setLoading = _useState6[1];
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    loading = _useState2[0],
+    setLoading = _useState2[1];
   var hiddenField = useRef({});
-  useEffect(function () {
+  var columns = useMemo(function () {
     var _cloneDeep;
-    setColumns(((_cloneDeep = cloneDeep(props.columns)) === null || _cloneDeep === void 0 ? void 0 : _cloneDeep.map(function (c) {
+    return ((_cloneDeep = cloneDeep(props.columns)) === null || _cloneDeep === void 0 ? void 0 : _cloneDeep.map(function (c) {
       var _c$formItemProps;
       // rules
       if (!c.formItemProps) {
@@ -61,44 +53,6 @@ export default function (props) {
         hiddenField.current[c.dataIndex] = (_props$initialValues = props.initialValues) === null || _props$initialValues === void 0 ? void 0 : _props$initialValues[c.dataIndex];
         return null;
       }
-
-      // item render
-      var formItemComponent = 'Column.' + upperFirst(c.valueType);
-      if (container.check(formItemComponent)) {
-        var Component = /*#__PURE__*/lazy(function () {
-          return container.get(formItemComponent);
-        });
-        c.renderFormItem = function (schema, config, form) {
-          var _c$formItemProps2;
-          return /*#__PURE__*/React.createElement(Component, {
-            config: config,
-            form: form,
-            fieldProps: c.fieldProps,
-            key: c.title,
-            rules: (_c$formItemProps2 = c.formItemProps) === null || _c$formItemProps2 === void 0 ? void 0 : _c$formItemProps2.rules,
-            dataIndex: c.dataIndex
-          });
-        };
-      }
-      // readonly render
-      var readonlyComponent = 'Column.Readonly.' + upperFirst(c.valueType);
-      if (container.check(readonlyComponent)) {
-        var _Component = /*#__PURE__*/lazy(function () {
-          return container.get(readonlyComponent);
-        });
-        c.render = function (dom, entity, index, action, schema) {
-          return /*#__PURE__*/React.createElement(Suspense, {
-            fallback: /*#__PURE__*/React.createElement(Spin, null)
-          }, /*#__PURE__*/React.createElement(_Component, {
-            key: c.title,
-            entity: entity,
-            index: index,
-            action: action,
-            schema: schema,
-            dom: dom
-          }));
-        };
-      }
       commonHandler(c);
       if (container.schemaHandler[c.valueType]) {
         return container.schemaHandler[c.valueType](c);
@@ -106,9 +60,8 @@ export default function (props) {
       return c;
     }).filter(function (c) {
       return !!c;
-    })) || []);
-    setInitialized(true);
-  }, []);
+    })) || [];
+  }, [props.columns]);
   var modalContext = useContext(ModalContext);
   var tableContext = useContext(TableContext);
   var handleAfterAction = /*#__PURE__*/function () {
@@ -192,10 +145,7 @@ export default function (props) {
       formRef: formRef,
       extraRenderValues: props.extraRenderValues
     }
-  }, !initialized ? /*#__PURE__*/React.createElement(ProSkeleton, {
-    type: "list",
-    list: 2
-  }) : /*#__PURE__*/React.createElement(BetaSchemaForm, {
+  }, /*#__PURE__*/React.createElement(BetaSchemaForm, {
     columns: columns,
     colProps: props.colProps,
     readonly: props.readonly,

package/dist/components/Layout/New.d.ts

@@ -1,7 +1,7 @@
 import React from "react";
-export default function ({ children, pageTitle, siteTitle, pageProps }: {
+export default function ({ children, pageTitle, siteTitle, setDarkMode }: {
     children: React.ReactNode;
     pageTitle: string;
     siteTitle: string;
-    pageProps: any;
+    setDarkMode: (darkMode: boolean) => void;
 }): React.JSX.Element;

package/dist/components/Layout/New.js

@@ -1,3 +1,4 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -8,58 +9,63 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { PageContainer, ProConfigProvider, ProLayout } from "@ant-design/pro-components";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+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(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { PageContainer, ProLayout, ProProvider } from "@ant-design/pro-components";
 import { Button, Dropdown, Menu, Space } from "antd";
 import { LayoutContext } from "../LayoutContext";
-import React, { useEffect, useRef, useState } from "react";
+import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
 import { routerNavigateTo } from "../../lib/helpers";
 import http from "../../lib/http";
 // @ts-ignore
 
 import { MoonOutlined, SunOutlined } from "@ant-design/icons";
+import { usePage } from "@inertiajs/react";
 export default function (_ref) {
   var children = _ref.children,
     pageTitle = _ref.pageTitle,
     siteTitle = _ref.siteTitle,
-    pageProps = _ref.pageProps;
-  var layoutProps = pageProps.layoutProps;
+    setDarkMode = _ref.setDarkMode;
   var contentRef = useRef(null);
-  var _useState = useState({
-      title: '',
-      metaTitle: '',
-      topMenuActiveKey: '',
-      menuActiveKey: '',
-      loading: false,
-      topMenu: [],
-      menuList: [],
-      logo: '',
-      userMenu: []
-    }),
-    _useState2 = _slicedToArray(_useState, 2),
-    props = _useState2[0],
-    setProps = _useState2[1];
-  var _useState3 = useState('light'),
-    _useState4 = _slicedToArray(_useState3, 2),
-    theme = _useState4[0],
-    setTheme = _useState4[1];
-  var assignProps = function assignProps(newProps) {
-    setProps(Object.assign(props, newProps));
-  };
+  var layoutContext = useContext(LayoutContext);
+  var pageProps = usePage().props;
+  var layoutProps = useMemo(function () {
+    return _objectSpread({}, layoutContext.props);
+  }, [layoutContext.props]);
+  var assignProps = layoutContext.assignProps;
   var headerContentRender = function headerContentRender() {
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Menu, {
-      items: props.topMenu,
+      items: layoutContext.props.topMenu,
       mode: 'horizontal',
-      activeKey: props.topMenuActiveKey
+      activeKey: layoutContext.props.topMenuActiveKey
     }));
   };
-  var _useState5 = useState([]),
-    _useState6 = _slicedToArray(_useState5, 2),
-    openKeys = _useState6[0],
-    setOpenKeys = _useState6[1];
-  var _useState7 = useState(),
-    _useState8 = _slicedToArray(_useState7, 2),
-    route = _useState8[0],
-    setRoute = _useState8[1];
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    openKeys = _useState2[0],
+    setOpenKeys = _useState2[1];
+  var route = useMemo(function () {
+    var _layoutProps$menuList;
+    return {
+      key: '/',
+      routes: (_layoutProps$menuList = layoutProps.menuList) === null || _layoutProps$menuList === void 0 ? void 0 : _layoutProps$menuList.map(function (menu) {
+        var _menu$children;
+        return {
+          name: menu.name,
+          key: menu.key,
+          children: (_menu$children = menu.children) === null || _menu$children === void 0 ? void 0 : _menu$children.map(function (child) {
+            return {
+              name: child.name,
+              key: child.key
+            };
+          })
+        };
+      })
+    };
+  }, [layoutProps.menuList]);
   useEffect(function () {
     function findKeyPath(key, list) {
       for (var i = 0; i < list.length; i++) {
@@ -76,19 +82,19 @@ export default function (_ref) {
       }
       return [];
     }
-    if (!props.menuActiveKey) {
+    if (!layoutContext.props.menuActiveKey) {
       return;
     }
-    setOpenKeys(findKeyPath(props.menuActiveKey, props.menuList || []));
-  }, [props.menuActiveKey]);
-  useEffect(function () {
+    setOpenKeys(findKeyPath(layoutContext.props.menuActiveKey, layoutContext.props.menuList || []));
+  }, [layoutContext.props.menuActiveKey]);
+  useCallback(function () {
     var _pageProps$layoutProp, _pageProps$layoutProp2;
     if ((_pageProps$layoutProp = pageProps.layoutProps) !== null && _pageProps$layoutProp !== void 0 && _pageProps$layoutProp.menuActiveKey) {
       assignProps({
         menuActiveKey: pageProps.layoutProps.menuActiveKey
       });
     }
-    var title = props.title || layoutProps.title;
+    var title = layoutContext.props.title || layoutProps.title;
     if ((_pageProps$layoutProp2 = pageProps.layoutProps) !== null && _pageProps$layoutProp2 !== void 0 && _pageProps$layoutProp2.metaTitle) {
       assignProps({
         metaTitle: pageProps.layoutProps.metaTitle + ' | ' + title
@@ -100,36 +106,6 @@ export default function (_ref) {
     }
   }, [pageProps.layoutProps]);
   useEffect(function () {
-    var _layoutProps$menuList;
-    setProps({
-      title: layoutProps.title || '',
-      metaTitle: '',
-      topMenuActiveKey: layoutProps.topMenuActiveKey,
-      menuActiveKey: layoutProps.menuActiveKey,
-      loading: false,
-      topMenu: layoutProps.topMenu,
-      menuList: layoutProps.menuList,
-      logo: layoutProps.logo,
-      userMenu: layoutProps.userMenu
-    });
-    var r = {
-      key: '/',
-      routes: (_layoutProps$menuList = layoutProps.menuList) === null || _layoutProps$menuList === void 0 ? void 0 : _layoutProps$menuList.map(function (menu) {
-        var _menu$children;
-        return {
-          name: menu.name,
-          key: menu.key,
-          children: (_menu$children = menu.children) === null || _menu$children === void 0 ? void 0 : _menu$children.map(function (child) {
-            return {
-              name: child.name,
-              key: child.key
-            };
-          })
-        };
-      })
-    };
-    setRoute(r);
-
     // 设置内容高度
     function onResize() {
       if (contentRef.current) {
@@ -143,9 +119,9 @@ export default function (_ref) {
     };
   }, []);
   var onMenuClick = function onMenuClick(info) {
-    var _props$menuList, _menu;
+    var _layoutContext$props$, _menu;
     var keyPath = info.keyPath.reverse();
-    var menu = (_props$menuList = props.menuList) === null || _props$menuList === void 0 ? void 0 : _props$menuList.find(function (menu) {
+    var menu = (_layoutContext$props$ = layoutContext.props.menuList) === null || _layoutContext$props$ === void 0 ? void 0 : _layoutContext$props$.find(function (menu) {
       return menu.key === keyPath[0];
     });
     var _loop = function _loop(i) {
@@ -175,32 +151,26 @@ export default function (_ref) {
       });
     }
   };
+  var proContext = useContext(ProProvider);
   var actionsRender = function actionsRender() {
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Button, {
       type: 'text',
       onClick: function onClick() {
-        setTheme(theme === 'light' ? 'realDark' : 'light');
+        setDarkMode(!proContext.dark);
       }
-    }, theme === 'realDark' ? /*#__PURE__*/React.createElement(MoonOutlined, null) : /*#__PURE__*/React.createElement(SunOutlined, null))));
+    }, proContext.dark ? /*#__PURE__*/React.createElement(MoonOutlined, null) : /*#__PURE__*/React.createElement(SunOutlined, null))));
   };
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LayoutContext.Provider, {
-    value: {
-      assignProps: assignProps,
-      props: props
-    }
-  }, /*#__PURE__*/React.createElement(ProConfigProvider, {
-    dark: theme === 'realDark'
-  }, /*#__PURE__*/React.createElement(ProLayout, {
-    title: siteTitle,
-    loading: props.loading,
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ProLayout, {
+    title: layoutProps.title,
+    loading: layoutContext.props.loading,
     layout: "mix",
     actionsRender: actionsRender,
     route: route,
     fixSiderbar: true,
-    logo: props.logo,
+    logo: layoutContext.props.logo,
     headerContentRender: headerContentRender,
     pageTitleRender: function pageTitleRender(p) {
-      return "".concat(pageTitle, " | ").concat(siteTitle, " \u540E\u53F0\u7BA1\u7406");
+      return "".concat(pageTitle, " | ").concat(layoutProps.title, " \u540E\u53F0\u7BA1\u7406");
     },
     footerRender: function footerRender() {
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement("a", {
@@ -214,10 +184,10 @@ export default function (_ref) {
     avatarProps: {
       title: 'admin',
       render: function render(p, dom) {
-        var _props$userMenu;
+        var _layoutContext$props$2;
         return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Dropdown, {
           menu: {
-            items: ((_props$userMenu = props.userMenu) === null || _props$userMenu === void 0 ? void 0 : _props$userMenu.map(function (menu) {
+            items: ((_layoutContext$props$2 = layoutContext.props.userMenu) === null || _layoutContext$props$2 === void 0 ? void 0 : _layoutContext$props$2.map(function (menu) {
               return {
                 label: menu.title,
                 key: menu.url,
@@ -243,8 +213,8 @@ export default function (_ref) {
       }
     },
     menuProps: {
-      activeKey: props.menuActiveKey,
-      selectedKeys: [props.menuActiveKey],
+      activeKey: layoutContext.props.menuActiveKey,
+      selectedKeys: [layoutContext.props.menuActiveKey],
       openKeys: openKeys,
       onClick: onMenuClick,
       onOpenChange: setOpenKeys
@@ -253,5 +223,5 @@ export default function (_ref) {
     title: pageTitle
   }, /*#__PURE__*/React.createElement("div", {
     ref: contentRef
-  }, children))))));
+  }, children))));
 }

package/dist/components/Layout.d.ts

@@ -1,4 +1,2 @@
 import React from "react";
-export default function ({ children }: {
-    children: React.ReactNode;
-}): React.JSX.Element;
+export default function (props: any): React.JSX.Element;

package/dist/components/Layout.js

@@ -1,3 +1,4 @@
+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); }
@@ -6,48 +7,69 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useState } from "react";
 import New from "./Layout/New";
-import { App } from "antd";
+import { App, App as AntdApp } from "antd";
 import global from "../lib/global";
 import Blank from "./Layout/Blank";
-import { Head } from "@inertiajs/react";
-export default function (_ref) {
-  var children = _ref.children;
+import { Head, usePage } from "@inertiajs/react";
+import { ProConfigProvider } from "@ant-design/pro-components";
+import { getProValueTypeMap } from "../lib/helpers";
+import { LayoutContext } from "./LayoutContext";
+function ChildApp(props) {
   var _App$useApp = App.useApp(),
     modal = _App$useApp.modal,
     notification = _App$useApp.notification,
     message = _App$useApp.message;
+  useEffect(function () {
+    global.modal = modal;
+    global.notification = notification;
+    global.message = message;
+  }, []);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, props.enableNewLayout ? /*#__PURE__*/React.createElement(New, props) : /*#__PURE__*/React.createElement(Blank, props));
+}
+export default function (props) {
+  var _pageProps$layoutProp, _pageProps$layoutProp2, _pageProps$layoutProp3, _pageProps$layoutProp4, _pageProps$layoutProp5, _pageProps$layoutProp6, _pageProps$layoutProp7;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
-    enableNewLayout = _useState2[0],
-    setEnableNewLayout = _useState2[1];
-  var _useState3 = useState(''),
+    darkMode = _useState2[0],
+    setDarkMode = _useState2[1];
+  var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
-    pageTitle = _useState4[0],
-    setPageTitle = _useState4[1];
-  var _useState5 = useState(''),
+    enableNewLayout = _useState4[0],
+    setEnableNewLayout = _useState4[1];
+  var pageProps = usePage().props;
+  var _useState5 = useState({
+      title: ((_pageProps$layoutProp = pageProps.layoutProps) === null || _pageProps$layoutProp === void 0 ? void 0 : _pageProps$layoutProp.title) || '',
+      metaTitle: '',
+      topMenuActiveKey: (_pageProps$layoutProp2 = pageProps.layoutProps) === null || _pageProps$layoutProp2 === void 0 ? void 0 : _pageProps$layoutProp2.topMenuActiveKey,
+      menuActiveKey: (_pageProps$layoutProp3 = pageProps.layoutProps) === null || _pageProps$layoutProp3 === void 0 ? void 0 : _pageProps$layoutProp3.menuActiveKey,
+      loading: false,
+      topMenu: (_pageProps$layoutProp4 = pageProps.layoutProps) === null || _pageProps$layoutProp4 === void 0 ? void 0 : _pageProps$layoutProp4.topMenu,
+      menuList: (_pageProps$layoutProp5 = pageProps.layoutProps) === null || _pageProps$layoutProp5 === void 0 ? void 0 : _pageProps$layoutProp5.menuList,
+      logo: (_pageProps$layoutProp6 = pageProps.layoutProps) === null || _pageProps$layoutProp6 === void 0 ? void 0 : _pageProps$layoutProp6.logo,
+      userMenu: (_pageProps$layoutProp7 = pageProps.layoutProps) === null || _pageProps$layoutProp7 === void 0 ? void 0 : _pageProps$layoutProp7.userMenu
+    }),
     _useState6 = _slicedToArray(_useState5, 2),
-    siteTitle = _useState6[0],
-    setSiteTitle = _useState6[1];
-  var _useState7 = useState({}),
-    _useState8 = _slicedToArray(_useState7, 2),
-    pageProps = _useState8[0],
-    setPageProps = _useState8[1];
+    layoutProps = _useState6[0],
+    setLayoutProps = _useState6[1];
+  var assignProps = function assignProps(newProps) {
+    setLayoutProps(Object.assign(layoutProps, newProps));
+  };
   useEffect(function () {
-    global.modal = modal;
-    global.notification = notification;
-    global.message = message;
+    var _pageProps$layoutProp8;
+    console.log('props=>', pageProps);
+    if ((_pageProps$layoutProp8 = pageProps.layoutProps) !== null && _pageProps$layoutProp8 !== void 0 && _pageProps$layoutProp8.enableNewLayout) {
+      setEnableNewLayout(true);
+    }
     var listener = function listener(e) {
-      var _e$detail$page$props$, _e$detail$page$props$2, _e$detail$page$props$3, _e$detail$page$props$4;
-      setPageProps(e.detail.page.props);
-      // @ts-ignore
-      if ((_e$detail$page$props$ = e.detail.page.props.layoutProps) !== null && _e$detail$page$props$ !== void 0 && _e$detail$page$props$.enableNewLayout) {
-        setEnableNewLayout(true);
+      var layoutProps = e.detail.page.props.layoutProps;
+      assignProps({
+        metaTitle: (layoutProps === null || layoutProps === void 0 ? void 0 : layoutProps.metaTitle) || ''
+      });
+      if (layoutProps !== null && layoutProps !== void 0 && layoutProps.title) {
+        assignProps({
+          title: layoutProps === null || layoutProps === void 0 ? void 0 : layoutProps.title
+        });
       }
-
-      // @ts-ignore
-      setPageTitle(((_e$detail$page$props$2 = e.detail.page.props.layoutProps) === null || _e$detail$page$props$2 === void 0 ? void 0 : _e$detail$page$props$2.metaTitle) || '');
-      // @ts-ignore
-      ((_e$detail$page$props$3 = e.detail.page.props.layoutProps) === null || _e$detail$page$props$3 === void 0 ? void 0 : _e$detail$page$props$3.title) && setSiteTitle(((_e$detail$page$props$4 = e.detail.page.props.layoutProps) === null || _e$detail$page$props$4 === void 0 ? void 0 : _e$detail$page$props$4.title) + '');
     };
     document.addEventListener('inertia:navigate', listener);
     return function () {
@@ -55,14 +77,18 @@ export default function (_ref) {
     };
   }, []);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Head, {
-    title: pageTitle + ' | ' + siteTitle + ' 后台管理'
-  }), enableNewLayout ? /*#__PURE__*/React.createElement(New, {
-    pageProps: pageProps,
-    pageTitle: pageTitle,
-    siteTitle: siteTitle,
-    children: children
-  }) : /*#__PURE__*/React.createElement(Blank, {
-    pageTitle: pageTitle,
-    children: children
-  }));
+    title: layoutProps.metaTitle + ' | ' + layoutProps.title + ' 后台管理'
+  }), /*#__PURE__*/React.createElement(LayoutContext.Provider, {
+    value: {
+      assignProps: assignProps,
+      props: layoutProps
+    }
+  }, /*#__PURE__*/React.createElement(ProConfigProvider, {
+    valueTypeMap: getProValueTypeMap(),
+    dark: darkMode
+  }, /*#__PURE__*/React.createElement(AntdApp, null, /*#__PURE__*/React.createElement(ChildApp, _extends({}, props, {
+    setDarkMode: setDarkMode,
+    pageTitle: layoutProps.metaTitle,
+    enableNewLayout: enableNewLayout
+  }))))));
 }

package/dist/components/Table/Action/Button.js

@@ -18,8 +18,7 @@ export default function (props) {
   var tableContext = useContext(TableContext);
   var onClick = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _tableContext$actionR;
-      var rowKey, data, _props$selectedRows, _loop, _ret, key;
+      var rowKey, data, _props$selectedRows, _loop, _ret, key, _tableContext$actionR;
       return _regeneratorRuntime().wrap(function _callee$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -32,7 +31,7 @@ export default function (props) {
             return _context2.abrupt("return");
           case 4:
             if (!props.request) {
-              _context2.next = 26;
+              _context2.next = 28;
               break;
             }
             setLoading(true);
@@ -100,28 +99,28 @@ export default function (props) {
               data: data
             });
           case 22:
-            _context2.prev = 22;
+            _context2.next = 24;
+            return (_tableContext$actionR = tableContext.actionRef) === null || _tableContext$actionR === void 0 ? void 0 : _tableContext$actionR.reload();
+          case 24:
+            _context2.prev = 24;
             setLoading(false);
-            return _context2.finish(22);
-          case 25:
+            return _context2.finish(24);
+          case 27:
             return _context2.abrupt("return");
-          case 26:
+          case 28:
             if (!props.modal) {
-              _context2.next = 30;
+              _context2.next = 32;
               break;
             }
-            _context2.next = 29;
+            _context2.next = 31;
             return modalShow(props.modal);
-          case 29:
+          case 31:
             return _context2.abrupt("return");
-          case 30:
-            _context2.next = 32;
-            return (_tableContext$actionR = tableContext.actionRef) === null || _tableContext$actionR === void 0 ? void 0 : _tableContext$actionR.reload();
           case 32:
           case "end":
             return _context2.stop();
         }
-      }, _callee, null, [[19,, 22, 25]]);
+      }, _callee, null, [[19,, 24, 27]]);
     }));
     return function onClick() {
       return _ref.apply(this, arguments);

package/dist/components/Table/Action/StartEditable.d.ts

@@ -6,5 +6,6 @@ export default function (props: TableActionProps & {
     saveRequest: {
         url: string;
         method: string;
+        data?: Record<string, any>;
     };
 }): React.JSX.Element;