antd-management-fast-framework 1.11.5 → 1.11.10

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

@@ -11,6 +11,10 @@ require("antd/es/row/style");
 
 var _row = _interopRequireDefault(require("antd/es/row"));
 
+require("antd/es/empty/style");
+
+var _empty = _interopRequireDefault(require("antd/es/empty"));
+
 require("antd/es/col/style");
 
 var _col = _interopRequireDefault(require("antd/es/col"));
@@ -1661,7 +1665,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 +1702,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 = [];
@@ -1726,7 +1736,9 @@ var Common = /*#__PURE__*/function (_Core) {
             }
           });
 
-          var imageListContainor = /*#__PURE__*/_react.default.createElement(_space.default, null, imageItemShowList.map(function (o) {
+          var imageListContainor = /*#__PURE__*/_react.default.createElement(_space.default, null, imageItemShowList.length <= 0 ? /*#__PURE__*/_react.default.createElement(_empty.default, {
+            image: _empty.default.PRESENTED_IMAGE_SIMPLE
+          }) : imageItemShowList.map(function (o) {
             return /*#__PURE__*/_react.default.createElement("div", {
               key: o.key,
               style: o.imageBoxContainorStyle

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;
@@ -76,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/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.5",
+  "version": "1.11.10",
   "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": "aa387c8a9a319bb8141de51b028950207cb027b3"
+  "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.