@nocobase/client 0.9.4-alpha.2 → 0.10.0-alpha.3

package/lib/test/mockAPIClient.d.ts

@@ -0,0 +1,6 @@
+import MockAdapter from 'axios-mock-adapter';
+import { APIClient } from '../api-client';
+export declare const mockAPIClient: () => {
+    apiClient: APIClient;
+    mockRequest: MockAdapter;
+};

package/lib/test/mockAPIClient.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.mockAPIClient = void 0;
+var _axiosMockAdapter = _interopRequireDefault(require("axios-mock-adapter"));
+var _apiClient = require("../api-client");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var mockAPIClient = function mockAPIClient() {
+  var apiClient = new _apiClient.APIClient();
+  var mockRequest = new _axiosMockAdapter.default(apiClient.axios);
+  return {
+    apiClient: apiClient,
+    mockRequest: mockRequest
+  };
+};
+exports.mockAPIClient = mockAPIClient;

package/lib/user/ChangePassword.d.ts

@@ -1 +1 @@
-export declare const ChangePassword: () => JSX.Element;
+export declare const useChangePassword: () => import("antd/lib/menu/hooks/useItems").ItemType;

package/lib/user/ChangePassword.js

@@ -4,15 +4,13 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ChangePassword = void 0;
+exports.useChangePassword = void 0;
 var _react = require("@formily/react");
 var _shared = require("@formily/shared");
-var _antd = require("antd");
 var _react2 = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
 var _ = require("../");
 var _apiClient = require("../api-client");
-var _CurrentUser = require("./CurrentUser");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -159,33 +157,39 @@ var schema = {
     }
   })
 };
-var ChangePassword = function ChangePassword() {
+var useChangePassword = function useChangePassword() {
+  var ctx = (0, _react2.useContext)(_.DropdownVisibleContext);
   var _useState = (0, _react2.useState)(false),
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
     setVisible = _useState2[1];
   var _useTranslation = (0, _reactI18next.useTranslation)(),
     t = _useTranslation.t;
-  var ctx = (0, _react2.useContext)(_CurrentUser.DropdownVisibleContext);
-  return /*#__PURE__*/_react2.default.createElement(_.ActionContext.Provider, {
-    value: {
-      visible: visible,
-      setVisible: setVisible
-    }
-  }, /*#__PURE__*/_react2.default.createElement(_antd.Menu.Item, {
-    key: "password",
-    eventKey: 'ChangePassword',
-    onClick: function onClick() {
-      var _ctx$setVisible;
-      ctx === null || ctx === void 0 ? void 0 : (_ctx$setVisible = ctx.setVisible) === null || _ctx$setVisible === void 0 ? void 0 : _ctx$setVisible.call(ctx, false);
-      setVisible(true);
-    }
-  }, t('Change password')), /*#__PURE__*/_react2.default.createElement(_.SchemaComponent, {
-    scope: {
-      useCloseAction: useCloseAction,
-      useSaveCurrentUserValues: useSaveCurrentUserValues
-    },
-    schema: schema
-  }));
+  return (0, _react2.useMemo)(function () {
+    return {
+      key: 'password',
+      eventKey: 'ChangePassword',
+      onClick: function onClick() {
+        setVisible(true);
+        ctx === null || ctx === void 0 ? void 0 : ctx.setVisible(false);
+      },
+      label: /*#__PURE__*/_react2.default.createElement(_react2.default.Fragment, null, t('Change password'), /*#__PURE__*/_react2.default.createElement(_.ActionContextProvider, {
+        value: {
+          visible: visible,
+          setVisible: setVisible
+        }
+      }, /*#__PURE__*/_react2.default.createElement("div", {
+        onClick: function onClick(e) {
+          return e.stopPropagation();
+        }
+      }, /*#__PURE__*/_react2.default.createElement(_.SchemaComponent, {
+        scope: {
+          useCloseAction: useCloseAction,
+          useSaveCurrentUserValues: useSaveCurrentUserValues
+        },
+        schema: schema
+      }))))
+    };
+  }, [visible]);
 };
-exports.ChangePassword = ChangePassword;
+exports.useChangePassword = useChangePassword;

package/lib/user/CurrentUser.d.ts

@@ -1,3 +1,9 @@
 import React from 'react';
+/**
+ * @note If you want to change here, Note the Setting block on the mobile side
+ */
+export declare const SettingsMenu: React.FC<{
+    redirectUrl?: string;
+}>;
 export declare const DropdownVisibleContext: React.Context<any>;
-export declare const CurrentUser: () => JSX.Element;
+export declare const CurrentUser: () => React.JSX.Element;

package/lib/user/CurrentUser.js

@@ -4,8 +4,9 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DropdownVisibleContext = exports.CurrentUser = void 0;
+exports.SettingsMenu = exports.DropdownVisibleContext = exports.CurrentUser = void 0;
 var _css = require("@emotion/css");
+var _client = require("@nocobase/utils/client");
 var _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
@@ -21,91 +22,91 @@ var _templateObject;
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 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; }
-var ApplicationVersion = function ApplicationVersion() {
-  var _data$data;
+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 _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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+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 _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+var useApplicationVersion = function useApplicationVersion() {
+  var _data$data2;
   var data = (0, _CurrentAppInfoProvider.useCurrentAppInfo)();
-  return /*#__PURE__*/_react.default.createElement(_antd.Menu.Item, {
-    key: "version",
-    disabled: true
-  }, "Version ", data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : _data$data.version);
+  return (0, _react.useMemo)(function () {
+    var _data$data;
+    return {
+      key: 'version',
+      disabled: true,
+      label: "Version ".concat(data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : _data$data.version)
+    };
+  }, [data === null || data === void 0 ? void 0 : (_data$data2 = data.data) === null || _data$data2 === void 0 ? void 0 : _data$data2.version]);
 };
-var DropdownVisibleContext = /*#__PURE__*/(0, _react.createContext)(null);
-exports.DropdownVisibleContext = DropdownVisibleContext;
-var CurrentUser = function CurrentUser() {
-  var _data$data2, _data$data3;
-  var history = (0, _reactRouterDom.useHistory)();
-  var api = (0, _.useAPIClient)();
-  var _useTranslation = (0, _reactI18next.useTranslation)(),
-    t = _useTranslation.t;
-  var _useState = (0, _react.useState)(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    visible = _useState2[0],
-    setVisible = _useState2[1];
-  var _useCurrentUserContex = (0, _.useCurrentUserContext)(),
-    data = _useCurrentUserContex.data;
+/**
+ * @note If you want to change here, Note the Setting block on the mobile side
+ */
+var SettingsMenu = function SettingsMenu(props) {
+  var _props$redirectUrl = props.redirectUrl,
+    redirectUrl = _props$redirectUrl === void 0 ? '' : _props$redirectUrl;
   var _useACLRoleContext = (0, _.useACLRoleContext)(),
     allowAll = _useACLRoleContext.allowAll,
     snippets = _useACLRoleContext.snippets;
   var appAllowed = allowAll || (snippets === null || snippets === void 0 ? void 0 : snippets.includes('app'));
+  var navigate = (0, _reactRouterDom.useNavigate)();
+  var api = (0, _.useAPIClient)();
+  var _useTranslation = (0, _reactI18next.useTranslation)(),
+    t = _useTranslation.t;
   var silenceApi = (0, _.useAPIClient)();
-  var check = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return new Promise(function (resolve) {
-              var heartbeat = setInterval(function () {
-                silenceApi.silent().resource('app').getInfo().then(function (res) {
-                  console.log(res);
-                  if ((res === null || res === void 0 ? void 0 : res.status) === 200) {
-                    resolve('ok');
-                    clearInterval(heartbeat);
-                  }
-                  return res;
-                }).catch(function () {
-                  // ignore
-                });
-              }, 3000);
-            });
-          case 2:
-            return _context.abrupt("return", _context.sent);
-          case 3:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function check() {
-      return _ref.apply(this, arguments);
+  var check = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return new Promise(function (resolve) {
+            var heartbeat = setInterval(function () {
+              silenceApi.silent().resource('app').getInfo().then(function (res) {
+                console.log(res);
+                if ((res === null || res === void 0 ? void 0 : res.status) === 200) {
+                  resolve('ok');
+                  clearInterval(heartbeat);
+                }
+                return res;
+              }).catch(function (err) {
+                (0, _client.error)(err);
+              });
+            }, 3000);
+          });
+        case 2:
+          return _context.abrupt("return", _context.sent);
+        case 3:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })), [silenceApi]);
+  var divider = (0, _react.useMemo)(function () {
+    return {
+      type: 'divider'
     };
-  }();
-  return /*#__PURE__*/_react.default.createElement("div", {
-    style: {
-      display: 'inline-flex',
-      verticalAlign: 'top'
+  }, []);
+  var appVersion = useApplicationVersion();
+  var editProfile = (0, _EditProfile.useEditProfile)();
+  var changePassword = (0, _ChangePassword.useChangePassword)();
+  var switchRole = (0, _SwitchRole.useSwitchRole)();
+  var languageSettings = (0, _LanguageSettings.useLanguageSettings)();
+  var themeSettings = (0, _ThemeSettings.useThemeSettings)();
+  var controlApp = (0, _react.useMemo)(function () {
+    if (!appAllowed) {
+      return [];
     }
-  }, /*#__PURE__*/_react.default.createElement(DropdownVisibleContext.Provider, {
-    value: {
-      visible: visible,
-      setVisible: setVisible
-    }
-  }, /*#__PURE__*/_react.default.createElement(_antd.Dropdown, {
-    open: visible,
-    onOpenChange: function onOpenChange(visible) {
-      setVisible(visible);
-    },
-    overlay: /*#__PURE__*/_react.default.createElement(_antd.Menu, null, /*#__PURE__*/_react.default.createElement(ApplicationVersion, null), /*#__PURE__*/_react.default.createElement(_antd.Menu.Divider, null), /*#__PURE__*/_react.default.createElement(_EditProfile.EditProfile, null), /*#__PURE__*/_react.default.createElement(_ChangePassword.ChangePassword, null), /*#__PURE__*/_react.default.createElement(_antd.Menu.Divider, null), /*#__PURE__*/_react.default.createElement(_SwitchRole.SwitchRole, null), /*#__PURE__*/_react.default.createElement(_LanguageSettings.LanguageSettings, null), /*#__PURE__*/_react.default.createElement(_ThemeSettings.ThemeSettings, null), /*#__PURE__*/_react.default.createElement(_antd.Menu.Divider, null), appAllowed && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_antd.Menu.Item, {
-      key: "cache",
+    return [{
+      key: 'cache',
+      label: t('Clear cache'),
       onClick: function () {
         var _onClick = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
           return _regeneratorRuntime().wrap(function _callee2$(_context2) {
@@ -126,8 +127,9 @@ var CurrentUser = function CurrentUser() {
         }
         return onClick;
       }()
-    }, t('Clear cache')), /*#__PURE__*/_react.default.createElement(_antd.Menu.Item, {
-      key: "reboot",
+    }, {
+      key: 'reboot',
+      label: t('Reboot application'),
       onClick: function () {
         var _onClick2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
           return _regeneratorRuntime().wrap(function _callee4$(_context4) {
@@ -175,19 +177,22 @@ var CurrentUser = function CurrentUser() {
         }
         return onClick;
       }()
-    }, t('Reboot application')), /*#__PURE__*/_react.default.createElement(_antd.Menu.Divider, null)), /*#__PURE__*/_react.default.createElement(_antd.Menu.Item, {
-      key: "signout",
+    }, divider];
+  }, [appAllowed, check]);
+  var items = (0, _react.useMemo)(function () {
+    return [appVersion, divider, editProfile, changePassword, divider, switchRole, languageSettings, themeSettings, divider].concat(_toConsumableArray(controlApp), [{
+      key: 'signout',
+      label: t('Sign out'),
       onClick: function () {
         var _onClick3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
           return _regeneratorRuntime().wrap(function _callee5$(_context5) {
             while (1) switch (_context5.prev = _context5.next) {
               case 0:
                 _context5.next = 2;
-                return api.resource('users').signout();
+                return api.auth.signOut();
               case 2:
-                api.auth.setToken(null);
-                history.push('/signin');
-              case 4:
+                navigate("/signin?redirect=".concat(encodeURIComponent(redirectUrl)));
+              case 3:
               case "end":
                 return _context5.stop();
             }
@@ -198,7 +203,41 @@ var CurrentUser = function CurrentUser() {
         }
         return onClick;
       }()
-    }, t('Sign out')))
+    }]);
+  }, [appVersion, changePassword, controlApp, divider, editProfile, history, languageSettings, switchRole, themeSettings]);
+  return /*#__PURE__*/_react.default.createElement(_antd.Menu, {
+    items: items
+  });
+};
+exports.SettingsMenu = SettingsMenu;
+var DropdownVisibleContext = /*#__PURE__*/(0, _react.createContext)(null);
+exports.DropdownVisibleContext = DropdownVisibleContext;
+var CurrentUser = function CurrentUser() {
+  var _data$data3, _data$data4;
+  var _useState = (0, _react.useState)(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    visible = _useState2[0],
+    setVisible = _useState2[1];
+  var _useCurrentUserContex = (0, _.useCurrentUserContext)(),
+    data = _useCurrentUserContex.data;
+  return /*#__PURE__*/_react.default.createElement("div", {
+    style: {
+      display: 'inline-flex',
+      verticalAlign: 'top'
+    }
+  }, /*#__PURE__*/_react.default.createElement(DropdownVisibleContext.Provider, {
+    value: {
+      visible: visible,
+      setVisible: setVisible
+    }
+  }, /*#__PURE__*/_react.default.createElement(_antd.Dropdown, {
+    open: visible,
+    onOpenChange: function onOpenChange(visible) {
+      setVisible(visible);
+    },
+    dropdownRender: function dropdownRender() {
+      return /*#__PURE__*/_react.default.createElement(SettingsMenu, null);
+    }
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n              max-width: 160px;\n              overflow: hidden;\n              display: inline-block;\n              line-height: 12px;\n              white-space: nowrap;\n              text-overflow: ellipsis;\n            "]))),
     style: {
@@ -207,6 +246,6 @@ var CurrentUser = function CurrentUser() {
       padding: '16px',
       color: 'rgba(255, 255, 255, 0.65)'
     }
-  }, (data === null || data === void 0 ? void 0 : (_data$data2 = data.data) === null || _data$data2 === void 0 ? void 0 : _data$data2.nickname) || (data === null || data === void 0 ? void 0 : (_data$data3 = data.data) === null || _data$data3 === void 0 ? void 0 : _data$data3.email)))));
+  }, (data === null || data === void 0 ? void 0 : (_data$data3 = data.data) === null || _data$data3 === void 0 ? void 0 : _data$data3.nickname) || (data === null || data === void 0 ? void 0 : (_data$data4 = data.data) === null || _data$data4 === void 0 ? void 0 : _data$data4.email)))));
 };
 exports.CurrentUser = CurrentUser;

package/lib/user/CurrentUserProvider.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 export declare const CurrentUserContext: React.Context<any>;
 export declare const useCurrentUserContext: () => any;
-export declare const CurrentUserProvider: (props: any) => JSX.Element;
+export declare const CurrentUserProvider: (props: any) => React.JSX.Element;

package/lib/user/CurrentUserProvider.js

@@ -21,7 +21,7 @@ var CurrentUserProvider = function CurrentUserProvider(props) {
   var _result$data, _result$data$data;
   var location = (0, _reactRouterDom.useLocation)();
   var result = (0, _apiClient.useRequest)({
-    url: 'users:check'
+    url: 'auth:check'
   });
   if (result.loading) {
     return /*#__PURE__*/_react.default.createElement(_antd.Spin, null);
@@ -30,7 +30,8 @@ var CurrentUserProvider = function CurrentUserProvider(props) {
     search = location.search;
   var redirect = "?redirect=".concat(pathname).concat(search);
   if (!(result === null || result === void 0 ? void 0 : (_result$data = result.data) === null || _result$data === void 0 ? void 0 : (_result$data$data = _result$data.data) === null || _result$data$data === void 0 ? void 0 : _result$data$data.id)) {
-    return /*#__PURE__*/_react.default.createElement(_reactRouterDom.Redirect, {
+    return /*#__PURE__*/_react.default.createElement(_reactRouterDom.Navigate, {
+      replace: true,
       to: "/signin".concat(redirect)
     });
   }

package/lib/user/EditProfile.d.ts

@@ -1 +1 @@
-export declare const EditProfile: () => JSX.Element;
+export declare const useEditProfile: () => import("antd/lib/menu/hooks/useItems").ItemType;

package/lib/user/EditProfile.js

@@ -4,10 +4,9 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.EditProfile = void 0;
+exports.useEditProfile = void 0;
 var _react = require("@formily/react");
 var _shared = require("@formily/shared");
-var _antd = require("antd");
 var _react2 = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
 var _ = require("../");
@@ -151,33 +150,40 @@ var schema = {
     }
   })
 };
-var EditProfile = function EditProfile() {
+var useEditProfile = function useEditProfile() {
+  var ctx = (0, _react2.useContext)(_.DropdownVisibleContext);
   var _useState = (0, _react2.useState)(false),
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
     setVisible = _useState2[1];
   var _useTranslation = (0, _reactI18next.useTranslation)(),
     t = _useTranslation.t;
-  var ctx = (0, _react2.useContext)(_.DropdownVisibleContext);
-  return /*#__PURE__*/_react2.default.createElement(_.ActionContext.Provider, {
-    value: {
-      visible: visible,
-      setVisible: setVisible
-    }
-  }, /*#__PURE__*/_react2.default.createElement(_antd.Menu.Item, {
-    key: "profile",
-    eventKey: 'EditProfile',
-    onClick: function onClick() {
-      setVisible(true);
-      ctx.setVisible(false);
-    }
-  }, t('Edit profile')), /*#__PURE__*/_react2.default.createElement(_.SchemaComponent, {
-    scope: {
-      useCurrentUserValues: useCurrentUserValues,
-      useCloseAction: useCloseAction,
-      useSaveCurrentUserValues: useSaveCurrentUserValues
-    },
-    schema: schema
-  }));
+  return (0, _react2.useMemo)(function () {
+    return {
+      key: 'profile',
+      eventKey: 'EditProfile',
+      onClick: function onClick() {
+        setVisible(true);
+        ctx === null || ctx === void 0 ? void 0 : ctx.setVisible(false);
+      },
+      label: /*#__PURE__*/_react2.default.createElement(_react2.default.Fragment, null, t('Edit profile'), /*#__PURE__*/_react2.default.createElement(_.ActionContextProvider, {
+        value: {
+          visible: visible,
+          setVisible: setVisible
+        }
+      }, /*#__PURE__*/_react2.default.createElement("div", {
+        onClick: function onClick(e) {
+          return e.stopPropagation();
+        }
+      }, /*#__PURE__*/_react2.default.createElement(_.SchemaComponent, {
+        scope: {
+          useCurrentUserValues: useCurrentUserValues,
+          useCloseAction: useCloseAction,
+          useSaveCurrentUserValues: useSaveCurrentUserValues
+        },
+        schema: schema
+      }))))
+    };
+  }, [visible]);
 };
-exports.EditProfile = EditProfile;
+exports.useEditProfile = useEditProfile;

package/lib/user/LanguageSettings.d.ts

@@ -1 +1 @@
-export declare const LanguageSettings: () => JSX.Element;
+export declare const useLanguageSettings: () => import("antd/lib/menu/hooks/useItems").ItemType;