antd-management-fast-framework 1.11.16 → 1.11.17

package/License.txt

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 luzhitao
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/es/framework/AuthorizationWrapper/index.d.ts

@@ -3,7 +3,7 @@ declare class AuthorizationWrapper extends SupplementWrapper {
     componentAuthority: any;
     doDidMountTask: () => void;
     checkAuthority: (auth: any) => boolean;
-    checkAuthorities: (auth: any) => boolean;
+    checkAuthorities: (auth: any) => any;
     getCurrentOperator: () => any;
     reloadCurrentOperator: (callback?: any) => void;
 }

package/es/utils/authority.d.ts

@@ -1,6 +1,4 @@
-export function getAllAuthority(): any;
 export function checkIsSuper(): boolean;
-export function checkHasAuthorities(authCollection: any): boolean;
 export function checkHasAuthority(auth: any): boolean;
 /**
  * 缓存用户权限数据体

package/es/utils/authority.js

@@ -3,10 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.checkHasAuthorities = checkHasAuthorities;
 exports.checkHasAuthority = checkHasAuthority;
 exports.checkIsSuper = checkIsSuper;
-exports.getAllAuthority = getAllAuthority;
 exports.setAuthority = setAuthority;
 
 var _tools = require("./tools");
@@ -18,6 +16,7 @@ var _globalStorageAssist = require("./globalStorageAssist");
 var _Authorized = require("./Authorized");
 
 var authorityCollectionCache = 'authorityCollectionCache';
+var superPermissionCacheKey = 'hasSuperPermission';
 
 function getAllAuthorityCore() {
   var result = [];
@@ -57,23 +56,73 @@ function getAllAuthorityCore() {
   return result;
 }
 
+function getSuperPermission() {
+  var result = '';
+  var accessWayCollection = (0, _globalStorageAssist.getAccessWayCollectionCache)();
+
+  if (!(0, _tools.isObject)(accessWayCollection)) {
+    return result;
+  }
+
+  var superPermission = (0, _tools.getValueByKey)({
+    data: accessWayCollection,
+    key: 'super'
+  });
+
+  if ((0, _tools.isObject)(superPermission)) {
+    var _superAuth = (0, _tools.getValueByKey)({
+      data: superPermission,
+      key: 'permission'
+    });
+
+    if ((0, _tools.isString)(_superAuth)) {
+      result = _superAuth;
+    }
+  }
+
+  return result;
+}
+
 function getAllAuthority() {
   return getAllAuthorityCore();
 }
 
 function checkIsSuper() {
-  var _getAccessWayCollecti;
+  var existCache = (0, _cacheAssist.hasCache)({
+    key: superPermissionCacheKey
+  });
 
-  var list = getAllAuthorityCore();
-  var superAuth = (_getAccessWayCollecti = (0, _globalStorageAssist.getAccessWayCollectionCache)().super.permission) !== null && _getAccessWayCollecti !== void 0 ? _getAccessWayCollecti : '';
-  var isSuper = (list || []).find(function (o) {
-    return o === superAuth;
-  }) || '';
+  if (existCache) {
+    result = (0, _cacheAssist.getCache)({
+      key: superPermissionCacheKey
+    });
 
-  if (isSuper === superAuth) {
-    return true;
+    if (result !== undefined) {
+      return !!result;
+    }
+  }
+
+  var superPermission = getSuperPermission();
+
+  if (!(0, _tools.stringIsNullOrWhiteSpace)(superPermission)) {
+    var list = getAllAuthority();
+    var isSuper = (list || []).find(function (o) {
+      return o === superPermission;
+    }) || '';
+
+    if (isSuper === superPermission) {
+      (0, _cacheAssist.setCache)({
+        key: superPermissionCacheKey,
+        value: true
+      });
+      return true;
+    }
   }
 
+  (0, _cacheAssist.setCache)({
+    key: superPermissionCacheKey,
+    value: false
+  });
   return false;
 }
 
@@ -82,7 +131,7 @@ function checkHasAuthorities(authCollection) {
 
   if ((0, _tools.isArray)(authCollection)) {
     authCollection.forEach(function (auth) {
-      result = checkHasAuthority(auth);
+      result = checkHasAuthorityCore(auth);
 
       if (result) {
         return true;
@@ -90,7 +139,7 @@ function checkHasAuthorities(authCollection) {
     });
 
     for (var _auth in authCollection) {
-      result = checkHasAuthority(_auth);
+      result = checkHasAuthorityCore(_auth);
 
       if (result) {
         break;
@@ -101,7 +150,7 @@ function checkHasAuthorities(authCollection) {
   }
 
   if ((0, _tools.isString)(authCollection)) {
-    result = checkHasAuthority(authCollection);
+    result = checkHasAuthorityCore(authCollection);
     return result;
   }
 
@@ -115,8 +164,10 @@ function checkHasAuthorities(authCollection) {
   return result;
 }
 
-function checkHasAuthority(auth) {
-  var _accessWayCollection$;
+function checkHasAuthorityCore(auth) {
+  if (checkIsSuper()) {
+    return true;
+  }
 
   if ((0, _tools.isObject)(auth)) {
     console.log({
@@ -140,21 +191,8 @@ function checkHasAuthority(auth) {
     }
   }
 
-  var list = getAllAuthorityCore();
+  var list = getAllAuthority();
   var accessWayCollection = (0, _globalStorageAssist.getAccessWayCollectionCache)();
-  var superAuth = (_accessWayCollection$ = accessWayCollection.super.permission) !== null && _accessWayCollection$ !== void 0 ? _accessWayCollection$ : '';
-  var isSuper = (list || []).find(function (o) {
-    return o === superAuth;
-  });
-
-  if (isSuper === superAuth) {
-    (0, _cacheAssist.setCache)({
-      key: auth,
-      value: '1'
-    });
-    return true;
-  }
-
   var v = (list || []).find(function (o) {
     return o === auth;
   });
@@ -175,6 +213,28 @@ function checkHasAuthority(auth) {
   });
   return result !== '0';
 }
+
+function checkHasAuthority(auth) {
+  if ((0, _tools.isObject)(auth)) {
+    console.log({
+      auth: auth,
+      attachedTargetName: (this || null) != null ? (this.constructor || null) != null ? this.constructor.name : '' : ''
+    });
+  }
+
+  if ((0, _tools.isArray)(auth)) {
+    return checkHasAuthorities(auth);
+  }
+
+  if ((0, _tools.isString)(auth)) {
+    return checkHasAuthorityCore(auth);
+  }
+
+  (0, _tools.recordObject)({
+    auth: auth
+  });
+  throw new Error('auth need string or string array, please check in console.');
+}
 /**
  * 缓存用户权限数据体
  * @param {*} authority

package/es/utils/requestAssistor.js

@@ -398,7 +398,7 @@ function request(_x) {
 
 function _request() {
   _request = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(_ref4) {
-    var api, _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, text, result, verifyToken, token, loginPath;
+    var api, _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;
 
     return regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
@@ -441,10 +441,12 @@ function _request() {
             }
 
             if (showUseVirtualRequestMessage) {
-              text = '由虚拟访问返回';
-              (0, _tools.showInfoMessage)({
-                message: text
-              });
+              setTimeout(function () {
+                var text = '由虚拟访问返回';
+                (0, _tools.showInfoMessage)({
+                  message: text
+                });
+              }, 500);
             }
 
             result = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-management-fast-framework",
-  "version": "1.11.16",
+  "version": "1.11.17",
   "description": "antd-management-fast-framework",
   "keywords": [
     "antd-management-fast-framework"
@@ -167,5 +167,5 @@
   "bugs": {
     "url": "https://github.com/kityandhero/antd-management-fast-framework/issues"
   },
-  "gitHead": "48e23cd378dbe7cda1566614180397fdc06e066d"
+  "gitHead": "70323abf4d38c2c07c61e4e66fd386516f623495"
 }