antd-management-fast-framework 1.11.21 → 1.11.30

package/es/customComponents/FunctionComponent/index.js

@@ -941,7 +941,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 +952,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 +991,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 +1075,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 +1301,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 +1314,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 +2918,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,42 @@ 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.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/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,14 @@ export namespace cardConfig {
          * 分隔符
          */
         divider: string;
+        /**
+         * Html
+         */
+        html: string;
+        /**
+         * CustomGrid
+         */
+        customGrid: string;
     };
 }
 export namespace searchCardConfig {
@@ -522,8 +532,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,17 @@ var cardConfig = _objectSpread(_objectSpread({}, contentConfig), {}, {
     /**
      * 分隔符
      */
-    divider: 'divider'
+    divider: 'divider',
+
+    /**
+     * Html
+     */
+    html: 'html',
+
+    /**
+     * CustomGrid
+     */
+    customGrid: 'customGrid'
   }
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-management-fast-framework",
-  "version": "1.11.21",
+  "version": "1.11.30",
   "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.3",
     "@antv/data-set": "^0.11.8",
     "antd": "^4.17.2",
     "array-move": "^4.0.0",
     "bizcharts": "^4.1.14",
     "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",
@@ -91,7 +91,7 @@
     "@testing-library/react-hooks": "^7.0.2",
     "@types/jest": "^27.0.3",
     "@types/node": "^16.11.11",
-    "@typescript-eslint/eslint-plugin": "^5.5.0",
+    "@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.0",
+    "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",