@guo514360255/antd-lib 1.4.17 → 1.4.18

package/dist/CustomFormModal/index.js

@@ -91,13 +91,13 @@ var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
     return {
       open: function open(values) {
         return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-          var data;
+          var _formRef$current, data, newData;
           return _regeneratorRuntime().wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
                 setOpen(true);
                 if (!(values !== null && values !== void 0 && values.id && detailRequest)) {
-                  _context.next = 18;
+                  _context.next = 20;
                   break;
                 }
                 setDetailLoading(true);
@@ -111,25 +111,30 @@ var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
                     data["".concat(item.dataIndex).concat(formKey)] = data[item.dataIndex];
                   }
                 });
-                setFieldValues(handleModalData ? handleModalData(data || {}) : data || {});
+                newData = handleModalData ? handleModalData(data || {}) : data || {};
+                setFieldValues(newData);
+                (_formRef$current = formRef.current) === null || _formRef$current === void 0 || _formRef$current.setFieldsValue(formValues || {});
                 return _context.abrupt("return");
-              case 12:
-                _context.prev = 12;
+              case 14:
+                _context.prev = 14;
                 _context.t0 = _context["catch"](3);
                 console.warn(_context.t0);
-              case 15:
-                _context.prev = 15;
+              case 17:
+                _context.prev = 17;
                 setDetailLoading(false);
-                return _context.finish(15);
-              case 18:
+                return _context.finish(17);
+              case 20:
                 setTimeout(function () {
-                  setFieldValues(handleModalData ? handleModalData(values || {}) : values || {});
+                  var _formRef$current2;
+                  var newData = handleModalData ? handleModalData(values || {}) : values || {};
+                  setFieldValues(newData);
+                  (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 || _formRef$current2.setFieldsValue(formValues || {});
                 }, 0);
-              case 19:
+              case 21:
               case "end":
                 return _context.stop();
             }
-          }, _callee, null, [[3, 12, 15, 18]]);
+          }, _callee, null, [[3, 14, 17, 20]]);
         }))();
       },
       getFormRef: function getFormRef() {
@@ -139,14 +144,14 @@ var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
   });
   var submitEvent = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var _formRef$current, _formRef$current2, _tableActionRef$curre, formData, data, result, _key2;
+      var _formRef$current3, _formRef$current4, _tableActionRef$curre, formData, data, result, _key2;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             setLoading(true);
             _context2.prev = 1;
             _context2.next = 4;
-            return (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.validateFields();
+            return (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.validateFields();
           case 4:
             formData = _context2.sent;
             data = _objectSpread(_objectSpread({}, formValues), formData);
@@ -183,7 +188,7 @@ var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
             return saveRequest(result);
           case 18:
             setOpen(false);
-            (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 || _formRef$current2.resetFields();
+            (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 || _formRef$current4.resetFields();
             if (onSubmit) {
               onSubmit();
             }
@@ -208,9 +213,9 @@ var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
     };
   }();
   var close = function close() {
-    var _formRef$current3;
+    var _formRef$current5;
     setOpen(false);
-    (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 || _formRef$current3.resetFields();
+    (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 || _formRef$current5.resetFields();
     if (onSubmit) {
       onSubmit();
     }
@@ -232,8 +237,8 @@ var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
 
   // 深度监听form数据
   useDeepCompareEffect(function () {
-    var _formRef$current4;
-    (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 || _formRef$current4.setFieldsValue(formValues || {});
+    var _formRef$current6;
+    (_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 || _formRef$current6.setFieldsValue(formValues || {});
   }, [formValues]);
   useEffect(function () {
     return function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@guo514360255/antd-lib",
-  "version": "1.4.17",
+  "version": "1.4.18",
   "description": "react design 5 lib",
   "license": "MIT",
   "module": "dist/index.js",