antd-management-fast-framework 1.2.8 → 1.2.12

package/es/customComponents/FunctionComponent/index.js

@@ -997,24 +997,37 @@ function buildDescriptionGrid(_ref8) {
       }), d);
     });
 
-    var _itemStyle = _objectSpread(_objectSpread({}, {
-      itemStyle: null
+    var _labelStyle$contentSt = _objectSpread(_objectSpread({}, {
+      labelStyle: null,
+      contentStyle: null
     }), props || {}),
-        itemStyle = _itemStyle.itemStyle;
+        globalLabelStyle = _labelStyle$contentSt.labelStyle,
+        globalContentStyle = _labelStyle$contentSt.contentStyle;
 
     return /*#__PURE__*/_react["default"].createElement(_descriptions["default"], _extends({
       key: key
     }, props || {}), dataList.map(function (item) {
-      var _emptyValue$item = _objectSpread(_objectSpread({}, {
+      var _label$span$labelStyl = _objectSpread(_objectSpread({}, {
+        label: '',
+        span: 1,
+        labelStyle: null,
+        contentStyle: null,
         emptyValue: ''
       }), item),
-          emptyValue = _emptyValue$item.emptyValue;
+          itemKey = _label$span$labelStyl.key,
+          label = _label$span$labelStyl.label,
+          span = _label$span$labelStyl.span,
+          labelStyle = _label$span$labelStyl.labelStyle,
+          contentStyle = _label$span$labelStyl.contentStyle,
+          emptyValue = _label$span$labelStyl.emptyValue;
 
       return /*#__PURE__*/_react["default"].createElement(Description, {
-        key: item.key,
-        label: item.label,
-        span: item.span || 1,
-        style: _objectSpread(_objectSpread({}, itemStyle), item.style || null)
+        key: itemKey,
+        label: label,
+        span: span || 1,
+        labelStyle: _objectSpread(_objectSpread({}, globalLabelStyle || {}), labelStyle || {}),
+        contentStyle: _objectSpread(_objectSpread({}, globalContentStyle || {}), contentStyle || {}) // style={{ ...itemStyle, ...(item.style || null) }}
+
       }, item.value || emptyValue, item.canCopy && (item.canCopy || null) != null ? /*#__PURE__*/_react["default"].createElement("a", {
         style: {
           marginLeft: '10px'

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

@@ -11,6 +11,7 @@ declare namespace HelpBox {
         const labelWidth: null;
         const list: never[];
         const useBackground: boolean;
+        const hidden: boolean;
     }
 }
 import React from "react";

package/es/customComponents/HelpBox/index.js

@@ -74,7 +74,8 @@ var HelpBox = /*#__PURE__*/function (_PureComponent) {
         showDivider: true,
         labelWidth: null,
         list: [],
-        useBackground: false
+        useBackground: false,
+        hidden: false
       }), this.props || {}),
           titleValue = _title$showTitle$show.title,
           showTitle = _title$showTitle$show.showTitle,
@@ -82,7 +83,12 @@ var HelpBox = /*#__PURE__*/function (_PureComponent) {
           showNumber = _title$showTitle$show.showNumber,
           labelWidthValue = _title$showTitle$show.labelWidth,
           listData = _title$showTitle$show.list,
-          useBackground = _title$showTitle$show.useBackground;
+          useBackground = _title$showTitle$show.useBackground,
+          hidden = _title$showTitle$show.hidden;
+
+      if (hidden) {
+        return null;
+      }
 
       var title = titleValue || '帮助信息';
       var list = [];
@@ -92,7 +98,12 @@ var HelpBox = /*#__PURE__*/function (_PureComponent) {
           var d = _objectSpread(_objectSpread({}, {
             key: '',
             label: '',
-            text: ''
+            text: '',
+            span: 1,
+            labelStyle: null,
+            contentStyle: null,
+            canCopy: false,
+            copyData: null
           }), o);
 
           d.key = "help_box_item_".concat(index);
@@ -119,7 +130,7 @@ var HelpBox = /*#__PURE__*/function (_PureComponent) {
         style: {
           marginTop: '4px',
           marginBottom: '4px',
-          color: 'rgb(153, 153, 153)',
+          color: '#999',
           fontWeight: 'normal',
           fontSize: '14px',
           lineHeight: '22px',
@@ -127,10 +138,24 @@ var HelpBox = /*#__PURE__*/function (_PureComponent) {
         }
       }, title, "\uFF1A") : null, (0, _FunctionComponent.buildDescriptionGrid)({
         list: list.map(function (o) {
+          var key = o.key,
+              no = o.no,
+              label = o.label,
+              text = o.text,
+              labelStyle = o.labelStyle,
+              contentStyle = o.contentStyle,
+              span = o.span,
+              canCopy = o.canCopy,
+              copyData = o.copyData;
           return {
-            key: o.key,
-            label: (0, _tools.stringIsNullOrWhiteSpace)(o.label) ? showNumber ? o.no : '•' : o.label,
-            value: o.text
+            key: key,
+            label: (0, _tools.stringIsNullOrWhiteSpace)(label) ? showNumber ? no : '•' : label,
+            value: text,
+            labelStyle: labelStyle || null,
+            contentStyle: contentStyle || null,
+            span: span,
+            canCopy: canCopy,
+            copyData: copyData
           };
         }),
         props: {
@@ -160,7 +185,8 @@ HelpBox.defaultProps = {
   showNumber: true,
   labelWidth: null,
   list: [],
-  useBackground: false
+  useBackground: false,
+  hidden: false
 };
 var _default = HelpBox;
 exports["default"] = _default;

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

@@ -57,12 +57,12 @@ declare class ListBase extends AuthorizationWrapper {
     buildSearchCard: () => JSX.Element | null;
     renderForm: () => JSX.Element | null;
     buildTableOtherConfig: () => {};
-    establishTableExpandableConfig: () => {};
+    establishTableExpandableConfig: () => null;
     restoreColumnsOtherConfigArray: () => void;
     buildTableConfig: () => {
         columns: any;
         size: any;
-        expandable: {};
+        expandable: null;
     };
     setTableSize: (key: any) => void;
     setColumnsMap: (e: any) => void;

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

@@ -836,7 +836,7 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
 
     _this.establishTableExpandableConfig = function () {
       // 可以配置额外的Table属性
-      return {};
+      return null;
     };
 
     _this.restoreColumnsOtherConfigArray = function () {
@@ -1407,91 +1407,108 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
         standardTableCustomOption.scroll = tableScroll;
       }
 
-      var _checkNeedExpander$ro = _objectSpread(_objectSpread({}, {
-        // 断整夜数据，如若整页数据不需要显示展开按钮，则整体不渲染，有助于优化页面显示效果，需要判断时配置此处检测函数
-        checkNeedExpander: function checkNeedExpander(list) {
-          return (0, _tools.isArray)(list) && list.length > 0;
-        },
-        rowExpandable: false,
-        expandPlaceholderIcon: /*#__PURE__*/_react["default"].createElement(_icons.BorderOuterOutlined, {
-          style: {
-            color: '#ccc'
-          }
-        }),
-        expanderStyle: null,
-        animalType: _constants.listViewConfig.expandAnimalType.none,
-        expandIconRotate: true,
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        expandIcon: function expandIcon(_ref4) {
-          var expanded = _ref4.expanded,
-              onExpand = _ref4.onExpand,
-              record = _ref4.record;
-          return /*#__PURE__*/_react["default"].createElement(_icons.RightCircleOutlined, null);
-        },
-        expandedRowRender: null
-      }), expandable || null),
-          checkNeedExpander = _checkNeedExpander$ro.checkNeedExpander,
-          rowExpandable = _checkNeedExpander$ro.rowExpandable,
-          expandPlaceholderIcon = _checkNeedExpander$ro.expandPlaceholderIcon,
-          expanderStyle = _checkNeedExpander$ro.expanderStyle,
-          expandAnimalType = _checkNeedExpander$ro.animalType,
-          expandIconRotate = _checkNeedExpander$ro.expandIconRotate,
-          expandIconCustom = _checkNeedExpander$ro.expandIcon,
-          expandedRowRenderCustom = _checkNeedExpander$ro.expandedRowRender;
-
-      var checkNeedExpanderResult = checkNeedExpander(metaListData);
-      var expandableConfig = (0, _tools.isBoolean)(checkNeedExpanderResult) && checkNeedExpanderResult ? {
-        rowExpandable: rowExpandable,
-        expandIcon: function expandIcon(_ref5) {
-          var canExpand = _ref5.expandable,
-              expanded = _ref5.expanded,
-              onExpand = _ref5.onExpand,
-              record = _ref5.record;
-
-          if (!canExpand && (expandPlaceholderIcon || null) != null) {
-            return expandPlaceholderIcon || null;
+      var expandableConfig = null;
+
+      if ((expandable || null) != null) {
+        var _checkNeedExpander$ro = _objectSpread(_objectSpread({}, {
+          // 判断当前列表数据，如若列表所有数据都不需要显示展开按钮，则忽略其他配置
+          // eslint-disable-next-line @typescript-eslint/no-unused-vars
+          checkNeedExpander: null,
+          rowExpandable: false,
+          expandPlaceholderIcon: /*#__PURE__*/_react["default"].createElement(_icons.BorderOuterOutlined, {
+            style: {
+              color: '#ccc'
+            }
+          }),
+          expanderStyle: null,
+          animalType: _constants.listViewConfig.expandAnimalType.none,
+          expandIconRotate: true,
+          // eslint-disable-next-line @typescript-eslint/no-unused-vars
+          expandIcon: function expandIcon(_ref4) {
+            var expanded = _ref4.expanded,
+                onExpand = _ref4.onExpand,
+                record = _ref4.record;
+            return /*#__PURE__*/_react["default"].createElement(_icons.RightCircleOutlined, null);
+          },
+          expandedRowRender: null
+        }), expandable || null),
+            checkNeedExpander = _checkNeedExpander$ro.checkNeedExpander,
+            rowExpandable = _checkNeedExpander$ro.rowExpandable,
+            expandPlaceholderIcon = _checkNeedExpander$ro.expandPlaceholderIcon,
+            expanderStyle = _checkNeedExpander$ro.expanderStyle,
+            expandAnimalType = _checkNeedExpander$ro.animalType,
+            expandIconRotate = _checkNeedExpander$ro.expandIconRotate,
+            expandIconCustom = _checkNeedExpander$ro.expandIcon,
+            expandedRowRenderCustom = _checkNeedExpander$ro.expandedRowRender;
+
+        var checkNeedExpanderResult = true;
+
+        if ((0, _tools.isBoolean)(checkNeedExpander)) {
+          checkNeedExpanderResult = checkNeedExpander;
+        }
+
+        if ((0, _tools.isFunction)(checkNeedExpander)) {
+          var r = checkNeedExpander(metaListData);
+
+          if ((0, _tools.isBoolean)(checkNeedExpander)) {
+            checkNeedExpanderResult = r;
           }
+        }
 
-          if (expandIconRotate) {
-            return /*#__PURE__*/_react["default"].createElement(_RotateBox["default"], {
-              rotate: expanded ? 90 : 0,
-              duration: 200,
-              onClick: function onClick(e) {
-                return onExpand(record, e);
-              }
-            }, expandIconCustom({
+        expandableConfig = checkNeedExpanderResult ? {
+          rowExpandable: rowExpandable,
+          expandIcon: function expandIcon(_ref5) {
+            var canExpand = _ref5.expandable,
+                expanded = _ref5.expanded,
+                onExpand = _ref5.onExpand,
+                record = _ref5.record;
+
+            if (!canExpand && (expandPlaceholderIcon || null) != null) {
+              return expandPlaceholderIcon || null;
+            }
+
+            if (expandIconRotate) {
+              return /*#__PURE__*/_react["default"].createElement(_RotateBox["default"], {
+                rotate: expanded ? 90 : 0,
+                duration: 200,
+                onClick: function onClick(e) {
+                  return onExpand(record, e);
+                }
+              }, expandIconCustom({
+                expanded: expanded,
+                onExpand: onExpand,
+                record: record
+              }));
+            }
+
+            return expandIconCustom({
               expanded: expanded,
               onExpand: onExpand,
               record: record
-            }));
-          }
+            });
+          },
+          expandedRowRender: (0, _tools.isFunction)(expandedRowRenderCustom) ? function (record, index, indent, expanded) {
+            var child = expandedRowRenderCustom(record, index, indent, expanded);
 
-          return expandIconCustom({
-            expanded: expanded,
-            onExpand: onExpand,
-            record: record
-          });
-        },
-        expandedRowRender: function expandedRowRender(record, index, indent, expanded) {
-          var child = expandedRowRenderCustom(record, index, indent, expanded);
+            if (expandAnimalType === _constants.listViewConfig.expandAnimalType.fade) {
+              child = /*#__PURE__*/_react["default"].createElement(_FadeBox["default"], {
+                show: expanded
+              }, child);
+            }
 
-          if (expandAnimalType === _constants.listViewConfig.expandAnimalType.fade) {
-            child = /*#__PURE__*/_react["default"].createElement(_FadeBox["default"], {
-              show: expanded
-            }, child);
-          }
+            if (expandAnimalType === _constants.listViewConfig.expandAnimalType.queue) {
+              child = /*#__PURE__*/_react["default"].createElement(_QueueBox["default"], {
+                show: expanded
+              }, child);
+            }
 
-          if (expandAnimalType === _constants.listViewConfig.expandAnimalType.queue) {
-            child = /*#__PURE__*/_react["default"].createElement(_QueueBox["default"], {
-              show: expanded
+            return /*#__PURE__*/_react["default"].createElement("div", {
+              style: expanderStyle || {}
             }, child);
-          }
+          } : null
+        } : {};
+      }
 
-          return /*#__PURE__*/_react["default"].createElement("div", {
-            style: expanderStyle || {}
-          }, child);
-        }
-      } : {};
       standardTableCustomOption.expandable = expandableConfig;
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: _index["default"].tableContainor

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-management-fast-framework",
-  "version": "1.2.8",
+  "version": "1.2.12",
   "description": "antd-management-fast-framework",
   "keywords": [
     "antd-management-fast-framework"
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@ant-design/pro-layout": "^6.26.3",
+    "@ant-design/pro-layout": "^6.26.6",
     "@antv/data-set": "^0.11.8",
     "antd": "^4.16.13",
     "array-move": "^4.0.0",
@@ -79,8 +79,8 @@
     "@testing-library/react": "^12.1.2",
     "@testing-library/react-hooks": "^7.0.2",
     "@types/jest": "^27.0.2",
-    "@types/node": "^16.10.9",
-    "@typescript-eslint/eslint-plugin": "^5.0.0",
+    "@types/node": "^16.11.1",
+    "@typescript-eslint/eslint-plugin": "^5.1.0",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.5.20",
     "@umijs/test-utils": "^3.5.20",
@@ -89,13 +89,13 @@
     "babel-preset-env": "^1.7.0",
     "body-parser": "^1.19.0",
     "cross-env": "^7.0.3",
-    "eslint": "^8.0.0",
+    "eslint": "^8.0.1",
     "eslint-config-airbnb": "^18.2.1",
     "eslint-config-airbnb-typescript": "^14.0.1",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-import": "^2.25.2",
-    "eslint-plugin-jest": "^25.0.5",
+    "eslint-plugin-jest": "^25.2.2",
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-react": "^7.26.1",
@@ -120,7 +120,7 @@
     "react-test-renderer": "^17.0.2",
     "rimraf": "^3.0.2",
     "stylelint": "^13.13.1",
-    "stylelint-config-prettier": "^9.0.2",
+    "stylelint-config-prettier": "^9.0.3",
     "stylelint-config-standard": "^22.0.0",
     "test-umi-plugin": "^0.1.0",
     "umi": "^3.5.20",