antd-management-fast-framework 1.11.30 → 1.11.36

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

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

package/es/customComponents/FunctionComponent/index.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.adjustTableExpandConfig = adjustTableExpandConfig;
+exports.buildAlert = buildAlert;
 exports.buildButton = buildButton;
 exports.buildButtonGroup = buildButtonGroup;
 exports.buildColorText = buildColorText;
@@ -54,6 +55,7 @@ exports.buildSearchInput = buildSearchInput;
 exports.buildSearchInputNumber = buildSearchInputNumber;
 exports.buildSyntaxHighlighter = buildSyntaxHighlighter;
 exports.buildTagList = buildTagList;
+exports.buildTree = buildTree;
 exports.empty = empty;
 exports.pageHeaderExtraContent = pageHeaderExtraContent;
 
@@ -89,6 +91,14 @@ require("antd/es/col/style");
 
 var _col = _interopRequireDefault(require("antd/es/col"));
 
+require("antd/es/alert/style");
+
+var _alert = _interopRequireDefault(require("antd/es/alert"));
+
+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 +925,14 @@ function buildMenu(_ref5) {
   }));
 }
 
+function buildTree(props) {
+  return /*#__PURE__*/_react.default.createElement(_tree.default, props);
+}
+
+function buildAlert(props) {
+  return /*#__PURE__*/_react.default.createElement(_alert.default, props);
+}
+
 function buildCustomGrid(_ref7) {
   var _ref7$key = _ref7.key,
       key = _ref7$key === void 0 ? null : _ref7$key,

package/es/framework/Common/index.js

@@ -1665,6 +1665,16 @@ var Common = /*#__PURE__*/function (_Core) {
           }));
         }
 
+        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,

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

@@ -9,6 +9,7 @@ declare class ListBase extends AuthorizationWrapper {
      * 使用前台模拟分页，有助于优化长列表页面交互操作导致的延迟
      */
     useFrontendPagination: boolean;
+    showSearchForm: boolean;
     affixPaginationBar: boolean;
     formRef: React.RefObject<any>;
     pageSizeAdditional: number;
@@ -207,6 +208,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;
 
@@ -171,6 +177,7 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
     _this.useRemotePagination = true;
     _this.useFrontendPagination = false;
     _this.useFrontendPagination = false;
+    _this.showSearchForm = true;
     _this.affixPaginationBar = true;
     _this.formRef = /*#__PURE__*/_react.default.createRef();
     _this.pageSizeAdditional = 0;
@@ -1343,33 +1350,112 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
       return null;
     };
 
-    _this.renderPageContent = function () {
-      var _this$state10 = _this.state,
-          listTitle = _this$state10.listTitle,
-          renderSearchForm = _this$state10.renderSearchForm;
+    _this.establishSiderTopAreaConfig = function () {
+      return null;
+    };
 
-      var extraAction = _this.renderExtraActionView();
+    _this.renderSiderTopArea = function () {
+      var config = _this.establishSiderTopAreaConfig();
 
-      var searchForm = _this.renderForm();
+      if (config == null) {
+        return null;
+      }
 
-      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 _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
-      }, _this.buildToolBarWrapper(), 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", {
-        className: _index.default.tableListForm
-      }, searchForm))) : null, /*#__PURE__*/_react.default.createElement(_card.default, {
+      }, 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 listTitle = _this.state.listTitle;
+
+      var extraAction = _this.renderExtraActionView();
+
+      var searchForm = _this.renderForm();
+
+      var hasPagination = _this.renderPaginationView() != null;
+
+      var gridView = /*#__PURE__*/_react.default.createElement(_card.default, {
         title: listTitle,
         headStyle: {
           borderBottom: '0px'
@@ -1385,7 +1471,91 @@ 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()));
+
+      if (!_this.showSearchForm || (searchForm || null) == null) {
+        return gridView;
+      }
+
+      return /*#__PURE__*/_react.default.createElement(_space.default, {
+        style: {
+          width: '100%'
+        },
+        direction: "vertical",
+        size: 24
+      }, /*#__PURE__*/_react.default.createElement(_card.default, {
+        bordered: false,
+        className: _index.default.containorSearch
+      }, /*#__PURE__*/_react.default.createElement("div", {
+        className: _index.default.tableListForm
+      }, searchForm)), gridView);
+    };
+
+    _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);
+
+      var toolbar = _this.buildToolBarWrapper();
+
+      var help = _this.buildHelpWrapper();
+
+      if ((toolbar || null) != null || (help || null) != 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()));
+      }
+
+      return inner;
     };
 
     _this.renderPageBody = function () {
@@ -1405,7 +1575,6 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
       showPageHeaderAvatar: false,
       tableSize: _constants.listViewConfig.tableSize.middle,
       counterSetColumnsOtherConfig: 0,
-      renderSearchForm: true,
       showListViewItemActionSelect: false
     });
     return _this;
@@ -1416,13 +1585,13 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
     value: function renderFurther() {
       var _this2 = this;
 
-      var _this$state11 = this.state,
-          renderPageHeaderWrapper = _this$state11.renderPageHeaderWrapper,
-          showPageHeaderAvatar = _this$state11.showPageHeaderAvatar,
-          defaultAvatarIcon = _this$state11.defaultAvatarIcon,
-          dataLoading = _this$state11.dataLoading,
-          reloading = _this$state11.reloading,
-          avatarImageLoadResult = _this$state11.avatarImageLoadResult;
+      var _this$state10 = this.state,
+          renderPageHeaderWrapper = _this$state10.renderPageHeaderWrapper,
+          showPageHeaderAvatar = _this$state10.showPageHeaderAvatar,
+          defaultAvatarIcon = _this$state10.defaultAvatarIcon,
+          dataLoading = _this$state10.dataLoading,
+          reloading = _this$state10.reloading,
+          avatarImageLoadResult = _this$state10.avatarImageLoadResult;
       var tabListAvailable = this.getTabListAvailable();
       var avatarProps = showPageHeaderAvatar ? (0, _DecorateAvatar.decorateAvatar)(this.establishPageHeaderAvatarConfig(), defaultAvatarIcon, showPageHeaderAvatar, dataLoading, reloading, avatarImageLoadResult, function () {
         _this2.onPageHeaderAvatarLoadErrorCallback();

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

@@ -226,8 +226,7 @@ var MultiPageDrawer = /*#__PURE__*/function (_MultiPage) {
           reloading = _this$state.reloading,
           processing = _this$state.processing,
           refreshing = _this$state.refreshing,
-          listViewMode = _this$state.listViewMode,
-          renderSearchForm = _this$state.renderSearchForm;
+          listViewMode = _this$state.listViewMode;
 
       var extraAction = _this.renderExtraActionView();
 
@@ -247,7 +246,7 @@ var MultiPageDrawer = /*#__PURE__*/function (_MultiPage) {
           display: 'flex',
           flexDirection: 'column'
         } : {}
-      }, renderSearchForm && (searchForm || null) != null ? /*#__PURE__*/_react.default.createElement("div", {
+      }, _this.showSearchForm && (searchForm || null) != null ? /*#__PURE__*/_react.default.createElement("div", {
         style: listViewMode === _constants.listViewConfig.viewMode.list ? {
           flex: 0
         } : {}
@@ -353,9 +352,7 @@ var MultiPageDrawer = /*#__PURE__*/function (_MultiPage) {
     };
 
     _this.renderContentContainor = function () {
-      var _this$state2 = _this.state,
-          listViewMode = _this$state2.listViewMode,
-          renderSearchForm = _this$state2.renderSearchForm;
+      var listViewMode = _this.state.listViewMode;
       return /*#__PURE__*/_react.default.createElement("div", {
         className: _index.default.contentContainor,
         style: _objectSpread(_objectSpread(_objectSpread({}, listViewMode === _constants.listViewConfig.viewMode.list ? {
@@ -364,7 +361,7 @@ var MultiPageDrawer = /*#__PURE__*/function (_MultiPage) {
           overflow: 'hidden'
         } : {
           paddingBottom: 0
-        }), renderSearchForm ? {} : {
+        }), _this.showSearchForm ? {} : {
           paddingTop: 0
         }), {
           backgroundColor: '#fff'
@@ -466,9 +463,9 @@ var MultiPageDrawer = /*#__PURE__*/function (_MultiPage) {
     key: "renderFurther",
     value: function renderFurther() {
       var widthDrawer = this.props.width;
-      var _this$state3 = this.state,
-          visible = _this$state3.visible,
-          listViewMode = _this$state3.listViewMode;
+      var _this$state2 = this.state,
+          visible = _this$state2.visible,
+          listViewMode = _this$state2.listViewMode;
       return /*#__PURE__*/_react.default.createElement(_drawer.default, {
         title: /*#__PURE__*/_react.default.createElement("span", null, this.renderTitleIcon(), this.getPageName()),
         destroyOnClose: false,

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

@@ -212,8 +212,7 @@ var SinglePageDrawer = /*#__PURE__*/function (_SinglePage) {
           listTitle = _this$state.listTitle,
           tableSize = _this$state.tableSize,
           refreshing = _this$state.refreshing,
-          listViewMode = _this$state.listViewMode,
-          renderSearchForm = _this$state.renderSearchForm;
+          listViewMode = _this$state.listViewMode;
 
       var extraAction = _this.renderExtraActionView();
 
@@ -233,7 +232,7 @@ var SinglePageDrawer = /*#__PURE__*/function (_SinglePage) {
           display: 'flex',
           flexDirection: 'column'
         } : {}
-      }, renderSearchForm && (searchForm || null) != null ? /*#__PURE__*/_react.default.createElement("div", {
+      }, _this.showSearchForm && (searchForm || null) != null ? /*#__PURE__*/_react.default.createElement("div", {
         style: listViewMode === _constants.listViewConfig.viewMode.list ? {
           flex: 0
         } : {}
@@ -336,9 +335,7 @@ var SinglePageDrawer = /*#__PURE__*/function (_SinglePage) {
     };
 
     _this.renderContentContainor = function () {
-      var _this$state2 = _this.state,
-          listViewMode = _this$state2.listViewMode,
-          renderSearchForm = _this$state2.renderSearchForm;
+      var listViewMode = _this.state.listViewMode;
       return /*#__PURE__*/_react.default.createElement("div", {
         className: _index.default.contentContainor,
         style: _objectSpread(_objectSpread(_objectSpread({}, listViewMode === _constants.listViewConfig.viewMode.list ? {
@@ -347,7 +344,7 @@ var SinglePageDrawer = /*#__PURE__*/function (_SinglePage) {
           overflow: 'hidden'
         } : {
           paddingBottom: 0
-        }), renderSearchForm ? {} : {
+        }), _this.showSearchForm ? {} : {
           paddingTop: 0
         }), {
           backgroundColor: '#fff'
@@ -367,9 +364,9 @@ var SinglePageDrawer = /*#__PURE__*/function (_SinglePage) {
     };
 
     _this.renderListView = function () {
-      var _this$state3 = _this.state,
-          dataLoading = _this$state3.dataLoading,
-          listViewMode = _this$state3.listViewMode;
+      var _this$state2 = _this.state,
+          dataLoading = _this$state2.dataLoading,
+          listViewMode = _this$state2.listViewMode;
       var list = _this.getCanUseFrontendPagination() ? _this.adjustFrontendPaginationViewDataSource() : _this.adjustViewDataSource();
 
       var bottomBar = _this.renderPaginationView();
@@ -444,9 +441,9 @@ var SinglePageDrawer = /*#__PURE__*/function (_SinglePage) {
     key: "renderFurther",
     value: function renderFurther() {
       var widthDrawer = this.props.width;
-      var _this$state4 = this.state,
-          visible = _this$state4.visible,
-          listViewMode = _this$state4.listViewMode;
+      var _this$state3 = this.state,
+          visible = _this$state3.visible,
+          listViewMode = _this$state3.listViewMode;
       return /*#__PURE__*/_react.default.createElement(_drawer.default, {
         title: /*#__PURE__*/_react.default.createElement("span", null, this.renderTitleIcon(), this.getPageName()),
         destroyOnClose: false,

package/es/utils/constants.d.ts

@@ -396,6 +396,10 @@ export namespace cardConfig {
          * CustomGrid
          */
         customGrid: string;
+        /**
+         * tree
+         */
+        tree: string;
     };
 }
 export namespace searchCardConfig {

package/es/utils/constants.js

@@ -585,7 +585,12 @@ var cardConfig = _objectSpread(_objectSpread({}, contentConfig), {}, {
     /**
      * CustomGrid
      */
-    customGrid: 'customGrid'
+    customGrid: 'customGrid',
+
+    /**
+     * tree
+     */
+    tree: 'tree'
   }
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-management-fast-framework",
-  "version": "1.11.30",
+  "version": "1.11.36",
   "description": "antd-management-fast-framework",
   "keywords": [
     "antd-management-fast-framework"
@@ -30,13 +30,13 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@ant-design/pro-layout": "^6.31.3",
+    "@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.30001285",
+    "caniuse-lite": "^1.0.30001286",
     "classnames": "^2.3.1",
     "copy-to-clipboard": "^3.3.1",
     "enquire-js": "^0.2.1",
@@ -90,7 +90,7 @@
     "@testing-library/react": "^12.1.2",
     "@testing-library/react-hooks": "^7.0.2",
     "@types/jest": "^27.0.3",
-    "@types/node": "^16.11.11",
+    "@types/node": "^16.11.12",
     "@typescript-eslint/eslint-plugin": "^5.6.0",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.5.20",
@@ -101,7 +101,7 @@
     "body-parser": "^1.19.0",
     "commitizen": "^4.2.4",
     "cross-env": "^7.0.3",
-    "eslint": "^8.4.0",
+    "eslint": "^8.4.1",
     "eslint-config-airbnb": "^19.0.2",
     "eslint-config-airbnb-typescript": "^16.1.0",
     "eslint-config-prettier": "^8.3.0",