antd-management-fast-framework 1.9.17 → 1.9.39

package/es/framework/DataDrawer/BaseLoadDrawer/index.js

@@ -52,13 +52,9 @@ var BaseLoadDrawer = /*#__PURE__*/function (_Base) {
     _this = _super.call.apply(_super, [this].concat(args));
 
     _this.doOtherWhenChangeVisibleToShow = function (preProps, preState, snapshot) {
-      _this.setState({
+      _this.reloadData({
         dataLoading: true
-      });
-
-      setTimeout(function () {
-        _this.reloadData();
-      }, 700);
+      }, null, 300);
     };
 
     return _this;

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

@@ -144,36 +144,51 @@ var BaseAddForm = /*#__PURE__*/function (_DataCore) {
         if (checkResult) {
           _this.setState({
             processing: true
-          });
-
-          dispatch({
-            type: submitApiPath,
-            payload: submitData
-          }).then(function () {
-            if (_this.mounted) {
-              var remoteData = _this.getApiData(_this.props);
-
-              var dataSuccess = remoteData.dataSuccess;
-
-              if (dataSuccess) {
-                var metaListData = remoteData.list,
-                    metaData = remoteData.data,
-                    metaExtra = remoteData.extra;
-
-                _this.afterSubmitSuccess({
-                  singleData: metaData || null,
-                  listData: metaListData || [],
-                  extraData: metaExtra || null,
-                  responseOriginalData: remoteData || null,
-                  submitData: submitData || null
+          }, function () {
+            _this.setState({
+              dispatchComplete: false
+            }, function () {
+              dispatch({
+                type: submitApiPath,
+                payload: submitData
+              }).then(function () {
+                if (_this.mounted) {
+                  var remoteData = _this.getApiData(_this.props);
+
+                  var dataSuccess = remoteData.dataSuccess;
+
+                  if (dataSuccess) {
+                    var metaListData = remoteData.list,
+                        metaData = remoteData.data,
+                        metaExtra = remoteData.extra;
+
+                    _this.afterSubmitSuccess({
+                      singleData: metaData || null,
+                      listData: metaListData || [],
+                      extraData: metaExtra || null,
+                      responseOriginalData: remoteData || null,
+                      submitData: submitData || null
+                    });
+                  }
+
+                  if (isFunction(afterSubmitCallback)) {
+                    afterSubmitCallback();
+                  }
+                }
+
+                _this.setState({
+                  processing: false,
+                  dispatchComplete: true
                 });
-              } // eslint-disable-next-line react/no-unused-state
+              })["catch"](function (res) {
+                (0, _tools.recordObject)(res);
 
-
-              _this.setState({
-                processing: false
+                _this.setState({
+                  processing: false,
+                  dispatchComplete: true
+                });
               });
-            }
+            });
           });
         }
       })["catch"](function (error) {

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

@@ -96,40 +96,51 @@ var BaseUpdateForm = /*#__PURE__*/function (_DataSingleView) {
       if (checkResult) {
         _this.setState({
           processing: true
-        });
+        }, function () {
+          _this.setState({
+            dispatchComplete: false
+          }, function () {
+            dispatch({
+              type: submitApiPath,
+              payload: submitData
+            }).then(function () {
+              if (_this.mounted) {
+                var remoteData = _this.getApiData(_this.props);
+
+                var dataSuccess = remoteData.dataSuccess;
+
+                if (dataSuccess) {
+                  var metaListData = remoteData.list,
+                      metaData = remoteData.data,
+                      metaExtra = remoteData.extra;
+
+                  _this.afterSubmitSuccess({
+                    singleData: metaData || null,
+                    listData: metaListData || [],
+                    extraData: metaExtra || null,
+                    responseOriginalData: remoteData || null,
+                    submitData: submitData || null
+                  });
+                }
+
+                if ((0, _tools.isFunction)(afterSubmitCallback)) {
+                  afterSubmitCallback();
+                }
+
+                _this.setState({
+                  processing: false,
+                  dispatchComplete: true
+                });
+              }
+            })["catch"](function (res) {
+              (0, _tools.recordObject)(res);
 
-        dispatch({
-          type: submitApiPath,
-          payload: submitData
-        }).then(function () {
-          if (_this.mounted) {
-            var remoteData = _this.getApiData(_this.props);
-
-            var dataSuccess = remoteData.dataSuccess;
-
-            if (dataSuccess) {
-              var metaListData = remoteData.list,
-                  metaData = remoteData.data,
-                  metaExtra = remoteData.extra;
-
-              _this.afterSubmitSuccess({
-                singleData: metaData || null,
-                listData: metaListData || [],
-                extraData: metaExtra || null,
-                responseOriginalData: remoteData || null,
-                submitData: submitData || null
+              _this.setState({
+                processing: false,
+                dispatchComplete: true
               });
-            } // eslint-disable-next-line react/no-unused-state
-
-
-            _this.setState({
-              processing: false
-            }, function () {
-              if ((0, _tools.isFunction)(afterSubmitCallback)) {
-                afterSubmitCallback();
-              }
             });
-          }
+          });
         });
       }
     };

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

@@ -49,8 +49,8 @@ var BaseUpdateFormContent = /*#__PURE__*/function (_BaseUpdateForm) {
   }
 
   _createClass(BaseUpdateFormContent, [{
-    key: "render",
-    value: function render() {
+    key: "renderFurther",
+    value: function renderFurther() {
       return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, this.renderFormWrapper(), this.renderOther(), /*#__PURE__*/_react["default"].createElement(_backTop["default"], null));
     }
   }]);

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

@@ -10,6 +10,7 @@ declare class ListBase extends AuthorizationWrapper {
      */
     useFrontendPagination: boolean;
     formRef: React.RefObject<any>;
+    pageSizeAdditional: number;
     lastLoadParams: any;
     columnsOtherConfig: any;
     state: any;
@@ -207,7 +208,7 @@ declare class ListBase extends AuthorizationWrapper {
     renderView: () => JSX.Element | null;
     renderPageContent: () => JSX.Element;
     renderPageBody: () => JSX.Element;
-    render(): JSX.Element;
+    renderFurther(): JSX.Element;
 }
 import AuthorizationWrapper from "../../AuthorizationWrapper";
 import React from "react";

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

@@ -59,10 +59,6 @@ require("antd/es/row/style");
 
 var _row = _interopRequireDefault(require("antd/es/row"));
 
-require("antd/es/message/style");
-
-var _message2 = _interopRequireDefault(require("antd/es/message"));
-
 require("antd/es/date-picker/style");
 
 var _datePicker = _interopRequireDefault(require("antd/es/date-picker"));
@@ -171,13 +167,11 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
     _this.useRemotePagination = true;
     _this.useFrontendPagination = false;
     _this.formRef = /*#__PURE__*/_react["default"].createRef();
+    _this.pageSizeAdditional = 0;
 
     _this.afterDidMount = function () {
       var pageSize = _this.state.pageSize;
-
-      _this.setState({
-        pageSizeAdditional: pageSize
-      });
+      _this.pageSizeAdditional = pageSize;
     };
 
     _this.afterLoadSuccess = function (_ref) {
@@ -376,7 +370,9 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
             errorMessage += ' ...';
           }
 
-          _message2["default"].warn(errorMessage);
+          (0, _tools.showWarnMessage)({
+            message: errorMessage
+          });
         } else {
           (0, _tools.showRuntimeError)({
             message: error
@@ -926,9 +922,8 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
     };
 
     _this.buildPageSizeOptionList = function () {
-      var pageSizeAdditional = _this.state.pageSizeAdditional;
       var pageSizeList = [10, 20, 50, 100];
-      pageSizeList.push((0, _tools.toNumber)(pageSizeAdditional));
+      pageSizeList.push((0, _tools.toNumber)(_this.pageSizeAdditional));
       pageSizeList = _toConsumableArray(new Set(pageSizeList)).sort(function (a, b) {
         return a - b;
       });
@@ -1232,7 +1227,7 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
           size = _this$buildTableConfi.size;
 
       var standardTableCustomOption = {
-        loading: dataLoading || processing,
+        loading: _this.checkInProgress(),
         showSelect: showSelect,
         selectedRows: selectedDataTableDataRows,
         columns: columns,
@@ -1385,7 +1380,6 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
     _this.columnsOtherConfig = [];
     var defaultState = (0, _tools.defaultListState)();
     _this.state = _objectSpread(_objectSpread(_objectSpread({}, _this.state), defaultState), {
-      pageSizeAdditional: 0,
       showSelect: false,
       renderPageHeaderWrapper: true,
       listTitle: '检索结果',
@@ -1402,8 +1396,8 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
   }
 
   _createClass(ListBase, [{
-    key: "render",
-    value: function render() {
+    key: "renderFurther",
+    value: function renderFurther() {
       var _this2 = this;
 
       var _this$state11 = this.state,

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

@@ -24,7 +24,7 @@ declare class DataMenuContainer extends AuthorizationWrapper {
     }) => void;
     resize: () => void;
     renderRightTitle: () => JSX.Element;
-    render(): JSX.Element;
+    renderFurther(): JSX.Element;
     main: HTMLDivElement | null | undefined;
 }
 import AuthorizationWrapper from "../AuthorizationWrapper";

package/es/framework/DataMenuContainer/index.js

@@ -310,8 +310,8 @@ var DataMenuContainer = /*#__PURE__*/function (_AuthorizationWrapper) {
   }
 
   _createClass(DataMenuContainer, [{
-    key: "render",
-    value: function render() {
+    key: "renderFurther",
+    value: function renderFurther() {
       var _this2 = this;
 
       var selectMenuKey = this.getMenuActiveKey();

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

@@ -62,6 +62,6 @@ declare class Base extends BaseWindow {
     renderFormWrapper: () => JSX.Element;
     renderForm: () => JSX.Element;
     renderModalInner: () => JSX.Element;
-    render(): JSX.Element;
+    renderFurther(): JSX.Element;
 }
 import BaseWindow from "../../DataOperation/BaseWindow";

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

@@ -108,11 +108,7 @@ var Base = /*#__PURE__*/function (_BaseWindow) {
     };
 
     _this.getSaveButtonDisabled = function () {
-      var _this$state = _this.state,
-          dataLoading = _this$state.dataLoading,
-          processing = _this$state.processing,
-          loadSuccess = _this$state.loadSuccess;
-      return dataLoading || processing || !loadSuccess;
+      return _this.checkOperability();
     };
 
     _this.buildOkButtonProps = function () {
@@ -217,11 +213,11 @@ var Base = /*#__PURE__*/function (_BaseWindow) {
     };
 
     _this.renderForm = function () {
-      var _this$state2 = _this.state,
-          metaData = _this$state2.metaData,
-          metaListData = _this$state2.metaListData,
-          metaExtra = _this$state2.metaExtra,
-          metaOriginalData = _this$state2.metaOriginalData;
+      var _this$state = _this.state,
+          metaData = _this$state.metaData,
+          metaListData = _this$state.metaListData,
+          metaExtra = _this$state.metaExtra,
+          metaOriginalData = _this$state.metaOriginalData;
 
       var initialValues = _this.buildInitialValues({
         metaData: metaData,
@@ -254,15 +250,15 @@ var Base = /*#__PURE__*/function (_BaseWindow) {
   }
 
   _createClass(Base, [{
-    key: "render",
-    value: function render() {
+    key: "renderFurther",
+    value: function renderFurther() {
       var _this2 = this;
 
-      var _this$state3 = this.state,
-          width = _this$state3.width,
-          visible = _this$state3.visible,
-          processing = _this$state3.processing,
-          dataLoading = _this$state3.dataLoading;
+      var _this$state2 = this.state,
+          width = _this$state2.width,
+          visible = _this$state2.visible,
+          processing = _this$state2.processing,
+          dataLoading = _this$state2.dataLoading;
       var maskClosable = this.props.maskClosable;
       return /*#__PURE__*/_react["default"].createElement(_modal["default"], {
         title: this.buildTitle(),

package/es/framework/DataModal/BaseLoadModal/index.js

@@ -44,10 +44,6 @@ var BaseLoadModal = /*#__PURE__*/function (_Base) {
     _this = _super.call.apply(_super, [this].concat(args));
 
     _this.doOtherWhenChangeVisibleToShow = function (preProps, preState, snapshot) {
-      _this.setState({
-        dataLoading: true
-      });
-
       if (_this.reloadWhenShow) {
         var form = _this.getTargetForm();
 
@@ -55,13 +51,9 @@ var BaseLoadModal = /*#__PURE__*/function (_Base) {
           form.resetFields();
         }
 
-        setTimeout(function () {
-          _this.reloadData();
-        }, 700);
-      } else {
-        _this.setState({
-          dataLoading: false
-        });
+        _this.reloadData({
+          dataLoading: true
+        }, null, 300);
       }
     };
 

package/es/framework/DataModal/BaseUpdateTransferModal/index.js

@@ -117,7 +117,7 @@ var BaseUpdateTransferModal = /*#__PURE__*/function (_BaseUpdateModal) {
           selectedKeys = _this$state.selectedKeys;
       return {
         list: [{
-          spinning: dataLoading || processing,
+          spinning: _this.checkInProgress(),
           items: [{
             lg: 24,
             type: _constants.cardConfig.contentItemType.component,

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

@@ -75,6 +75,7 @@ var MultiPage = /*#__PURE__*/function (_Base) {
 
     _this.handleSearchReset = function () {
       var checkWorkDoing = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+      var delay = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
 
       if (checkWorkDoing) {
         if (_this.checkWorkDoing()) {
@@ -89,15 +90,13 @@ var MultiPage = /*#__PURE__*/function (_Base) {
 
       _this.handleAdditionalSearchReset();
 
-      _this.setState({
+      _this.reloadData({
         formValues: {},
         startTime: '',
         endTime: '',
         pageNo: 1,
         pageSize: pageSize
-      }, function () {
-        _this.reloadData();
-      });
+      }, null, delay);
     };
 
     _this.adjustLoadRequestParams = function (o) {

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

@@ -144,9 +144,7 @@ var MultiPageDrawer = /*#__PURE__*/function (_MultiPage) {
 
         var that = _assertThisInitialized(_this);
 
-        setTimeout(function () {
-          that.handleSearchReset(false);
-        }, 700);
+        that.handleSearchReset(false, 700);
       } else if (_this.reloadWhenShow) {
         _this.setState({
           reloadAnimalShow: true
@@ -154,11 +152,9 @@ var MultiPageDrawer = /*#__PURE__*/function (_MultiPage) {
 
         var _that = _assertThisInitialized(_this);
 
-        setTimeout(function () {
-          _that.reloadData({}, function () {
-            _that.setState({
-              reloadAnimalShow: false
-            });
+        _that.reloadData({}, function () {
+          _that.setState({
+            reloadAnimalShow: false
           });
         }, 700);
       }
@@ -473,8 +469,8 @@ var MultiPageDrawer = /*#__PURE__*/function (_MultiPage) {
 
 
   _createClass(MultiPageDrawer, [{
-    key: "render",
-    value: function render() {
+    key: "renderFurther",
+    value: function renderFurther() {
       var widthDrawer = this.props.width;
       var _this$state3 = this.state,
           visible = _this$state3.visible,

package/es/framework/DataOperation/BaseWindow/index.js

@@ -206,40 +206,51 @@ var BaseWindow = /*#__PURE__*/function (_Base) {
       if (checkResult) {
         _this.setState({
           processing: true
-        });
+        }, function () {
+          _this.setState({
+            dispatchComplete: false
+          }, function () {
+            dispatch({
+              type: submitApiPath,
+              payload: submitData
+            }).then(function () {
+              if (_this.mounted) {
+                var remoteData = _this.getApiData(_this.props);
+
+                var dataSuccess = remoteData.dataSuccess;
+
+                if (dataSuccess) {
+                  var metaListData = remoteData.list,
+                      metaData = remoteData.data,
+                      metaExtra = remoteData.extra;
+
+                  _this.afterSubmitSuccess({
+                    singleData: metaData || null,
+                    listData: metaListData || [],
+                    extraData: metaExtra || null,
+                    responseOriginalData: remoteData || null,
+                    submitData: submitData || null
+                  });
+                }
+
+                if ((0, _tools.isFunction)(afterSubmitCallback)) {
+                  afterSubmitCallback();
+                }
+              }
 
-        dispatch({
-          type: submitApiPath,
-          payload: submitData
-        }).then(function () {
-          if (_this.mounted) {
-            var remoteData = _this.getApiData(_this.props);
-
-            var dataSuccess = remoteData.dataSuccess;
-
-            if (dataSuccess) {
-              var metaListData = remoteData.list,
-                  metaData = remoteData.data,
-                  metaExtra = remoteData.extra;
-
-              _this.afterSubmitSuccess({
-                singleData: metaData || null,
-                listData: metaListData || [],
-                extraData: metaExtra || null,
-                responseOriginalData: remoteData || null,
-                submitData: submitData || null
+              _this.setState({
+                processing: false,
+                dispatchComplete: true
               });
-            } // eslint-disable-next-line react/no-unused-state
+            })["catch"](function (res) {
+              (0, _tools.recordObject)(res);
 
-
-            _this.setState({
-              processing: false
-            }, function () {
-              if ((0, _tools.isFunction)(afterSubmitCallback)) {
-                afterSubmitCallback();
-              }
+              _this.setState({
+                processing: false,
+                dispatchComplete: true
+              });
             });
-          }
+          });
         });
       }
     };

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

@@ -67,12 +67,10 @@ var SinglePage = /*#__PURE__*/function (_Base) {
 
       _this.handleAdditionalSearchReset();
 
-      _this.setState({
+      _this.reloadData({
         formValues: {},
         startTime: '',
         endTime: ''
-      }, function () {
-        _this.reloadData();
       });
     };
 

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

@@ -430,8 +430,8 @@ var SinglePageDrawer = /*#__PURE__*/function (_SinglePage) {
 
 
   _createClass(SinglePageDrawer, [{
-    key: "render",
-    value: function render() {
+    key: "renderFurther",
+    value: function renderFurther() {
       var widthDrawer = this.props.width;
       var _this$state4 = this.state,
           visible = _this$state4.visible,

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

@@ -21,7 +21,7 @@ declare class DataCore extends BaseView {
     renderForm: () => JSX.Element;
     establishCardCollectionConfig: () => null;
     formContent: () => any;
-    render(): JSX.Element;
+    renderFurther(): JSX.Element;
 }
 import BaseView from "../../DataOperation/BaseView";
 import React from "react";

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

@@ -237,8 +237,8 @@ var DataCore = /*#__PURE__*/function (_BaseView) {
   }
 
   _createClass(DataCore, [{
-    key: "render",
-    value: function render() {
+    key: "renderFurther",
+    value: function renderFurther() {
       var pageName = this.state.pageName;
       return /*#__PURE__*/_react["default"].createElement(_proLayout.PageHeaderWrapper, {
         title: pageName,

package/es/framework/DataTabContainer/index.js

@@ -239,8 +239,8 @@ var DataTabContainer = /*#__PURE__*/function (_DataSingleView) {
   }
 
   _createClass(DataTabContainer, [{
-    key: "render",
-    value: function render() {
+    key: "renderFurther",
+    value: function renderFurther() {
       var _this2 = this;
 
       var _this$state = this.state,

package/es/framework/FieldExtension/SelectFieldDrawer/SelectFieldBase/index.d.ts

@@ -11,11 +11,12 @@ declare class SelectFieldBase extends SupplementWrapper {
         placeholder: string;
     };
     renderField: () => any;
-    render(): JSX.Element;
+    renderFurther(): JSX.Element;
 }
 declare namespace SelectFieldBase {
     export namespace defaultProps {
         export const dataLoading: boolean;
+        export const processing: boolean;
         export const loadSuccess: boolean;
         export const required: boolean;
         export const showClear: boolean;

package/es/framework/FieldExtension/SelectFieldDrawer/SelectFieldBase/index.js

@@ -160,8 +160,8 @@ var SelectFieldBase = /*#__PURE__*/function (_SupplementWrapper) {
   }
 
   _createClass(SelectFieldBase, [{
-    key: "render",
-    value: function render() {
+    key: "renderFurther",
+    value: function renderFurther() {
       return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, this.renderField(), this.renderOther());
     }
   }], [{
@@ -176,6 +176,7 @@ var SelectFieldBase = /*#__PURE__*/function (_SupplementWrapper) {
 
 SelectFieldBase.defaultProps = {
   dataLoading: false,
+  processing: false,
   loadSuccess: true,
   required: false,
   showClear: true