@bchr/bchr-front-lib 0.3.145 → 0.3.148

package/lib/base/layout/modal/SmartModal.js

@@ -54,7 +54,7 @@ var SmartMessage = {
 exports.SmartMessage = SmartMessage;
 
 var showConfirm = function showConfirm(options) {
-  var confirmDlgHandler = _antd.Modal.confirm({
+  _antd.Modal.confirm({
     centered: true,
     title: options.title,
     content: options.content,
@@ -64,16 +64,16 @@ var showConfirm = function showConfirm(options) {
     closable: options.closable,
     onOk: function onOk(e) {
       options.okCallback ? options.okCallback(e) : function () {};
+
+      _antd.Modal.destroyAll();
     },
     onCancel: function onCancel(e) {
+      _antd.Modal.destroyAll();
+
       options.cancelCallback ? options.cancelCallback(e) : function () {};
     },
     autoFocusButton: null
   });
-
-  return /*#__PURE__*/_react["default"].createElement(_antd.ConfigProvider, {
-    locale: _zh_CN["default"]
-  }, confirmDlgHandler);
 };
 
 var showInfo = function showInfo(options) {
@@ -86,6 +86,8 @@ var showInfo = function showInfo(options) {
     closable: options.closable,
     onOk: function onOk(e) {
       options.okCallback ? options.okCallback(e) : function () {};
+
+      _antd.Modal.destroyAll();
     }
   });
 
@@ -104,6 +106,8 @@ var showSuccess = function showSuccess(options) {
     closable: options.closable,
     onOk: function onOk(e) {
       options.okCallback ? options.okCallback(e) : function () {};
+
+      _antd.Modal.destroyAll();
     }
   });
 
@@ -122,6 +126,8 @@ var showError = function showError(options) {
     closable: options.closable,
     onOk: function onOk(e) {
       options.okCallback ? options.okCallback(e) : function () {};
+
+      _antd.Modal.destroyAll();
     }
   });
 
@@ -140,6 +146,8 @@ var showWarn = function showWarn(options) {
     closable: options.closable,
     onOk: function onOk(e) {
       options.okCallback ? options.okCallback(e) : function () {};
+
+      _antd.Modal.destroyAll();
     }
   });
 
@@ -160,6 +168,8 @@ var showAutoCloseInfo = function showAutoCloseInfo(options) {
     closable: options.closable,
     onOk: function onOk(e) {
       options.okCallback ? options.okCallback(e) : function () {};
+
+      _antd.Modal.destroyAll();
     }
   });
 
@@ -186,6 +196,8 @@ var showAutoCloseSuccess = function showAutoCloseSuccess(options) {
     closable: options.closable,
     onOk: function onOk(e) {
       options.okCallback ? options.okCallback(e) : function () {};
+
+      _antd.Modal.destroyAll();
     }
   });
 
@@ -212,6 +224,8 @@ var showAutoCloseError = function showAutoCloseError(options) {
     closable: options.closable,
     onOk: function onOk(e) {
       options.okCallback ? options.okCallback(e) : function () {};
+
+      _antd.Modal.destroyAll();
     }
   });
 
@@ -238,6 +252,8 @@ var showAutoCloseWarn = function showAutoCloseWarn(options) {
     closable: options.closable,
     onOk: function onOk(e) {
       options.okCallback ? options.okCallback(e) : function () {};
+
+      _antd.Modal.destroyAll();
     }
   });
 

package/lib/base/layout/ui_tpl/modal/FormModifyModal.js

@@ -41,7 +41,12 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var ButtonGroup = _antd.Button.Group;
 
-var FormModifyModal = function FormModifyModal(props) {
+var FormModifyModal = function FormModifyModal(props, ref) {
+  (0, _react.useImperativeMethods)(ref, function () {
+    return {
+      closeLoading: closeLoading
+    };
+  });
   var formref = props.formref,
       onOk = props.onOk,
       data = props.data,
@@ -92,6 +97,10 @@ var FormModifyModal = function FormModifyModal(props) {
     });
   };
 
+  var closeLoading = function closeLoading() {
+    setLoading(false);
+  };
+
   return /*#__PURE__*/_react["default"].createElement(_SModal["default"], {
     className: "form-modify-modal my-fix-auto-height",
     width: 1000,
@@ -126,5 +135,6 @@ var FormModifyModal = function FormModifyModal(props) {
   })))));
 };
 
-var _default = FormModifyModal;
+var _default = /*#__PURE__*/(0, _react.forwardRef)(FormModifyModal);
+
 exports["default"] = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bchr/bchr-front-lib",
-  "version": "0.3.145",
+  "version": "0.3.148",
   "description": "bchr front lib",
   "main": "lib/index.js",
   "scripts": {

package/src/base/layout/modal/SmartModal.js

@@ -48,7 +48,7 @@ const SmartMessage = {
 };
 
 const showConfirm = function(options){
-    let confirmDlgHandler = Modal.confirm({
+    Modal.confirm({
         centered: true,
         title: options.title,
         content: options.content,
@@ -56,19 +56,16 @@ const showConfirm = function(options){
         cancelText: options.cancelText,
         zIndex: options.zIndex,
         closable: options.closable,
-        onOk(e) {
+        onOk: (e) => {
             options.okCallback ? options.okCallback(e) : function () {};
+            Modal.destroyAll()
         },
-        onCancel(e) {
+        onCancel: (e) => {
+            Modal.destroyAll()
             options.cancelCallback ? options.cancelCallback(e) : function() {};
         },
         autoFocusButton: null
     });
-
-    return <ConfigProvider locale={zhCN}>
-        {confirmDlgHandler}
-    </ConfigProvider>;
-
 };
 
 const showInfo = function(options) {
@@ -81,6 +78,7 @@ const showInfo = function(options) {
         closable: options.closable,
         onOk(e) {
             options.okCallback ? options.okCallback(e) : function () {}
+            Modal.destroyAll()
         },
     });
 
@@ -99,6 +97,7 @@ const showSuccess = function(options) {
         closable: options.closable,
         onOk(e) {
             options.okCallback ? options.okCallback(e) : function () {}
+            Modal.destroyAll()
         },
     });
 
@@ -117,6 +116,7 @@ const showError = function(options) {
         closable: options.closable,
         onOk(e) {
             options.okCallback ? options.okCallback(e) : function () {}
+            Modal.destroyAll()
         },
     });
 
@@ -135,6 +135,7 @@ const showWarn = function(options) {
         closable: options.closable,
         onOk(e) {
             options.okCallback ? options.okCallback(e) : function () {}
+            Modal.destroyAll()
         },
     });
 
@@ -155,6 +156,7 @@ const showAutoCloseInfo = function(options) {
         closable: options.closable,
         onOk(e) {
             options.okCallback ? options.okCallback(e) : function () {}
+            Modal.destroyAll()
         },
     });
 
@@ -180,6 +182,7 @@ const showAutoCloseSuccess = function(options) {
         closable: options.closable,
         onOk(e) {
             options.okCallback ? options.okCallback(e) : function () {}
+            Modal.destroyAll()
         },
     });
 
@@ -205,6 +208,7 @@ const showAutoCloseError = function(options) {
         closable: options.closable,
         onOk(e) {
             options.okCallback ? options.okCallback(e) : function () {}
+            Modal.destroyAll()
         },
     });
 
@@ -230,6 +234,7 @@ const showAutoCloseWarn = function(options) {
         closable: options.closable,
         onOk(e) {
             options.okCallback ? options.okCallback(e) : function () {}
+            Modal.destroyAll()
         },
     });
 

package/src/base/layout/ui_tpl/modal/FormModifyModal.js

@@ -1,11 +1,16 @@
-import React, {useEffect, useState} from 'react';
+import React, {useEffect, useState, forwardRef, useImperativeMethods} from 'react';
 import SModal from "../../modal/SModal";
 import {Button, message, Spin} from "antd";
 import FormForModify from "../form/FormForModify";
 import $ from 'jquery';
 
 const ButtonGroup = Button.Group;
-const FormModifyModal = (props) => {
+const FormModifyModal = (props, ref) => {
+
+    useImperativeMethods(ref, () => ({
+        closeLoading
+    }));
+
     let {
         formref,
         onOk,
@@ -42,6 +47,10 @@ const FormModifyModal = (props) => {
         });
     };
 
+    const closeLoading = () => {
+        setLoading(false);
+    }
+
     return (
         <SModal
             className="form-modify-modal my-fix-auto-height"
@@ -73,4 +82,4 @@ const FormModifyModal = (props) => {
     )
 }
 
-export default FormModifyModal;
+export default forwardRef(FormModifyModal);