@quansitech/antd-admin 1.1.32 → 1.1.34

package/dist/components/Layout/New.js

@@ -26,7 +26,6 @@ import { MoonOutlined, SunOutlined } from "@ant-design/icons";
 import { usePage } from "@inertiajs/react";
 import "./New.scss";
 export default function (_ref) {
-  var _layoutContext$props$;
   var children = _ref.children,
     pageTitle = _ref.pageTitle,
     setDarkMode = _ref.setDarkMode;
@@ -48,44 +47,48 @@ export default function (_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     openKeys = _useState2[0],
     setOpenKeys = _useState2[1];
+  var mapMenuListToRoutes = function mapMenuListToRoutes(menuList) {
+    return menuList === null || menuList === void 0 ? void 0 : 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
+          };
+        })
+      };
+    });
+  };
   var _useState3 = useState({
       key: '/',
-      routes: (_layoutContext$props$ = layoutContext.props.menuList) === null || _layoutContext$props$ === void 0 ? void 0 : _layoutContext$props$.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
-            };
-          })
-        };
-      })
+      routes: mapMenuListToRoutes(layoutContext.props.menuList)
     }),
     _useState4 = _slicedToArray(_useState3, 2),
     route = _useState4[0],
     setRoute = _useState4[1];
   useEffect(function () {
-    var _layoutContext$props$2;
     setRoute({
       key: '/',
-      routes: (_layoutContext$props$2 = layoutContext.props.menuList) === null || _layoutContext$props$2 === void 0 ? void 0 : _layoutContext$props$2.map(function (menu) {
-        var _menu$children2;
-        return {
-          name: menu.name,
-          key: menu.key,
-          children: (_menu$children2 = menu.children) === null || _menu$children2 === void 0 ? void 0 : _menu$children2.map(function (child) {
-            return {
-              name: child.name,
-              key: child.key
-            };
-          })
-        };
-      })
+      routes: mapMenuListToRoutes(layoutContext.props.menuList)
     });
   }, [layoutContext.props.menuList]);
+  var useWindowResize = function useWindowResize(callback) {
+    useEffect(function () {
+      callback();
+      window.addEventListener('resize', callback);
+      return function () {
+        return window.removeEventListener('resize', callback);
+      };
+    }, [callback]);
+  };
+  useWindowResize(function () {
+    if (contentRef.current) {
+      contentRef.current.style.minHeight = Math.max(window.innerHeight - 200, 200) + 'px';
+    }
+  });
   useEffect(function () {
     function findKeyPath(key, list) {
       for (var i = 0; i < list.length; i++) {
@@ -102,28 +105,31 @@ export default function (_ref) {
       }
       return [];
     }
-    if (!layoutContext.props.menuActiveKey) {
-      return;
+    if (layoutContext.props.menuActiveKey) {
+      setOpenKeys(findKeyPath(layoutContext.props.menuActiveKey, layoutContext.props.menuList || []));
     }
-    setOpenKeys(findKeyPath(layoutContext.props.menuActiveKey, layoutContext.props.menuList || []));
-  }, [layoutContext.props.menuActiveKey]);
-  useEffect(function () {
-    // 设置内容高度
-    function onResize() {
-      if (contentRef.current) {
-        contentRef.current.style.minHeight = Math.max(window.innerHeight - 200, 200) + 'px';
+  }, [layoutContext.props.menuActiveKey, layoutContext.props.menuList]);
+  var handleMenuNavigation = function handleMenuNavigation(path, menuKey) {
+    assignProps({
+      loading: true
+    });
+    routerNavigateTo(path, {
+      onSuccess: function onSuccess() {
+        assignProps({
+          menuActiveKey: menuKey
+        });
+      },
+      onFinish: function onFinish() {
+        assignProps({
+          loading: false
+        });
       }
-    }
-    onResize();
-    window.addEventListener('resize', onResize);
-    return function () {
-      window.removeEventListener('resize', onResize);
-    };
-  }, []);
+    });
+  };
   var onMenuClick = function onMenuClick(info) {
-    var _layoutContext$props$3, _menu;
+    var _layoutContext$props$, _menu;
     var keyPath = info.keyPath.reverse();
-    var menu = (_layoutContext$props$3 = layoutContext.props.menuList) === null || _layoutContext$props$3 === void 0 ? void 0 : _layoutContext$props$3.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) {
@@ -136,30 +142,20 @@ export default function (_ref) {
       _loop(i);
     }
     if ((_menu = menu) !== null && _menu !== void 0 && _menu.path) {
-      assignProps({
-        loading: true
-      });
-      routerNavigateTo(menu.path, {
-        onSuccess: function onSuccess() {
-          assignProps({
-            menuActiveKey: info.key
-          });
-        },
-        onFinish: function onFinish() {
-          assignProps({
-            loading: false
-          });
-        }
-      });
+      handleMenuNavigation(menu.path, info.key);
     }
   };
   var proContext = useContext(ProProvider);
+  var toggleDarkMode = function toggleDarkMode() {
+    var newDarkMode = !proContext.dark;
+    setDarkMode(newDarkMode);
+    return newDarkMode;
+  };
   var actionsRender = function actionsRender() {
     return /*#__PURE__*/React.createElement(React.Fragment, null, layoutContext.props.headerActions, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Button, {
-      type: 'text',
-      onClick: function onClick() {
-        setDarkMode(!proContext.dark);
-      }
+      type: "text",
+      onClick: toggleDarkMode,
+      "aria-label": proContext.dark ? "Switch to light mode" : "Switch to dark mode"
     }, proContext.dark ? /*#__PURE__*/React.createElement(MoonOutlined, null) : /*#__PURE__*/React.createElement(SunOutlined, null))));
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ProLayout, {
@@ -186,10 +182,10 @@ export default function (_ref) {
     avatarProps: {
       title: layoutProps.userName,
       render: function render(p, dom) {
-        var _layoutContext$props$4;
+        var _layoutContext$props$2;
         return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Dropdown, {
           menu: {
-            items: ((_layoutContext$props$4 = layoutContext.props.userMenu) === null || _layoutContext$props$4 === void 0 ? void 0 : _layoutContext$props$4.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,

package/dist/lib/upload.js

@@ -58,9 +58,10 @@ function _customRequest() {
               formData.append(key, policyRes.data.params[key]);
             }
           }
+          formData.append('Content-Type', options.file.type);
           formData.append('file', options.file);
-          _context.prev = 11;
-          _context.next = 14;
+          _context.prev = 12;
+          _context.next = 15;
           return http({
             url: url,
             method: 'post',
@@ -75,25 +76,25 @@ function _customRequest() {
               });
             }
           });
-        case 14:
+        case 15:
           res = _context.sent;
           err = res.data.info || res.data.err_msg;
           if (!err) {
-            _context.next = 20;
+            _context.next = 21;
             break;
           }
           message.error(err);
           options.onError && options.onError(new Error(err), res.data);
           return _context.abrupt("return");
-        case 20:
+        case 21:
           options.onSuccess && options.onSuccess(_objectSpread(_objectSpread({}, res.data), {}, {
             url: res.data.url || res.data.file_url
           }));
-          _context.next = 28;
+          _context.next = 29;
           break;
-        case 23:
-          _context.prev = 23;
-          _context.t0 = _context["catch"](11);
+        case 24:
+          _context.prev = 24;
+          _context.t0 = _context["catch"](12);
           if (_context.t0 instanceof AxiosError) {
             options.onError && options.onError(_context.t0, (_e$response = _context.t0.response) === null || _e$response === void 0 ? void 0 : _e$response.data);
           }
@@ -106,11 +107,11 @@ function _customRequest() {
             });
           }
           throw _context.t0;
-        case 28:
+        case 29:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[11, 23]]);
+    }, _callee, null, [[12, 24]]);
   }));
   return _customRequest.apply(this, arguments);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quansitech/antd-admin",
-  "version": "1.1.32",
+  "version": "1.1.34",
   "type": "module",
   "files": [
     "dist"