antd-management-fast-framework 1.9.38 → 1.9.39

package/es/framework/Base/index.js

@@ -13,6 +13,8 @@ var _nprogress = _interopRequireDefault(require("nprogress"));
 
 var _tools = require("../../utils/tools");
 
+var _defaultSettingsSpecial = require("../../utils/defaultSettingsSpecial");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -153,7 +155,9 @@ var Base = /*#__PURE__*/function (_Component) {
         pathname: path
       };
 
-      _nprogress["default"].inc();
+      if (_defaultSettingsSpecial.defaultSettingsLayoutCustom.getUseNprogress()) {
+        _nprogress["default"].inc();
+      }
 
       _umi.history.push(location);
     };
@@ -163,7 +167,9 @@ var Base = /*#__PURE__*/function (_Component) {
         pathname: path
       };
 
-      _nprogress["default"].inc();
+      if (_defaultSettingsSpecial.defaultSettingsLayoutCustom.getUseNprogress()) {
+        _nprogress["default"].inc();
+      }
 
       _umi.history.replace(location);
     };
@@ -186,9 +192,12 @@ var Base = /*#__PURE__*/function (_Component) {
   _createClass(Base, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      setTimeout(function () {
-        _nprogress["default"].done();
-      }, 400);
+      if (_defaultSettingsSpecial.defaultSettingsLayoutCustom.getUseNprogress()) {
+        setTimeout(function () {
+          _nprogress["default"].done();
+        }, 400);
+      }
+
       this.beforeDidMount();
       this.mounted = true;
       this.doDidMountTask();

package/es/utils/constants.d.ts

@@ -52,6 +52,7 @@ export namespace appInitDefault {
     export const imageUploadMaxSize: number;
     export const videoUploadMaxSize: number;
     export const fileUploadMaxSize: number;
+    export const useNprogress: boolean;
 }
 export const accessWaySpecialCollection: {
     super: {

package/es/utils/constants.js

@@ -81,7 +81,8 @@ var appInitDefault = {
   apiVersion: '',
   imageUploadMaxSize: 2,
   videoUploadMaxSize: 4,
-  fileUploadMaxSize: 2
+  fileUploadMaxSize: 2,
+  useNprogress: true
 };
 exports.appInitDefault = appInitDefault;
 var accessWaySpecialCollection = {

package/es/utils/defaultSettingsSpecial.d.ts

@@ -6,6 +6,7 @@
  */
 export function empty(): {};
 export namespace defaultSettingsLayoutCustom {
+    export function getUseNprogress(): boolean;
     export function getFileUploadMaxSize(): number;
     export function getVideoUploadMaxSize(): number;
     export function getImageUploadMaxSize(): number;

package/es/utils/defaultSettingsSpecial.js

@@ -17,6 +17,16 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 var defaultSettingsLayoutCustom = {
+  getUseNprogress: function getUseNprogress() {
+    var appInit = (0, _tools.getAppInitConfigData)();
+
+    var _useNprogress = _objectSpread(_objectSpread({}, {
+      useNprogress: true
+    }), appInit || {}),
+        useNprogress = _useNprogress.useNprogress;
+
+    return useNprogress;
+  },
   getFileUploadMaxSize: function getFileUploadMaxSize() {
     var appInit = (0, _tools.getAppInitConfigData)();
 

package/es/utils/globalStorageAssist.d.ts

@@ -36,7 +36,7 @@ export function removeParamsDataCache(key: any): void;
  */
 export function getTokenKeyName(): string;
 /**
- * 获取Token
+ * Get Token
  *
  * @export
  * @param {*} fn
@@ -44,7 +44,7 @@ export function getTokenKeyName(): string;
  */
 export function getToken(): any;
 /**
- * 设置Token
+ * Set Token
  *
  * @export
  * @param {*} fn

package/es/utils/globalStorageAssist.js

@@ -154,7 +154,7 @@ function getTokenKeyName() {
   return storageKeyCollection.token;
 }
 /**
- * 获取Token
+ * Get Token
  *
  * @export
  * @param {*} fn
@@ -167,7 +167,7 @@ function getToken() {
   return (0, _tools.getStringFromLocalStorage)(key);
 }
 /**
- * 设置Token
+ * Set Token
  *
  * @export
  * @param {*} fn

package/es/utils/proLayoutCollection.js

@@ -14,6 +14,8 @@ var _nprogress = _interopRequireDefault(require("nprogress"));
 
 var _tools = require("./tools");
 
+var _defaultSettingsSpecial = require("./defaultSettingsSpecial");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var proLayoutDefaultProps = {
@@ -39,18 +41,20 @@ var proLayoutDefaultProps = {
     return /*#__PURE__*/_react["default"].createElement(_umi.Link, {
       to: menuItemProps.path,
       onClick: function onClick() {
-        if ((_nprogress["default"] || null) == null) {
-          var text = 'nprogress need install';
-          (0, _tools.showErrorMessage)({
-            message: text
-          });
-        }
+        if (_defaultSettingsSpecial.defaultSettingsLayoutCustom.getUseNprogress()) {
+          if ((_nprogress["default"] || null) == null) {
+            var text = 'nprogress need install';
+            (0, _tools.showErrorMessage)({
+              message: text
+            });
+          }
 
-        _nprogress["default"].inc();
+          _nprogress["default"].inc();
 
-        setTimeout(function () {
-          _nprogress["default"].done();
-        }, 400);
+          setTimeout(function () {
+            _nprogress["default"].done();
+          }, 400);
+        }
       }
     }, defaultDom);
   }

package/es/utils/tools.d.ts

@@ -25,6 +25,7 @@ export function getAppInitConfigData(): {
     imageUploadMaxSize: number;
     videoUploadMaxSize: number;
     fileUploadMaxSize: number;
+    useNprogress: boolean;
 };
 export function defaultBaseState(): {
     dataLoading: boolean;

package/es/utils/tools.js

@@ -191,8 +191,12 @@ function getAppInitConfigData() {
   var appInitConfig = _constants.appInitDefault;
 
   if (isBrowser()) {
-    if ((window.appInitCustom || null) != null) {
-      appInitConfig = _objectSpread(_objectSpread({}, appInitConfig), window.appInitCustom);
+    if ((window.appInitCustomLocal || null) != null) {
+      appInitConfig = _objectSpread(_objectSpread({}, appInitConfig), window.appInitCustomLocal);
+    }
+
+    if ((window.appInitCustomRemote || null) != null) {
+      appInitConfig = _objectSpread(_objectSpread({}, appInitConfig), window.appInitCustomRemote);
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-management-fast-framework",
-  "version": "1.9.38",
+  "version": "1.9.39",
   "description": "antd-management-fast-framework",
   "keywords": [
     "antd-management-fast-framework"
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@ant-design/pro-layout": "^6.31.0",
+    "@ant-design/pro-layout": "^6.31.2",
     "@antv/data-set": "^0.11.8",
     "antd": "^4.17.1",
     "array-move": "^4.0.0",
@@ -88,7 +88,7 @@
     "@testing-library/react": "^12.1.2",
     "@testing-library/react-hooks": "^7.0.2",
     "@types/jest": "^27.0.3",
-    "@types/node": "^16.11.9",
+    "@types/node": "^16.11.10",
     "@typescript-eslint/eslint-plugin": "^5.4.0",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.5.20",
@@ -105,7 +105,7 @@
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-import": "^2.25.3",
-    "eslint-plugin-jest": "^25.2.4",
+    "eslint-plugin-jest": "^25.3.0",
     "eslint-plugin-jsx-a11y": "^6.5.1",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-react": "^7.27.1",