antd-management-fast-framework 1.11.4 → 1.11.9

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

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

package/es/framework/AuthorizationWrapper/index.js

@@ -83,6 +83,10 @@ var AuthorizationWrapper = /*#__PURE__*/function (_SupplementWrapper) {
       return (0, _authority.checkHasAuthority)(auth);
     };
 
+    _this.checkAuthorities = function (auth) {
+      return (0, _authority.checkHasAuthorities)(auth);
+    };
+
     _this.getCurrentOperator = function () {
       var currentOperator = _this.props.global.currentOperator;
       return currentOperator;

package/es/framework/Common/index.js

@@ -1661,7 +1661,10 @@ var Common = /*#__PURE__*/function (_Core) {
           }), contentItem.imageBoxProps || {});
 
           var imageBoxContainorStyle = _objectSpread(_objectSpread({}, {
-            width: '120px'
+            width: '100px',
+            border: '1px solid #d9d9d9',
+            borderRadius: '4px',
+            padding: '8px'
           }), contentItem.imageBoxContainorStyle || {});
 
           var imageBox = /*#__PURE__*/_react.default.createElement(_ImageBox.default, _extends({
@@ -1695,7 +1698,10 @@ var Common = /*#__PURE__*/function (_Core) {
           }
 
           var _imageBoxContainorStyle = _objectSpread(_objectSpread({}, {
-            width: '120px'
+            width: '100px',
+            border: '1px solid #d9d9d9',
+            borderRadius: '4px',
+            padding: '8px'
           }), contentItem.imageBoxContainorStyle || {});
 
           var imageItemShowList = [];

package/es/utils/authority.d.ts

@@ -1,5 +1,6 @@
 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,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.checkHasAuthorities = checkHasAuthorities;
 exports.checkHasAuthority = checkHasAuthority;
 exports.checkIsSuper = checkIsSuper;
 exports.getAllAuthority = getAllAuthority;
@@ -16,7 +17,24 @@ var _globalStorageAssist = require("./globalStorageAssist");
 
 var _Authorized = require("./Authorized");
 
+var authorityCollectionCache = 'authorityCollectionCache';
+
 function getAllAuthorityCore() {
+  var result = [];
+  var existCache = (0, _cacheAssist.hasCache)({
+    key: authorityCollectionCache
+  });
+
+  if (existCache) {
+    result = (0, _cacheAssist.getCache)({
+      key: authorityCollectionCache
+    });
+
+    if ((0, _tools.isArray)(result)) {
+      return result;
+    }
+  }
+
   var authorityString = (0, _tools.getStringFromLocalStorage)(_globalStorageAssist.storageKeyCollection.authorityCollection);
   var authority;
 
@@ -27,10 +45,16 @@ function getAllAuthorityCore() {
   }
 
   if (typeof authority === 'string') {
-    return [authority];
+    result.push(authority);
+  } else {
+    result = (0, _tools.isArray)(authority) ? authority : [];
   }
 
-  return (0, _tools.isArray)(authority) ? authority : [];
+  (0, _cacheAssist.setCache)({
+    key: authorityCollectionCache,
+    value: result
+  });
+  return result;
 }
 
 function getAllAuthority() {
@@ -53,6 +77,44 @@ function checkIsSuper() {
   return false;
 }
 
+function checkHasAuthorities(authCollection) {
+  var result = false;
+
+  if ((0, _tools.isArray)(authCollection)) {
+    authCollection.forEach(function (auth) {
+      result = checkHasAuthority(auth);
+
+      if (result) {
+        return true;
+      }
+    });
+
+    for (var _auth in authCollection) {
+      result = checkHasAuthority(_auth);
+
+      if (result) {
+        break;
+      }
+    }
+
+    return result;
+  }
+
+  if ((0, _tools.isString)(authCollection)) {
+    result = checkHasAuthority(authCollection);
+    return result;
+  }
+
+  var text = '无效的待验证权限';
+  (0, _tools.showErrorMessage)({
+    message: text
+  });
+  (0, _tools.recordError)({
+    auth: auth
+  });
+  return result;
+}
+
 function checkHasAuthority(auth) {
   var _accessWayCollection$;
 

package/es/utils/constants.d.ts

@@ -81,6 +81,7 @@ export const convertCollection: {
     string: string;
     moment: string;
     money: string;
+    array: string;
 };
 export namespace formatCollection {
     export const money: string;

package/es/utils/constants.js

@@ -110,7 +110,8 @@ var convertCollection = {
   datetime: 'datetime',
   string: 'string',
   moment: 'moment',
-  money: 'money'
+  money: 'money',
+  array: 'array'
 };
 exports.convertCollection = convertCollection;
 var formatCollection = {

package/es/utils/globalStorageAssist.d.ts

@@ -1,7 +1,7 @@
 export function getNearestLocalhostNotifyCache(): any;
 export function setNearestLocalhostNotifyCache(): void;
 export function removeNearestLocalhostNotifyCache(): void;
-export function getAccessWayCollectionCache(): any;
+export function getAccessWayCollectionCache(): {};
 export function setAccessWayCollectionCache(o: any): void;
 /**
  * 获取useParamsData缓存

package/es/utils/globalStorageAssist.js

@@ -21,6 +21,8 @@ exports.storageKeyCollection = void 0;
 
 var _tools = require("./tools");
 
+var _cacheAssist = require("./cacheAssist");
+
 var _constants = require("./constants");
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
@@ -67,14 +69,34 @@ function removeNearestLocalhostNotifyCache() {
 }
 
 function getAccessWayCollectionCache() {
+  var result = {};
   var key = storageKeyCollection.accessWayCollection;
+  var existCache = (0, _cacheAssist.hasCache)({
+    key: key
+  });
+
+  if (existCache) {
+    result = (0, _cacheAssist.getCache)({
+      key: key
+    });
+
+    if ((0, _tools.isArray)(result)) {
+      return result;
+    }
+  }
+
   var d = (0, _tools.getJsonFromLocalStorage)(key);
 
   if ((d || null) == null) {
     return _objectSpread({}, _constants.accessWaySpecialCollection || {});
   }
 
-  return _objectSpread(_objectSpread({}, d || null), _constants.accessWaySpecialCollection || {});
+  result = _objectSpread(_objectSpread({}, d || null), _constants.accessWaySpecialCollection || {});
+  (0, _cacheAssist.setCache)({
+    key: key,
+    value: result
+  });
+  return result;
 }
 
 function setAccessWayCollectionCache(o) {

package/es/utils/tools.js

@@ -1049,6 +1049,10 @@ function getValueByKey(_ref14) {
         result = toMoney(v);
         break;
 
+      case _constants.convertCollection.array:
+        result = (v || null) == null ? [] : isArray(v) ? v : [v];
+        break;
+
       default:
         result = v;
         break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-management-fast-framework",
-  "version": "1.11.4",
+  "version": "1.11.9",
   "description": "antd-management-fast-framework",
   "keywords": [
     "antd-management-fast-framework"
@@ -40,7 +40,7 @@
     "classnames": "^2.3.1",
     "copy-to-clipboard": "^3.3.1",
     "enquire-js": "^0.2.1",
-    "html-react-parser": "^1.4.0",
+    "html-react-parser": "^1.4.1",
     "lodash": "^4.17.21",
     "lodash-decorators": "^6.0.1",
     "lodash.debounce": "^4.0.8",
@@ -124,10 +124,10 @@
     "lint-staged": "^12.1.2",
     "npm-run-all": "^4.1.5",
     "pify": "^5.0.0",
-    "postcss": "^8.4.3",
+    "postcss": "^8.4.4",
     "postcss-less": "^5.0.0",
     "prettier": "^2.5.0",
-    "puppeteer": "^11.0.0",
+    "puppeteer": "^12.0.0",
     "query-string": "^7.0.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
@@ -167,5 +167,5 @@
   "bugs": {
     "url": "https://github.com/kityandhero/antd-management-fast-framework/issues"
   },
-  "gitHead": "23ac2b1ce1267df2c5c613529b0d354784b7d88e"
+  "gitHead": "48e23cd378dbe7cda1566614180397fdc06e066d"
 }

package/License.txt

@@ -1,21 +0,0 @@
-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.