@pisell/private-materials 3.4.8 → 3.4.9

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

@@ -74,6 +74,7 @@ var CustomSelect = function CustomSelect(props, ref) {
     showDropDown = _props$showDropDown === void 0 ? true : _props$showDropDown,
     propsHandleOpenModal = props.handleOpenModal,
     handleDayChange = props.handleDayChange;
+  console.log('custom select');
   var searchRef = useRef();
 
   // 当前选择的值

package/es/components/booking/hooks/useClearCart.js

@@ -2,12 +2,12 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import React from 'react';
+import React, { useMemo } from 'react';
 import classNames from 'classnames';
 import { Iconfont } from '@pisell/materials';
 import { locales } from "@pisell/utils";
 var useClearCart = function useClearCart(state, dispatch) {
-  var _state$service, _state$service2;
+  var _state$service3;
   var handleClear = function handleClear() {
     // 清除购物车
     dispatch({
@@ -17,11 +17,14 @@ var useClearCart = function useClearCart(state, dispatch) {
       }
     });
   };
-  return !!((_state$service = state.service) !== null && _state$service !== void 0 && (_state$service = _state$service.value) !== null && _state$service !== void 0 && _state$service.length) && !state.channelDisabledEdit && /*#__PURE__*/React.createElement("span", {
-    className: classNames('pisell-lowcode__booking-service-clear-btn', _defineProperty({}, 'pisell-lowcode__booking-service-clear-btn-disabled', !((_state$service2 = state.service) !== null && _state$service2 !== void 0 && (_state$service2 = _state$service2.value) !== null && _state$service2 !== void 0 && _state$service2.length))),
-    onClick: handleClear
-  }, /*#__PURE__*/React.createElement(Iconfont, {
-    type: "pisell2-trash-01"
-  }), " ", /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.booking.info.text.clear-cart')));
+  return useMemo(function () {
+    var _state$service, _state$service2;
+    return !!((_state$service = state.service) !== null && _state$service !== void 0 && (_state$service = _state$service.value) !== null && _state$service !== void 0 && _state$service.length) && !state.channelDisabledEdit && /*#__PURE__*/React.createElement("span", {
+      className: classNames('pisell-lowcode__booking-service-clear-btn', _defineProperty({}, 'pisell-lowcode__booking-service-clear-btn-disabled', !((_state$service2 = state.service) !== null && _state$service2 !== void 0 && (_state$service2 = _state$service2.value) !== null && _state$service2 !== void 0 && _state$service2.length))),
+      onClick: handleClear
+    }, /*#__PURE__*/React.createElement(Iconfont, {
+      type: "pisell2-trash-01"
+    }), " ", /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.booking.info.text.clear-cart')));
+  }, [(_state$service3 = state.service) === null || _state$service3 === void 0 || (_state$service3 = _state$service3.value) === null || _state$service3 === void 0 ? void 0 : _state$service3.length, state.channelDisabledEdit]);
 };
 export default useClearCart;

package/es/components/booking/hooks/useQuotation.js

@@ -15,7 +15,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { getProductTotalPrice } from "../utils";
-import useEngineContext from "../../../../es/hooks/useEngineContext";
+import useEngineContext from "../../../hooks/useEngineContext";
 import { locales } from "@pisell/utils";
 import { PisellModal } from "@pisell/materials";
 import { getProductPrice } from "../info/service/serve";

package/es/components/booking/info/client/index.js

@@ -36,7 +36,7 @@ import { getWaiverTitle } from "../clientVariant/utils";
 import useGetHolderList from "../hooks/useGetHolderList";
 var isLoadClient = false;
 var Client = function Client() {
-  var _state$client$value2, _state$client$value3, _state$client$value4, _state$client$value5, _state$client$value6, _state$client$value7, _state$client$value8, _state$client$value9, _state$client$value10, _state$client$value11;
+  var _state$client$value2, _state$client4, _state$client$value3, _state$client$value4, _state$client$value5, _state$client$value6, _state$client$value7, _state$client$value8, _state$client$value9, _state$client$value10, _state$client$value11;
   var modalRef = useRef();
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -397,6 +397,7 @@ var Client = function Client() {
     }, locales.getText('pisell2.text.load-more'))) : null;
   }, [loadLoading, params, state.client.clients.length]);
   var customSelect = useMemo(function () {
+    console.log('render customSelect');
     return /*#__PURE__*/React.createElement(CustomSelect, {
       autoFocus: !state.isTerminal,
       modalOpen: state.modalOpen,
@@ -459,7 +460,7 @@ var Client = function Client() {
         return true;
       }
     });
-  }, [state, renderList, loading, franchiseeLoading, params.search, loadMore]);
+  }, [state.isTerminal, state.modalOpen, (_state$client4 = state.client) === null || _state$client4 === void 0 ? void 0 : _state$client4.value, state.drawerMask, renderList, loading, franchiseeLoading, params.search, loadMore]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-client",
     onClick: function onClick() {

package/es/components/booking/info/dateRange/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 export declare const disabledDate: (current: any, position: any, currentDate: any) => any;
 declare const DateRange: ({ state, dispatch, key }: any) => JSX.Element;

package/es/components/booking/info/hooks/useInfoHolder.js

@@ -4,6 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { useMemoizedFn } from "ahooks";
 import { useEffect, useMemo, useRef } from "react";
 import useHolderConfig from "./useHolderConfig";
 import { isOpenAddTime } from "../utils";
@@ -29,21 +30,27 @@ var useInfoHolder = function useInfoHolder(state, dispatch) {
     };
   }, [state === null || state === void 0 || (_state$bookingConfig2 = state.bookingConfig) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.config) === null || _state$bookingConfig2 === void 0 ? void 0 : _state$bookingConfig2.information_tab]);
   var showAddTimeModal = useMemo(function () {
-    return isOpenAddTime(state);
+    return isOpenAddTime(state) && !state.isBookingTicket2;
   }, [state, appointment_card.quick_time]);
-  var handleEdit = function handleEdit(cacheItem, type) {
-    setTimeout(function () {
-      var _detailRef$current, _detailRef$current$in;
-      (_detailRef$current = detailRef.current) === null || _detailRef$current === void 0 || (_detailRef$current$in = _detailRef$current.init) === null || _detailRef$current$in === void 0 || _detailRef$current$in.call(_detailRef$current, cacheItem, false, type === 'edit_product');
-    }, 100);
-  };
+  var handleEdit = useMemoizedFn(function (cacheItem, type) {
+    var _detailRef$current, _detailRef$current$in;
+    // console.timeEnd('handleChange');
+    console.time('handleEdit');
+    console.log(performance.now() - window.pp1, '打开商品4');
+    (_detailRef$current = detailRef.current) === null || _detailRef$current === void 0 || (_detailRef$current$in = _detailRef$current.init) === null || _detailRef$current$in === void 0 || _detailRef$current$in.call(_detailRef$current, cacheItem, false, type === 'edit_product');
+    // setTimeout(() => {
+    //   console.log(performance.now() - window.pp1, '打开商品5');
+    //   console.timeEnd('handleEdit')
+    //   detailRef.current?.init?.(cacheItem, false, type === 'edit_product');
+    // }, );
+  });
   var dispatchService = function dispatchService(type, payload) {
     dispatch({
       type: type,
       payload: _objectSpread({}, payload)
     });
   };
-  var handleAction = function handleAction(dataSource) {
+  var handleAction = useMemoizedFn(function (dataSource) {
     var cacheItem = getProductExtend({
       cacheItem: _objectSpread(_objectSpread({}, dataSource._origin), {}, {
         new: 0
@@ -57,7 +64,7 @@ var useInfoHolder = function useInfoHolder(state, dispatch) {
         cacheItem: cacheItem
       }
     });
-  };
+  });
   return {
     detailRef: detailRef,
     handleEdit: handleEdit,

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/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/info2/index.js

@@ -79,6 +79,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;
     };

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) || []);
     }, []);