@quansitech/antd-admin 1.1.23 → 1.1.25

package/dist/components/Layout/New.js

@@ -25,6 +25,7 @@ import http from "../../lib/http";
 import { MoonOutlined, SunOutlined } from "@ant-design/icons";
 import { usePage } from "@inertiajs/react";
 export default function (_ref) {
+  var _layoutContext$props$;
   var children = _ref.children,
     pageTitle = _ref.pageTitle,
     siteTitle = _ref.siteTitle,
@@ -47,11 +48,9 @@ export default function (_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     openKeys = _useState2[0],
     setOpenKeys = _useState2[1];
-  var route = useMemo(function () {
-    var _layoutProps$menuList;
-    return {
+  var _useState3 = useState({
       key: '/',
-      routes: (_layoutProps$menuList = layoutProps.menuList) === null || _layoutProps$menuList === void 0 ? void 0 : _layoutProps$menuList.map(function (menu) {
+      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,
@@ -64,8 +63,29 @@ export default function (_ref) {
           })
         };
       })
-    };
-  }, [layoutProps.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
+            };
+          })
+        };
+      })
+    });
+  }, [layoutContext.props.menuList]);
   useEffect(function () {
     function findKeyPath(key, list) {
       for (var i = 0; i < list.length; i++) {
@@ -119,9 +139,9 @@ export default function (_ref) {
     };
   }, []);
   var onMenuClick = function onMenuClick(info) {
-    var _layoutContext$props$, _menu;
+    var _layoutContext$props$3, _menu;
     var keyPath = info.keyPath.reverse();
-    var menu = (_layoutContext$props$ = layoutContext.props.menuList) === null || _layoutContext$props$ === void 0 ? void 0 : _layoutContext$props$.find(function (menu) {
+    var menu = (_layoutContext$props$3 = layoutContext.props.menuList) === null || _layoutContext$props$3 === void 0 ? void 0 : _layoutContext$props$3.find(function (menu) {
       return menu.key === keyPath[0];
     });
     var _loop = function _loop(i) {
@@ -184,10 +204,10 @@ export default function (_ref) {
     avatarProps: {
       title: 'admin',
       render: function render(p, dom) {
-        var _layoutContext$props$2;
+        var _layoutContext$props$4;
         return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Dropdown, {
           menu: {
-            items: ((_layoutContext$props$2 = layoutContext.props.userMenu) === null || _layoutContext$props$2 === void 0 ? void 0 : _layoutContext$props$2.map(function (menu) {
+            items: ((_layoutContext$props$4 = layoutContext.props.userMenu) === null || _layoutContext$props$4 === void 0 ? void 0 : _layoutContext$props$4.map(function (menu) {
               return {
                 label: menu.title,
                 key: menu.url,

package/dist/components/Layout.js

@@ -1,4 +1,10 @@
+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 _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(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); }
 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); }
@@ -62,23 +68,42 @@ export default function (props) {
     }
     var listener = function listener(e) {
       var layoutProps = e.detail.page.props.layoutProps;
-      assignProps({
+      assignProps(_objectSpread(_objectSpread({}, layoutProps), {}, {
         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
-        });
+      }));
+    };
+    document.addEventListener('inertia:navigate', listener);
+    return function () {
+      document.removeEventListener('inertia:navigate', listener);
+    };
+  }, []);
+  useEffect(function () {
+    var listener = function listener(e) {
+      if (!e.detail.response.headers['content-type'].includes('json')) {
+        return;
       }
-      if (layoutProps !== null && layoutProps !== void 0 && layoutProps.menuActiveKey) {
-        assignProps({
-          menuActiveKey: layoutProps === null || layoutProps === void 0 ? void 0 : layoutProps.menuActiveKey
+      e.preventDefault();
+      var data = e.detail.response.data;
+      var goto = function goto() {
+        if (!data.url) {
+          return;
+        }
+        window.location.href = data.url;
+      };
+      if (data.info) {
+        global.notification.warning({
+          message: data.info
         });
+        setTimeout(function () {
+          goto();
+        });
+      } else {
+        goto();
       }
     };
-    document.addEventListener('inertia:navigate', listener);
+    document.addEventListener('inertia:invalid', listener);
     return function () {
-      document.removeEventListener('inertia:navigate', listener);
+      document.removeEventListener('inertia:invalid', listener);
     };
   }, []);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Head, {

package/dist/components/Table.js

@@ -68,6 +68,7 @@ export default function (props) {
                   props = getValueByPath(props, tabsContext.propsPath);
                 }
                 setDataSource(postData(props.dataSource));
+                setExtraRenderValues(props.extraRenderValues);
                 setPagination(props.pagination);
               },
               onFinish: function onFinish() {

package/dist/lib/upload.js

@@ -17,7 +17,7 @@ export function customRequest(_x) {
 function _customRequest() {
   _customRequest = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(options) {
     var _options$file;
-    var policyRes, formData, url, key, res, _e$response;
+    var policyRes, formData, url, key, res, err, _e$response;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -77,21 +77,22 @@ function _customRequest() {
           });
         case 14:
           res = _context.sent;
-          if (!res.data.info) {
-            _context.next = 19;
+          err = res.data.info || res.data.err_msg;
+          if (!err) {
+            _context.next = 20;
             break;
           }
-          message.error(res.data.info);
-          options.onError && options.onError(new Error(res.data.info), res.data);
+          message.error(err);
+          options.onError && options.onError(new Error(err), res.data);
           return _context.abrupt("return");
-        case 19:
+        case 20:
           options.onSuccess && options.onSuccess(_objectSpread(_objectSpread({}, res.data), {}, {
             url: res.data.url || res.data.file_url
           }));
-          _context.next = 27;
+          _context.next = 28;
           break;
-        case 22:
-          _context.prev = 22;
+        case 23:
+          _context.prev = 23;
           _context.t0 = _context["catch"](11);
           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);
@@ -105,11 +106,11 @@ function _customRequest() {
             });
           }
           throw _context.t0;
-        case 27:
+        case 28:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[11, 22]]);
+    }, _callee, null, [[11, 23]]);
   }));
   return _customRequest.apply(this, arguments);
 }

package/package.json

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