antd-management-fast-framework 1.11.3 → 1.11.8

package/es/framework/Base/index.js

@@ -157,6 +157,10 @@ var Base = /*#__PURE__*/function (_Component) {
 
       if (_defaultSettingsSpecial.defaultSettingsLayoutCustom.getUseNprogress()) {
         _nprogress.default.inc();
+
+        setTimeout(function () {
+          _nprogress.default.done();
+        }, 400);
       }
 
       _umi.history.push(location);
@@ -169,6 +173,10 @@ var Base = /*#__PURE__*/function (_Component) {
 
       if (_defaultSettingsSpecial.defaultSettingsLayoutCustom.getUseNprogress()) {
         _nprogress.default.inc();
+
+        setTimeout(function () {
+          _nprogress.default.done();
+        }, 400);
       }
 
       _umi.history.replace(location);
@@ -192,12 +200,6 @@ var Base = /*#__PURE__*/function (_Component) {
   _createClass(Base, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      if (_defaultSettingsSpecial.defaultSettingsLayoutCustom.getUseNprogress()) {
-        setTimeout(function () {
-          _nprogress.default.done();
-        }, 400);
-      }
-
       this.beforeDidMount();
       this.mounted = true;
       this.doDidMountTask();

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/framework/DataListView/Base/index.d.ts

@@ -9,6 +9,7 @@ declare class ListBase extends AuthorizationWrapper {
      * 使用前台模拟分页，有助于优化长列表页面交互操作导致的延迟
      */
     useFrontendPagination: boolean;
+    affixPaginationBar: boolean;
     formRef: React.RefObject<any>;
     pageSizeAdditional: number;
     lastLoadParams: any;

package/es/framework/DataListView/Base/index.js

@@ -31,6 +31,10 @@ require("antd/es/tooltip/style");
 
 var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
 
+require("antd/es/affix/style");
+
+var _affix = _interopRequireDefault(require("antd/es/affix"));
+
 require("antd/es/pagination/style");
 
 var _pagination = _interopRequireDefault(require("antd/es/pagination"));
@@ -166,6 +170,8 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
     _this = _super.call(this, props);
     _this.useRemotePagination = true;
     _this.useFrontendPagination = false;
+    _this.useFrontendPagination = false;
+    _this.affixPaginationBar = true;
     _this.formRef = /*#__PURE__*/_react.default.createRef();
     _this.pageSizeAdditional = 0;
 
@@ -1074,7 +1080,7 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
 
       var style = _this.establishPaginationViewStyle();
 
-      return /*#__PURE__*/_react.default.createElement(_FlexBox.default, {
+      var bar = /*#__PURE__*/_react.default.createElement(_FlexBox.default, {
         style: style,
         right: /*#__PURE__*/_react.default.createElement(_pagination.default, _extends({}, paginationConfig, {
           onChange: function onChange(page, size) {
@@ -1085,6 +1091,18 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
           }
         }))
       });
+
+      if (_this.affixPaginationBar) {
+        return /*#__PURE__*/_react.default.createElement(_affix.default, {
+          offsetBottom: 0
+        }, /*#__PURE__*/_react.default.createElement("div", {
+          style: {
+            background: '#fff'
+          }
+        }, bar));
+      }
+
+      return bar;
     };
 
     _this.renderCardExtraAction = function () {
@@ -1216,9 +1234,7 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
           metaListData = _this$state7.metaListData,
           tableScroll = _this$state7.tableScroll,
           showSelect = _this$state7.showSelect,
-          selectedDataTableDataRows = _this$state7.selectedDataTableDataRows,
-          dataLoading = _this$state7.dataLoading,
-          processing = _this$state7.processing;
+          selectedDataTableDataRows = _this$state7.selectedDataTableDataRows;
 
       var _this$buildTableConfi = _this.buildTableConfig(),
           styleSet = _this$buildTableConfi.styleSet,

package/es/utils/authority.js

@@ -16,7 +16,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 +44,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() {

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/proLayoutCollection.js

@@ -18,6 +18,9 @@ var _defaultSettingsSpecial = require("./defaultSettingsSpecial");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+/**
+ * layout默认配置
+ */
 var proLayoutDefaultProps = {
   onMenuHeaderClick: function onMenuHeaderClick() {
     return _umi.history.push('/');

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.3",
+  "version": "1.11.8",
   "description": "antd-management-fast-framework",
   "keywords": [
     "antd-management-fast-framework"
@@ -32,15 +32,15 @@
     "@ant-design/icons": "^4.7.0",
     "@ant-design/pro-layout": "^6.31.2",
     "@antv/data-set": "^0.11.8",
-    "antd": "^4.17.1",
+    "antd": "^4.17.2",
     "array-move": "^4.0.0",
     "bizcharts": "^4.1.14",
     "browserslist": "^4.18.1",
-    "caniuse-lite": "^1.0.30001282",
+    "caniuse-lite": "^1.0.30001283",
     "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.3.11",
+    "postcss": "^8.4.4",
     "postcss-less": "^5.0.0",
-    "prettier": "^2.4.1",
-    "puppeteer": "^11.0.0",
+    "prettier": "^2.5.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": "11398bf0bfb60684cbbf10e6d713bae473a9e68f"
+  "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.