antd-management-fast-framework 1.11.10 → 1.11.15

package/es/customComponents/FunctionComponent/index.js

@@ -77,6 +77,18 @@ require("antd/es/tag/style");
 
 var _tag = _interopRequireDefault(require("antd/es/tag"));
 
+require("antd/es/space/style");
+
+var _space = _interopRequireDefault(require("antd/es/space"));
+
+require("antd/es/row/style");
+
+var _row = _interopRequireDefault(require("antd/es/row"));
+
+require("antd/es/col/style");
+
+var _col = _interopRequireDefault(require("antd/es/col"));
+
 require("antd/es/menu/style");
 
 var _menu = _interopRequireDefault(require("antd/es/menu"));
@@ -93,18 +105,6 @@ require("antd/es/popconfirm/style");
 
 var _popconfirm = _interopRequireDefault(require("antd/es/popconfirm"));
 
-require("antd/es/row/style");
-
-var _row = _interopRequireDefault(require("antd/es/row"));
-
-require("antd/es/space/style");
-
-var _space = _interopRequireDefault(require("antd/es/space"));
-
-require("antd/es/col/style");
-
-var _col = _interopRequireDefault(require("antd/es/col"));
-
 require("antd/es/descriptions/style");
 
 var _descriptions = _interopRequireDefault(require("antd/es/descriptions"));
@@ -218,15 +218,15 @@ function buildPageHeaderTitle(pageName, headerTitlePrefix) {
       whiteSpace: 'nowrap',
       textOverflow: 'ellipsis'
     }
-  }, /*#__PURE__*/_react.default.createElement(_row.default, null, /*#__PURE__*/_react.default.createElement(_col.default, null, (0, _tools.stringIsNullOrWhiteSpace)(headerTitlePrefixValue) ? '' : "".concat(headerTitlePrefixValue, "\uFF1A")), /*#__PURE__*/_react.default.createElement(_col.default, {
-    flex: "auto"
-  }, /*#__PURE__*/_react.default.createElement(_space.default, null, nameList.map(function (o) {
-    return /*#__PURE__*/_react.default.createElement(_rcTexty.default, {
-      key: o.key,
-      type: "alpha",
-      mode: "smooth"
-    }, o.text);
-  })))));
+  }, /*#__PURE__*/_react.default.createElement(_IconInfo.default, {
+    textPrefix: headerTitlePrefixValue,
+    text: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, nameList.map(function (o) {
+      return /*#__PURE__*/_react.default.createElement("span", {
+        key: o.key
+      }, o.text);
+    })),
+    ellipsis: true
+  }));
 }
 /**
  * 构建按钮

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

@@ -167,5 +167,9 @@ declare class Common extends Core {
         keyPrefix?: string | undefined;
         configList: any;
     }) => any[];
+    buildTabBarExtraContentItemsCore: ({ keyPrefix, configList }: {
+        keyPrefix?: string | undefined;
+        configList: any;
+    }) => any[];
 }
 import Core from "../Core";

package/es/framework/Common/index.js

@@ -1965,6 +1965,83 @@ var Common = /*#__PURE__*/function (_Core) {
       return list;
     };
 
+    _this.buildTabBarExtraContentItemsCore = function (_ref10) {
+      var _ref10$keyPrefix = _ref10.keyPrefix,
+          keyPrefix = _ref10$keyPrefix === void 0 ? '' : _ref10$keyPrefix,
+          configList = _ref10.configList;
+      var list = [];
+      ((0, _tools.isArray)(configList) ? configList : []).forEach(function (item, index) {
+        if ((item || null) != null) {
+          var _hidden$buildType$ico2 = _objectSpread(_objectSpread({}, {
+            hidden: false,
+            buildType: null,
+            icon: null,
+            text: '',
+            component: null
+          }), item),
+              hidden = _hidden$buildType$ico2.hidden,
+              buildType = _hidden$buildType$ico2.buildType,
+              componentSource = _hidden$buildType$ico2.component;
+
+          if (!hidden) {
+            var itemKey = "".concat(keyPrefix || 'tabBarExtraContentItem', "_").concat(index);
+            var itemAdjust = item;
+
+            switch (buildType) {
+              case _constants.tabBarCollection.extraBuildType.button:
+                itemAdjust = (0, _FunctionComponent.buildButton)(item);
+                break;
+
+              case _constants.tabBarCollection.extraBuildType.dropdown:
+                itemAdjust = (0, _FunctionComponent.buildDropdown)(item);
+                break;
+
+              case _constants.tabBarCollection.extraBuildType.dropdownButton:
+                itemAdjust = (0, _FunctionComponent.buildDropdownButton)(item);
+                break;
+
+              case _constants.tabBarCollection.extraBuildType.dropdownEllipsis:
+                itemAdjust = (0, _FunctionComponent.buildDropdownEllipsis)(item);
+                break;
+
+              case _constants.tabBarCollection.extraBuildType.iconInfo:
+                itemAdjust = /*#__PURE__*/_react.default.createElement("div", {
+                  style: {
+                    padding: '0 8px'
+                  }
+                }, /*#__PURE__*/_react.default.createElement(_IconInfo.default, item));
+                break;
+
+              case _constants.tabBarCollection.extraBuildType.colorText:
+                itemAdjust = /*#__PURE__*/_react.default.createElement("div", {
+                  style: {
+                    padding: '0 8px'
+                  }
+                }, /*#__PURE__*/_react.default.createElement(_ColorText.default, item));
+                break;
+
+              case _constants.tabBarCollection.extraBuildType.component:
+                itemAdjust = componentSource || null;
+                break;
+
+              default:
+                (0, _tools.recordObject)({
+                  message: '未找到匹配的构建模式',
+                  config: item
+                });
+                itemAdjust = null;
+                break;
+            }
+
+            list.push( /*#__PURE__*/_react.default.createElement(_react.Fragment, {
+              key: itemKey
+            }, itemAdjust));
+          }
+        }
+      });
+      return list;
+    };
+
     var defaultState = (0, _tools.defaultCommonState)();
     _this.state = _objectSpread(_objectSpread({}, defaultState), {
       backPath: '',

package/es/framework/DataForm/BaseAddForm/index.d.ts

@@ -2,26 +2,6 @@ export default BaseAddForm;
 declare class BaseAddForm extends DataCore {
     constructor(props: any);
     loadDataAfterMount: boolean;
-    state: {
-        dataLoading: boolean;
-        errorFieldName: string;
-        submitApiPath: string;
-        loadApiPath: string;
-        pageName: string;
-        metaData: null;
-        metaExtra: null;
-        metaListData: never[];
-        metaOriginalData: null;
-        processing: boolean;
-        reloading: boolean;
-        searching: boolean;
-        refreshing: boolean;
-        paging: boolean;
-        firstLoadSuccess: boolean;
-        loadSuccess: boolean;
-        urlParams: null;
-        externalData: null;
-    };
     adjustWhenDidMount: () => void;
     fillData: () => void;
     afterFillForm: (initialValues: any) => void;

package/es/framework/DataForm/BaseAddForm/index.js

@@ -7,6 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+require("antd/es/back-top/style");
+
+var _backTop = _interopRequireDefault(require("antd/es/back-top"));
+
 require("antd/es/form/style");
 
 var _form = _interopRequireDefault(require("antd/es/form"));
@@ -21,6 +25,8 @@ var _message2 = _interopRequireDefault(require("antd/es/message"));
 
 var _react = _interopRequireDefault(require("react"));
 
+var _proLayout = require("@ant-design/pro-layout");
+
 var _icons = require("@ant-design/icons");
 
 var _tools = require("../../../utils/tools");
@@ -29,8 +35,14 @@ var _requestAssistor = require("../../../utils/requestAssistor");
 
 var _constants = require("../../../utils/constants");
 
+var _FunctionComponent = require("../../../customComponents/FunctionComponent");
+
+var _DecorateAvatar = require("../../../customComponents/DecorateAvatar");
+
 var _DataCore2 = _interopRequireDefault(require("../../DataSingleView/DataCore"));
 
+var _index = _interopRequireDefault(require("./index.less"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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; }
@@ -278,7 +290,41 @@ var BaseAddForm = /*#__PURE__*/function (_DataCore) {
     return _this;
   }
 
-  _createClass(BaseAddForm, null, [{
+  _createClass(BaseAddForm, [{
+    key: "renderFurther",
+    value: function renderFurther() {
+      var _this2 = this;
+
+      var _this$state = this.state,
+          defaultAvatarIcon = _this$state.defaultAvatarIcon,
+          showPageHeaderAvatar = _this$state.showPageHeaderAvatar,
+          dataLoading = _this$state.dataLoading,
+          reloading = _this$state.reloading,
+          avatarImageLoadResult = _this$state.avatarImageLoadResult;
+      var avatarProps = showPageHeaderAvatar ? (0, _DecorateAvatar.decorateAvatar)(this.establishPageHeaderAvatarConfig(), defaultAvatarIcon, showPageHeaderAvatar, dataLoading, reloading, avatarImageLoadResult, function () {
+        _this2.onPageHeaderAvatarLoadErrorCallback();
+      }) : null;
+      var pageHeaderContentConfig = this.establishPageHeaderContentConfig();
+      return /*#__PURE__*/_react.default.createElement(_proLayout.PageHeaderWrapper, {
+        className: _index.default.customContainor,
+        avatar: avatarProps,
+        title: (0, _FunctionComponent.buildPageHeaderTitle)(this.getPageName(), this.establishPageHeaderTitlePrefix()),
+        subTitle: this.buildPageHeaderSubTitle(),
+        tags: (0, _FunctionComponent.buildPageHeaderTagWrapper)(this.establishPageHeaderTagConfig()),
+        extra: this.pageHeaderAction(),
+        content: (0, _FunctionComponent.buildPageHeaderContent)(pageHeaderContentConfig),
+        extraContent: (0, _FunctionComponent.pageHeaderExtraContent)(this.establishPageHeaderExtraContentConfig()) // onBack={() => {
+        //   this.backToList();
+        // }}
+
+      }, /*#__PURE__*/_react.default.createElement("div", {
+        className: _index.default.containorBox,
+        style: {
+          overflowX: 'hidden'
+        }
+      }, this.renderFormWrapper(), this.renderOther()), /*#__PURE__*/_react.default.createElement(_backTop.default, null));
+    }
+  }], [{
     key: "getDerivedStateFromProps",
     value: function getDerivedStateFromProps(nextProps, prevState) {
       return (0, _tools.getDerivedStateFromPropsForUrlParams)(nextProps, prevState);

package/es/framework/DataForm/BaseAddForm/index.less

@@ -0,0 +1,51 @@
+@import '~antd/lib/style/themes/default.less';
+
+@import '../../../utils/utils.less';
+
+.customContainor {
+  :global {
+    .ant-page-header.has-footer {
+      padding-bottom: 0;
+    }
+
+    .ant-page-header-footer .ant-tabs-bar .ant-tabs-nav .ant-tabs-tab {
+      font-size: 14px;
+    }
+
+    .ant-tabs-small > .ant-tabs-nav .ant-tabs-tab {
+      border-bottom: 0;
+    }
+
+    .ant-tabs-small > .ant-tabs-nav .ant-tabs-tab.ant-tabs-tab-active {
+      background-color: #f0f2f5;
+      border-bottom-color: #f0f2f5;
+    }
+  }
+
+  .textSecondary {
+    color: @text-color-secondary;
+  }
+
+  .heading {
+    color: @heading-color;
+    font-size: 20px;
+  }
+
+  .pageNameBox {
+    display: block;
+    max-width: 700px;
+    height: 32px;
+    overflow: hidden;
+    font-size: 18px;
+    line-height: 32px;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
+
+  .pageTagBox {
+    position: relative;
+    height: 24px;
+    padding: 0 14px 0 0;
+    line-height: 24px;
+  }
+}

package/es/framework/DataSingleView/DataCore/index.d.ts

@@ -1,15 +1,46 @@
 export default DataCore;
 declare class DataCore extends BaseView {
+    constructor(props: any);
     enableActionBack: boolean;
     reloadByUrlOp: boolean;
     actionBackProps: {};
     formRef: React.RefObject<any>;
+    state: any;
     setFormFieldsValue: (v: any) => void;
     afterSetFieldsValue: (v: any) => void;
     getTargetForm: () => any;
-    pageHeaderLogo: () => JSX.Element;
+    onPageHeaderAvatarLoadErrorCallback: () => void;
+    establishPageHeaderAvatarConfig: () => null;
+    establishPageHeaderContentGridConfig: () => never[];
+    establishPageHeaderContentCollectionGridConfig: () => {
+        type: string;
+        list: never[];
+    };
+    establishPageHeaderContentParagraphCollectionConfig: () => never[];
+    establishPageHeaderContentParagraphConfig: () => {
+        type: string;
+        list: never[];
+    };
+    establishPageHeaderContentActionCollectionConfig: () => never[];
+    establishPageHeaderContentActionConfig: () => {
+        type: string;
+        list: never[];
+    };
+    establishPageHeaderContentConfig: () => {
+        list: {
+            type: string;
+            list: never[];
+        }[];
+    };
+    establishPageHeaderTagCollectionConfig: () => never[];
+    establishPageHeaderExtraContentConfig: () => null;
+    establishPageHeaderTitlePrefix: () => string;
+    establishPageHeaderTagConfig: () => JSX.Element | null;
     establishPageHeaderActionExtraGroupConfig: () => null;
     establishPageHeaderActionExtraEllipsisConfig: () => null;
+    buildPageHeaderSubTitle: () => null;
+    pageHeaderLogo: () => JSX.Element;
+    getPageName: () => any;
     buildPageHeaderActionBack: () => JSX.Element | null;
     pageHeaderAction: () => JSX.Element;
     buildFormLayout: () => string;

package/es/framework/DataSingleView/DataCore/index.js

@@ -39,8 +39,12 @@ var _icons = require("@ant-design/icons");
 
 var _tools = require("../../../utils/tools");
 
+var _constants = require("../../../utils/constants");
+
 var _FunctionComponent = require("../../../customComponents/FunctionComponent");
 
+var _DecorateAvatar = require("../../../customComponents/DecorateAvatar");
+
 var _BaseView2 = _interopRequireDefault(require("../../DataOperation/BaseView"));
 
 var _index = _interopRequireDefault(require("./index.less"));
@@ -80,16 +84,12 @@ var DataCore = /*#__PURE__*/function (_BaseView) {
 
   var _super = _createSuper(DataCore);
 
-  function DataCore() {
+  function DataCore(_props) {
     var _this;
 
     _classCallCheck(this, DataCore);
 
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-
-    _this = _super.call.apply(_super, [this].concat(args));
+    _this = _super.call(this, _props);
     _this.enableActionBack = true;
     _this.reloadByUrlOp = false;
     _this.actionBackProps = {};
@@ -111,10 +111,70 @@ var DataCore = /*#__PURE__*/function (_BaseView) {
       return _this.formRef.current;
     };
 
-    _this.pageHeaderLogo = function () {
-      return /*#__PURE__*/_react.default.createElement(_avatar.default, {
-        shape: "square",
-        icon: /*#__PURE__*/_react.default.createElement(_icons.PlusOutlined, null)
+    _this.onPageHeaderAvatarLoadErrorCallback = function () {
+      _this.setState({
+        avatarImageLoadResult: _DecorateAvatar.avatarImageLoadResultCollection.fail
+      });
+    };
+
+    _this.establishPageHeaderAvatarConfig = function () {
+      return null;
+    };
+
+    _this.establishPageHeaderContentGridConfig = function () {
+      return [];
+    };
+
+    _this.establishPageHeaderContentCollectionGridConfig = function () {
+      return {
+        type: _constants.pageHeaderRenderType.descriptionGrid,
+        list: _this.establishPageHeaderContentGridConfig()
+      };
+    };
+
+    _this.establishPageHeaderContentParagraphCollectionConfig = function () {
+      return [];
+    };
+
+    _this.establishPageHeaderContentParagraphConfig = function () {
+      return {
+        type: _constants.pageHeaderRenderType.paragraph,
+        list: _this.establishPageHeaderContentParagraphCollectionConfig()
+      };
+    };
+
+    _this.establishPageHeaderContentActionCollectionConfig = function () {
+      return [];
+    };
+
+    _this.establishPageHeaderContentActionConfig = function () {
+      return {
+        type: _constants.pageHeaderRenderType.action,
+        list: _this.establishPageHeaderContentActionCollectionConfig()
+      };
+    };
+
+    _this.establishPageHeaderContentConfig = function () {
+      return {
+        list: [_this.establishPageHeaderContentCollectionGridConfig(), _this.establishPageHeaderContentParagraphConfig(), _this.establishPageHeaderContentActionConfig()]
+      };
+    };
+
+    _this.establishPageHeaderTagCollectionConfig = function () {
+      return [];
+    };
+
+    _this.establishPageHeaderExtraContentConfig = function () {
+      return null;
+    };
+
+    _this.establishPageHeaderTitlePrefix = function () {
+      return '';
+    };
+
+    _this.establishPageHeaderTagConfig = function () {
+      return (0, _FunctionComponent.buildTagList)({
+        list: _this.establishPageHeaderTagCollectionConfig()
       });
     };
 
@@ -126,6 +186,22 @@ var DataCore = /*#__PURE__*/function (_BaseView) {
       return null;
     };
 
+    _this.buildPageHeaderSubTitle = function () {
+      return null;
+    };
+
+    _this.pageHeaderLogo = function () {
+      return /*#__PURE__*/_react.default.createElement(_avatar.default, {
+        shape: "square",
+        icon: /*#__PURE__*/_react.default.createElement(_icons.PlusOutlined, null)
+      });
+    };
+
+    _this.getPageName = function () {
+      var pageName = _this.state.pageName;
+      return pageName;
+    };
+
     _this.buildPageHeaderActionBack = function () {
       var backPath = _this.state.backPath;
 
@@ -233,6 +309,9 @@ var DataCore = /*#__PURE__*/function (_BaseView) {
       return _this.buildCardCollection(_this.establishCardCollectionConfig());
     };
 
+    _this.state = _objectSpread(_objectSpread({}, _this.state), {}, {
+      avatarImageLoadResult: _DecorateAvatar.avatarImageLoadResultCollection.wait
+    });
     return _this;
   }
 

package/es/framework/DataSingleView/DataLoad/index.d.ts

@@ -2,27 +2,6 @@ export default DataLoad;
 declare class DataLoad extends DataCore {
     constructor(props: any);
     lastLoadParams: any;
-    state: {
-        showReloadButton: boolean;
-        errorFieldName: string;
-        submitApiPath: string;
-        loadApiPath: string;
-        pageName: string;
-        metaData: null;
-        metaExtra: null;
-        metaListData: never[];
-        metaOriginalData: null;
-        dataLoading: boolean;
-        processing: boolean;
-        reloading: boolean;
-        searching: boolean;
-        refreshing: boolean;
-        paging: boolean;
-        firstLoadSuccess: boolean;
-        loadSuccess: boolean;
-        urlParams: null;
-        externalData: null;
-    };
     doOtherWhenChangeVisibleToShow: (preProps: any, preState: any, snapshot: any) => void;
     afterLoadSuccess: ({ metaData, metaListData, metaExtra, metaOriginalData, }: {
         metaData: any;

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

@@ -6,34 +6,6 @@ declare class DataTabContainer extends DataSingleView {
     handleTabChange: (key: any) => void;
     adjustTabListAvailable: (tabListAvailable: any) => any;
     getTabActiveKey: () => any;
-    onPageHeaderAvatarLoadErrorCallback: () => void;
-    establishPageHeaderTagCollectionConfig: () => never[];
-    establishPageHeaderTagConfig: () => JSX.Element | null;
-    establishPageHeaderAvatarConfig: () => null;
-    establishPageHeaderTitlePrefix: () => string;
-    buildPageHeaderSubTitle: () => null;
-    establishPageHeaderContentGridConfig: () => never[];
-    establishPageHeaderContentCollectionGridConfig: () => {
-        type: string;
-        list: never[];
-    };
-    establishPageHeaderContentParagraphCollectionConfig: () => never[];
-    establishPageHeaderContentParagraphConfig: () => {
-        type: string;
-        list: never[];
-    };
-    establishPageHeaderContentActionCollectionConfig: () => never[];
-    establishPageHeaderContentActionConfig: () => {
-        type: string;
-        list: never[];
-    };
-    establishPageHeaderContentConfig: () => {
-        list: {
-            type: string;
-            list: never[];
-        }[];
-    };
-    establishPageHeaderExtraContentConfig: () => null;
     getTabListAvailable: () => any;
     buildOtherTabProps: () => {
         type: string;
@@ -43,6 +15,16 @@ declare class DataTabContainer extends DataSingleView {
         };
         tabBarGutter: number;
     } | null;
-    getPageName: () => any;
+    establishTabBarExtraContentLeftConfig: () => null;
+    establishTabBarExtraContentRightConfig: () => null;
+    buildTabBarExtraContentItems: ({ keyPrefix, list: configListSource, split: splitSource, }: {
+        keyPrefix?: string | undefined;
+        list: any;
+        split?: boolean | undefined;
+    }) => JSX.Element | null;
+    buildTabBarExtraContent: () => {
+        left: JSX.Element | null;
+        right: JSX.Element | null;
+    };
 }
 import DataSingleView from "../DataSingleView/DataLoad";

package/es/framework/DataTabContainer/index.js

@@ -7,13 +7,21 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _react = _interopRequireDefault(require("react"));
+require("antd/es/space/style");
 
-var _icons = require("@ant-design/icons");
+var _space = _interopRequireDefault(require("antd/es/space"));
+
+require("antd/es/divider/style");
+
+var _divider = _interopRequireDefault(require("antd/es/divider"));
+
+var _react = _interopRequireDefault(require("react"));
 
 var _proLayout = require("@ant-design/pro-layout");
 
-var _constants = require("../../utils/constants");
+var _icons = require("@ant-design/icons");
+
+var _tools = require("../../utils/tools");
 
 var _FunctionComponent = require("../../customComponents/FunctionComponent");
 
@@ -124,77 +132,6 @@ var DataTabContainer = /*#__PURE__*/function (_DataSingleView) {
       return null;
     };
 
-    _this.onPageHeaderAvatarLoadErrorCallback = function () {
-      _this.setState({
-        avatarImageLoadResult: _DecorateAvatar.avatarImageLoadResultCollection.fail
-      });
-    };
-
-    _this.establishPageHeaderTagCollectionConfig = function () {
-      return [];
-    };
-
-    _this.establishPageHeaderTagConfig = function () {
-      return (0, _FunctionComponent.buildTagList)({
-        list: _this.establishPageHeaderTagCollectionConfig()
-      });
-    };
-
-    _this.establishPageHeaderAvatarConfig = function () {
-      return null;
-    };
-
-    _this.establishPageHeaderTitlePrefix = function () {
-      return '';
-    };
-
-    _this.buildPageHeaderSubTitle = function () {
-      return null;
-    };
-
-    _this.establishPageHeaderContentGridConfig = function () {
-      return [];
-    };
-
-    _this.establishPageHeaderContentCollectionGridConfig = function () {
-      return {
-        type: _constants.pageHeaderRenderType.descriptionGrid,
-        list: _this.establishPageHeaderContentGridConfig()
-      };
-    };
-
-    _this.establishPageHeaderContentParagraphCollectionConfig = function () {
-      return [];
-    };
-
-    _this.establishPageHeaderContentParagraphConfig = function () {
-      return {
-        type: _constants.pageHeaderRenderType.paragraph,
-        list: _this.establishPageHeaderContentParagraphCollectionConfig()
-      };
-    };
-
-    _this.establishPageHeaderContentActionCollectionConfig = function () {
-      return [];
-    };
-
-    _this.establishPageHeaderContentActionConfig = function () {
-      return {
-        type: _constants.pageHeaderRenderType.action,
-        list: _this.establishPageHeaderContentActionCollectionConfig()
-      };
-    };
-
-    _this.establishPageHeaderContentConfig = function () {
-      return {
-        list: [_this.establishPageHeaderContentCollectionGridConfig(), _this.establishPageHeaderContentParagraphConfig(), _this.establishPageHeaderContentActionConfig()]
-      };
-    };
-
-    _this.establishPageHeaderExtraContentConfig = function () {
-      return null;
-    };
-
     _this.getTabListAvailable = function () {
       var tabListAvailable = [];
       (_this.tabList || []).forEach(function (o) {
@@ -224,14 +161,68 @@ var DataTabContainer = /*#__PURE__*/function (_DataSingleView) {
       return null;
     };
 
-    _this.getPageName = function () {
-      var pageName = _this.state.pageName;
-      return pageName;
+    _this.establishTabBarExtraContentLeftConfig = function () {
+      return null;
+    };
+
+    _this.establishTabBarExtraContentRightConfig = function () {
+      return null;
+    };
+
+    _this.buildTabBarExtraContentItems = function (_ref2) {
+      var _ref2$keyPrefix = _ref2.keyPrefix,
+          keyPrefix = _ref2$keyPrefix === void 0 ? '' : _ref2$keyPrefix,
+          configListSource = _ref2.list,
+          _ref2$split = _ref2.split,
+          splitSource = _ref2$split === void 0 ? false : _ref2$split;
+
+      var _split$list$split$lis = _objectSpread(_objectSpread({}, {
+        split: false,
+        list: []
+      }), {
+        split: splitSource,
+        list: configListSource
+      }),
+          split = _split$list$split$lis.split,
+          list = _split$list$split$lis.list;
+
+      var configList = (0, _tools.isArray)(list) ? list : (0, _tools.isObject)(list) ? [list] : [];
+
+      if (configList.length <= 0) {
+        return null;
+      }
+
+      var listItem = _this.buildTabBarExtraContentItemsCore({
+        keyPrefix: keyPrefix,
+        configList: configList
+      });
+
+      return /*#__PURE__*/_react.default.createElement(_space.default, {
+        split: (0, _tools.isBoolean)(split) ? split ? /*#__PURE__*/_react.default.createElement(_divider.default, {
+          type: "vertical"
+        }) : null : split
+      }, listItem);
+    };
+
+    _this.buildTabBarExtraContent = function () {
+      var leftItems = _this.buildTabBarExtraContentItems({
+        keyPrefix: "data_tab_container_tab_bar_left_action_key",
+        list: _this.establishTabBarExtraContentLeftConfig()
+      });
+
+      var rightItems = _this.buildTabBarExtraContentItems({
+        keyPrefix: "data_tab_container_tab_bar_right_action_key",
+        list: _this.establishTabBarExtraContentRightConfig()
+      });
+
+      return {
+        left: leftItems,
+        right: rightItems
+      };
     };
 
     _this.state = _objectSpread(_objectSpread({}, _this.state), {}, {
       defaultAvatarIcon: /*#__PURE__*/_react.default.createElement(_icons.PictureOutlined, null),
-      avatarImageLoadResult: _DecorateAvatar.avatarImageLoadResultCollection.wait,
       showPageHeaderAvatar: true,
       customTabActiveKey: false
     });
@@ -244,55 +235,29 @@ var DataTabContainer = /*#__PURE__*/function (_DataSingleView) {
       var _this2 = this;
 
       var _this$state = this.state,
-          pageName = _this$state.pageName,
           defaultAvatarIcon = _this$state.defaultAvatarIcon,
           showPageHeaderAvatar = _this$state.showPageHeaderAvatar,
           dataLoading = _this$state.dataLoading,
           reloading = _this$state.reloading,
           avatarImageLoadResult = _this$state.avatarImageLoadResult;
       var children = this.props.children;
-      var customTabActiveKey = this.state.customTabActiveKey;
       var tabListAvailable = this.getTabListAvailable();
       var avatarProps = showPageHeaderAvatar ? (0, _DecorateAvatar.decorateAvatar)(this.establishPageHeaderAvatarConfig(), defaultAvatarIcon, showPageHeaderAvatar, dataLoading, reloading, avatarImageLoadResult, function () {
         _this2.onPageHeaderAvatarLoadErrorCallback();
       }) : null;
       var pageHeaderContentConfig = this.establishPageHeaderContentConfig();
-
-      if (customTabActiveKey) {
-        return /*#__PURE__*/_react.default.createElement(_proLayout.PageHeaderWrapper, {
-          className: _index.default.customContainor,
-          avatar: avatarProps,
-          title: (0, _FunctionComponent.buildPageHeaderTitle)(this.getPageName(), this.establishPageHeaderTitlePrefix()),
-          subTitle: this.buildPageHeaderSubTitle(),
-          tags: (0, _FunctionComponent.buildPageHeaderTagWrapper)(this.establishPageHeaderTagConfig()),
-          extra: this.pageHeaderAction() // eslint-disable-next-line no-restricted-globals
-          ,
-          tabActiveKey: this.getTabActiveKey(),
-          content: (0, _FunctionComponent.buildPageHeaderContent)(pageHeaderContentConfig),
-          extraContent: (0, _FunctionComponent.pageHeaderExtraContent)(this.pageHeaderExtraContent()),
-          tabList: tabListAvailable // tabBarExtraContent={<Button>Extra Action</Button>}
-          ,
-          onTabChange: this.handleTabChange,
-          tabProps: this.buildOtherTabProps() // onBack={() => {
-          //   this.backToList();
-          // }}
-
-        }, children);
-      }
-
       return /*#__PURE__*/_react.default.createElement(_proLayout.PageHeaderWrapper, {
         className: _index.default.customContainor,
         avatar: avatarProps,
-        title: (0, _FunctionComponent.buildPageHeaderTitle)(pageName, this.establishPageHeaderTitlePrefix()),
+        title: (0, _FunctionComponent.buildPageHeaderTitle)(this.getPageName(), this.establishPageHeaderTitlePrefix()),
         subTitle: this.buildPageHeaderSubTitle(),
         tags: (0, _FunctionComponent.buildPageHeaderTagWrapper)(this.establishPageHeaderTagConfig()),
-        extra: this.pageHeaderAction() // eslint-disable-next-line no-restricted-globals
-        ,
+        extra: this.pageHeaderAction(),
         tabActiveKey: this.getTabActiveKey(),
         content: (0, _FunctionComponent.buildPageHeaderContent)(pageHeaderContentConfig),
         extraContent: (0, _FunctionComponent.pageHeaderExtraContent)(this.establishPageHeaderExtraContentConfig()),
-        tabList: tabListAvailable // tabBarExtraContent={<Button>Extra Action</Button>}
-        ,
+        tabList: tabListAvailable,
+        tabBarExtraContent: this.buildTabBarExtraContent(),
         onTabChange: this.handleTabChange,
         tabProps: this.buildOtherTabProps() // onBack={() => {
         //   this.backToList();

package/es/utils/actionAssist.d.ts

@@ -1,3 +1,7 @@
+export function getApiDataCore({ props, modelName }: {
+    props: any;
+    modelName: any;
+}): any;
 /**
  * 处理 actionCore 的异步请求结果
  * @param {*} param0

package/es/utils/actionAssist.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.actionCore = actionCore;
 exports.confirmActionCore = confirmActionCore;
 exports.empty = empty;
+exports.getApiDataCore = getApiDataCore;
 exports.handleItem = handleItem;
 
 require("antd/es/message/style");
@@ -25,17 +26,41 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
 var confirm = _modal.default.confirm;
+
+function getApiDataCore(_ref) {
+  var props = _ref.props,
+      modelName = _ref.modelName;
+
+  if ((0, _tools.isUndefined)(props)) {
+    throw new Error('props is undefined, please check params.');
+  }
+
+  var m = (0, _tools.getPathValue)(props, modelName);
+
+  if ((m || null) == null) {
+    (0, _tools.recordError)("getApiDataCore error: model ".concat(modelName, " is null or undefined"));
+  }
+
+  var data = m.data;
+
+  if ((data || null) == null) {
+    (0, _tools.recordError)("getApiDataCore error: key \u201Cdata\u201D in model ".concat(modelName, " is null or undefined"));
+  }
+
+  return data;
+}
 /**
  * 处理 actionCore 的异步请求结果
  * @param {*} param0
  * @returns
  */
 
-function handleItem(_ref) {
-  var target = _ref.target,
-      dataId = _ref.dataId,
-      compareDataIdHandler = _ref.compareDataIdHandler,
-      handler = _ref.handler;
+
+function handleItem(_ref2) {
+  var target = _ref2.target,
+      dataId = _ref2.dataId,
+      compareDataIdHandler = _ref2.compareDataIdHandler,
+      handler = _ref2.handler;
 
   if ((target || null) == null) {
     throw new Error('actionCore: target not allow null');
@@ -98,14 +123,14 @@ function actionCore(_x) {
 }
 
 function _actionCore() {
-  _actionCore = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(_ref2) {
-    var api, params, _ref2$getApiData, getApiData, target, handleData, successCallback, _ref2$successMessage, successMessage, _ref2$successMessageB, successMessageBuilder, _ref2$showProcessing, showProcessing, _ref2$textProcessing, textProcessing, text, dispatch, key;
+  _actionCore = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(_ref3) {
+    var api, params, _ref3$getApiData, getApiData, target, handleData, successCallback, _ref3$successMessage, successMessage, _ref3$successMessageB, successMessageBuilder, _ref3$showProcessing, showProcessing, _ref3$textProcessing, textProcessing, text, dispatch, key;
 
     return regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            api = _ref2.api, params = _ref2.params, _ref2$getApiData = _ref2.getApiData, getApiData = _ref2$getApiData === void 0 ? null : _ref2$getApiData, target = _ref2.target, handleData = _ref2.handleData, successCallback = _ref2.successCallback, _ref2$successMessage = _ref2.successMessage, successMessage = _ref2$successMessage === void 0 ? '数据已经操作成功，请进行后续操作。' : _ref2$successMessage, _ref2$successMessageB = _ref2.successMessageBuilder, successMessageBuilder = _ref2$successMessageB === void 0 ? null : _ref2$successMessageB, _ref2$showProcessing = _ref2.showProcessing, showProcessing = _ref2$showProcessing === void 0 ? true : _ref2$showProcessing, _ref2$textProcessing = _ref2.textProcessing, textProcessing = _ref2$textProcessing === void 0 ? '处理中，请稍后' : _ref2$textProcessing;
+            api = _ref3.api, params = _ref3.params, _ref3$getApiData = _ref3.getApiData, getApiData = _ref3$getApiData === void 0 ? null : _ref3$getApiData, target = _ref3.target, handleData = _ref3.handleData, successCallback = _ref3.successCallback, _ref3$successMessage = _ref3.successMessage, successMessage = _ref3$successMessage === void 0 ? '数据已经操作成功，请进行后续操作。' : _ref3$successMessage, _ref3$successMessageB = _ref3.successMessageBuilder, successMessageBuilder = _ref3$successMessageB === void 0 ? null : _ref3$successMessageB, _ref3$showProcessing = _ref3.showProcessing, showProcessing = _ref3$showProcessing === void 0 ? true : _ref3$showProcessing, _ref3$textProcessing = _ref3.textProcessing, textProcessing = _ref3$textProcessing === void 0 ? '处理中，请稍后' : _ref3$textProcessing;
 
             if ((handleData || null) == null) {
               text = 'actionCore : handleData not allow null';
@@ -253,14 +278,14 @@ function confirmActionCore(_x2) {
 
 
 function _confirmActionCore() {
-  _confirmActionCore = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(_ref3) {
-    var title, content, _ref3$okText, okText, _ref3$okType, okType, _ref3$cancelText, cancelText, target, handleData, successCallback, _ref3$okAction, okAction, _ref3$successMessage, successMessage, _ref3$successMessageB, successMessageBuilder, _ref3$showProcessing, showProcessing, processing;
+  _confirmActionCore = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(_ref4) {
+    var title, content, _ref4$okText, okText, _ref4$okType, okType, _ref4$cancelText, cancelText, target, handleData, successCallback, _ref4$okAction, okAction, _ref4$successMessage, successMessage, _ref4$successMessageB, successMessageBuilder, _ref4$showProcessing, showProcessing, processing;
 
     return regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
-            title = _ref3.title, content = _ref3.content, _ref3$okText = _ref3.okText, okText = _ref3$okText === void 0 ? '确定' : _ref3$okText, _ref3$okType = _ref3.okType, okType = _ref3$okType === void 0 ? 'danger' : _ref3$okType, _ref3$cancelText = _ref3.cancelText, cancelText = _ref3$cancelText === void 0 ? '取消' : _ref3$cancelText, target = _ref3.target, handleData = _ref3.handleData, successCallback = _ref3.successCallback, _ref3$okAction = _ref3.okAction, okAction = _ref3$okAction === void 0 ? null : _ref3$okAction, _ref3$successMessage = _ref3.successMessage, successMessage = _ref3$successMessage === void 0 ? '数据已经操作成功，请进行后续操作。' : _ref3$successMessage, _ref3$successMessageB = _ref3.successMessageBuilder, successMessageBuilder = _ref3$successMessageB === void 0 ? null : _ref3$successMessageB, _ref3$showProcessing = _ref3.showProcessing, showProcessing = _ref3$showProcessing === void 0 ? true : _ref3$showProcessing;
+            title = _ref4.title, content = _ref4.content, _ref4$okText = _ref4.okText, okText = _ref4$okText === void 0 ? '确定' : _ref4$okText, _ref4$okType = _ref4.okType, okType = _ref4$okType === void 0 ? 'danger' : _ref4$okType, _ref4$cancelText = _ref4.cancelText, cancelText = _ref4$cancelText === void 0 ? '取消' : _ref4$cancelText, target = _ref4.target, handleData = _ref4.handleData, successCallback = _ref4.successCallback, _ref4$okAction = _ref4.okAction, okAction = _ref4$okAction === void 0 ? null : _ref4$okAction, _ref4$successMessage = _ref4.successMessage, successMessage = _ref4$successMessage === void 0 ? '数据已经操作成功，请进行后续操作。' : _ref4$successMessage, _ref4$successMessageB = _ref4.successMessageBuilder, successMessageBuilder = _ref4$successMessageB === void 0 ? null : _ref4$successMessageB, _ref4$showProcessing = _ref4.showProcessing, showProcessing = _ref4$showProcessing === void 0 ? true : _ref4$showProcessing;
 
             if ((0, _tools.isFunction)(okAction)) {
               _context2.next = 3;

package/es/utils/constants.d.ts

@@ -488,6 +488,25 @@ export namespace messageTypeCollection {
     const open_1: string;
     export { open_1 as open };
 }
+export namespace tabBarCollection {
+    export namespace extraBuildType_1 {
+        const iconInfo_3: string;
+        export { iconInfo_3 as iconInfo };
+        const colorText_1: string;
+        export { colorText_1 as colorText };
+        const button_3: string;
+        export { button_3 as button };
+        const dropdownButton_3: string;
+        export { dropdownButton_3 as dropdownButton };
+        const dropdownEllipsis_3: string;
+        export { dropdownEllipsis_3 as dropdownEllipsis };
+        const dropdown_3: string;
+        export { dropdown_3 as dropdown };
+        const component_4: string;
+        export { component_4 as component };
+    }
+    export { extraBuildType_1 as extraBuildType };
+}
 declare namespace animalType {
     const none_2: string;
     export { none_2 as none };

package/es/utils/constants.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.drawerConfig = exports.defaultUserAvatar = exports.defaultEmptyImage = exports.datetimeFormat = exports.dataTypeCollection = exports.convertCollection = exports.contentConfig = exports.columnPlaceholder = exports.columnFacadeMode = exports.cardConfig = exports.authenticationFailCode = exports.appInitDefault = exports.apiSuccessCode = exports.accessWaySpecialCollection = void 0;
 exports.empty = empty;
-exports.zeroString = exports.zeroInt = exports.whetherString = exports.whetherNumber = exports.unlimitedWithStringFlag = exports.unlimitedWithNumberFlag = exports.sortOperate = exports.selectModeCollection = exports.searchCardConfig = exports.pageHeaderRenderType = exports.notificationTypeCollection = exports.messageTypeCollection = exports.menuType = exports.logShowMode = exports.logLevel = exports.listViewConfig = exports.imageContentPreviewMode = exports.formatCollection = exports.formNameCollection = exports.emptyLogo = exports.emptyDatetime = void 0;
+exports.zeroString = exports.zeroInt = exports.whetherString = exports.whetherNumber = exports.unlimitedWithStringFlag = exports.unlimitedWithNumberFlag = exports.tabBarCollection = exports.sortOperate = exports.selectModeCollection = exports.searchCardConfig = exports.pageHeaderRenderType = exports.notificationTypeCollection = exports.messageTypeCollection = exports.menuType = exports.logShowMode = exports.logLevel = exports.listViewConfig = exports.imageContentPreviewMode = exports.formatCollection = exports.formNameCollection = exports.emptyLogo = exports.emptyDatetime = void 0;
 
 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; }
 
@@ -717,6 +717,48 @@ var messageTypeCollection = {
   loading: 'loading',
   open: 'open'
 };
+exports.messageTypeCollection = messageTypeCollection;
+var tabBarCollection = {
+  /**
+   * 扩展区构建模式
+   */
+  extraBuildType: {
+    /**
+     * 带图标文字，图标为空或者文字为空情况下渲染方式有差异
+     */
+    iconInfo: 'iconInfo',
+
+    /**
+     * 彩色文字
+     */
+    colorText: 'colorText',
+
+    /**
+     * 根据配置项渲染按钮，事件触发需要自定义指定,配置项与generalButton相仿，配置模式有所不同，最终效果类似
+     */
+    button: 'button',
+
+    /**
+     * 带扩展操作的按钮
+     */
+    dropdownButton: 'dropdownButton',
+
+    /**
+     * 带扩展操作的省略按钮，省略占位符本身不具有操作
+     */
+    dropdownEllipsis: 'dropdownEllipsis',
+
+    /**
+     * dropdown
+     */
+    dropdown: 'dropdown',
+
+    /**
+     * 指定渲染自定义组件，组件由配置传入
+     */
+    component: 'component'
+  }
+};
 /**
  * 占位函数
  *
@@ -724,7 +766,7 @@ var messageTypeCollection = {
  * @returns
  */
 
-exports.messageTypeCollection = messageTypeCollection;
+exports.tabBarCollection = tabBarCollection;
 
 function empty() {
   return {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-management-fast-framework",
-  "version": "1.11.10",
+  "version": "1.11.15",
   "description": "antd-management-fast-framework",
   "keywords": [
     "antd-management-fast-framework"
@@ -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.10",
-    "@typescript-eslint/eslint-plugin": "^5.4.0",
+    "@types/node": "^16.11.11",
+    "@typescript-eslint/eslint-plugin": "^5.5.0",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.5.20",
     "@umijs/test-utils": "^3.5.20",
@@ -127,7 +127,7 @@
     "postcss": "^8.4.4",
     "postcss-less": "^5.0.0",
     "prettier": "^2.5.0",
-    "puppeteer": "^12.0.0",
+    "puppeteer": "^12.0.1",
     "query-string": "^7.0.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",