antd-management-fast-framework 1.2.39 → 1.2.40

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

@@ -380,6 +380,10 @@ export function buildColorText({ canCopy, randomSeed, seedOffset, randomColor, c
     separatorStyle?: null | undefined;
     wrapperBuilder?: null | undefined;
 }): any;
+export function adjustTableExpandConfig({ list, config }: {
+    list: any;
+    config: any;
+}): any;
 /**
  * 占位函数
  *

package/es/customComponents/FunctionComponent/index.js

@@ -54,6 +54,7 @@ exports.buildFormDatePicker = buildFormDatePicker;
 exports.buildColumnList = buildColumnList;
 exports.buildColumnItem = buildColumnItem;
 exports.buildColorText = buildColorText;
+exports.adjustTableExpandConfig = adjustTableExpandConfig;
 exports.empty = empty;
 
 require("antd/es/badge/style");
@@ -160,6 +161,12 @@ var _FlexText = _interopRequireDefault(require("../FlexText"));
 
 var _ColorText = _interopRequireDefault(require("../ColorText"));
 
+var _RotateBox = _interopRequireDefault(require("../AnimalBox/RotateBox"));
+
+var _QueueBox = _interopRequireDefault(require("../AnimalBox/QueueBox"));
+
+var _FadeBox = _interopRequireDefault(require("../AnimalBox/FadeBox"));
+
 var _index = _interopRequireDefault(require("./index.less"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -2840,6 +2847,114 @@ function buildColorText(_ref50) {
 
   return wrapperBuilder(colorText);
 }
+
+function adjustTableExpandConfig(_ref51) {
+  var list = _ref51.list,
+      config = _ref51.config;
+
+  if ((config || 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(_ref52) {
+        var expanded = _ref52.expanded,
+            onExpand = _ref52.onExpand,
+            record = _ref52.record;
+        return /*#__PURE__*/_react["default"].createElement(_icons.RightCircleOutlined, null);
+      },
+      expandedRowRender: null
+    }), config || 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(list);
+
+      if ((0, _tools.isBoolean)(checkNeedExpander)) {
+        checkNeedExpanderResult = r;
+      }
+    }
+
+    expandableConfig = checkNeedExpanderResult ? {
+      rowExpandable: rowExpandable,
+      expandIcon: function expandIcon(_ref53) {
+        var canExpand = _ref53.expandable,
+            expanded = _ref53.expanded,
+            onExpand = _ref53.onExpand,
+            record = _ref53.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);
+
+        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);
+        }
+
+        return /*#__PURE__*/_react["default"].createElement("div", {
+          style: expanderStyle || {}
+        }, child);
+      } : null
+    } : {};
+    return expandableConfig;
+  }
+
+  return null;
+}
 /**
  * 占位函数
  *

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

@@ -87,12 +87,6 @@ var _StandardTableCustom = _interopRequireDefault(require("../../../customCompon
 
 var _AuthorizationWrapper2 = _interopRequireDefault(require("../../AuthorizationWrapper"));
 
-var _QueueBox = _interopRequireDefault(require("../../../customComponents/AnimalBox/QueueBox"));
-
-var _FadeBox = _interopRequireDefault(require("../../../customComponents/AnimalBox/FadeBox"));
-
-var _RotateBox = _interopRequireDefault(require("../../../customComponents/AnimalBox/RotateBox"));
-
 var _DensityAction = _interopRequireDefault(require("../DensityAction"));
 
 var _ColumnSetting = _interopRequireDefault(require("../ColumnSetting"));
@@ -1199,7 +1193,11 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
         columns: columns,
         size: size || null,
         onSelectRow: _this.handleSelectRows,
-        onChange: _this.handleStandardTableChange
+        onChange: _this.handleStandardTableChange,
+        expandable: (0, _FunctionComponent.adjustTableExpandConfig)({
+          list: metaListData,
+          config: expandable
+        })
       };
 
       if (!!paginationConfig) {
@@ -1221,116 +1219,13 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
         standardTableCustomOption.scroll = tableScroll;
       }
 
-      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;
-          }
-        }
-
-        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);
-
-            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);
-            }
-
-            return /*#__PURE__*/_react["default"].createElement("div", {
-              style: expanderStyle || {}
-            }, child);
-          } : null
-        } : {};
-      }
-
-      standardTableCustomOption.expandable = expandableConfig;
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: _index["default"].tableContainor
       }, /*#__PURE__*/_react["default"].createElement(_StandardTableCustom["default"], standardTableCustomOption));
     };
 
-    _this.renderCardCollectionView = function (_ref6) {
-      var list = _ref6.list;
+    _this.renderCardCollectionView = function (_ref4) {
+      var list = _ref4.list;
       var _this$state8 = _this.state,
           dataLoading = _this$state8.dataLoading,
           reloading = _this$state8.reloading,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-management-fast-framework",
-  "version": "1.2.39",
+  "version": "1.2.40",
   "description": "antd-management-fast-framework",
   "keywords": [
     "antd-management-fast-framework"