antd-management-fast-framework 1.12.95 → 1.12.98

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

@@ -46,8 +46,11 @@ declare class Base extends BaseWindow {
     buildBottomBarInnerDefaultConfigList: () => {
         buildType: string;
     }[];
-    buildBottomBarInnerItemConfigList: () => any[];
-    renderBottomBarInner: () => any[];
+    buildBottomBarInnerLeftItemConfigList: () => never[];
+    buildBottomBarInnerRightItemConfigList: () => any[];
+    renderBottomBarRightBox: () => any[] | null;
+    renderBottomBarLeftBox: () => any[] | null;
+    renderBottomBarInnerBox: (configList: any) => any[] | null;
     renderBottomBar: () => JSX.Element;
     renderFurther(): JSX.Element;
 }

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

@@ -41,6 +41,8 @@ var _layout = _interopRequireDefault(require("antd/es/layout"));
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _FlexBox = _interopRequireDefault(require("../../../customComponents/FlexBox"));
+
 var _FunctionComponent = require("../../../customComponents/FunctionComponent");
 
 var _IconInfo = _interopRequireDefault(require("../../../customComponents/IconInfo"));
@@ -224,7 +226,11 @@ var Base = /*#__PURE__*/function (_BaseWindow) {
       }];
     };
 
-    _this.buildBottomBarInnerItemConfigList = function () {
+    _this.buildBottomBarInnerLeftItemConfigList = function () {
+      return [];
+    };
+
+    _this.buildBottomBarInnerRightItemConfigList = function () {
       var bottomBarInnerExtraConfigList = _this.buildBottomBarInnerExtraConfigList();
 
       var bottomBarInnerDefaultConfigList = _this.buildBottomBarInnerDefaultConfigList();
@@ -232,10 +238,24 @@ var Base = /*#__PURE__*/function (_BaseWindow) {
       return [].concat(_toConsumableArray(bottomBarInnerExtraConfigList), _toConsumableArray(bottomBarInnerDefaultConfigList));
     };
 
-    _this.renderBottomBarInner = function () {
-      var components = [];
+    _this.renderBottomBarRightBox = function () {
+      var rightConfigList = _this.buildBottomBarInnerRightItemConfigList();
+
+      return _this.renderBottomBarInnerBox(rightConfigList);
+    };
 
-      var configList = _this.buildBottomBarInnerItemConfigList();
+    _this.renderBottomBarLeftBox = function () {
+      var leftConfigList = _this.buildBottomBarInnerLeftItemConfigList();
+
+      return _this.renderBottomBarInnerBox(leftConfigList);
+    };
+
+    _this.renderBottomBarInnerBox = function (configList) {
+      if (!(0, _tools.isArray)(configList) || configList.length <= 0) {
+        return null;
+      }
+
+      var components = [];
 
       var that = _assertThisInitialized(_this);
 
@@ -333,6 +353,10 @@ var Base = /*#__PURE__*/function (_BaseWindow) {
     };
 
     _this.renderBottomBar = function () {
+      var bottomBarLeftBox = _this.renderBottomBarLeftBox();
+
+      var bottomBarRightBox = _this.renderBottomBarRightBox();
+
       return /*#__PURE__*/_react.default.createElement(Footer, null, /*#__PURE__*/_react.default.createElement(_affix.default, {
         offsetBottom: 0
       }, /*#__PURE__*/_react.default.createElement("div", {
@@ -342,11 +366,23 @@ var Base = /*#__PURE__*/function (_BaseWindow) {
         style: {
           textAlign: 'right'
         }
-      }, /*#__PURE__*/_react.default.createElement(_space.default, {
-        split: /*#__PURE__*/_react.default.createElement(_divider.default, {
-          type: "vertical"
-        })
-      }, _this.renderBottomBarInner()))))));
+      }, /*#__PURE__*/_react.default.createElement(_FlexBox.default, {
+        flexAuto: "left",
+        left: /*#__PURE__*/_react.default.createElement(_FlexBox.default, {
+          flexAuto: "right",
+          left: /*#__PURE__*/_react.default.createElement(_space.default, {
+            split: /*#__PURE__*/_react.default.createElement(_divider.default, {
+              type: "vertical"
+            })
+          }, bottomBarLeftBox),
+          right: /*#__PURE__*/_react.default.createElement("div", null)
+        }),
+        right: /*#__PURE__*/_react.default.createElement(_space.default, {
+          split: /*#__PURE__*/_react.default.createElement(_divider.default, {
+            type: "vertical"
+          })
+        }, bottomBarRightBox)
+      }))))));
     };
 
     var defaultState = (0, _tools.defaultFormState)();

package/es/framework/DataOperation/BaseWindow/index.d.ts

@@ -73,8 +73,8 @@ declare class BaseWindow extends Base {
     afterSetFieldsValue: (v: any) => void;
     afterCheckSubmitRequestParams: (o: any) => any;
     execSubmitApi: (values: {} | undefined, afterSubmitCallback: any) => void;
-    handleOkWithForm: () => void;
-    handleOk: (e: any) => void;
+    handleOkWithForm: (successCallback: any) => void;
+    handleOk: (e: any, successCallback?: null) => void;
     afterSubmitSuccess: ({ singleData, listData, extraData, responseOriginalData, submitData, }: {
         singleData?: null | undefined;
         listData?: any[] | undefined;

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

@@ -233,7 +233,7 @@ var BaseWindow = /*#__PURE__*/function (_Base) {
                 }
 
                 if ((0, _tools.isFunction)(afterSubmitCallback)) {
-                  afterSubmitCallback();
+                  afterSubmitCallback(remoteData);
                 }
               }
 
@@ -253,7 +253,7 @@ var BaseWindow = /*#__PURE__*/function (_Base) {
       }
     };
 
-    _this.handleOkWithForm = function () {
+    _this.handleOkWithForm = function (successCallback) {
       var form = _this.getTargetForm();
 
       if (form == null) {
@@ -262,7 +262,11 @@ var BaseWindow = /*#__PURE__*/function (_Base) {
 
       var validateFields = form.validateFields;
       validateFields().then(function (values) {
-        _this.execSubmitApi(values, function () {
+        _this.execSubmitApi(values, function (remoteData) {
+          if ((0, _tools.isFunction)(successCallback)) {
+            successCallback(remoteData);
+          }
+
           if (_this.goToUpdateWhenProcessed) {
             _this.reloadByUrl();
           }
@@ -299,10 +303,12 @@ var BaseWindow = /*#__PURE__*/function (_Base) {
     };
 
     _this.handleOk = function (e) {
+      var successCallback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+
       if (_this.submitWithForm) {
-        _this.handleOkWithForm(e);
+        _this.handleOkWithForm(e, successCallback);
       } else {
-        _this.execSubmitApi();
+        _this.execSubmitApi({}, successCallback);
       }
     };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-management-fast-framework",
-  "version": "1.12.95",
+  "version": "1.12.98",
   "description": "antd-management-fast-framework",
   "keywords": [
     "antd-management-fast-framework"
@@ -219,7 +219,7 @@
     "src/framework",
     "src/utils"
   ],
-  "gitHead": "7a4a19bfc4b310bf76c5b4375e4244a47d5453d6",
+  "gitHead": "97b3e6c9e997ea90c415d949825ae4987e0ec733",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }