antd-management-fast-framework 1.11.34 → 1.11.39

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.js

@@ -469,7 +469,7 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
         md: md,
         sm: sm,
         xs: xs
-      }, type === _constants.searchCardConfig.contentItemType.input ? _this.renderSearchInput(fieldData.label, fieldData.name, showHelper ? fieldData.helper : '', icon || /*#__PURE__*/_react.default.createElement(_icons.FormOutlined, null), _objectSpread(_objectSpread({}, {}), contentItem.otherProps || {})) : null, type === _constants.searchCardConfig.contentItemType.inputNumber ? _this.renderSearchInputNumber(fieldData.label, fieldData.name, fieldData.helper, _objectSpread(_objectSpread({}, {}), contentItem.otherProps || {})) : null, type === _constants.searchCardConfig.contentItemType.datePicker ? _this.renderFormDatePicker(fieldData.label, fieldData.name, false, fieldData.helper, _objectSpread(_objectSpread({}, {}), otherProps || {})) : null, type === _constants.searchCardConfig.contentItemType.customRangePicker ? _this.buildSearchCardRangePickerCore(contentItem.dateRangeFieldName, _objectSpread(_objectSpread({}, {}), otherProps || {})) : null, type === _constants.searchCardConfig.contentItemType.onlyShowInput ? _this.renderFormOnlyShowInput(fieldData.label, contentItem.value, fieldData.helper || '', contentItem.icon || /*#__PURE__*/_react.default.createElement(_icons.FormOutlined, null), _objectSpread(_objectSpread(_objectSpread({}, {}), contentItem.otherProps || {}), {
+      }, type === _constants.searchCardConfig.contentItemType.input ? _this.renderSearchInput(fieldData.label, fieldData.name, showHelper ? fieldData.helper : '', icon || /*#__PURE__*/_react.default.createElement(_icons.FormOutlined, null), _objectSpread(_objectSpread({}, {}), contentItem.otherProps || {})) : null, type === _constants.searchCardConfig.contentItemType.inputNumber ? _this.renderSearchInputNumber(fieldData.label, fieldData.name, fieldData.helper, icon || /*#__PURE__*/_react.default.createElement(_icons.FormOutlined, null), _objectSpread(_objectSpread({}, {}), contentItem.otherProps || {})) : null, type === _constants.searchCardConfig.contentItemType.datePicker ? _this.renderFormDatePicker(fieldData.label, fieldData.name, false, fieldData.helper, _objectSpread(_objectSpread({}, {}), otherProps || {})) : null, type === _constants.searchCardConfig.contentItemType.customRangePicker ? _this.buildSearchCardRangePickerCore(contentItem.dateRangeFieldName, _objectSpread(_objectSpread({}, {}), otherProps || {})) : null, type === _constants.searchCardConfig.contentItemType.onlyShowInput ? _this.renderFormOnlyShowInput(fieldData.label, contentItem.value, fieldData.helper || '', contentItem.icon || /*#__PURE__*/_react.default.createElement(_icons.FormOutlined, null), _objectSpread(_objectSpread(_objectSpread({}, {}), contentItem.otherProps || {}), {
         disabled: true
       })) : null, type === _constants.searchCardConfig.contentItemType.customSelect ? contentItem.component : null, type === _constants.searchCardConfig.contentItemType.customRadio ? contentItem.component : null, type === _constants.searchCardConfig.contentItemType.innerComponent ? _this.renderFormInnerComponent(fieldData.label, component, fieldData.helper, null, false) : null, type === _constants.searchCardConfig.contentItemType.component ? component || null : null);
     };
@@ -1535,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 () {

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.34",
+  "version": "1.11.39",
   "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",