antd-management-fast-framework 1.11.3 → 1.11.4

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/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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-management-fast-framework",
-  "version": "1.11.3",
+  "version": "1.11.4",
   "description": "antd-management-fast-framework",
   "keywords": [
     "antd-management-fast-framework"
@@ -32,11 +32,11 @@
     "@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",
@@ -124,9 +124,9 @@
     "lint-staged": "^12.1.2",
     "npm-run-all": "^4.1.5",
     "pify": "^5.0.0",
-    "postcss": "^8.3.11",
+    "postcss": "^8.4.3",
     "postcss-less": "^5.0.0",
-    "prettier": "^2.4.1",
+    "prettier": "^2.5.0",
     "puppeteer": "^11.0.0",
     "query-string": "^7.0.1",
     "react": "^17.0.2",
@@ -167,5 +167,5 @@
   "bugs": {
     "url": "https://github.com/kityandhero/antd-management-fast-framework/issues"
   },
-  "gitHead": "11398bf0bfb60684cbbf10e6d713bae473a9e68f"
+  "gitHead": "23ac2b1ce1267df2c5c613529b0d354784b7d88e"
 }