antd-management-fast-framework 1.11.20 → 1.11.33

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

@@ -76,6 +76,7 @@ export function buildMenu({ handleData: r, handleMenuClick, menuItems, }: {
     handleMenuClick?: (() => void) | undefined;
     menuItems?: any[] | undefined;
 }): JSX.Element;
+export function buildTree(props: any): JSX.Element;
 export function buildCustomGrid({ key, list, props }: {
     key?: any;
     list: any;

package/es/customComponents/FunctionComponent/index.js

@@ -54,6 +54,7 @@ exports.buildSearchInput = buildSearchInput;
 exports.buildSearchInputNumber = buildSearchInputNumber;
 exports.buildSyntaxHighlighter = buildSyntaxHighlighter;
 exports.buildTagList = buildTagList;
+exports.buildTree = buildTree;
 exports.empty = empty;
 exports.pageHeaderExtraContent = pageHeaderExtraContent;
 
@@ -89,6 +90,10 @@ require("antd/es/col/style");
 
 var _col = _interopRequireDefault(require("antd/es/col"));
 
+require("antd/es/tree/style");
+
+var _tree = _interopRequireDefault(require("antd/es/tree"));
+
 require("antd/es/menu/style");
 
 var _menu = _interopRequireDefault(require("antd/es/menu"));
@@ -915,6 +920,10 @@ function buildMenu(_ref5) {
   }));
 }
 
+function buildTree(props) {
+  return /*#__PURE__*/_react.default.createElement(_tree.default, props);
+}
+
 function buildCustomGrid(_ref7) {
   var _ref7$key = _ref7.key,
       key = _ref7$key === void 0 ? null : _ref7$key,
@@ -941,7 +950,8 @@ function buildCustomGrid(_ref7) {
       emptyStyle: null,
       bordered: false,
       colon: true,
-      size: null
+      size: null,
+      ellipsis: true
     }), props || {}),
         title = _title$column$labelSt.title,
         columnSource = _title$column$labelSt.column,
@@ -951,7 +961,8 @@ function buildCustomGrid(_ref7) {
         globalEmptyStyle = _title$column$labelSt.emptyStyle,
         borderedSource = _title$column$labelSt.bordered,
         colonSource = _title$column$labelSt.colon,
-        sizeSource = _title$column$labelSt.size;
+        sizeSource = _title$column$labelSt.size,
+        ellipsis = _title$column$labelSt.ellipsis;
 
     if (!(0, _tools.isNumber)(columnSource)) {
       column = 3;
@@ -989,11 +1000,13 @@ function buildCustomGrid(_ref7) {
       borderTop: '1px solid #f0f0f0',
       borderLeft: '1px solid #f0f0f0'
     } : null;
-    var labelStyle = bordered ? _objectSpread(_objectSpread(_objectSpread({}, {
+
+    var labelStyle = _objectSpread(_objectSpread(_objectSpread({}, {
       width: '180px'
-    }), labelStyleSource || {}), {
+    }), labelStyleSource || {}), bordered ? {
       margin: margin
-    }) : {};
+    } : {});
+
     var contentStyle = bordered ? _objectSpread(_objectSpread(_objectSpread({}, {
       margin: '16px 24px'
     }), contentStyleSource || {}), {
@@ -1071,15 +1084,16 @@ function buildCustomGrid(_ref7) {
           borderRight: '1px solid #f0f0f0'
         } : {}),
         right: /*#__PURE__*/_react.default.createElement("div", {
-          style: _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, contentStyle), isEmpty ? globalEmptyStyle || {} : {}), isEmpty ? itemEmptyStyle || {} : {}), {
+          style: _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, contentStyle), isEmpty ? globalEmptyStyle || {} : {}), isEmpty ? itemEmptyStyle || {} : {}), {
             WebkitBoxOrient: 'vertical',
-            WebkitLineClamp: '1',
             overflow: 'hidden',
             display: '-webkit-box',
             textOverflow: 'ellipsis',
             wordBreak: 'break-all',
             whiteSpace: 'normal'
-          })
+          }), ellipsis ? {
+            WebkitLineClamp: '1'
+          } : {})
         }, v, itemCanCopy && (itemCanCopy || null) != null ? /*#__PURE__*/_react.default.createElement("a", {
           style: {
             marginLeft: '10px'
@@ -1296,7 +1310,11 @@ function buildMenuHeaderRender(_ref10) {
       collapsed = _ref10.collapsed,
       navTheme = _ref10.navTheme,
       shortName = _ref10.shortName;
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_FlexBox.default, {
+  return /*#__PURE__*/_react.default.createElement("div", {
+    style: {
+      overflow: 'hidden'
+    }
+  }, /*#__PURE__*/_react.default.createElement(_FlexBox.default, {
     flexAuto: "right",
     left: logoDom,
     right: collapsed ? null : /*#__PURE__*/_react.default.createElement(_VerticalBox.default, {
@@ -1305,21 +1323,20 @@ function buildMenuHeaderRender(_ref10) {
       style: {
         height: '100%'
       }
-    }, /*#__PURE__*/_react.default.createElement(Title, {
-      level: 1,
+    }, /*#__PURE__*/_react.default.createElement("div", {
       style: _objectSpread(_objectSpread({}, {
         margin: ' 0 0 0 12px',
         fontSize: '20px',
         color: 'white',
         fontWeight: '600',
-        lineHeight: '32px'
+        lineHeight: '32px',
+        overflow: 'hidden',
+        height: '100%',
+        whiteSpace: 'nowrap'
       }), navTheme === 'light' ? {
         color: '#000000d9'
       } : {})
-    }, /*#__PURE__*/_react.default.createElement(_rcTexty.default, {
-      type: "alpha",
-      mode: "smooth"
-    }, shortName || '应用简称')))
+    }, shortName || '应用简称'))
   }));
 }
 
@@ -2910,6 +2927,15 @@ function buildColumnItem(_ref49) {
         }));
       }
 
+      if (facadeMode === _constants.columnFacadeMode.dropdown) {
+        if (!(0, _tools.isFunction)(d.configBuilder)) {
+          return null;
+        }
+
+        var operateConfig = d.configBuilder(value, record, index);
+        return buildDropdown(operateConfig);
+      }
+
       throw new Error("\u65E0\u6548\u7684\u6E32\u67D3\u6A21\u5F0F\uFF1A".concat(facadeMode));
     };
   }

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

@@ -8,4 +8,10 @@ declare class HtmlBox extends React.PureComponent<any, any, any> {
     renderToHtml: () => void;
     main: HTMLSpanElement | null | undefined;
 }
+declare namespace HtmlBox {
+    export namespace defaultProps {
+        export const useEmpty: boolean;
+        export const html: string;
+    }
+}
 import React from "react";

package/es/customComponents/HtmlBox/index.js

@@ -7,16 +7,22 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+require("antd/es/empty/style");
+
+var _empty = _interopRequireDefault(require("antd/es/empty"));
+
 var _react = _interopRequireWildcard(require("react"));
 
-var _index = _interopRequireDefault(require("./index.less"));
+var _tools = require("../../utils/tools");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _index = _interopRequireDefault(require("./index.less"));
 
 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); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+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"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
@@ -57,10 +63,10 @@ var HtmlBox = /*#__PURE__*/function (_PureComponent) {
     _this = _super.call.apply(_super, [this].concat(args));
 
     _this.renderToHtml = function () {
-      var children = _this.props.children;
+      var html = _this.props.html;
 
       if (_this.main) {
-        _this.main.innerHTML = children;
+        _this.main.innerHTML = html;
       }
     };
 
@@ -82,6 +88,16 @@ var HtmlBox = /*#__PURE__*/function (_PureComponent) {
     value: function render() {
       var _this2 = this;
 
+      var _this$props = this.props,
+          useEmpty = _this$props.useEmpty,
+          html = _this$props.html;
+
+      if (!!useEmpty && (0, _tools.stringIsNullOrWhiteSpace)(html)) {
+        return /*#__PURE__*/_react.default.createElement(_empty.default, {
+          image: _empty.default.PRESENTED_IMAGE_SIMPLE
+        });
+      }
+
       return /*#__PURE__*/_react.default.createElement("span", {
         className: _index.default.richTextBox,
         ref: function ref(_ref) {
@@ -94,5 +110,9 @@ var HtmlBox = /*#__PURE__*/function (_PureComponent) {
   return HtmlBox;
 }(_react.PureComponent);
 
+HtmlBox.defaultProps = {
+  useEmpty: true,
+  html: ''
+};
 var _default = HtmlBox;
 exports.default = _default;

package/es/framework/AuthorizationWrapper/index.d.ts

@@ -3,7 +3,6 @@ declare class AuthorizationWrapper extends SupplementWrapper {
     componentAuthority: any;
     doDidMountTask: () => void;
     checkAuthority: (auth: any) => boolean;
-    checkAuthorities: (auth: any) => any;
     getCurrentOperator: () => any;
     reloadCurrentOperator: (callback?: any) => void;
 }

package/es/framework/AuthorizationWrapper/index.js

@@ -83,10 +83,6 @@ 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.d.ts

@@ -8,6 +8,7 @@ declare class Common extends Core {
         payload: {};
     };
     checkNeedUpdate: (preProps: any, preState: any, snapshot: any) => boolean;
+    getGlobal: () => any;
     getApiData: (props: any) => {
         metaOriginalData: {
             dataSuccess: boolean;

package/es/framework/Common/index.js

@@ -79,6 +79,8 @@ var _QueueBox = _interopRequireDefault(require("../../customComponents/AnimalBox
 
 var _ColorText = _interopRequireDefault(require("../../customComponents/ColorText"));
 
+var _HtmlBox = _interopRequireDefault(require("../../customComponents/HtmlBox"));
+
 var _FunctionComponent = require("../../customComponents/FunctionComponent");
 
 var _Whether = require("../../customComponents/FunctionSupplement/Whether");
@@ -148,6 +150,20 @@ var Common = /*#__PURE__*/function (_Core) {
       return false;
     };
 
+    _this.getGlobal = function () {
+      var global = _this.props.global;
+
+      if ((global || null) == null) {
+        var text = 'global is null, function getGlobal need override. ';
+        (0, _tools.showRuntimeError)({
+          message: text
+        });
+        throw new Error(text);
+      }
+
+      return global;
+    };
+
     _this.getApiData = function (props) {
       var text = 'getApiData 方法需要重载实现';
       (0, _tools.showRuntimeError)({
@@ -1626,6 +1642,52 @@ var Common = /*#__PURE__*/function (_Core) {
           }, /*#__PURE__*/_react.default.createElement(_divider.default, _objectSpread(_objectSpread({}, {}), contentItem.otherProps || {}), (0, _tools.stringIsNullOrWhiteSpace)(contentItem.text || '') ? null : contentItem.text));
         }
 
+        if (type === _constants.cardConfig.contentItemType.customGrid) {
+          return /*#__PURE__*/_react.default.createElement(_col.default, {
+            key: contentItemKey,
+            lg: lg,
+            md: lg || md,
+            sm: lg || sm,
+            xs: lg || xs
+          }, (0, _FunctionComponent.buildCustomGrid)({
+            list: (0, _tools.isArray)(contentItem.list) ? contentItem.list : [],
+            props: _objectSpread(_objectSpread({}, {
+              bordered: true,
+              column: 3,
+              emptyStyle: {
+                color: '#cccccc'
+              },
+              emptyValue: '暂无',
+              labelStyle: {
+                width: '100px'
+              }
+            }), contentItem.props || {})
+          }));
+        }
+
+        if (type === _constants.cardConfig.contentItemType.tree) {
+          return /*#__PURE__*/_react.default.createElement(_col.default, {
+            key: contentItemKey,
+            lg: lg,
+            md: lg || md,
+            sm: lg || sm,
+            xs: lg || xs
+          }, (0, _FunctionComponent.buildTree)(contentItem));
+        }
+
+        if (type === _constants.cardConfig.contentItemType.html) {
+          return /*#__PURE__*/_react.default.createElement(_col.default, {
+            key: contentItemKey,
+            lg: lg,
+            md: lg || md,
+            sm: lg || sm,
+            xs: lg || xs
+          }, /*#__PURE__*/_react.default.createElement(_HtmlBox.default, {
+            useEmpty: (contentItem.useEmpty || null) == null ? true : contentItem.useEmpty || false,
+            html: contentItem.html || ''
+          }));
+        }
+
         if (type === _constants.cardConfig.contentItemType.imageUpload) {
           var uploadProps = _objectSpread(_objectSpread({}, {
             image: contentItem.image || '',

package/es/framework/DataListView/Base/index.d.ts

@@ -207,6 +207,15 @@ declare class ListBase extends AuthorizationWrapper {
     renderCardCollectionView: () => JSX.Element;
     renderPaginationView: () => JSX.Element;
     renderView: () => JSX.Element | null;
+    establishSiderTopAreaConfig: () => null;
+    renderSiderTopArea: () => JSX.Element | null;
+    establishSiderBottomAreaConfig: () => null;
+    renderSiderBottomArea: () => JSX.Element | null;
+    buildCardCollectionArea: (config?: any) => JSX.Element | null;
+    renderSiderArea: () => JSX.Element | null;
+    renderContentArea: () => JSX.Element;
+    establishPageContentLayoutSiderConfig: () => {};
+    establishPageContentLayoutConfig: () => {};
     renderPageContent: () => JSX.Element;
     renderPageBody: () => JSX.Element;
     renderFurther(): JSX.Element;

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

@@ -71,6 +71,10 @@ require("antd/es/form/style");
 
 var _form = _interopRequireDefault(require("antd/es/form"));
 
+require("antd/es/layout/style");
+
+var _layout = _interopRequireDefault(require("antd/es/layout"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _icons = require("@ant-design/icons");
@@ -147,6 +151,8 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
+var Content = _layout.default.Content,
+    Sider = _layout.default.Sider;
 var FormItem = _form.default.Item;
 var RangePicker = _datePicker.default.RangePicker;
 
@@ -1343,7 +1349,103 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
       return null;
     };
 
-    _this.renderPageContent = function () {
+    _this.establishSiderTopAreaConfig = function () {
+      return null;
+    };
+
+    _this.renderSiderTopArea = function () {
+      var config = _this.establishSiderTopAreaConfig();
+
+      if (config == null) {
+        return null;
+      }
+
+      return _this.buildCardCollectionArea(config);
+    };
+
+    _this.establishSiderBottomAreaConfig = function () {
+      return null;
+    };
+
+    _this.renderSiderBottomArea = function () {
+      var config = _this.establishSiderBottomAreaConfig();
+
+      if (config == null) {
+        return null;
+      }
+
+      return _this.buildCardCollectionArea(config);
+    };
+
+    _this.buildCardCollectionArea = function () {
+      var config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+
+      if (config == null) {
+        return null;
+      }
+
+      var formContentWrapperTypeConfig = _this.establishWrapperTypeConfig() || {
+        mode: _constants.cardConfig.wrapperType.page
+      };
+
+      var configData = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, {
+        mode: _constants.cardConfig.wrapperType.page,
+        justify: 'start',
+        align: 'top'
+      }), formContentWrapperTypeConfig || {}), {
+        list: []
+      }), config || {});
+
+      var mode = configData.mode,
+          justifyGeneral = configData.justify,
+          alignGeneral = configData.align,
+          list = configData.list;
+      var listData = [];
+
+      if ((0, _tools.isArray)(list)) {
+        list.forEach(function (co, ci) {
+          listData.push(co);
+
+          if (ci !== list.length - 1) {
+            listData.push('');
+          }
+        });
+      }
+
+      return /*#__PURE__*/_react.default.createElement(_space.default, {
+        style: {
+          width: '100%'
+        },
+        direction: "vertical",
+        size: 24
+      }, listData.map(function (item, index) {
+        return _this.buildCardCollectionItem({
+          mode: mode,
+          justify: justifyGeneral,
+          align: alignGeneral,
+          config: item,
+          key: index
+        });
+      }));
+    };
+
+    _this.renderSiderArea = function () {
+      var topArea = _this.renderSiderTopArea();
+
+      var bottomArea = _this.renderSiderBottomArea();
+
+      if ((bottomArea || null) == null) {
+        return topArea;
+      }
+
+      return /*#__PURE__*/_react.default.createElement(_FlexBox.default, {
+        direction: "vertical",
+        top: topArea,
+        bottom: bottomArea
+      });
+    };
+
+    _this.renderContentArea = function () {
       var _this$state10 = _this.state,
           listTitle = _this$state10.listTitle,
           renderSearchForm = _this$state10.renderSearchForm;
@@ -1353,18 +1455,13 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
       var searchForm = _this.renderForm();
 
       var hasPagination = _this.renderPaginationView() != null;
-      return /*#__PURE__*/_react.default.createElement("div", {
-        className: _index.default.containorBox,
-        style: {
-          overflowX: 'hidden'
-        }
-      }, /*#__PURE__*/_react.default.createElement(_space.default, {
+      return /*#__PURE__*/_react.default.createElement(_space.default, {
         style: {
           width: '100%'
         },
         direction: "vertical",
         size: 24
-      }, _this.buildToolBarWrapper(), renderSearchForm && (searchForm || null) != null ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_card.default, {
+      }, renderSearchForm && (searchForm || null) != null ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_card.default, {
         bordered: false,
         className: _index.default.containorSearch
       }, /*#__PURE__*/_react.default.createElement("div", {
@@ -1385,7 +1482,65 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
         }), _this.renderBatchAction(), _this.renderCardExtraAction())
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: _index.default.tableList
-      }, _this.renderAboveTable(), _this.renderView())), _this.buildHelpWrapper()));
+      }, _this.renderAboveTable(), _this.renderView())));
+    };
+
+    _this.establishPageContentLayoutSiderConfig = function () {
+      return {};
+    };
+
+    _this.establishPageContentLayoutConfig = function () {
+      return {};
+    };
+
+    _this.renderPageContent = function () {
+      var siderArea = _this.renderSiderArea();
+
+      var contentArea = _this.renderContentArea();
+
+      var layoutSiderConfig = _this.establishPageContentLayoutSiderConfig();
+
+      var layoutConfig = _this.establishPageContentLayoutConfig();
+
+      var _position = _objectSpread(_objectSpread({}, {
+        position: 'left'
+      }), layoutSiderConfig || {}),
+          siderPosition = _position.position;
+
+      var siderConfig = _objectSpread(_objectSpread({}, {
+        width: 300,
+        style: _objectSpread(_objectSpread({}, {
+          backgroundColor: '#fff',
+          borderRadius: '4px',
+          overflowX: 'auto',
+          overflowY: 'hidden'
+        }), siderPosition === 'left' ? {
+          marginRight: '24px'
+        } : {
+          marginLeft: '24px'
+        })
+      }), layoutSiderConfig || {});
+
+      layoutConfig = _objectSpread(_objectSpread({}, {
+        breakpoint: 'sm',
+        style: {
+          backgroundColor: '#f0f2f5',
+          minHeight: 'auto'
+        }
+      }), layoutConfig || {});
+      var inner = siderArea == null ? contentArea : /*#__PURE__*/_react.default.createElement(_layout.default, layoutConfig, siderPosition === 'left' ? /*#__PURE__*/_react.default.createElement(Sider, siderConfig, siderArea) : null, /*#__PURE__*/_react.default.createElement(Content, null, contentArea), siderPosition !== 'left' ? /*#__PURE__*/_react.default.createElement(Sider, siderConfig, siderArea) : null);
+      return /*#__PURE__*/_react.default.createElement("div", {
+        className: _index.default.containorBox,
+        style: {
+          overflowX: 'hidden'
+        }
+      }, /*#__PURE__*/_react.default.createElement(_space.default, {
+        style: {
+          width: '100%'
+        },
+        direction: "vertical",
+        size: 24
+      }, _this.buildToolBarWrapper(), inner, _this.buildHelpWrapper()));
     };
 
     _this.renderPageBody = function () {

package/es/framework/DataMultiPageView/MultiPageDrawer/index.js

@@ -142,18 +142,12 @@ var MultiPageDrawer = /*#__PURE__*/function (_MultiPage) {
           dataLoading: true
         });
 
-        var that = _assertThisInitialized(_this);
-
-        that.handleSearchReset(false, 700);
+        _this.handleSearchReset(false, 700);
       } else if (_this.reloadWhenShow) {
-        _this.setState({
+        _this.reloadData({
           reloadAnimalShow: true
-        });
-
-        var _that = _assertThisInitialized(_this);
-
-        _that.reloadData({}, function () {
-          _that.setState({
+        }, function () {
+          _this.setState({
             reloadAnimalShow: false
           });
         }, 700);

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

@@ -130,12 +130,23 @@ var SinglePageDrawer = /*#__PURE__*/function (_SinglePage) {
     };
 
     _this.doOtherWhenChangeVisibleToShow = function (preProps, preState, snapshot) {
-      if (_this.reloadWhenShow) {
-        var that = _assertThisInitialized(_this);
-
-        setTimeout(function () {
-          that.reloadData();
-        }, 460);
+      var firstLoadSuccess = _this.state.firstLoadSuccess; // 未加载数据过数据的时候，进行加载
+
+      if (!firstLoadSuccess) {
+        // 设置界面效果为加载中，减少用户误解
+        _this.setState({
+          dataLoading: true
+        });
+
+        _this.handleSearchReset(false, 700);
+      } else if (_this.reloadWhenShow) {
+        _this.reloadData({
+          reloadAnimalShow: true
+        }, function () {
+          _this.setState({
+            reloadAnimalShow: false
+          });
+        }, 700);
       }
     };
 

package/es/utils/constants.d.ts

@@ -143,6 +143,7 @@ export namespace columnFacadeMode {
     export const badge: string;
     const money_1: string;
     export { money_1 as money };
+    export const dropdown: string;
 }
 export namespace columnPlaceholder {
     export const placeholder: boolean;
@@ -168,7 +169,8 @@ export namespace listViewConfig {
     export namespace dataContainerExtraActionBuildType {
         export const generalButton: string;
         export const button: string;
-        export const dropdown: string;
+        const dropdown_1: string;
+        export { dropdown_1 as dropdown };
         export const dropdownButton: string;
         export const dropdownEllipsis: string;
         export const iconInfo: string;
@@ -212,8 +214,8 @@ export namespace drawerConfig {
         export { dropdownButton_1 as dropdownButton };
         const dropdownEllipsis_1: string;
         export { dropdownEllipsis_1 as dropdownEllipsis };
-        const dropdown_1: string;
-        export { dropdown_1 as dropdown };
+        const dropdown_2: string;
+        export { dropdown_2 as dropdown };
         const component_1: string;
         export { component_1 as component };
     }
@@ -248,8 +250,8 @@ export namespace cardConfig {
         export { dropdownButton_2 as dropdownButton };
         const dropdownEllipsis_2: string;
         export { dropdownEllipsis_2 as dropdownEllipsis };
-        const dropdown_2: string;
-        export { dropdown_2 as dropdown };
+        const dropdown_3: string;
+        export { dropdown_3 as dropdown };
         const component_2: string;
         export { component_2 as component };
     }
@@ -386,6 +388,18 @@ export namespace cardConfig {
          * 分隔符
          */
         divider: string;
+        /**
+         * Html
+         */
+        html: string;
+        /**
+         * CustomGrid
+         */
+        customGrid: string;
+        /**
+         * tree
+         */
+        tree: string;
     };
 }
 export namespace searchCardConfig {
@@ -522,8 +536,8 @@ export namespace tabBarCollection {
         export { dropdownButton_3 as dropdownButton };
         const dropdownEllipsis_3: string;
         export { dropdownEllipsis_3 as dropdownEllipsis };
-        const dropdown_3: string;
-        export { dropdown_3 as dropdown };
+        const dropdown_4: string;
+        export { dropdown_4 as dropdown };
         const component_4: string;
         export { component_4 as component };
     }

package/es/utils/constants.js

@@ -234,7 +234,13 @@ var columnFacadeMode = {
    * 货币，例如￥0.05
    * value : money
    */
-  money: 'money'
+  money: 'money',
+
+  /**
+   * dropdown
+   * value : dropdown component
+   */
+  dropdown: 'dropdown'
 };
 exports.columnFacadeMode = columnFacadeMode;
 var columnPlaceholder = {
@@ -569,7 +575,22 @@ var cardConfig = _objectSpread(_objectSpread({}, contentConfig), {}, {
     /**
      * 分隔符
      */
-    divider: 'divider'
+    divider: 'divider',
+
+    /**
+     * Html
+     */
+    html: 'html',
+
+    /**
+     * CustomGrid
+     */
+    customGrid: 'customGrid',
+
+    /**
+     * tree
+     */
+    tree: 'tree'
   }
 });
 

package/es/utils/tools.d.ts

@@ -408,6 +408,14 @@ export function getValueByKey({ data, key, defaultValue, convert, convertBuilder
     format?: any;
     formatBuilder?: any;
 }): any;
+export function convertTarget({ target, convert }: {
+    target: any;
+    convert: any;
+}): any;
+export function formatTarget({ target, format }: {
+    target: any;
+    format: any;
+}): any;
 /**
  * 通过 path 获取对应得值
  */

package/es/utils/tools.js

@@ -14,6 +14,7 @@ exports.checkLocalhost = checkLocalhost;
 exports.clearLocalStorage = clearLocalStorage;
 exports.clearSessionStorage = clearSessionStorage;
 exports.cloneWithoutMethod = cloneWithoutMethod;
+exports.convertTarget = convertTarget;
 exports.copyToClipboard = copyToClipboard;
 exports.corsTarget = corsTarget;
 exports.dateToMoment = dateToMoment;
@@ -38,6 +39,7 @@ exports.formatDatetime = formatDatetime;
 exports.formatDecimal = formatDecimal;
 exports.formatMoney = formatMoney;
 exports.formatMoneyToChinese = formatMoneyToChinese;
+exports.formatTarget = formatTarget;
 exports.getAppInitConfigData = getAppInitConfigData;
 exports.getBrowserInfo = getBrowserInfo;
 exports.getDerivedStateFromPropsForUrlParams = getDerivedStateFromPropsForUrlParams;
@@ -171,8 +173,6 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-function _readOnlyError(name) { throw new TypeError("\"" + name + "\" is read-only"); }
-
 function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 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; }
@@ -965,8 +965,12 @@ function sortedUnique(array) {
 
 
 function roundToTarget(v, len) {
+  if (!isMoney(v)) {
+    return 0;
+  }
+
   var temp = Math.pow(10, len);
-  return Math.round(v * temp) / temp;
+  return Math.round(toMoney(v) * temp) / temp;
 }
 /**
  * 判断是否是数字字符串
@@ -1025,77 +1029,105 @@ function getValueByKey(_ref14) {
   var v = getPathValue(data, key, defaultValue);
   var result = v;
 
-  if (isFunction(convertBuilder)) {
-    result = convertBuilder(v);
-  } else if ((convert || null) != null) {
+  if ((convertBuilder || null) != null || (convert || null) != null) {
+    if (isFunction(convertBuilder)) {
+      result = convertTarget({
+        target: v,
+        convert: convertBuilder
+      });
+    } else {
+      result = convertTarget({
+        target: v,
+        convert: convert
+      });
+    }
+  }
+
+  if ((formatBuilder || null) != null || (format || null) != null) {
+    if (isFunction(formatBuilder)) {
+      result = formatTarget({
+        target: v,
+        format: formatBuilder
+      });
+    } else {
+      result = formatTarget({
+        target: v,
+        format: format
+      });
+    }
+  }
+
+  return result;
+}
+
+function convertTarget(_ref15) {
+  var target = _ref15.target,
+      convert = _ref15.convert;
+
+  if (isFunction(convert)) {
+    return convert(target);
+  }
+
+  if (isString(convert)) {
     switch (convert) {
       case _constants.convertCollection.number:
-        result = toNumber(v);
-        break;
+        return toNumber(target);
 
       case _constants.convertCollection.datetime:
-        result = toDatetime(v);
-        break;
+        return toDatetime(target);
 
       case _constants.convertCollection.string:
-        result = toString(v);
-        break;
+        return toString(target);
 
       case _constants.convertCollection.moment:
-        result = toMoment({
-          data: toString(v)
+        return toMoment({
+          data: toString(target)
         });
-        break;
 
       case _constants.convertCollection.money:
-        result = toMoney(v);
-        break;
+        return toMoney(target);
 
       case _constants.convertCollection.array:
-        result = (v || null) == null ? [] : isArray(v) ? v : [v];
-        break;
+        return (target || null) == null ? [] : isArray(target) ? target : [target];
 
       default:
-        result = v;
-        break;
+        return target;
     }
   }
 
-  if (isFunction(formatBuilder)) {
-    result = formatBuilder(v);
-  } else if ((format || null) != null) {
+  return target;
+}
+
+function formatTarget(_ref16) {
+  var target = _ref16.target,
+      format = _ref16.format;
+
+  if (isFunction(format)) {
+    return format(target);
+  }
+
+  if (isString(format)) {
     switch (format) {
       case _constants.formatCollection.money:
-        result = formatMoney(v);
-        break;
+        return formatMoney(target);
 
       case _constants.formatCollection.datetime:
-        result = formatDatetime({
-          data: v
+        return formatDatetime({
+          data: target
         });
-        break;
 
       case _constants.formatCollection.chineseMoney:
-        result = formatMoneyToChinese(v);
-        break;
+        return formatMoneyToChinese(target);
 
       case _constants.formatCollection.percentage:
-        var d = 0;
-
-        if (!isMoney(v)) {
-          roundToTarget(v * 100, 1), _readOnlyError("d");
-        }
-
-        result = "".concat(d, "%");
-        break;
+        return "".concat(roundToTarget(target * 100, 1), "%");
 
       default:
-        result = v;
-        break;
+        return target;
     }
   }
 
-  return result;
+  return target;
 }
 /**
  * 通过 path 获取对应得值
@@ -1345,10 +1377,10 @@ function formatMoneyToChinese(v) {
   return ChineseString;
 }
 
-function seededRandom(_ref15) {
-  var seed = _ref15.seed,
-      min = _ref15.min,
-      max = _ref15.max;
+function seededRandom(_ref17) {
+  var seed = _ref17.seed,
+      min = _ref17.min,
+      max = _ref17.max;
   var maxValue = max || 1;
   var minValue = min || 0;
   var seedValue = (seed * 9301 + 49297) % 233280;
@@ -1364,18 +1396,18 @@ function seededRandom(_ref15) {
  */
 
 
-function getRandomColor(_ref16) {
-  var seed = _ref16.seed,
-      _ref16$hue = _ref16.hue,
-      hue = _ref16$hue === void 0 ? null : _ref16$hue,
-      _ref16$luminosity = _ref16.luminosity,
-      luminosity = _ref16$luminosity === void 0 ? null : _ref16$luminosity,
-      _ref16$count = _ref16.count,
-      count = _ref16$count === void 0 ? null : _ref16$count,
-      _ref16$format = _ref16.format,
-      format = _ref16$format === void 0 ? null : _ref16$format,
-      _ref16$alpha = _ref16.alpha,
-      alpha = _ref16$alpha === void 0 ? null : _ref16$alpha;
+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;
   return (0, _randomcolor.default)({
     seed: seed,
     hue: hue,
@@ -2078,8 +2110,8 @@ function removeNearestLocalhostNotifyCache() {
  */
 
 
-function trySendNearestLocalhostNotify(_ref17) {
-  var text = _ref17.text;
+function trySendNearestLocalhostNotify(_ref19) {
+  var text = _ref19.text;
   var needSend = false;
   var nearestTime = 0;
 
@@ -2140,11 +2172,11 @@ function notifySuccess(text) {
  */
 
 
-function notify(_ref18) {
-  var type = _ref18.type,
-      placementValue = _ref18.placement,
-      messageValue = _ref18.message,
-      descriptionValue = _ref18.description;
+function notify(_ref20) {
+  var type = _ref20.type,
+      placementValue = _ref20.placement,
+      messageValue = _ref20.message,
+      descriptionValue = _ref20.description;
 
   var _placement$message$de = _objectSpread(_objectSpread({}, {
     placement: 'bottomRight',
@@ -2218,10 +2250,10 @@ function notify(_ref18) {
   }, 600);
 }
 
-function checkFromConfig(_ref19) {
-  var label = _ref19.label,
-      name = _ref19.name,
-      helper = _ref19.helper;
+function checkFromConfig(_ref21) {
+  var label = _ref21.label,
+      name = _ref21.name,
+      helper = _ref21.helper;
   var labelText = 'object';
   var nameText = 'object';
   var helperText = 'object';
@@ -2280,13 +2312,13 @@ var requestAnimFrame = requestAnimFrameCustom;
 
 exports.requestAnimFrame = requestAnimFrame;
 
-function sortCollectionByKey(_ref20) {
-  var operate = _ref20.operate,
-      item = _ref20.item,
-      list = _ref20.list,
-      sortKey = _ref20.sortKey,
-      _ref20$sortMin = _ref20.sortMin,
-      sortMin = _ref20$sortMin === void 0 ? 0 : _ref20$sortMin;
+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;
 
   if ((item || null) == null) {
     return list;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-management-fast-framework",
-  "version": "1.11.20",
+  "version": "1.11.33",
   "description": "antd-management-fast-framework",
   "keywords": [
     "antd-management-fast-framework"
@@ -30,17 +30,17 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@ant-design/pro-layout": "^6.31.2",
+    "@ant-design/pro-layout": "^6.31.5",
     "@antv/data-set": "^0.11.8",
-    "antd": "^4.17.2",
+    "antd": "^4.17.3",
     "array-move": "^4.0.0",
-    "bizcharts": "^4.1.14",
+    "bizcharts": "^4.1.15",
     "browserslist": "^4.18.1",
-    "caniuse-lite": "^1.0.30001283",
+    "caniuse-lite": "^1.0.30001285",
     "classnames": "^2.3.1",
     "copy-to-clipboard": "^3.3.1",
     "enquire-js": "^0.2.1",
-    "html-react-parser": "^1.4.1",
+    "html-react-parser": "^1.4.2",
     "lodash": "^4.17.21",
     "lodash-decorators": "^6.0.1",
     "lodash.debounce": "^4.0.8",
@@ -90,8 +90,8 @@
     "@testing-library/react": "^12.1.2",
     "@testing-library/react-hooks": "^7.0.2",
     "@types/jest": "^27.0.3",
-    "@types/node": "^16.11.11",
-    "@typescript-eslint/eslint-plugin": "^5.5.0",
+    "@types/node": "^16.11.12",
+    "@typescript-eslint/eslint-plugin": "^5.6.0",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.5.20",
     "@umijs/test-utils": "^3.5.20",
@@ -101,9 +101,9 @@
     "body-parser": "^1.19.0",
     "commitizen": "^4.2.4",
     "cross-env": "^7.0.3",
-    "eslint": "^8.3.0",
-    "eslint-config-airbnb": "^19.0.1",
-    "eslint-config-airbnb-typescript": "^16.0.0",
+    "eslint": "^8.4.1",
+    "eslint-config-airbnb": "^19.0.2",
+    "eslint-config-airbnb-typescript": "^16.1.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-import": "^2.25.3",
@@ -126,7 +126,7 @@
     "pify": "^5.0.0",
     "postcss": "^8.4.4",
     "postcss-less": "^5.0.0",
-    "prettier": "^2.5.0",
+    "prettier": "^2.5.1",
     "puppeteer": "^12.0.1",
     "query-string": "^7.0.1",
     "react": "^17.0.2",