antd-management-fast-framework 1.12.9 → 1.12.13

package/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [1.12.13](https://github.com/kityandhero/antd-management-fast-framework/compare/antd-management-fast-framework@1.12.12...antd-management-fast-framework@1.12.13) (2022-01-19)
+
+**Note:** Version bump only for package antd-management-fast-framework
+
+### [1.12.12](https://github.com/kityandhero/antd-management-fast-framework/compare/antd-management-fast-framework@1.12.11...antd-management-fast-framework@1.12.12) (2021-12-29)
+
+**Note:** Version bump only for package antd-management-fast-framework
+
+### [1.12.11](https://github.com/kityandhero/antd-management-fast-framework/compare/antd-management-fast-framework@1.12.10...antd-management-fast-framework@1.12.11) (2021-12-29)
+
+### Performance Improvements
+
+- **antd-management-fast-framework:** update ([0ae9427](https://github.com/kityandhero/antd-management-fast-framework/commit/0ae9427e7832c6b3014fd51814154612def06c78))
+
+### [1.12.10](https://github.com/kityandhero/antd-management-fast-framework/compare/antd-management-fast-framework@1.12.9...antd-management-fast-framework@1.12.10) (2021-12-29)
+
+**Note:** Version bump only for package antd-management-fast-framework
+
 ### [1.12.9](https://github.com/kityandhero/antd-management-fast-framework/compare/antd-management-fast-framework@1.12.8...antd-management-fast-framework@1.12.9) (2021-12-28)
 
 **Note:** Version bump only for package antd-management-fast-framework

package/es/customComponents/AudioUpload/index.js

@@ -45,14 +45,14 @@ var _input = _interopRequireDefault(require("antd/es/input"));
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _reactPlayer = _interopRequireDefault(require("react-player"));
-
 var _icons = require("@ant-design/icons");
 
 var _tools = require("../../utils/tools");
 
 var _defaultSettingsSpecial = require("../../utils/defaultSettingsSpecial");
 
+var _FunctionComponent = require("../../customComponents/FunctionComponent");
+
 var _IconInfo = _interopRequireDefault(require("../IconInfo"));
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -425,11 +425,8 @@ var AudioUpload = /*#__PURE__*/function (_PureComponent) {
           height: '50px',
           width: '100%'
         }
-      }, /*#__PURE__*/_react.default.createElement(_reactPlayer.default, {
-        width: "100%",
-        height: "100%",
-        url: audioUrl,
-        controls: true
+      }, (0, _FunctionComponent.buildPlayer)({
+        url: audioUrl
       }))), /*#__PURE__*/_react.default.createElement(_modal.default, {
         title: /*#__PURE__*/_react.default.createElement(_IconInfo.default, {
           icon: /*#__PURE__*/_react.default.createElement(_icons.SwapOutlined, null),

package/es/customComponents/FunctionComponent/index.d.ts

@@ -379,6 +379,12 @@ export function buildColumnItem({ column: columnConfig, attachedTargetName, }: {
     column: any;
     attachedTargetName?: string | undefined;
 }): any;
+export function buildPlayer({ url, width, height, controls, }: {
+    url: any;
+    width?: string | undefined;
+    height?: string | undefined;
+    controls?: boolean | undefined;
+}): JSX.Element;
 /**
  * 构建彩色文本
  */

package/es/customComponents/FunctionComponent/index.js

@@ -49,6 +49,7 @@ exports.buildOptionItem = buildOptionItem;
 exports.buildPageHeaderContent = buildPageHeaderContent;
 exports.buildPageHeaderTagWrapper = buildPageHeaderTagWrapper;
 exports.buildPageHeaderTitle = buildPageHeaderTitle;
+exports.buildPlayer = buildPlayer;
 exports.buildRadioGroup = buildRadioGroup;
 exports.buildRadioItem = buildRadioItem;
 exports.buildSearchFormSelect = buildSearchFormSelect;
@@ -154,6 +155,8 @@ var _rcTexty = _interopRequireDefault(require("rc-texty"));
 
 var _icons = require("@ant-design/icons");
 
+var _reactPlayer = _interopRequireDefault(require("react-player"));
+
 var _reactJsonView = _interopRequireDefault(require("react-json-view"));
 
 var _reactSyntaxHighlighter = _interopRequireDefault(require("react-syntax-highlighter"));
@@ -3005,34 +3008,50 @@ function buildColumnItem(_ref50) {
 
   return d;
 }
+
+function buildPlayer(_ref51) {
+  var url = _ref51.url,
+      _ref51$width = _ref51.width,
+      width = _ref51$width === void 0 ? '100%' : _ref51$width,
+      _ref51$height = _ref51.height,
+      height = _ref51$height === void 0 ? 'auto' : _ref51$height,
+      _ref51$controls = _ref51.controls,
+      controls = _ref51$controls === void 0 ? true : _ref51$controls;
+  return /*#__PURE__*/_react.default.createElement(_reactPlayer.default, {
+    width: width,
+    height: height,
+    url: url,
+    controls: controls
+  });
+}
 /**
  * 构建彩色文本
  */
 
 
-function buildColorText(_ref51) {
-  var _ref51$canCopy = _ref51.canCopy,
-      canCopy = _ref51$canCopy === void 0 ? false : _ref51$canCopy,
-      _ref51$randomSeed = _ref51.randomSeed,
-      randomSeed = _ref51$randomSeed === void 0 ? 0 : _ref51$randomSeed,
-      _ref51$seedOffset = _ref51.seedOffset,
-      seedOffset = _ref51$seedOffset === void 0 ? 0 : _ref51$seedOffset,
-      _ref51$randomColor = _ref51.randomColor,
-      randomColor = _ref51$randomColor === void 0 ? false : _ref51$randomColor,
-      _ref51$color = _ref51.color,
-      color = _ref51$color === void 0 ? '' : _ref51$color,
-      _ref51$textPrefix = _ref51.textPrefix,
-      textPrefix = _ref51$textPrefix === void 0 ? null : _ref51$textPrefix,
-      _ref51$textPrefixStyl = _ref51.textPrefixStyle,
-      textPrefixStyle = _ref51$textPrefixStyl === void 0 ? null : _ref51$textPrefixStyl,
-      _ref51$text = _ref51.text,
-      text = _ref51$text === void 0 ? '' : _ref51$text,
-      _ref51$separator = _ref51.separator,
-      separator = _ref51$separator === void 0 ? '：' : _ref51$separator,
-      _ref51$separatorStyle = _ref51.separatorStyle,
-      separatorStyle = _ref51$separatorStyle === void 0 ? null : _ref51$separatorStyle,
-      _ref51$wrapperBuilder = _ref51.wrapperBuilder,
-      wrapperBuilder = _ref51$wrapperBuilder === void 0 ? null : _ref51$wrapperBuilder;
+function buildColorText(_ref52) {
+  var _ref52$canCopy = _ref52.canCopy,
+      canCopy = _ref52$canCopy === void 0 ? false : _ref52$canCopy,
+      _ref52$randomSeed = _ref52.randomSeed,
+      randomSeed = _ref52$randomSeed === void 0 ? 0 : _ref52$randomSeed,
+      _ref52$seedOffset = _ref52.seedOffset,
+      seedOffset = _ref52$seedOffset === void 0 ? 0 : _ref52$seedOffset,
+      _ref52$randomColor = _ref52.randomColor,
+      randomColor = _ref52$randomColor === void 0 ? false : _ref52$randomColor,
+      _ref52$color = _ref52.color,
+      color = _ref52$color === void 0 ? '' : _ref52$color,
+      _ref52$textPrefix = _ref52.textPrefix,
+      textPrefix = _ref52$textPrefix === void 0 ? null : _ref52$textPrefix,
+      _ref52$textPrefixStyl = _ref52.textPrefixStyle,
+      textPrefixStyle = _ref52$textPrefixStyl === void 0 ? null : _ref52$textPrefixStyl,
+      _ref52$text = _ref52.text,
+      text = _ref52$text === void 0 ? '' : _ref52$text,
+      _ref52$separator = _ref52.separator,
+      separator = _ref52$separator === void 0 ? '：' : _ref52$separator,
+      _ref52$separatorStyle = _ref52.separatorStyle,
+      separatorStyle = _ref52$separatorStyle === void 0 ? null : _ref52$separatorStyle,
+      _ref52$wrapperBuilder = _ref52.wrapperBuilder,
+      wrapperBuilder = _ref52$wrapperBuilder === void 0 ? null : _ref52$wrapperBuilder;
 
   var colorText = /*#__PURE__*/_react.default.createElement(_ColorText.default, {
     canCopy: canCopy || false,
@@ -3054,9 +3073,9 @@ function buildColorText(_ref51) {
   return wrapperBuilder(colorText);
 }
 
-function adjustTableExpandConfig(_ref52) {
-  var list = _ref52.list,
-      config = _ref52.config;
+function adjustTableExpandConfig(_ref53) {
+  var list = _ref53.list,
+      config = _ref53.config;
 
   if ((config || null) != null) {
     var _checkNeedExpander$ro = _objectSpread(_objectSpread({}, {
@@ -3073,10 +3092,10 @@ function adjustTableExpandConfig(_ref52) {
       animalType: _constants.listViewConfig.expandAnimalType.none,
       expandIconRotate: true,
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      expandIcon: function expandIcon(_ref53) {
-        var expanded = _ref53.expanded,
-            onExpand = _ref53.onExpand,
-            record = _ref53.record;
+      expandIcon: function expandIcon(_ref54) {
+        var expanded = _ref54.expanded,
+            onExpand = _ref54.onExpand,
+            record = _ref54.record;
         return /*#__PURE__*/_react.default.createElement(_icons.RightCircleOutlined, null);
       },
       expandedRowRender: null
@@ -3106,11 +3125,11 @@ function adjustTableExpandConfig(_ref52) {
 
     var expandableConfig = checkNeedExpanderResult ? {
       rowExpandable: rowExpandable,
-      expandIcon: function expandIcon(_ref54) {
-        var canExpand = _ref54.expandable,
-            expanded = _ref54.expanded,
-            onExpand = _ref54.onExpand,
-            record = _ref54.record;
+      expandIcon: function expandIcon(_ref55) {
+        var canExpand = _ref55.expandable,
+            expanded = _ref55.expanded,
+            onExpand = _ref55.onExpand,
+            record = _ref55.record;
 
         if (!canExpand && (expandPlaceholderIcon || null) != null) {
           return expandPlaceholderIcon || null;

package/es/customComponents/VideoUpload/index.js

@@ -45,14 +45,14 @@ var _input = _interopRequireDefault(require("antd/es/input"));
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _reactPlayer = _interopRequireDefault(require("react-player"));
-
 var _icons = require("@ant-design/icons");
 
 var _tools = require("../../utils/tools");
 
 var _defaultSettingsSpecial = require("../../utils/defaultSettingsSpecial");
 
+var _FunctionComponent = require("../../customComponents/FunctionComponent");
+
 var _IconInfo = _interopRequireDefault(require("../IconInfo"));
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -419,11 +419,8 @@ var VideoUpload = /*#__PURE__*/function (_PureComponent) {
         visible: previewVisible,
         footer: null,
         onCancel: this.handleUploadCancel
-      }, /*#__PURE__*/_react.default.createElement(_reactPlayer.default, {
-        width: "100%",
-        height: "100%",
-        url: videoUrl,
-        controls: true
+      }, (0, _FunctionComponent.buildPlayer)({
+        url: videoUrl
       })), /*#__PURE__*/_react.default.createElement(_modal.default, {
         title: /*#__PURE__*/_react.default.createElement(_IconInfo.default, {
           icon: /*#__PURE__*/_react.default.createElement(_icons.SwapOutlined, null),

package/es/framework/DataSinglePageView/SinglePage/index.js

@@ -67,7 +67,9 @@ var SinglePage = /*#__PURE__*/function (_Base) {
     _this.handleSearchReset = function () {
       var form = _this.getSearchCard();
 
-      form.resetFields();
+      if ((form || null) != null) {
+        form.resetFields();
+      }
 
       _this.handleAdditionalSearchReset();
 

package/es/utils/globalStorageAssist.d.ts

@@ -58,7 +58,7 @@ export function setToken(v: any): void;
  * @param {*} fn
  * @returns
  */
-export function removeToken(v: any): void;
+export function removeToken(): void;
 export function getTokenObject(): {};
 /**
  * 清空LocalStorage数据

package/es/utils/globalStorageAssist.js

@@ -210,9 +210,9 @@ function setToken(v) {
  */
 
 
-function removeToken(v) {
+function removeToken() {
   var key = storageKeyCollection.token;
-  return (0, _tools.removeLocalStorage)(key, v);
+  return (0, _tools.removeLocalStorage)(key);
 }
 
 function getTokenObject() {

package/es/utils/mediaDefault.d.ts

@@ -1,9 +1,10 @@
 /**
- * 清空LocalStorage数据
+ * 占位函数
+ *
  * @export
- * @param {*} key
+ * @returns
  */
-export function clearCustomData(): void;
+export function emptyExport(): {};
 /**
  * Empty Logo
  */

package/es/utils/mediaDefault.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.clearCustomData = clearCustomData;
+exports.emptyExport = emptyExport;
 exports.emptyLogo = void 0;
 
 /**
@@ -11,13 +11,14 @@ exports.emptyLogo = void 0;
  */
 var emptyLogo = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAAEXRFWHRTb2Z0d2FyZQBTbmlwYXN0ZV0Xzt0AAAIsSURBVHic7ZqxaoNQFIb/lL7EHYUU8gB3yih06OATmLlDhm7O4uxQyNDBWZ8gQ4eAYyYfIJDCHe9jtEMtRKPNvY3lh/Z84OTx5L9f9HgDmVlr3/GPuWEHYCMC2AHYiAB2ADYigB2AjQhgB2AjAtgB2IgAdgA2IoAdgI0IYAdgIwLYAdiIAHYANiKAHYCNCGAHYCMCfC8wRQSlEtSXCusESqnOERXmuwuQ9OpVMvIp3r3H+YU7wKCIFFR8QLa3sPbrqLBIl1BRgX7UT6kxUJ3WW9iH154E/96XuL1ytWeY4glps0Jlc4SdMyFyWwEqxjKZw+bt2TrBMgWyvcVj0GsW5rAnTbx7OzDxHVDjJW2gszWGI4RYZxooX9tHyKB4LqGzzfnir+7txrQCzBsO0Ijux1cT3EfQOODNADA7bBtgMb+4ev/ejkws4IjGqbDB0XzVa9x11tQfhu3A9e3tyLQCgjtop8J20YP1IfJ2uO2zk7O+vR2ZWMAcCzTY7sa/ArPbosEC88Ct/se9HZl4CIZ4WAFN+jIyiPqD7HNwjddf09uNyfcBYb5HpkvEZ5ulGomKUeoMm5ORHzxu2voI/b2MOXafet/eLsx8/yRligjLdGAcrarO+3eoblVZjL6i6wQqLvtNB975P+j9Dd4C/hryY4gdgI0IYAdgIwLYAdiIAHYANiKAHYCNCGAHYCMC2AHYiAB2ADYigB2AjQhgB2AjAtgB2IgAdgA2/17AB0T0+YJa7nadAAAAAElFTkSuQmCC';
 /**
- * 清空LocalStorage数据
+ * 占位函数
+ *
  * @export
- * @param {*} key
+ * @returns
  */
 
 exports.emptyLogo = emptyLogo;
 
-function clearCustomData() {
-  clearLocalStorage();
+function emptyExport() {
+  return {};
 }

package/es/utils/requestAssistor.d.ts

@@ -61,7 +61,7 @@ export function handlePageListDataAssist(state: any, action: any, pretreatment?:
  * @param {*} virtualNeedAuthorize [object]:set virtual request whether check token， only check mull or empty, generally used to debug
  * @returns
  */
-export function request({ api, params, method, useVirtualRequest, showUseVirtualRequestMessage, virtualSuccessResponse, virtualFailResponse, virtualRequestResult, virtualNeedAuthorize, }: any): Promise<any>;
+export function request({ api, urlParams, params, method, useVirtualRequest, showUseVirtualRequestMessage, virtualSuccessResponse, virtualFailResponse, virtualRequestResult, virtualNeedAuthorize, }: any): Promise<any>;
 /**
  * 获取配置的 api 版本号
  */

package/es/utils/requestAssistor.js

@@ -407,13 +407,13 @@ function request(_x) {
 
 function _request() {
   _request = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(_ref4) {
-    var api, _ref4$params, params, _ref4$method, method, _ref4$useVirtualReque, useVirtualRequest, _ref4$showUseVirtualR, showUseVirtualRequestMessage, _ref4$virtualSuccessR, virtualSuccessResponse, _ref4$virtualFailResp, virtualFailResponse, _ref4$virtualRequestR, virtualRequestResult, _ref4$virtualNeedAuth, virtualNeedAuthorize, apiVersion, url, showRequestInfo, result, verifyToken, token, loginPath;
+    var api, _ref4$urlParams, urlParams, _ref4$params, params, _ref4$method, method, _ref4$useVirtualReque, useVirtualRequest, _ref4$showUseVirtualR, showUseVirtualRequestMessage, _ref4$virtualSuccessR, virtualSuccessResponse, _ref4$virtualFailResp, virtualFailResponse, _ref4$virtualRequestR, virtualRequestResult, _ref4$virtualNeedAuth, virtualNeedAuthorize, apiVersion, url, showRequestInfo, result, verifyToken, token, loginPath;
 
     return regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            api = _ref4.api, _ref4$params = _ref4.params, params = _ref4$params === void 0 ? {} : _ref4$params, _ref4$method = _ref4.method, method = _ref4$method === void 0 ? 'POST' : _ref4$method, _ref4$useVirtualReque = _ref4.useVirtualRequest, useVirtualRequest = _ref4$useVirtualReque === void 0 ? _defaultSettingsSpecial.defaultSettingsLayoutCustom.getUseVirtualRequest() : _ref4$useVirtualReque, _ref4$showUseVirtualR = _ref4.showUseVirtualRequestMessage, showUseVirtualRequestMessage = _ref4$showUseVirtualR === void 0 ? _defaultSettingsSpecial.defaultSettingsLayoutCustom.getShowUseVirtualRequestMessage() : _ref4$showUseVirtualR, _ref4$virtualSuccessR = _ref4.virtualSuccessResponse, virtualSuccessResponse = _ref4$virtualSuccessR === void 0 ? {} : _ref4$virtualSuccessR, _ref4$virtualFailResp = _ref4.virtualFailResponse, virtualFailResponse = _ref4$virtualFailResp === void 0 ? {
+            api = _ref4.api, _ref4$urlParams = _ref4.urlParams, urlParams = _ref4$urlParams === void 0 ? null : _ref4$urlParams, _ref4$params = _ref4.params, params = _ref4$params === void 0 ? {} : _ref4$params, _ref4$method = _ref4.method, method = _ref4$method === void 0 ? 'POST' : _ref4$method, _ref4$useVirtualReque = _ref4.useVirtualRequest, useVirtualRequest = _ref4$useVirtualReque === void 0 ? _defaultSettingsSpecial.defaultSettingsLayoutCustom.getUseVirtualRequest() : _ref4$useVirtualReque, _ref4$showUseVirtualR = _ref4.showUseVirtualRequestMessage, showUseVirtualRequestMessage = _ref4$showUseVirtualR === void 0 ? _defaultSettingsSpecial.defaultSettingsLayoutCustom.getShowUseVirtualRequestMessage() : _ref4$showUseVirtualR, _ref4$virtualSuccessR = _ref4.virtualSuccessResponse, virtualSuccessResponse = _ref4$virtualSuccessR === void 0 ? {} : _ref4$virtualSuccessR, _ref4$virtualFailResp = _ref4.virtualFailResponse, virtualFailResponse = _ref4$virtualFailResp === void 0 ? {
               code: 1001,
               message: '虚拟未知错误'
             } : _ref4$virtualFailResp, _ref4$virtualRequestR = _ref4.virtualRequestResult, virtualRequestResult = _ref4$virtualRequestR === void 0 ? true : _ref4$virtualRequestR, _ref4$virtualNeedAuth = _ref4.virtualNeedAuthorize, virtualNeedAuthorize = _ref4$virtualNeedAuth === void 0 ? true : _ref4$virtualNeedAuth;
@@ -442,10 +442,21 @@ function _request() {
             }
 
             url = "".concat(apiVersion).concat(api).replace('//', '/');
+
+            if ((urlParams || null) != null) {
+              if ((0, _tools.isString)(urlParams)) {
+                url = "".concat(url, "?").concat(urlParams);
+              }
+
+              if ((0, _tools.isObject)(urlParams)) {
+                url = "".concat(url, "?").concat((0, _tools.queryStringify)(urlParams));
+              }
+            }
+
             showRequestInfo = _defaultSettingsSpecial.defaultSettingsLayoutCustom.getShowRequestInfo();
 
             if (!useVirtualRequest) {
-              _context.next = 28;
+              _context.next = 29;
               break;
             }
 
@@ -470,20 +481,20 @@ function _request() {
             }
 
             if (!(virtualNeedAuthorize && !verifyToken)) {
-              _context.next = 23;
+              _context.next = 24;
               break;
             }
 
             loginPath = _defaultSettingsSpecial.defaultSettingsLayoutCustom.getLoginPath();
 
             if (!(0, _tools.stringIsNullOrWhiteSpace)(loginPath)) {
-              _context.next = 20;
+              _context.next = 21;
               break;
             }
 
             throw new Error('缺少登录页面路径配置');
 
-          case 20:
+          case 21:
             setTimeout(function () {
               (0, _globalStorageAssist.clearCustomData)();
 
@@ -493,11 +504,11 @@ function _request() {
                 pathname: loginPath
               });
             }, 400);
-            _context.next = 26;
+            _context.next = 27;
             break;
 
-          case 23:
-            _context.next = 25;
+          case 24:
+            _context.next = 26;
             return (0, _virtualRequest.apiVirtualAccess)({
               dataBuild: function dataBuild(resolve) {
                 if (virtualRequestResult) {
@@ -513,10 +524,10 @@ function _request() {
               }
             });
 
-          case 25:
+          case 26:
             result = _context.sent;
 
-          case 26:
+          case 27:
             if (showRequestInfo) {
               (0, _tools.recordObject)({
                 url: url,
@@ -528,7 +539,7 @@ function _request() {
 
             return _context.abrupt("return", result);
 
-          case 28:
+          case 29:
             if (showRequestInfo) {
               (0, _tools.recordObject)({
                 api: api,
@@ -543,7 +554,7 @@ function _request() {
               data: params
             }));
 
-          case 30:
+          case 31:
           case "end":
             return _context.stop();
         }

package/es/utils/tools.d.ts

@@ -417,14 +417,26 @@ export function getValueByKey({ data, key, defaultValue, convert, convertBuilder
  * @returns
  */
 export function convertTarget({ target, convert }: any): any;
-export function formatTarget({ target, format }: {
+export function formatTarget({ target, format, option }: {
     target: any;
     format: any;
+    option?: {} | undefined;
 }): any;
 /**
  * 通过 path 获取对应得值
  */
 export function getPathValue(o: any, path: any, defaultValue?: any): any;
+/**
+ *计算时间间隔
+ * @param {startTime} 起始时间
+ * @param {endTime} 结束时间
+ */
+export function calculateTimeInterval(startTime: any, endTime: any): {
+    day: number;
+    hour: number;
+    minute: number;
+    second: number;
+};
 /**
  * 格式化货币
  *
@@ -458,10 +470,11 @@ export function removeLastMatch(source: any, target: any): any;
  * 转换金额为人民币大写
  *
  * @export
- * @param {*} v
+ * @param {*} target 转换的目标
+ * @param {*} option 转换配置, 参看Nzh包
  * @returns
  */
-export function formatMoneyToChinese(v: any): string;
+export function formatMoneyToChinese({ target, option }: any): string;
 export function seededRandom({ seed, min, max }: {
     seed: any;
     min: any;
@@ -745,7 +758,7 @@ export function trySendNearestLocalhostNotify({ text }: {
 /**
  * 文本缩略
  */
-export function ellipsis(value: any, length: any): string;
+export function ellipsis(value: any, length: any, symbol?: string): string;
 export function notifySuccess(text: any): void;
 /**
  * 发送页面通知
@@ -775,6 +788,8 @@ export function sortCollectionByKey({ operate, item, list, sortKey, sortMin, }:
     sortKey: any;
     sortMin?: number | undefined;
 }): any;
+export function queryStringify(data: any): string;
+export function queryStringParse(data: any): import("qs").ParsedQs;
 /**
  * 占位函数
  *

package/es/utils/tools.js

@@ -7,6 +7,7 @@ exports.arrayMove = arrayMove;
 exports.arrayMoveMutate = arrayMoveMutate;
 exports.buildFieldDescription = buildFieldDescription;
 exports.buildFieldHelper = buildFieldHelper;
+exports.calculateTimeInterval = calculateTimeInterval;
 exports.checkDevelopment = checkDevelopment;
 exports.checkExist = checkExist;
 exports.checkFromConfig = checkFromConfig;
@@ -75,6 +76,8 @@ exports.isUndefined = isUndefined;
 exports.notify = notify;
 exports.notifySuccess = notifySuccess;
 exports.numeralFormat = numeralFormat;
+exports.queryStringParse = queryStringParse;
+exports.queryStringify = queryStringify;
 exports.recordError = recordError;
 exports.recordLog = recordLog;
 exports.recordObject = recordObject;
@@ -145,6 +148,10 @@ var _numeral = _interopRequireDefault(require("numeral"));
 
 var _randomcolor = _interopRequireDefault(require("randomcolor"));
 
+var _nzh = _interopRequireDefault(require("nzh"));
+
+var _qs = require("qs");
+
 var _arrayMove = require("array-move");
 
 var _lodash = require("lodash");
@@ -157,22 +164,14 @@ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableTo
 
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -1106,7 +1105,9 @@ function convertTarget(_ref15) {
 
 function formatTarget(_ref16) {
   var target = _ref16.target,
-      format = _ref16.format;
+      format = _ref16.format,
+      _ref16$option = _ref16.option,
+      option = _ref16$option === void 0 ? {} : _ref16$option;
 
   if (isFunction(format)) {
     return format(target);
@@ -1123,7 +1124,10 @@ function formatTarget(_ref16) {
         });
 
       case _constants.formatCollection.chineseMoney:
-        return formatMoneyToChinese(target);
+        return formatMoneyToChinese({
+          target: target,
+          option: option
+        });
 
       case _constants.formatCollection.percentage:
         return "".concat(roundToTarget(target * 100, 1), "%");
@@ -1167,6 +1171,36 @@ function getPathValue(o, path) {
 
   return v || defaultValue;
 }
+/**
+ *计算时间间隔
+ * @param {startTime} 起始时间
+ * @param {endTime} 结束时间
+ */
+
+
+function calculateTimeInterval(startTime, endTime) {
+  var timeBegin = startTime.getTime();
+  var timeEnd = endTime.getTime();
+  var total = (timeEnd - timeBegin) / 1000;
+  var day = parseInt(total / (24 * 60 * 60)); //计算整数天数
+
+  var afterDay = total - day * 24 * 60 * 60; //取得算出天数后剩余的秒数
+
+  var hour = parseInt(afterDay / (60 * 60)); //计算整数小时数
+
+  var afterHour = total - day * 24 * 60 * 60 - hour * 60 * 60; //取得算出小时数后剩余的秒数
+
+  var min = parseInt(afterHour / 60); //计算整数分
+
+  var afterMin = total - day * 24 * 60 * 60 - hour * 60 * 60 - min * 60; //取得算出分后剩余的秒数
+
+  return {
+    day: day,
+    hour: hour,
+    minute: min,
+    second: afterMin
+  };
+}
 /**
  * 格式化货币
  *
@@ -1273,120 +1307,42 @@ function removeLastMatch(source, target) {
  * 转换金额为人民币大写
  *
  * @export
- * @param {*} v
+ * @param {*} target 转换的目标
+ * @param {*} option 转换配置, 参看Nzh包
  * @returns
  */
 
 
-function formatMoneyToChinese(v) {
-  var money = v;
-  var cnNumber = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖']; // 汉字的数字
-
-  var cnIntBasic = ['', '拾', '佰', '仟']; // 基本单位
-
-  var cnIntUnits = ['', '万', '亿', '兆']; // 对应整数部分扩展单位
-
-  var cnDecUnits = ['角', '分', '毫', '厘']; // 对应小数部分单位
-  // var cnInteger = "整"; // 整数金额时后面跟的字符
-
-  var cnIntLast = '元'; // 整型完以后的单位
-
-  var maxNum = 999999999999999.9999; // 最大处理的数字
-
-  var IntegerNum; // 金额整数部分
-
-  var DecimalNum; // 金额小数部分
-
-  var ChineseString = ''; // 输出的中文金额字符串
-
-  var parts; // 分离金额后用的数组，预定义
-
-  if (money === '') {
-    return '';
-  }
-
-  money = parseFloat(money);
-
-  if (money >= maxNum) {
-    return '超出最大处理数字';
-  }
-
-  if (money === 0) {
-    ChineseString = cnNumber[0] + cnIntLast;
-    return ChineseString;
-  }
-
-  money = money.toString(); // 转换为字符串
-
-  if (money.indexOf('.') === -1) {
-    IntegerNum = money;
-    DecimalNum = '';
-  } else {
-    parts = money.split('.');
-    var _parts = parts;
-
-    var _parts2 = _slicedToArray(_parts, 2);
-
-    IntegerNum = _parts2[0];
-    DecimalNum = _parts2[1];
-    DecimalNum = parts[1].substr(0, 4);
-  }
-
-  if (parseInt(IntegerNum, 10) > 0) {
-    // 获取整型部分转换
-    var zeroCount = 0;
-    var IntLen = IntegerNum.length;
-
-    for (var i = 0; i < IntLen; i += 1) {
-      var n = IntegerNum.substr(i, 1);
-      var p = IntLen - i - 1;
-      var q = p / 4;
-      var m = p % 4;
-
-      if (n === '0') {
-        zeroCount += 1;
-      } else {
-        if (zeroCount > 0) {
-          ChineseString += cnNumber[0];
-        }
-
-        zeroCount = 0; // 归零
-
-        ChineseString += cnNumber[parseInt(n, 10)] + cnIntBasic[m];
-      }
-
-      if (m === 0 && zeroCount < 4) {
-        ChineseString += cnIntUnits[q];
-      }
-    }
-
-    ChineseString += cnIntLast; // 整型部分处理完毕
-  }
+function formatMoneyToChinese(_ref17) {
+  var target = _ref17.target,
+      _ref17$option = _ref17.option,
+      option = _ref17$option === void 0 ? {} : _ref17$option;
 
-  if (DecimalNum !== '') {
-    // 小数部分
-    var decLen = DecimalNum.length;
+  var o = _objectSpread(_objectSpread({}, {
+    mode: 'cn',
+    complete: false,
+    outSymbol: true
+  }), option || {});
 
-    for (var _i2 = 0; _i2 < decLen; _i2 += 1) {
-      var _n2 = DecimalNum.substr(_i2, 1);
+  var mode = o.mode;
+  var nzhLocal = _nzh.default.cn;
 
-      if (_n2 !== '0') {
-        ChineseString += cnNumber[Number(_n2)] + cnDecUnits[_i2];
-      }
-    }
-  }
+  switch (mode) {
+    case 'hk':
+      nzhLocal = _nzh.default.hk;
+      break;
 
-  if (ChineseString === '') {
-    ChineseString += cnNumber[0] + cnIntLast;
+    default:
+      break;
   }
 
-  return ChineseString;
+  return nzhLocal.toMoney(target, o);
 }
 
-function seededRandom(_ref17) {
-  var seed = _ref17.seed,
-      min = _ref17.min,
-      max = _ref17.max;
+function seededRandom(_ref18) {
+  var seed = _ref18.seed,
+      min = _ref18.min,
+      max = _ref18.max;
   var maxValue = max || 1;
   var minValue = min || 0;
   var seedValue = (seed * 9301 + 49297) % 233280;
@@ -1402,18 +1358,18 @@ function seededRandom(_ref17) {
  */
 
 
-function getRandomColor(_ref18) {
-  var seed = _ref18.seed,
-      _ref18$hue = _ref18.hue,
-      hue = _ref18$hue === void 0 ? null : _ref18$hue,
-      _ref18$luminosity = _ref18.luminosity,
-      luminosity = _ref18$luminosity === void 0 ? null : _ref18$luminosity,
-      _ref18$count = _ref18.count,
-      count = _ref18$count === void 0 ? null : _ref18$count,
-      _ref18$format = _ref18.format,
-      format = _ref18$format === void 0 ? null : _ref18$format,
-      _ref18$alpha = _ref18.alpha,
-      alpha = _ref18$alpha === void 0 ? null : _ref18$alpha;
+function getRandomColor(_ref19) {
+  var seed = _ref19.seed,
+      _ref19$hue = _ref19.hue,
+      hue = _ref19$hue === void 0 ? null : _ref19$hue,
+      _ref19$luminosity = _ref19.luminosity,
+      luminosity = _ref19$luminosity === void 0 ? null : _ref19$luminosity,
+      _ref19$count = _ref19.count,
+      count = _ref19$count === void 0 ? null : _ref19$count,
+      _ref19$format = _ref19.format,
+      format = _ref19$format === void 0 ? null : _ref19$format,
+      _ref19$alpha = _ref19.alpha,
+      alpha = _ref19$alpha === void 0 ? null : _ref19$alpha;
   return (0, _randomcolor.default)({
     seed: seed,
     hue: hue,
@@ -2116,8 +2072,8 @@ function removeNearestLocalhostNotifyCache() {
  */
 
 
-function trySendNearestLocalhostNotify(_ref19) {
-  var text = _ref19.text;
+function trySendNearestLocalhostNotify(_ref20) {
+  var text = _ref20.text;
   var needSend = false;
   var nearestTime = 0;
 
@@ -2157,8 +2113,10 @@ function trySendNearestLocalhostNotify(_ref19) {
 
 
 function ellipsis(value, length) {
+  var symbol = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '...';
+
   if (value && value.length > length) {
-    return "".concat(toString(value).substr(0, length), "...");
+    return "".concat(toString(value).substr(0, length)).concat(symbol);
   }
 
   return toString(value);
@@ -2178,11 +2136,11 @@ function notifySuccess(text) {
  */
 
 
-function notify(_ref20) {
-  var type = _ref20.type,
-      placementValue = _ref20.placement,
-      messageValue = _ref20.message,
-      descriptionValue = _ref20.description;
+function notify(_ref21) {
+  var type = _ref21.type,
+      placementValue = _ref21.placement,
+      messageValue = _ref21.message,
+      descriptionValue = _ref21.description;
 
   var _placement$message$de = _objectSpread(_objectSpread({}, {
     placement: 'bottomRight',
@@ -2256,10 +2214,10 @@ function notify(_ref20) {
   }, 600);
 }
 
-function checkFromConfig(_ref21) {
-  var label = _ref21.label,
-      name = _ref21.name,
-      helper = _ref21.helper;
+function checkFromConfig(_ref22) {
+  var label = _ref22.label,
+      name = _ref22.name,
+      helper = _ref22.helper;
   var labelText = 'object';
   var nameText = 'object';
   var helperText = 'object';
@@ -2318,13 +2276,13 @@ var requestAnimFrame = requestAnimFrameCustom;
 
 exports.requestAnimFrame = requestAnimFrame;
 
-function sortCollectionByKey(_ref22) {
-  var operate = _ref22.operate,
-      item = _ref22.item,
-      list = _ref22.list,
-      sortKey = _ref22.sortKey,
-      _ref22$sortMin = _ref22.sortMin,
-      sortMin = _ref22$sortMin === void 0 ? 0 : _ref22$sortMin;
+function sortCollectionByKey(_ref23) {
+  var operate = _ref23.operate,
+      item = _ref23.item,
+      list = _ref23.list,
+      sortKey = _ref23.sortKey,
+      _ref23$sortMin = _ref23.sortMin,
+      sortMin = _ref23$sortMin === void 0 ? 0 : _ref23$sortMin;
 
   if ((item || null) == null) {
     return list;
@@ -2423,6 +2381,14 @@ function sortCollectionByKey(_ref22) {
 
   return result;
 }
+
+function queryStringify(data) {
+  return (0, _qs.stringify)(data);
+}
+
+function queryStringParse(data) {
+  return (0, _qs.parse)(data);
+}
 /**
  * 占位函数
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-management-fast-framework",
-  "version": "1.12.9",
+  "version": "1.12.13",
   "description": "antd-management-fast-framework",
   "keywords": [
     "antd-management-fast-framework"
@@ -30,14 +30,14 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@ant-design/pro-layout": "^6.31.7",
+    "@ant-design/pro-layout": "^6.32.1",
     "@antv/data-set": "^0.11.8",
     "@tinymce/tinymce-react": "^3.13.0",
-    "antd": "^4.17.4",
+    "antd": "^4.18.0",
     "array-move": "^4.0.0",
     "bizcharts": "^4.1.15",
     "browserslist": "^4.19.1",
-    "caniuse-lite": "^1.0.30001292",
+    "caniuse-lite": "^1.0.30001294",
     "classnames": "^2.3.1",
     "copy-to-clipboard": "^3.3.1",
     "enquire-js": "^0.2.1",
@@ -51,9 +51,11 @@
     "node-cache": "^5.1.2",
     "nprogress": "^0.2.0",
     "numeral": "^2.0.6",
+    "nzh": "^1.0.8",
     "omit.js": "^2.0.2",
     "path-to-regexp": "^6.2.0",
     "prop-types": "^15.8.0",
+    "qs": "^6.10.2",
     "queue": "^6.0.2",
     "randomcolor": "^0.6.2",
     "rc-animate": "^3.1.1",
@@ -62,19 +64,20 @@
     "rc-scroll-anim": "^2.7.6",
     "rc-texty": "^0.2.0",
     "rc-tween-one": "^3.0.3",
+    "rc-util": "^5.16.1",
     "react": "^17.0.2",
     "react-container-query": "^0.12.0",
     "react-copy-to-clipboard": "^5.0.4",
     "react-dnd": "^14.0.4",
     "react-dnd-html5-backend": "^14.0.2",
+    "react-document-title": "^2.0.3",
     "react-dom": "^17.0.2",
     "react-json-view": "^1.21.3",
     "react-player": "^2.9.0",
     "react-router": "^6.2.1",
     "react-router-dom": "^6.2.1",
     "react-syntax-highlighter": "^15.4.5",
-    "stylelint-config-css-modules": "^2.3.0",
-    "stylelint-declaration-block-no-ignored-properties": "^2.5.0",
+    "redux": "^4.1.2",
     "umi-request": "^1.4.0",
     "use-merge-value": "^1.0.2",
     "uuid": "^8.3.2"
@@ -84,7 +87,7 @@
     "@babel/plugin-proposal-decorators": "^7.16.5",
     "@babel/plugin-syntax-jsx": "^7.16.5",
     "@babel/preset-react": "^7.16.5",
-    "@commitlint/cli": "^16.0.0",
+    "@commitlint/cli": "^16.0.1",
     "@commitlint/config-conventional": "^16.0.0",
     "@commitlint/config-lerna-scopes": "^16.0.0",
     "@commitlint/cz-commitlint": "^16.0.0",
@@ -92,6 +95,7 @@
     "@testing-library/react-hooks": "^7.0.2",
     "@types/jest": "^27.0.3",
     "@types/node": "^17.0.5",
+    "@types/react-document-title": "^2.0.5",
     "@typescript-eslint/eslint-plugin": "^5.8.1",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.5.20",
@@ -121,26 +125,22 @@
     "import-sort-parser-babylon": "^6.0.0",
     "import-sort-parser-typescript": "^6.0.0",
     "import-sort-style-module": "^6.0.0",
-    "lerna": "^4.0.0",
     "lint-staged": "^12.1.4",
-    "npm-run-all": "^4.1.5",
-    "pify": "^5.0.0",
     "postcss": "^8.4.5",
     "postcss-less": "^5.0.0",
     "prettier": "^2.5.1",
     "puppeteer": "^13.0.1",
-    "query-string": "^7.0.1",
     "react": "^17.0.2",
-    "react-dom": "^17.0.2",
     "react-test-renderer": "^17.0.2",
     "rimraf": "^3.0.2",
     "stylelint": "^14.2.0",
+    "stylelint-config-css-modules": "^2.3.0",
     "stylelint-config-prettier": "^9.0.3",
     "stylelint-config-standard": "^24.0.0",
+    "stylelint-declaration-block-no-ignored-properties": "^2.5.0",
     "test-umi-plugin": "^0.1.0",
     "umi": "^3.5.20",
-    "umi-plugin-custom-extra": "^1.0.12",
-    "yorkie": "^2.0.0"
+    "umi-plugin-custom-extra": "^1.0.12"
   },
   "gitHooks": {
     "pre-commit": "lint-staged"