antd-management-fast-framework 1.11.33 → 1.11.38

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

@@ -77,6 +77,7 @@ export function buildMenu({ handleData: r, handleMenuClick, menuItems, }: {
     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;
@@ -90,6 +91,10 @@ 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"));
@@ -924,6 +929,10 @@ 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.d.ts

@@ -133,7 +133,7 @@ declare class Common extends Core {
         showIcon?: boolean | undefined;
     }) => JSX.Element | null;
     establishFormAdditionalConfig: () => {};
-    renderRefreshButton: () => JSX.Element;
+    renderRefreshButton: (props?: any) => JSX.Element | null;
     getUploadTokenObject: () => never;
     beforeVideoUpload: (file: any) => boolean;
     pretreatmentImageUploadRemoteResponse: (response: any) => never;

package/es/framework/Common/index.js

@@ -128,12 +128,12 @@ var Common = /*#__PURE__*/function (_Core) {
 
   var _super = _createSuper(Common);
 
-  function Common(props) {
+  function Common(_props) {
     var _this;
 
     _classCallCheck(this, Common);
 
-    _this = _super.call(this, props);
+    _this = _super.call(this, _props);
     _this.loadDataAfterMount = true;
     _this.lastRequestingData = {
       type: '',
@@ -1108,18 +1108,22 @@ var Common = /*#__PURE__*/function (_Core) {
     };
 
     _this.renderRefreshButton = function () {
-      var _this$state2 = _this.state,
-          dataLoading = _this$state2.dataLoading,
-          reloading = _this$state2.reloading,
-          processing = _this$state2.processing,
-          loadSuccess = _this$state2.loadSuccess;
-      return /*#__PURE__*/_react.default.createElement(_button.default, {
-        disabled: dataLoading || reloading || processing || !loadSuccess,
-        onClick: _this.reloadData
-      }, /*#__PURE__*/_react.default.createElement(_IconInfo.default, {
-        icon: reloading ? /*#__PURE__*/_react.default.createElement(_icons.LoadingOutlined, null) : /*#__PURE__*/_react.default.createElement(_icons.ReloadOutlined, null),
-        text: "\u5237\u65B0"
-      }));
+      var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+
+      var _size$text = _objectSpread(_objectSpread({}, {
+        size: 'default',
+        text: '刷新'
+      }), props || {}),
+          size = _size$text.size,
+          text = _size$text.text;
+
+      return (0, _FunctionComponent.buildButton)({
+        size: size,
+        text: text,
+        icon: /*#__PURE__*/_react.default.createElement(_icons.ReloadOutlined, null),
+        disabled: _this.checkOperability(),
+        handleClick: _this.reloadData
+      });
     };
 
     _this.getUploadTokenObject = function () {
@@ -1970,7 +1974,7 @@ var Common = /*#__PURE__*/function (_Core) {
 
             switch (buildType) {
               case _constants.cardConfig.extraBuildType.refresh:
-                itemAdjust = _this.renderRefreshButton();
+                itemAdjust = _this.renderRefreshButton(item);
                 break;
 
               case _constants.cardConfig.extraBuildType.save:
@@ -2144,13 +2148,13 @@ var Common = /*#__PURE__*/function (_Core) {
   }, {
     key: "checkWorkDoing",
     value: function checkWorkDoing() {
-      var _this$state3 = this.state,
-          dataLoading = _this$state3.dataLoading,
-          reloading = _this$state3.reloading,
-          searching = _this$state3.searching,
-          refreshing = _this$state3.refreshing,
-          paging = _this$state3.paging,
-          processing = _this$state3.processing;
+      var _this$state2 = this.state,
+          dataLoading = _this$state2.dataLoading,
+          reloading = _this$state2.reloading,
+          searching = _this$state2.searching,
+          refreshing = _this$state2.refreshing,
+          paging = _this$state2.paging,
+          processing = _this$state2.processing;
 
       if (dataLoading || reloading || searching || refreshing || paging || processing) {
         var text = '数据正在处理中，请稍等一下再点哦';

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;

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

@@ -177,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;
@@ -1446,27 +1447,15 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
     };
 
     _this.renderContentArea = function () {
-      var _this$state10 = _this.state,
-          listTitle = _this$state10.listTitle,
-          renderSearchForm = _this$state10.renderSearchForm;
+      var listTitle = _this.state.listTitle;
 
       var extraAction = _this.renderExtraActionView();
 
       var searchForm = _this.renderForm();
 
       var hasPagination = _this.renderPaginationView() != null;
-      return /*#__PURE__*/_react.default.createElement(_space.default, {
-        style: {
-          width: '100%'
-        },
-        direction: "vertical",
-        size: 24
-      }, 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, {
+
+      var gridView = /*#__PURE__*/_react.default.createElement(_card.default, {
         title: listTitle,
         headStyle: {
           borderBottom: '0px'
@@ -1482,7 +1471,24 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
         }), _this.renderBatchAction(), _this.renderCardExtraAction())
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: _index.default.tableList
-      }, _this.renderAboveTable(), _this.renderView())));
+      }, _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 () {
@@ -1529,18 +1535,27 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
         }
       }), 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);
-      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()));
+
+      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 () {
@@ -1560,7 +1575,6 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
       showPageHeaderAvatar: false,
       tableSize: _constants.listViewConfig.tableSize.middle,
       counterSetColumnsOtherConfig: 0,
-      renderSearchForm: true,
       showListViewItemActionSelect: false
     });
     return _this;
@@ -1571,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/authority.js

@@ -70,13 +70,13 @@ function getSuperPermission() {
   });
 
   if ((0, _tools.isObject)(superPermission)) {
-    var _superAuth = (0, _tools.getValueByKey)({
+    var superAuth = (0, _tools.getValueByKey)({
       data: superPermission,
       key: 'permission'
     });
 
-    if ((0, _tools.isString)(_superAuth)) {
-      result = _superAuth;
+    if ((0, _tools.isString)(superAuth)) {
+      result = superAuth;
     }
   }
 
@@ -199,7 +199,6 @@ function checkHasAuthorityCore(auth) {
 
   if ((v !== null && v !== void 0 ? v : null) == null) {
     (0, _tools.recordObject)({
-      superAuth: superAuth,
       checkAuthority: auth,
       listAuthority: list,
       accessWayCollection: accessWayCollection

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-management-fast-framework",
-  "version": "1.11.33",
+  "version": "1.11.38",
   "description": "antd-management-fast-framework",
   "keywords": [
     "antd-management-fast-framework"
@@ -36,7 +36,7 @@
     "array-move": "^4.0.0",
     "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",