@pisell/private-materials 3.0.19 → 3.0.21

package/es/components/booking/info/service/addService/index.js

@@ -39,6 +39,10 @@ var Info = function Info() {
   var _useContext = useContext(Context),
     state = _useContext.state,
     dispatch = _useContext.dispatch;
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    loading = _useState4[0],
+    setLoading = _useState4[1];
   var context = useEngineContext();
   request.setRequest(context.appHelper.utils.request);
   var setDefaultService = /*#__PURE__*/function () {
@@ -72,21 +76,25 @@ var Info = function Info() {
             }
             return _context.abrupt("return");
           case 9:
+            setLoading(true);
             product = list[0];
-            _context.next = 12;
+            _context.next = 13;
             return getProductDetail(product.id, {
               schedule_date: state.date.value.format("YYYY-MM-DD")
             });
-          case 12:
+          case 13:
             detail = _context.sent;
             // 商品是套餐或单规格多规格
-            isBundleOrCombination = getIsBundleOrCombination(detail.data); // 套餐商品单规格多规格不设置默认
+            isBundleOrCombination = getIsBundleOrCombination(detail.data);
+            setLoading(false);
+
+            // 套餐商品单规格多规格不设置默认
             if (!isBundleOrCombination) {
-              _context.next = 16;
+              _context.next = 18;
               break;
             }
             return _context.abrupt("return");
-          case 16:
+          case 18:
             _item = _objectSpread(_objectSpread({}, product), {}, {
               product_id: product.id,
               _id: getUniqueId(),
@@ -111,7 +119,7 @@ var Info = function Info() {
                 edit: true
               }
             });
-          case 19:
+          case 21:
           case "end":
             return _context.stop();
         }
@@ -128,7 +136,8 @@ var Info = function Info() {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            _context2.next = 2;
+            setLoading(true);
+            _context2.next = 3;
             return state.apis.getServices({
               skip: 1,
               num: 500,
@@ -142,8 +151,9 @@ var Info = function Info() {
               open_quotation: 1,
               with_schedule: 1
             });
-          case 2:
+          case 3:
             data = _context2.sent;
+            setLoading(false);
             setDefaultService(data === null || data === void 0 ? void 0 : data.list);
             dispatch({
               type: "setService",
@@ -151,7 +161,7 @@ var Info = function Info() {
                 services: (data === null || data === void 0 ? void 0 : data.list) || []
               }
             });
-          case 5:
+          case 7:
           case "end":
             return _context2.stop();
         }
@@ -254,6 +264,7 @@ var Info = function Info() {
           height: 20
         }
       }) : /*#__PURE__*/React.createElement(AddButton, {
+        loading: loading,
         showSub: false,
         title: locales.getText("pisell2.text.add-a-service"),
         subTitle: locales.getText("pisell2.text.add-another-service"),
@@ -270,7 +281,7 @@ var Info = function Info() {
         height: 20
       }
     });
-  }, [state.renderType, showAddButton, isService, state.service.value]);
+  }, [state.renderType, showAddButton, isService, state.service.value, loading]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, addButton, /*#__PURE__*/React.createElement(Drawer, {
     open: state.service.addModal,
     title: locales.getText("pisell2.text.select-service"),

package/es/components/productExtension/fields/SelectResourcesTable/index.js

@@ -27,7 +27,7 @@ var sortArrayByOrder = function sortArrayByOrder(arr1, arr2, reverse) {
     var _b = arr2.findIndex(function (item) {
       return item.form_id === b.form_id;
     });
-    return reverse ? _a - _b : _b - _a;
+    return reverse ? _b - _a : _a - _b;
   });
 };
 var SelectResourcesTable = function SelectResourcesTable(_ref) {

package/lib/components/booking/info/service/addService/index.js

@@ -49,6 +49,7 @@ var Info = () => {
   var _a;
   const [search, setSearch] = (0, import_react.useState)("");
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
+  const [loading, setLoading] = (0, import_react.useState)(false);
   const context = (0, import_useEngineContext.default)();
   import_utils2.request.setRequest(context.appHelper.utils.request);
   const setDefaultService = async (list) => {
@@ -65,11 +66,13 @@ var Info = () => {
     if (_list.length !== 0) {
       return;
     }
+    setLoading(true);
     let product = list[0];
     const detail = await (0, import_serve.getProductDetail)(product.id, {
       schedule_date: state.date.value.format("YYYY-MM-DD")
     });
     const isBundleOrCombination = (0, import_utils.getIsBundleOrCombination)(detail.data);
+    setLoading(false);
     if (isBundleOrCombination)
       return;
     let _item = {
@@ -100,6 +103,7 @@ var Info = () => {
   };
   const getServices = async () => {
     var _a2;
+    setLoading(true);
     let data = await state.apis.getServices({
       skip: 1,
       num: 500,
@@ -113,6 +117,7 @@ var Info = () => {
       open_quotation: 1,
       with_schedule: 1
     });
+    setLoading(false);
     setDefaultService(data == null ? void 0 : data.list);
     dispatch({
       type: "setService",
@@ -208,6 +213,7 @@ var Info = () => {
       return isService ? /* @__PURE__ */ import_react.default.createElement("div", { style: { height: 20 } }) : /* @__PURE__ */ import_react.default.createElement(
         import_addButton.default,
         {
+          loading,
           showSub: false,
           title: import_utils3.locales.getText("pisell2.text.add-a-service"),
           subTitle: import_utils3.locales.getText("pisell2.text.add-another-service"),
@@ -224,7 +230,7 @@ var Info = () => {
         onClick: handleSelectService
       }
     ) : /* @__PURE__ */ import_react.default.createElement("div", { style: { height: 20 } });
-  }, [state.renderType, showAddButton, isService, state.service.value]);
+  }, [state.renderType, showAddButton, isService, state.service.value, loading]);
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, addButton, /* @__PURE__ */ import_react.default.createElement(
     import_drawer.default,
     {

package/lib/components/productExtension/fields/SelectResourcesTable/index.js

@@ -41,7 +41,7 @@ var sortArrayByOrder = (arr1, arr2, reverse) => {
   return (arr1 || []).sort((a, b) => {
     let _a = arr2.findIndex((item) => item.form_id === a.form_id);
     let _b = arr2.findIndex((item) => item.form_id === b.form_id);
-    return reverse ? _a - _b : _b - _a;
+    return reverse ? _b - _a : _a - _b;
   });
 };
 var SelectResourcesTable = ({ value, onChange }) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.19",
+  "version": "3.0.21",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",