@pisell/private-materials 6.2.18 → 6.2.20

package/es/components/booking/info/service/Lists.js

@@ -14,7 +14,7 @@ import { useMemoizedFn } from 'ahooks';
 import { getProductExtend } from "../../info2/service/addService/utils";
 import useAddHolder from "../hooks/useAddHolder";
 var Lists = function Lists(_ref) {
-  var _state$service;
+  var _state$service2;
   var onEdit = _ref.onEdit,
     onChange = _ref.onChange,
     onAction = _ref.onAction,
@@ -36,6 +36,8 @@ var Lists = function Lists(_ref) {
    * @Date: 2024-11-29 16:35
    */
   var handleChange = useMemoizedFn(function (currentItem, type, other) {
+    console.time('handleChange');
+    console.log(window.pp1 = performance.now(), '打开商品');
     if (state.disabledEdit || state.disableEventBookingEdit) {
       return;
     }
@@ -59,9 +61,7 @@ var Lists = function Lists(_ref) {
         editModal: true,
         cacheItem: cacheItem
       });
-      return onEdit === null || onEdit === void 0 ? void 0 : onEdit(_objectSpread(_objectSpread({}, product), {}, {
-        new: 0
-      }), type);
+      return onEdit === null || onEdit === void 0 ? void 0 : onEdit(cacheItem, type);
     }
     var params = {
       editModal: false,
@@ -95,27 +95,37 @@ var Lists = function Lists(_ref) {
       isShowEditProduct: !state.isBookingCreatePage
     };
   }, [state === null || state === void 0 ? void 0 : state.bookingId, state === null || state === void 0 ? void 0 : state.disabledEdit, isShowChangeHolder, state.isBookingCreatePage]);
-  return /*#__PURE__*/React.createElement(CartContext.Provider, {
-    value: {
-      state: state
-    }
-  }, /*#__PURE__*/React.createElement(ShoppingCart, {
-    isParallelResource: isParallelResource,
-    onAction: onAction,
-    onChange: handleChange,
-    isOpenGroup: false,
-    isHideClearCart: true,
-    onAddProduct: function onAddProduct() {
-      return onChange({
-        addModal: true
-      });
-    }
-    // onActiveKey={handleActiveKey}
-    // collapseParams={CollapseParams}
-    ,
-    productParams: _objectSpread(_objectSpread({}, productParams), {}, {
-      products: formatProducts((state === null || state === void 0 || (_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.value) || [], state, false, true, isParallelResource)
-    })
-  }));
+  var products = useMemo(function () {
+    var _state$service;
+    console.time('products');
+    var p = formatProducts((state === null || state === void 0 || (_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.value) || [], state, false, true, isParallelResource);
+    console.timeEnd('products');
+    return p;
+  }, [state === null || state === void 0 || (_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.value, state]);
+  return useMemo(function () {
+    console.log('render List');
+    return /*#__PURE__*/React.createElement(CartContext.Provider, {
+      value: {
+        state: state
+      }
+    }, /*#__PURE__*/React.createElement(ShoppingCart, {
+      isParallelResource: isParallelResource,
+      onAction: onAction,
+      onChange: handleChange,
+      isOpenGroup: false,
+      isHideClearCart: true,
+      onAddProduct: function onAddProduct() {
+        return onChange({
+          addModal: true
+        });
+      }
+      // onActiveKey={handleActiveKey}
+      // collapseParams={CollapseParams}
+      ,
+      productParams: _objectSpread(_objectSpread({}, productParams), {}, {
+        products: products
+      })
+    }));
+  }, [products, state, productParams]);
 };
 export default Lists;

package/es/components/booking/info/service/addService/utils.d.ts

@@ -6,7 +6,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

package/es/components/booking/info/service/editService/BookingList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const BookingList: ({ items }: {
     items: any[];
 }) => JSX.Element;

package/es/components/booking/info/service/editService/constants.d.ts

@@ -0,0 +1 @@
+export declare const getIsPartyRoomResourceShop: (id: number) => boolean;

package/es/components/booking/info/service/editService/constants.js

@@ -0,0 +1,3 @@
+export var getIsPartyRoomResourceShop = function getIsPartyRoomResourceShop(id) {
+  return [2155].includes(id);
+};

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

@@ -45,12 +45,15 @@ import Like from "../like";
 import { editSessionProduct, getMultiDayPrices } from "../../utils";
 import { useService } from "../serviceManager";
 import EditTabs from "./EditTabs";
+import { getIsPartyRoomResourceShop } from "./constants";
+import useEngineContext from "../../../../../hooks/useEngineContext";
 var submitLock = false;
 var Info = function Info(_, ref) {
   var _state$bookingConfig2, _state$service$cacheI4, _state$service$cacheI6, _state$service$cacheI7, _state$service4, _state$service6, _state$service8, _state$date, _state$date$format, _state$date2, _window$BaseMaterials, _state$service$cacheI13, _state$service10, _state$service$cacheI14, _state$bookingConfig4;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
+  var context = useEngineContext();
   var useTotal = Form.useWatch('total', form);
   var useLikeStatus = Form.useWatch('like_status', form);
   var useResource = Form.useWatch('resource', form);
@@ -569,7 +572,7 @@ var Info = function Info(_, ref) {
    */
   var getResourcesData = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-      var params, format, startDate, endDate, _formatDayTime, startDateTime, endDateTime, data, _list;
+      var _context$appHelper$ut, _context$appHelper$ut2, params, format, startDate, endDate, _formatDayTime, startDateTime, endDateTime, isPartyRoomResourceShop, codes, data, _list;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -602,16 +605,18 @@ var Info = function Info(_, ref) {
           case 13:
             params.with_date_times = state.date.value.format('YYYY-MM-DD');
           case 14:
-            _context3.next = 16;
+            isPartyRoomResourceShop = getIsPartyRoomResourceShop((_context$appHelper$ut = context.appHelper.utils.store) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut.getState) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.global) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.globalConfig) === null || _context$appHelper$ut2 === void 0 ? void 0 : _context$appHelper$ut2.id);
+            codes = isPartyRoomResourceShop ? ['resources', 'therapist', 'table', 'party_room'] : ['resources', 'therapist', 'table'];
+            _context3.next = 18;
             return state.apis.getResources(_objectSpread({
               skip: 1,
               num: 1000,
-              codes: ['resources', 'therapist', 'table'],
+              codes: codes,
               _config: {
                 abort: true
               }
             }, params));
-          case 16:
+          case 18:
             data = _context3.sent;
             // 合并无资源
             _list = [getNoResource()].concat((data === null || data === void 0 ? void 0 : data.list) || []);
@@ -621,19 +626,19 @@ var Info = function Info(_, ref) {
                 resourcesOrigin: _list
               }
             });
-            _context3.next = 24;
+            _context3.next = 26;
             break;
-          case 21:
-            _context3.prev = 21;
+          case 23:
+            _context3.prev = 23;
             _context3.t0 = _context3["catch"](1);
             console.log(_context3.t0, 'err');
-          case 24:
+          case 26:
             setResourceLoading(false);
-          case 25:
+          case 27:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[1, 21]]);
+      }, _callee3, null, [[1, 23]]);
     }));
     return function getResourcesData() {
       return _ref5.apply(this, arguments);

package/es/components/booking/info/service/like/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const Like: ({ status, onChange, className, style, }: {
     style?: any;

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

@@ -19,7 +19,7 @@ var Like = function Like(_ref) {
       }
       e.preventDefault();
       e.stopPropagation();
-      onChange === null || onChange === void 0 ? void 0 : onChange(status === "like" ? "common" : "like");
+      onChange === null || onChange === void 0 || onChange(status === "like" ? "common" : "like");
     }
   });
 };

package/es/components/booking/info/service2/Lists.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Lists: ({ onEdit, onChange }: any) => JSX.Element;
 export default Lists;

package/es/components/booking/info/service2/utils.js

@@ -691,29 +691,28 @@ export var formatProducts = function formatProducts(lists, state) {
       _origin: item
     });
   };
-
-  // 将商品分为组商品和非组商品
-  lists.forEach(function (item) {
-    var _item$_extend28;
-    if (!(item !== null && item !== void 0 && (_item$_extend28 = item._extend) !== null && _item$_extend28 !== void 0 && _item$_extend28.groupId)) {
-      normalList.push(formItem(item));
-    } else {
-      groupList.push(item);
-    }
-  });
-
-  // 根据item._extend.groupId 进行分组
-  var groups = groupList.reduce(function (prev, item) {
-    var _item$_extend29;
-    var groupId = item === null || item === void 0 || (_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.groupId;
-    if (!prev[groupId]) {
-      prev[groupId] = [];
-    }
-    prev[groupId].push(item);
-    return prev;
-  }, {});
   console.log(normalList, 'normalList');
   if (isRenderGroup) {
+    // 将商品分为组商品和非组商品
+    lists.forEach(function (item) {
+      var _item$_extend28;
+      if (!(item !== null && item !== void 0 && (_item$_extend28 = item._extend) !== null && _item$_extend28 !== void 0 && _item$_extend28.groupId)) {
+        normalList.push(formItem(item));
+      } else {
+        groupList.push(item);
+      }
+    });
+
+    // 根据item._extend.groupId 进行分组
+    var groups = groupList.reduce(function (prev, item) {
+      var _item$_extend29;
+      var groupId = item === null || item === void 0 || (_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.groupId;
+      if (!prev[groupId]) {
+        prev[groupId] = [];
+      }
+      prev[groupId].push(item);
+      return prev;
+    }, {});
     return Object.values(groups).map(function (d) {
       return formItem(concatBookings(d));
     }).concat(normalList);

package/es/components/booking/info/utils.js

@@ -95,7 +95,7 @@ export var isBooking4Shop = function isBooking4Shop(shopId, renderType, business
   if (renderType === 'eventBooking') {
     return false;
   }
-  var booking4Shops = [8390, 1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9, 2155, 8030, 1749, 8194, 2327, 8609, 8610, 8782, 1285, 6124, 8727, 5538, 6988, 8872, 6930, 8824, 8913, 8918];
+  var booking4Shops = [8390, 1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9, 2155, 8030, 1749, 8194, 2327, 8609, 8610, 8782, 1285, 6124, 8727, 5538, 6988, 8872, 6930, 8824, 8913, 8918, 6413];
 
   // 固定的shopId 或者安装 Resource Kit 应用，则认为是booking4Shop
   return booking4Shops.includes(shopId) || (businessUtils === null || businessUtils === void 0 ? void 0 : businessUtils.getAppByModal('resourcekit'));

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

@@ -81,6 +81,7 @@ var Info = Provider(function (props) {
   }, []);
   useMemo(function () {
     var _context$appHelper, _context$appHelper$ge, _context$appHelper2, _context$appHelper2$i, _context$appHelper3;
+    // TODO: 优化 内部每次设置state会触发两次渲染
     var isFranchisee = context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.businessUtils) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getAppByModal) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.call(_context$appHelper, 'franchisee');
     modal.dispatch({
       type: 'setState',

package/es/components/booking/info2/service/addService/utils.js

@@ -128,7 +128,8 @@ export var getTimeObj = function getTimeObj(_ref4) {
     cacheItem: cacheItem,
     useStartTime: useStartTime,
     currentResource: currentResource,
-    state: state,
+    // 没有使用该参数
+    // state,
     durationProps: durationProps
   });
   var obj = sliceDayIntoFiveMinutes((_state$bookingConfig2 = state.bookingConfig) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.config) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.basic) === null || _state$bookingConfig2 === void 0 ? void 0 : _state$bookingConfig2.service_time, locales.locale);
@@ -286,7 +287,9 @@ export var setDefaultResource = function setDefaultResource(_ref6) {
         defaultOriginalResource = renderList;
       }
       var defaultResource = defaultOriginalResource.map(function (d) {
-        return _objectSpread(_objectSpread({}, d), {}, {
+        return {
+          // ...d,
+          children: d.children,
           relation_type: d.relation_type,
           form_id: item.form_id,
           relation_id: d.id,
@@ -297,7 +300,7 @@ export var setDefaultResource = function setDefaultResource(_ref6) {
             form_name: item.title,
             resource_name: d.main_field
           }
-        });
+        };
       });
       obj[item.form_id] = defaultResource;
     };
@@ -401,7 +404,7 @@ export var getResourceByIds = function getResourceByIds(resourcesOriginMap, cach
         });
       } else {
         extraResourceIds = extraResources.filter(function (_extraItem) {
-          return _extraItem.form_id === form_id && !!_extraItem.id && !item.optional_resource.includes(_extraItem.id) && !item.default_resource.includes(_extraItem.id);
+          return _extraItem.form_id === form_id && !item.optional_resource.includes(_extraItem.id) && !item.default_resource.includes(_extraItem.id);
         }).map(function (_extraItem) {
           return _extraItem.id;
         });

package/es/components/booking/info2/service/addTimeModal/index.js

@@ -70,6 +70,7 @@ var AddTimeModal = function AddTimeModal() {
     _useState10 = _slicedToArray(_useState9, 2),
     renderList = _useState10[0],
     setRenderList = _useState10[1];
+  console.log(renderList, 'renderListrenderList');
   var context = useEngineContext();
   var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
     interaction = _context$appHelper$ut.interaction;
@@ -148,6 +149,7 @@ var AddTimeModal = function AddTimeModal() {
     }
     return arr.filter(Boolean);
   }, [(_state$service = state.service) === null || _state$service === void 0 || (_state$service = _state$service.cacheItem) === null || _state$service === void 0 || (_state$service = _state$service._extend) === null || _state$service === void 0 ? void 0 : _state$service.resource]);
+  console.log(currentResource, 'currentResource');
   var getTimeUsableStatus = function getTimeUsableStatus(time) {
     var _state$service$cacheI3;
     if (!((_state$service$cacheI3 = state.service.cacheItem) !== null && _state$service$cacheI3 !== void 0 && _state$service$cacheI3._extend) || !currentResource.length) {
@@ -270,6 +272,7 @@ var AddTimeModal = function AddTimeModal() {
           case 3:
             newList = _context2.sent;
             list = newList.map(function (d) {
+              debugger;
               // 是否可用
               var isUsable = isUsableProduct(d.add_time, state.service.cacheItem);
               return _objectSpread(_objectSpread({}, d), {}, {

package/es/components/booking/info2/service/editService/Resources/index.js

@@ -189,9 +189,14 @@ var Resources = function Resources(_ref, ref) {
   var getIsAutoAllocation = function getIsAutoAllocation(id) {
     return getAutoAllocationStorage(id);
   };
+  console.log('resourcesss');
+
+  /* todo: 此处value变化渲染三次 */
+
   return /*#__PURE__*/React.createElement(React.Fragment, null, data.map(function (item) {
     var _cur$2;
     var cur = _value[item.form_id];
+    console.log(cur, 'curcur');
     var errors = (cur || []).reduce(function (pre, d) {
       return pre.concat((d === null || d === void 0 ? void 0 : d.errors) || []);
     }, []);

package/es/components/booking/info2/service/editService/ResourcesV2/index.js

@@ -57,7 +57,7 @@ var Resources = function Resources(_ref, ref) {
   var originData = useMemo(function () {
     var _cacheItem$_data3;
     return (cacheItem === null || cacheItem === void 0 || (_cacheItem$_data3 = cacheItem._data) === null || _cacheItem$_data3 === void 0 ? void 0 : _cacheItem$_data3.resources) || [];
-  }, [originCacheItem === null || originCacheItem === void 0 || (_originCacheItem$_dat = originCacheItem._data) === null || _originCacheItem$_dat === void 0 ? void 0 : _originCacheItem$_dat.resources]);
+  }, [originCacheItem === null || originCacheItem === void 0 || (_originCacheItem$_dat = originCacheItem._data) === null || _originCacheItem$_dat === void 0 ? void 0 : _originCacheItem$_dat.resource]);
 
   // 同上, 只是map结构,方便计算
   var resourceMaps = useMemo(function () {