@pisell/private-materials 3.0.31 → 3.0.33

package/es/components/booking/forms/index.js

@@ -89,23 +89,26 @@ var Forms = Provider(function (props) {
     };
   }();
   var getFormData = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(formList) {
-      var all;
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var formList,
+        all,
+        _args2 = arguments;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
+            formList = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : [];
             all = [];
             all = formList.map(function (d) {
               return getFormDataById(d);
             });
             return _context2.abrupt("return", Promise.all(all));
-          case 3:
+          case 4:
           case "end":
             return _context2.stop();
         }
       }, _callee2);
     }));
-    return function getFormData(_x3) {
+    return function getFormData() {
       return _ref2.apply(this, arguments);
     };
   }();
@@ -141,15 +144,16 @@ var Forms = Provider(function (props) {
             });
           case 4:
             data = _context3.sent;
+            data = data || [];
             if (params.type === "form") {
               // 去除预约主体
               data = data.filter(function (d) {
                 return d.form_id !== (params === null || params === void 0 ? void 0 : params.form_id);
               });
             }
-            _context3.next = 8;
+            _context3.next = 9;
             return getFormData(data);
-          case 8:
+          case 9:
             formData = _context3.sent;
             dispatch({
               type: "setForm",
@@ -159,17 +163,18 @@ var Forms = Provider(function (props) {
               }
             });
             setLoading(false);
-            _context3.next = 16;
+            _context3.next = 18;
             break;
-          case 13:
-            _context3.prev = 13;
+          case 14:
+            _context3.prev = 14;
             _context3.t0 = _context3["catch"](1);
+            setLoading(false);
             console.log("form_error", _context3.t0);
-          case 16:
+          case 18:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[1, 13]]);
+      }, _callee3, null, [[1, 14]]);
     }));
     return function geForms() {
       return _ref3.apply(this, arguments);
@@ -223,7 +228,7 @@ var Forms = Provider(function (props) {
         }
       }, _callee4, null, [[0, 8]]);
     }));
-    return function saveBookingFormData(_x4) {
+    return function saveBookingFormData(_x3) {
       return _ref4.apply(this, arguments);
     };
   }();
@@ -272,7 +277,7 @@ var Forms = Provider(function (props) {
         }
       }, _callee5);
     }));
-    return function addCallback(_x5) {
+    return function addCallback(_x4) {
       return _ref5.apply(this, arguments);
     };
   }();

package/lib/components/booking/forms/index.js

@@ -78,7 +78,7 @@ var Forms = (0, import_model.Provider)((props) => {
       options
     };
   };
-  const getFormData = async (formList) => {
+  const getFormData = async (formList = []) => {
     let all = [];
     all = formList.map((d) => getFormDataById(d));
     return Promise.all(all);
@@ -98,6 +98,7 @@ var Forms = (0, import_model.Provider)((props) => {
         relation_id: state.bookingDetail.bookings.id
         // _config: { useCache: true },
       });
+      data = data || [];
       if (params.type === "form") {
         data = data.filter((d) => d.form_id !== (params == null ? void 0 : params.form_id));
       }
@@ -111,6 +112,7 @@ var Forms = (0, import_model.Provider)((props) => {
       });
       setLoading(false);
     } catch (err) {
+      setLoading(false);
       console.log("form_error", err);
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.31",
+  "version": "3.0.33",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -58,8 +58,8 @@
     "ahooks": "^3.7.6",
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
-    "@pisell/utils": "1.0.23",
     "@pisell/date-picker": "1.0.68",
+    "@pisell/utils": "1.0.23",
     "@pisell/icon": "0.0.8"
   },
   "peerDependencies": {