@pisell/private-materials 6.9.6 → 6.10.2

package/es/components/appointmentBooking/utils.js

@@ -174,32 +174,6 @@ export var sortResources = function sortResources(resources, resourceSort) {
     console.log(error, 'wh2222');
   }
 };
-
-/**
- * @title: 处理资源列表并提取资源代码
- * @description: 对资源列表进行排序，并提取 resourceCodes
- * @param {any[]} resources - 原始资源列表
- * @param {any[]} resourceSort - 资源排序配置
- * @return {*} 返回处理后的资源列表和资源代码数组
- * @Author: WangHan
- * @Date: 2025-11-21 15:33
- */
-export var processResourceList = function processResourceList(resources, resourceSort) {
-  var _processedResources$;
-  var processedResources = resources.map(function (item) {
-    return _objectSpread(_objectSpread({}, item), {}, {
-      resources: sortResources((item === null || item === void 0 ? void 0 : item.resources) || [], resourceSort)
-    });
-  });
-  var _resources = (processedResources === null || processedResources === void 0 || (_processedResources$ = processedResources[0]) === null || _processedResources$ === void 0 ? void 0 : _processedResources$.resources) || [];
-  var resourceCodes = _resources.map(function (item) {
-    return item.code;
-  });
-  return {
-    resources: processedResources,
-    resourceCodes: resourceCodes
-  };
-};
 export var getMeAccount = function getMeAccount(val) {
   return val === null || val === void 0 ? void 0 : val.find(function (d) {
     return !(d !== null && d !== void 0 && d.isGuest);
@@ -791,137 +765,4 @@ export var updateCartResources = function updateCartResources(item, value, curre
     });
   }
   return newResource || [];
-};
-
-// 步骤配置：定义每个步骤需要清空的数据类型（从后往前，越往前步骤清的越多）
-var STEP_CLEAR_CONFIG = {
-  'select-time': ['time'],
-  'fill-form': ['time', 'form'],
-  'select-resource': ['time', 'form', 'resource'],
-  'select-date': ['time', 'form', 'resource', 'date'],
-  'select-service': ['time', 'form', 'resource', 'date']
-};
-
-// 数据类型枚举
-
-/**
- * 根据key匹配步骤（支持精确匹配和startsWith匹配）
- * @param key - 步骤key
- * @returns 匹配到的步骤key，未匹配到返回null
- */
-var getMatchedStepKey = function getMatchedStepKey(key) {
-  // 精确匹配
-  if (STEP_CLEAR_CONFIG[key]) {
-    return key;
-  }
-  // startsWith匹配（支持 select-resource_@xxx 和 fill-form_@xxx 等）
-  var matchedKey = Object.keys(STEP_CLEAR_CONFIG).find(function (stepKey) {
-    return key.startsWith(stepKey);
-  });
-  return matchedKey || null;
-};
-
-/**
- * 创建清空操作的映射
- */
-var createClearActions = function createClearActions(appointmentBooking, setTimes) {
-  return {
-    time: function time() {
-      appointmentBooking.deleteCartItemInfo('time');
-      setTimes === null || setTimes === void 0 || setTimes([]);
-    },
-    resource: function resource() {
-      appointmentBooking.deleteCartItemInfo('resource');
-    },
-    form: function form() {
-      appointmentBooking.deleteCartItemInfo('relationForms');
-      appointmentBooking.removeStep('fill-form');
-    },
-    date: function date() {
-      var _appointmentBooking$o2;
-      var _ref4 = (appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$o2 = appointmentBooking.otherParams) === null || _appointmentBooking$o2 === void 0 ? void 0 : _appointmentBooking$o2.productModuleParams) || {},
-        bookingProcess = _ref4.bookingProcess;
-
-      // 如果不是先选择日期步骤，则清空日期
-      if (bookingProcess !== 'date_first') {
-        appointmentBooking.clearDateRange();
-      }
-    }
-  };
-};
-
-/**
- * 处理选择服务步骤的特殊逻辑：清空所有相关的资源和表单步骤
- */
-var clearServiceRelatedSteps = function clearServiceRelatedSteps(appointmentBooking) {
-  var stepList = (appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.getStepList()) || [];
-  var stepKeysToRemove = ['select-resource_', 'fill-form_'];
-  stepList.forEach(function (item) {
-    // 如果某个步骤是跳过的，则取消跳过
-    if (item !== null && item !== void 0 && item.isSkip) {
-      appointmentBooking.updateStep(item.key, {
-        key: item.key,
-        isSkip: false
-      });
-    }
-    var shouldRemove = stepKeysToRemove.some(function (prefix) {
-      var _item$key;
-      return (_item$key = item.key) === null || _item$key === void 0 ? void 0 : _item$key.startsWith(prefix);
-    });
-    if (shouldRemove) {
-      appointmentBooking.removeStep(item.key);
-    }
-  });
-};
-
-/**
- * 执行清空操作
- */
-var executeClearActions = function executeClearActions(dataTypes, clearActions) {
-  // 去重后执行
-  var uniqueTypes = Array.from(new Set(dataTypes));
-  uniqueTypes.forEach(function (type) {
-    var action = clearActions[type];
-    if (action) {
-      action();
-    }
-  });
-};
-
-/**
- * @title: 根据步骤key清空数据
- * @param {string} key - 当前步骤的key
- * @param {any} appointmentBooking - 预约预订实例
- * @param {(times: any[]) => void} setTimes - 设置时间列表的回调函数
- * @return {string[]} 返回需要清空的数据类型数组
- * @Author: WangHan
- * @Date: 2025-11-21 15:40
- */
-export var clearDataByStepKey = function clearDataByStepKey(key, appointmentBooking, setTimes) {
-  // 参数校验
-  if (!key || !appointmentBooking) {
-    return;
-  }
-
-  // 选择服务步骤的特殊处理
-  if (key === 'select-service') {
-    clearServiceRelatedSteps(appointmentBooking);
-  }
-
-  // 匹配步骤key
-  var stepKey = getMatchedStepKey(key);
-  if (!stepKey) {
-    return;
-  }
-
-  // 获取需要清空的数据类型
-  var clearDataTypes = STEP_CLEAR_CONFIG[stepKey] || [];
-  if (clearDataTypes.length === 0) {
-    return clearDataTypes;
-  }
-
-  // 创建清空操作并执行
-  var clearActions = createClearActions(appointmentBooking, setTimes);
-  executeClearActions(clearDataTypes, clearActions);
-  return clearDataTypes;
 };

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

@@ -60,15 +60,14 @@ export var formatProducts = function formatProducts(values) {
       discountway: 'num',
       discount_type: 'discount',
       bundle_edit: (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.bundle_edit,
-      product_bundle: formatProductBundle((_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 || (_item$_extend3 = _item$_extend3.other) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.bundle, item.is_price_include_tax),
+      product_bundle: formatProductBundle((_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 || (_item$_extend3 = _item$_extend3.other) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.bundle),
       "product_option_item": formatProductOption((_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 || (_item$_extend4 = _item$_extend4.other) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.option),
       "product_variant_id": ((_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 || (_item$_extend5 = _item$_extend5.other) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.product_variant_id) || 0,
       "source_product_price": getSourceProductPrice(item),
       "main_product_selling_price": (_getMainProductSellin = getMainProductSellingPrice(item)) !== null && _getMainProductSellin !== void 0 ? _getMainProductSellin : formatProductPrice(item),
       "calculated_original_price": formatOriginalPrice(item),
       "calculated_selling_price": formatSellingPrice(item),
-      "tax_fee": item._extend.tax_fee,
-      is_price_include_tax: item.is_price_include_tax
+      "tax_fee": item._extend.tax_fee
     };
   });
   return arr;

package/es/components/booking/addons/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

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

@@ -32,7 +32,6 @@ import useScanManager from "../../../ticketBooking/hooks/pisellos/useScanManager
 import { DiscountKeyboard } from "../../../../pro/priceKeyboard";
 import { useActiveExecute, useBookingTicket } from "../../../ticketBooking/hooks/pisellos";
 import { useShopDiscountModule } from "../../../ticketBooking/hooks/pisellos/useShopDiscountModule";
-import useLogger from "../../../../hooks/useLogger";
 // Toast 内容包装器，统一设置行高
 var createToastContent = function createToastContent(text) {
   return /*#__PURE__*/React.createElement("div", {
@@ -73,7 +72,6 @@ var ActionButtons = function ActionButtons(_ref) {
   var bookingTicket = useBookingTicket();
   var ScheduleModule = pisellosAllModule.ScheduleModule;
   var shopDiscount = useShopDiscountModule();
-  var logger = useLogger();
   var _useScanManager = useScanManager(),
     clearAllScanListenersTaskQueue = _useScanManager.clearAllScanListenersTaskQueue;
 
@@ -232,10 +230,6 @@ var ActionButtons = function ActionButtons(_ref) {
 
   // 仅清空商品
   var handleClearItemsOnly = function handleClearItemsOnly() {
-    logger.addLog({
-      title: 'ActionButtons: handleClearItemsOnly 调用',
-      metadata: {}
-    });
     clearAllScanListenersTaskQueue();
     if (!hasCartItems) {
       // 购物车为空时显示Toast提示
@@ -280,10 +274,6 @@ var ActionButtons = function ActionButtons(_ref) {
   // 清空所有内容并重置购物车
   var handleClearAllAndReset = function handleClearAllAndReset() {
     var _window;
-    logger.addLog({
-      title: 'ActionButtons: handleClearAllAndReset 调用',
-      metadata: {}
-    });
     clearAllScanListenersTaskQueue();
     (_window = window) === null || _window === void 0 || (_window = _window.shopApi) === null || _window === void 0 || (_window = _window.bookingTicket) === null || _window === void 0 || _window.clearAllCart();
     // 清空服务项目

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

@@ -6,9 +6,11 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState, useEffect, useRef } from 'react';
 import { Modal, Input, Checkbox, Button } from 'antd';
+// import { X } from '@pisell/icon';
 import { locales } from '@pisell/utils';
 import { useToast } from '@pisell/materials';
-import NumericStepper from "../../../../pro/NumericStepper";
+// import PisellPriceRadio from '../../../../pro/pisellPriceRadio';
+import PisellNumberSelector from "../../../../pro/pisellNumberSelector";
 import PisellPriceKeyboardModal from "../../../../pro/pisellPriceKeyboardModal";
 import useEngineContext from "../../../../hooks/useEngineContext";
 import "./index.less";
@@ -260,8 +262,7 @@ var CustomiseItemModal = function CustomiseItemModal(_ref) {
     className: "customise-item-save-btn"
   }, locales.getText('pisell2.customise-item.save'))))), /*#__PURE__*/React.createElement("div", {
     className: "customise-item-quantity-selector-fixed"
-  }, /*#__PURE__*/React.createElement(NumericStepper, {
-    variant: "capsule",
+  }, /*#__PURE__*/React.createElement(PisellNumberSelector, {
     value: quantity,
     min: 1,
     max: 999,
@@ -273,7 +274,9 @@ var CustomiseItemModal = function CustomiseItemModal(_ref) {
       } else {
         setQuantity(value);
       }
-    }
+    },
+    size: "middle",
+    enablePriceAdjust: true
   }))), /*#__PURE__*/React.createElement(PisellPriceKeyboardModal, {
     visible: showPriceKeyboard,
     value: priceType === 'sell' ? sellPrice : deductionPrice,

package/es/components/booking/components/footer/amount.d.ts

@@ -1,5 +1,4 @@
 export declare const getRelationDetailsTotal: (relation_details: any) => number;
-export declare const getProductDiscountProductDiscountDifference: (product: any) => any;
 export declare const getIsPriceIncludeTax: (state: any) => any;
 /**
  * 总金额