antd-management-fast-framework 1.12.18 → 1.12.21

package/es/utils/authority.js

@@ -167,14 +167,18 @@ function checkHasAuthorities(authCollection) {
 function checkHasAuthorityCore(auth) {
   if (checkIsSuper()) {
     return true;
-  }
+  } // if (isObject(auth)) {
+  //   console.log({
+  //     auth,
+  //     attachedTargetName:
+  //       (this || null) != null
+  //         ? (this.constructor || null) != null
+  //           ? this.constructor.name
+  //           : ''
+  //         : '',
+  //   });
+  // }
 
-  if ((0, _tools.isObject)(auth)) {
-    console.log({
-      auth: auth,
-      attachedTargetName: (this || null) != null ? (this.constructor || null) != null ? this.constructor.name : '' : ''
-    });
-  }
 
   var result = '0';
   var existCache = (0, _cacheAssist.hasCache)({
@@ -214,13 +218,17 @@ function checkHasAuthorityCore(auth) {
 }
 
 function checkHasAuthority(auth) {
-  if ((0, _tools.isObject)(auth)) {
-    console.log({
-      auth: auth,
-      attachedTargetName: (this || null) != null ? (this.constructor || null) != null ? this.constructor.name : '' : ''
-    });
-  }
-
+  // if (isObject(auth)) {
+  //   console.log({
+  //     auth,
+  //     attachedTargetName:
+  //       (this || null) != null
+  //         ? (this.constructor || null) != null
+  //           ? this.constructor.name
+  //           : ''
+  //         : '',
+  //   });
+  // }
   if ((0, _tools.isArray)(auth)) {
     return checkHasAuthorities(auth);
   }

package/es/utils/constants.d.ts

@@ -34,7 +34,7 @@ export namespace appInitDefault {
     export const platformName: string;
     export const appName: string;
     export const appDescription: string;
-    export const loginLogo: string;
+    export const entranceLogo: string;
     export const shareLogo: string;
     export const shareLogoName: string;
     export const leftBarText: string;
@@ -44,12 +44,12 @@ export namespace appInitDefault {
         export const corsTargetProduction: string;
     }
     export const showSelectLanguage: boolean;
-    export const showLogoInLoginView: boolean;
+    export const showLogoInEntrance: boolean;
     export { emptyLogo };
     export { emptyLogo as leftBarLogo };
     export { apiSuccessCode };
     export { authenticationFailCode };
-    export const loginPath: string;
+    export const entrancePath: string;
     export const showLogInConsole: boolean;
     export const showRequestInfo: boolean;
     export const useVirtualRequest: boolean;

package/es/utils/constants.js

@@ -62,7 +62,7 @@ var appInitDefault = {
   platformName: '平台名称',
   appName: '应用名称',
   appDescription: '应用描述',
-  loginLogo: '',
+  entranceLogo: '',
   shareLogo: '',
   shareLogoName: 'Logo',
   leftBarText: '左侧名称',
@@ -72,12 +72,12 @@ var appInitDefault = {
     corsTargetProduction: ''
   },
   showSelectLanguage: false,
-  showLogoInLoginView: true,
+  showLogoInEntrance: true,
   emptyLogo: emptyLogo,
   leftBarLogo: emptyLogo,
   apiSuccessCode: apiSuccessCode,
   authenticationFailCode: authenticationFailCode,
-  loginPath: '/user/login',
+  entrancePath: '/entrance/signIn',
   showLogInConsole: false,
   showRequestInfo: false,
   useVirtualRequest: false,

package/es/utils/defaultSettingsSpecial.d.ts

@@ -14,11 +14,11 @@ export namespace defaultSettingsLayoutCustom {
     export function getVideoUploadMaxSize(): number;
     export function getImageUploadMaxSize(): number;
     export function getShowSelectLanguage(): boolean;
-    export function getShowLogoInLoginView(): boolean;
+    export function getShowLogoInEntrance(): boolean;
     export function getEmptyLogo(): string;
     export function getApiSuccessCode(): number;
     export function getAuthenticationFailCode(): number;
-    export function getLoginPath(): string;
+    export function getEntrancePath(): string;
     export function getApiVersion(): string;
     export function getUseVirtualRequest(): boolean;
     export function getShowUseVirtualRequestMessage(): boolean;
@@ -28,7 +28,7 @@ export namespace defaultSettingsLayoutCustom {
     export function getAppName(): string;
     export function getAppDescription(): string;
     export function getTitle(): string;
-    export function getLoginLogo(): string;
+    export function getEntranceLogo(): string;
     export function getShareLogo(): string;
     export function getShareLogoName(): string;
     export function getCompanyName(): string;

package/es/utils/defaultSettingsSpecial.js

@@ -97,15 +97,15 @@ var defaultSettingsLayoutCustom = {
 
     return showSelectLanguage || false;
   },
-  getShowLogoInLoginView: function getShowLogoInLoginView() {
+  getShowLogoInEntrance: function getShowLogoInEntrance() {
     var appInit = (0, _tools.getAppInitConfigData)();
 
-    var _showLogoInLoginView = _objectSpread(_objectSpread({}, {
-      showLogoInLoginView: false
+    var _showLogoInEntrance = _objectSpread(_objectSpread({}, {
+      showLogoInEntrance: false
     }), appInit || {}),
-        showLogoInLoginView = _showLogoInLoginView.showLogoInLoginView;
+        showLogoInEntrance = _showLogoInEntrance.showLogoInEntrance;
 
-    return showLogoInLoginView || false;
+    return showLogoInEntrance || false;
   },
   getEmptyLogo: function getEmptyLogo() {
     var appInit = (0, _tools.getAppInitConfigData)();
@@ -137,15 +137,15 @@ var defaultSettingsLayoutCustom = {
 
     return authenticationFailCode || _constants.authenticationFailCode;
   },
-  getLoginPath: function getLoginPath() {
+  getEntrancePath: function getEntrancePath() {
     var appInit = (0, _tools.getAppInitConfigData)();
 
-    var _loginPath = _objectSpread(_objectSpread({}, {
-      loginPath: ''
+    var _entrancePath = _objectSpread(_objectSpread({}, {
+      entrancePath: ''
     }), appInit || {}),
-        loginPath = _loginPath.loginPath;
+        entrancePath = _entrancePath.entrancePath;
 
-    return loginPath || '';
+    return entrancePath || '';
   },
   getApiVersion: function getApiVersion() {
     var appInit = (0, _tools.getAppInitConfigData)();
@@ -237,15 +237,15 @@ var defaultSettingsLayoutCustom = {
 
     return appName || '';
   },
-  getLoginLogo: function getLoginLogo() {
+  getEntranceLogo: function getEntranceLogo() {
     var appInit = (0, _tools.getAppInitConfigData)();
 
-    var _loginLogo = _objectSpread(_objectSpread({}, {
-      loginLogo: _constants.emptyLogo
+    var _entranceLogo = _objectSpread(_objectSpread({}, {
+      entranceLogo: _constants.emptyLogo
     }), appInit || {}),
-        loginLogo = _loginLogo.loginLogo;
+        entranceLogo = _entranceLogo.entranceLogo;
 
-    return loginLogo || _constants.emptyLogo;
+    return entranceLogo || _constants.emptyLogo;
   },
   getShareLogo: function getShareLogo() {
     var appInit = (0, _tools.getAppInitConfigData)();

package/es/utils/request.js

@@ -218,9 +218,9 @@ request.interceptors.response.use(function (response) {
     var code = o.code;
 
     if (code === _defaultSettingsSpecial.defaultSettingsLayoutCustom.getAuthenticationFailCode()) {
-      var loginPath = _defaultSettingsSpecial.defaultSettingsLayoutCustom.getLoginPath();
+      var entrancePath = _defaultSettingsSpecial.defaultSettingsLayoutCustom.getEntrancePath();
 
-      if ((0, _tools.stringIsNullOrWhiteSpace)(loginPath)) {
+      if ((0, _tools.stringIsNullOrWhiteSpace)(entrancePath)) {
         throw new Error('缺少登录页面路径配置');
       }
 
@@ -230,7 +230,7 @@ request.interceptors.response.use(function (response) {
         _message2.default.info('登陆超时，请重新登录！', 0.6);
 
         _umi.history.replace({
-          pathname: loginPath
+          pathname: entrancePath
         });
       }, 200);
     }

package/es/utils/requestAssistor.js

@@ -98,17 +98,17 @@ function dataExceptionNotice(d) {
       }
     }
 
-    var loginPath = _defaultSettingsSpecial.defaultSettingsLayoutCustom.getLoginPath();
+    var entrancePath = _defaultSettingsSpecial.defaultSettingsLayoutCustom.getEntrancePath();
 
     var authenticationFailCode = _defaultSettingsSpecial.defaultSettingsLayoutCustom.getAuthenticationFailCode();
 
     if (code === authenticationFailCode) {
-      if ((0, _tools.stringIsNullOrWhiteSpace)(loginPath)) {
+      if ((0, _tools.stringIsNullOrWhiteSpace)(entrancePath)) {
         throw new Error('缺少登录页面路径配置');
       }
 
       requestAnimationFrame(function () {
-        _umi.history.replace(loginPath);
+        _umi.history.replace(entrancePath);
       });
     }
   }
@@ -407,7 +407,7 @@ function request(_x) {
 
 function _request() {
   _request = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(_ref4) {
-    var api, _ref4$urlParams, urlParams, _ref4$params, params, _ref4$method, method, _ref4$useVirtualReque, useVirtualRequest, _ref4$showUseVirtualR, showUseVirtualRequestMessage, _ref4$virtualSuccessR, virtualSuccessResponse, _ref4$virtualFailResp, virtualFailResponse, _ref4$virtualRequestR, virtualRequestResult, _ref4$virtualNeedAuth, virtualNeedAuthorize, apiVersion, url, showRequestInfo, result, verifyToken, token, loginPath;
+    var api, _ref4$urlParams, urlParams, _ref4$params, params, _ref4$method, method, _ref4$useVirtualReque, useVirtualRequest, _ref4$showUseVirtualR, showUseVirtualRequestMessage, _ref4$virtualSuccessR, virtualSuccessResponse, _ref4$virtualFailResp, virtualFailResponse, _ref4$virtualRequestR, virtualRequestResult, _ref4$virtualNeedAuth, virtualNeedAuthorize, apiVersion, url, showRequestInfo, result, verifyToken, token, entrancePath;
 
     return regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
@@ -463,9 +463,7 @@ function _request() {
             if (showUseVirtualRequestMessage) {
               setTimeout(function () {
                 var text = '由虚拟访问返回';
-                (0, _tools.showInfoMessage)({
-                  message: text
-                });
+                (0, _tools.notifyInfo)(text);
               }, 500);
             }
 
@@ -485,9 +483,9 @@ function _request() {
               break;
             }
 
-            loginPath = _defaultSettingsSpecial.defaultSettingsLayoutCustom.getLoginPath();
+            entrancePath = _defaultSettingsSpecial.defaultSettingsLayoutCustom.getEntrancePath();
 
-            if (!(0, _tools.stringIsNullOrWhiteSpace)(loginPath)) {
+            if (!(0, _tools.stringIsNullOrWhiteSpace)(entrancePath)) {
               _context.next = 21;
               break;
             }
@@ -501,7 +499,7 @@ function _request() {
               _message2.default.info('登陆超时，请重新登录！', 0.6);
 
               _umi.history.replace({
-                pathname: loginPath
+                pathname: entrancePath
               });
             }, 400);
             _context.next = 27;

package/es/utils/tools.d.ts

@@ -2,7 +2,7 @@ export function getAppInitConfigData(): {
     platformName: string;
     appName: string;
     appDescription: string;
-    loginLogo: string;
+    entranceLogo: string;
     shareLogo: string;
     shareLogoName: string;
     leftBarText: string;
@@ -12,12 +12,12 @@ export function getAppInitConfigData(): {
         corsTargetProduction: string;
     };
     showSelectLanguage: boolean;
-    showLogoInLoginView: boolean;
+    showLogoInEntrance: boolean;
     emptyLogo: string;
     leftBarLogo: string;
     apiSuccessCode: number;
     authenticationFailCode: number;
-    loginPath: string;
+    entrancePath: string;
     showLogInConsole: boolean;
     showRequestInfo: boolean;
     useVirtualRequest: boolean;
@@ -760,6 +760,7 @@ export function trySendNearestLocalhostNotify({ text }: {
  */
 export function ellipsis(value: any, length: any, symbol?: string): string;
 export function notifySuccess(text: any): void;
+export function notifyInfo(text: any): void;
 /**
  * 发送页面通知
  */

package/es/utils/tools.js

@@ -74,6 +74,7 @@ exports.isObject = isObject;
 exports.isString = isString;
 exports.isUndefined = isUndefined;
 exports.notify = notify;
+exports.notifyInfo = notifyInfo;
 exports.notifySuccess = notifySuccess;
 exports.numeralFormat = numeralFormat;
 exports.queryStringParse = queryStringParse;
@@ -2129,6 +2130,21 @@ function notifySuccess(text) {
     description: description
   });
 }
+
+function notifyInfo(text) {
+  var description = text || '';
+
+  if (stringIsNullOrWhiteSpace(description)) {
+    return;
+  }
+
+  notify({
+    type: _constants.notificationTypeCollection.info,
+    placement: 'bottomRight',
+    message: '操作结果',
+    description: description
+  });
+}
 /**
  * 发送页面通知
  */

package/es/utils/virtualRequest.js

@@ -142,7 +142,7 @@ function apiVirtualSuccessAccess(_x) {
 
 function _apiVirtualSuccessAccess() {
   _apiVirtualSuccessAccess = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(_ref3) {
-    var remoteResponse, _ref3$needAuthorize, needAuthorize, result, _result, code, loginPath;
+    var remoteResponse, _ref3$needAuthorize, needAuthorize, result, _result, code, entrancePath;
 
     return regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
@@ -170,9 +170,9 @@ function _apiVirtualSuccessAccess() {
               break;
             }
 
-            loginPath = _defaultSettingsSpecial.defaultSettingsLayoutCustom.getLoginPath();
+            entrancePath = _defaultSettingsSpecial.defaultSettingsLayoutCustom.getEntrancePath();
 
-            if (!(0, _tools.stringIsNullOrWhiteSpace)(loginPath)) {
+            if (!(0, _tools.stringIsNullOrWhiteSpace)(entrancePath)) {
               _context.next = 9;
               break;
             }
@@ -180,7 +180,7 @@ function _apiVirtualSuccessAccess() {
             throw new Error('缺少登录页面路径配置');
 
           case 9:
-            _umi.history.push(loginPath);
+            _umi.history.push(entrancePath);
 
           case 10:
             return _context.abrupt("return", result);
@@ -205,7 +205,7 @@ function apiVirtualFailAccess(_x2) {
 
 function _apiVirtualFailAccess() {
   _apiVirtualFailAccess = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(_ref4) {
-    var remoteResponse, _ref4$needAuthorize, needAuthorize, result, _result2, code, messageText, loginPath;
+    var remoteResponse, _ref4$needAuthorize, needAuthorize, result, _result2, code, messageText, entrancePath;
 
     return regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) {
@@ -230,9 +230,9 @@ function _apiVirtualFailAccess() {
               break;
             }
 
-            loginPath = _defaultSettingsSpecial.defaultSettingsLayoutCustom.getLoginPath();
+            entrancePath = _defaultSettingsSpecial.defaultSettingsLayoutCustom.getEntrancePath();
 
-            if (!(0, _tools.stringIsNullOrWhiteSpace)(loginPath)) {
+            if (!(0, _tools.stringIsNullOrWhiteSpace)(entrancePath)) {
               _context2.next = 9;
               break;
             }
@@ -240,7 +240,7 @@ function _apiVirtualFailAccess() {
             throw new Error('缺少登录页面路径配置');
 
           case 9:
-            _umi.history.push(loginPath);
+            _umi.history.push(entrancePath);
 
             _context2.next = 13;
             break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-management-fast-framework",
-  "version": "1.12.18",
+  "version": "1.12.21",
   "description": "antd-management-fast-framework",
   "keywords": [
     "antd-management-fast-framework"
@@ -30,14 +30,14 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@ant-design/pro-layout": "^6.34.0",
+    "@ant-design/pro-layout": "^6.34.1",
     "@antv/data-set": "^0.11.8",
     "@tinymce/tinymce-react": "^3.13.1",
-    "antd": "^4.19.0",
+    "antd": "^4.19.1",
     "array-move": "^4.0.0",
     "bizcharts": "^4.1.15",
     "browserslist": "^4.20.0",
-    "caniuse-lite": "^1.0.30001313",
+    "caniuse-lite": "^1.0.30001314",
     "classnames": "^2.3.1",
     "copy-to-clipboard": "^3.3.1",
     "enquire-js": "^0.2.1",
@@ -65,7 +65,7 @@
     "rc-scroll-anim": "^2.7.6",
     "rc-texty": "^0.2.0",
     "rc-tween-one": "^3.0.3",
-    "rc-util": "^5.18.1",
+    "rc-util": "^5.19.3",
     "react": "^17.0.2",
     "react-container-query": "^0.12.0",
     "react-copy-to-clipboard": "^5.0.4",
@@ -85,14 +85,16 @@
   },
   "devDependencies": {
     "@ant-design/colors": "^6.0.0",
+    "@babel/plugin-proposal-class-properties": "^7.16.7",
     "@babel/plugin-proposal-decorators": "^7.17.2",
     "@babel/plugin-syntax-jsx": "^7.16.7",
+    "@babel/preset-env": "^7.16.11",
     "@babel/preset-react": "^7.16.7",
     "@commitlint/cli": "^16.2.1",
     "@commitlint/config-conventional": "^16.2.1",
     "@commitlint/config-lerna-scopes": "^16.2.2",
     "@commitlint/cz-commitlint": "^16.2.1",
-    "@testing-library/react": "^12.1.3",
+    "@testing-library/react": "^12.1.4",
     "@testing-library/react-hooks": "^7.0.2",
     "@types/jest": "^27.4.1",
     "@types/node": "^17.0.21",
@@ -109,7 +111,7 @@
     "cross-env": "^7.0.3",
     "eslint": "^8.10.0",
     "eslint-config-airbnb": "^19.0.4",
-    "eslint-config-airbnb-typescript": "^16.1.0",
+    "eslint-config-airbnb-typescript": "^16.1.1",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-import": "^2.25.4",
@@ -130,7 +132,7 @@
     "postcss": "^8.4.8",
     "postcss-less": "^6.0.0",
     "prettier": "^2.5.1",
-    "puppeteer": "^13.5.0",
+    "puppeteer": "^13.5.1",
     "react": "^17.0.2",
     "react-test-renderer": "^17.0.2",
     "rimraf": "^3.0.2",
@@ -169,5 +171,5 @@
   "bugs": {
     "url": "https://github.com/kityandhero/antd-management-fast-framework/issues"
   },
-  "gitHead": "97152a86624e40c517b6e055472c424d90529d7a"
+  "gitHead": "d9178482e73291b0f0b4dfcc0d0c1623a4c86789"
 }

package/es/customComponents/Login/LoginItem.d.ts

@@ -1,2 +0,0 @@
-export default LoginItem;
-declare const LoginItem: {};