@pisell/private-materials 6.4.72 → 6.4.73

package/es/components/authentication/admin/SaaSAdminAuth/locales.js

@@ -0,0 +1,74 @@
+export default {
+  en: {
+    // Page title and description
+    'saas.admin.auth.title': 'SaaS Platform Admin Authentication',
+    'saas.admin.auth.description': 'Configure authentication methods for your SaaS platform admin portal and other administrative channels.',
+    // Auth Methods section
+    'saas.admin.auth.methods.title': 'Auth Methods',
+    'saas.admin.auth.methods.description': 'Configure authentication methods that will be available for SaaS platform admins. Drag to reorder by priority.',
+    // Password Settings section
+    'saas.admin.password.settings.title': 'Password Settings',
+    'saas.admin.password.settings.description': 'Configure password requirements specifically for SaaS platform admin accounts. These rules apply to all platform administrative users.',
+    // Buttons
+    'auth.button.cancel': 'Cancel',
+    'auth.button.save': 'Save',
+    'auth.button.settings': 'Settings',
+    // Messages
+    'auth.save.success': 'Settings saved successfully',
+    'auth.save.error': 'Failed to save settings',
+    // OAuth configuration
+    'auth.oauth.config.message': 'Configure OAuth settings in Auth Configuration page first',
+    'auth.oauth.config.link': 'click to config',
+    // Category badges
+    'auth.category.general': 'General',
+    'auth.category.oauth': 'OAuth'
+  },
+  'zh-CN': {
+    // Page title and description
+    'saas.admin.auth.title': 'SaaS平台管理员认证',
+    'saas.admin.auth.description': '为您的SaaS平台管理员门户和其他管理渠道配置认证方法。',
+    // Auth Methods section
+    'saas.admin.auth.methods.title': '认证方法',
+    'saas.admin.auth.methods.description': '配置SaaS平台管理员可用的认证方法。拖动以调整优先级。',
+    // Password Settings section
+    'saas.admin.password.settings.title': '密码设置',
+    'saas.admin.password.settings.description': '专门为SaaS平台管理员账户配置密码要求。这些规则适用于所有平台管理用户。',
+    // Buttons
+    'auth.button.cancel': '取消',
+    'auth.button.save': '保存',
+    'auth.button.settings': '设置',
+    // Messages
+    'auth.save.success': '保存成功',
+    'auth.save.error': '保存失败',
+    // OAuth configuration
+    'auth.oauth.config.message': '请先在OAuth配置页面中配置OAuth设置',
+    'auth.oauth.config.link': '点击配置',
+    // Category badges
+    'auth.category.general': '通用',
+    'auth.category.oauth': 'OAuth'
+  },
+  'zh-HK': {
+    // Page title and description
+    'saas.admin.auth.title': 'SaaS平台管理員認證',
+    'saas.admin.auth.description': '為您的SaaS平台管理員門戶和其他管理渠道配置認證方法。',
+    // Auth Methods section
+    'saas.admin.auth.methods.title': '認證方法',
+    'saas.admin.auth.methods.description': '配置SaaS平台管理員可用的認證方法。拖動以調整優先級。',
+    // Password Settings section
+    'saas.admin.password.settings.title': '密碼設置',
+    'saas.admin.password.settings.description': '專門為SaaS平台管理員賬戶配置密碼要求。這些規則適用於所有平台管理用戶。',
+    // Buttons
+    'auth.button.cancel': '取消',
+    'auth.button.save': '保存',
+    'auth.button.settings': '設置',
+    // Messages
+    'auth.save.success': '保存成功',
+    'auth.save.error': '保存失敗',
+    // OAuth configuration
+    'auth.oauth.config.message': '請先在OAuth配置頁面中配置OAuth設置',
+    'auth.oauth.config.link': '點擊配置',
+    // Category badges
+    'auth.category.general': '通用',
+    'auth.category.oauth': 'OAuth'
+  }
+};

package/es/components/authentication/admin/SaaSAdminAuth/types.d.ts

@@ -0,0 +1,16 @@
+/// <reference types="react" />
+import { AuthMethod } from '../AuthMethods/types';
+export interface SaaSAdminAuthProps {
+    /**
+     * 自定义类名
+     */
+    className?: string;
+    /**
+     * 自定义样式
+     */
+    style?: React.CSSProperties;
+    /**
+     * 保存回调
+     */
+    onSave?: (authMethods: AuthMethod[], passwordRules: any) => void;
+}

package/es/components/authentication/admin/SaaSAdminAuth/types.js

@@ -0,0 +1 @@
+export {};

package/es/components/authentication/admin/index.d.ts

@@ -0,0 +1,26 @@
+export type { AuthMethodsProps, AuthMethod } from './AuthMethods';
+export { AuthMethodType, AuthMethodCategory } from './AuthMethods';
+export { default as ChannelAuthSetting } from './ChannelAuthSetting';
+export type { ChannelAuthSettingProps, ChannelAuthSettingValue, TabKey } from './ChannelAuthSetting';
+export { default as PageSetting } from './ChannelAuthSetting/PageSetting';
+export { default as PageSettingItem } from './ChannelAuthSetting/PageSettingItem';
+export { default as AuthenticationMethods } from './ChannelAuthSetting/AuthenticationMethods';
+export { default as CollectInfo } from './ChannelAuthSetting/CollectInfo';
+export type { PageSettingProps, PageSettingValue, } from './ChannelAuthSetting/PageSetting/types';
+export type { PageSettingItemProps, PageSettingItemValue, TermsCondition, TranslationValue as PageTranslationValue, } from './ChannelAuthSetting/PageSettingItem/types';
+export type { AuthenticationMethodsProps, AuthenticationMethodsValue, GlobalAuthMethod, AuthenticationMethod, AuthenticationSettingsMode, } from './ChannelAuthSetting/AuthenticationMethods/types';
+export type { CollectInfoProps, CollectInfoValue, AccountField, CustomerFormItem, TranslationValue as CollectInfoTranslationValue, } from './ChannelAuthSetting/CollectInfo/types';
+export type { SaaSAdminAuthProps } from './SaaSAdminAuth';
+export type { OrgAdminAuthProps } from './OrgAdminAuth';
+export type { DeviceAuthProps } from './DeviceAuth';
+export type { POSOperatorAuthProps } from './POSOperatorAuth';
+export type { CustomerOAuthConfigProps } from './CustomerOAuthConfig';
+export { default as SaaSAdminAuth } from './SaaSAdminAuth';
+export { default as OrgAdminAuth } from './OrgAdminAuth';
+export { default as OAuthConfig } from './OAuthConfig';
+export { default as CustomerAuth } from './CustomerAuth';
+export { default as CustomerOAuthConfig } from './CustomerOAuthConfig';
+export { default as DeviceAuth } from './DeviceAuth';
+export { default as POSOperatorAuth } from './POSOperatorAuth';
+export { default as OnlineShopAuth } from './ChannelAuthSetting/OnlineShopAuth';
+export { default as SaaSManagermentAuth } from './ChannelAuthSetting/SaaSManagermentAuth';

package/es/components/authentication/admin/index.js

@@ -0,0 +1,23 @@
+// export { default as AuthMethods, SettingList } from './AuthMethods';
+
+export { AuthMethodType, AuthMethodCategory } from "./AuthMethods";
+
+// ChannelAuthSetting 主组件
+export { default as ChannelAuthSetting } from "./ChannelAuthSetting";
+// ChannelAuthSetting 子组件
+export { default as PageSetting } from "./ChannelAuthSetting/PageSetting";
+export { default as PageSettingItem } from "./ChannelAuthSetting/PageSettingItem";
+export { default as AuthenticationMethods } from "./ChannelAuthSetting/AuthenticationMethods";
+export { default as CollectInfo } from "./ChannelAuthSetting/CollectInfo";
+
+// ChannelAuthSetting 类型
+
+export { default as SaaSAdminAuth } from "./SaaSAdminAuth";
+export { default as OrgAdminAuth } from "./OrgAdminAuth";
+export { default as OAuthConfig } from "./OAuthConfig";
+export { default as CustomerAuth } from "./CustomerAuth";
+export { default as CustomerOAuthConfig } from "./CustomerOAuthConfig";
+export { default as DeviceAuth } from "./DeviceAuth";
+export { default as POSOperatorAuth } from "./POSOperatorAuth";
+export { default as OnlineShopAuth } from "./ChannelAuthSetting/OnlineShopAuth";
+export { default as SaaSManagermentAuth } from "./ChannelAuthSetting/SaaSManagermentAuth";

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

@@ -270,15 +270,34 @@ var CustomSelect = function CustomSelect(props, ref) {
   var renderList = useMemo(function () {
     var _list = _toConsumableArray(options);
     if (search) {
-      var isIncludes = function isIncludes(str) {
-        return str.toLowerCase().indexOf(search.toLowerCase()) !== -1;
+      var isIncludes = function isIncludes(item) {
+        try {
+          var q = search.toLowerCase();
+          var numericKeys = Object.keys(item).filter(function (k) {
+            return /^\d+$/.test(k);
+          });
+          var customerKeys = ['customer_nickname', 'customer_first_name', 'customer_last_name', 'customer_phone', 'customer_email'];
+          var allKeys = [].concat(_toConsumableArray(numericKeys), customerKeys);
+          return allKeys.some(function (k) {
+            var val = item[k];
+            if (val === null || val === undefined) return false;
+            try {
+              var str = JSON.stringify(val);
+              return str.includes(q) || str.toLocaleLowerCase().includes(q);
+            } catch (error) {
+              return false;
+            }
+          });
+        } catch (e) {
+          return false;
+        }
       };
       _list = _list.filter(function (d) {
         // 自定义搜索
         if (filterItem) {
           return filterItem(d, search);
         }
-        return isIncludes(d.main_field || '');
+        return isIncludes(d);
       });
     }
     return _list;

package/es/components/booking/components/footer/amount.js

@@ -7,11 +7,10 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-import { flexibleObj, getDiscountTimeByDayMinutes } from "../../utils";
+import { getDiscountTime, flexibleObj } from "../../utils";
 import { formatAmount } from '@pisell/utils';
 import Decimal from 'decimal.js';
-import { isDayBooking, isNormalProductByDurationSchedule } from "../../info/service2/utils";
-import { isMultiDayProduct } from "../../info2/service/addService/utils";
+import { isDayBooking, isDayBookingProduct, isNormalProductByDurationSchedule } from "../../info/service2/utils";
 export var getRelationDetailsTotal = function getRelationDetailsTotal(relation_details) {
   var total = new Decimal(0);
   var _iterator = _createForOfIteratorHelper(relation_details),
@@ -40,8 +39,6 @@ var getProductExpectAmount = function getProductExpectAmount(state, isEdit) {
   var duration = new Decimal(0);
   // 是否是跨日预约
   var isDay = isDayBooking(state);
-  var dayDuration = new Decimal(0);
-  var minuteDuration = new Decimal(0);
   if (isEdit) {
     // 计算总价  服务 和 附加商品
     if (state !== null && state !== void 0 && state.service || state !== null && state !== void 0 && state.addons) {
@@ -54,18 +51,14 @@ var getProductExpectAmount = function getProductExpectAmount(state, isEdit) {
           for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
             var item = _step2.value;
             // 跨日预约
-            if (isDay || isNormalProductByDurationSchedule(item) || isMultiDayProduct(item)) {
+            if (isDay || isNormalProductByDurationSchedule(item)) {
               var quantity = new Decimal(item._extend.quantity || 1);
               var itemTotal = new Decimal(item._extend.total || 0);
               price = price.add(itemTotal.mul(quantity));
 
               // 普通商品不能加到时长上
-              var _duration = !isNormalProductByDurationSchedule(item) ? new Decimal(item._extend.duration || 0) : new Decimal(0);
-              if (isDay || isMultiDayProduct(item)) {
-                dayDuration = dayDuration.add(_duration);
-              } else {
-                minuteDuration = minuteDuration.add(_duration);
-              }
+              var _duration = isDayBookingProduct(item, state) ? new Decimal(item._extend.duration || 0) : new Decimal(0);
+              duration = duration.add(_duration);
             } else {
               var _quantity = new Decimal(item._extend.quantity || 1);
               var _itemTotal = new Decimal(item._extend.total || 0);
@@ -76,11 +69,6 @@ var getProductExpectAmount = function getProductExpectAmount(state, isEdit) {
               price = price.add(relationTotal);
               var itemDuration = new Decimal(flexibleObj.getValue(item._extend.duration) || 0);
               duration = duration.add(itemDuration);
-              if (isMultiDayProduct(item)) {
-                dayDuration = dayDuration.add(itemDuration);
-              } else {
-                minuteDuration = minuteDuration.add(itemDuration);
-              }
             }
           }
         } catch (err) {
@@ -114,25 +102,20 @@ var getProductExpectAmount = function getProductExpectAmount(state, isEdit) {
     var services = (state === null || state === void 0 || (_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.value) || [];
     duration = services.reduce(function (pre, cur) {
       var current = new Decimal(0);
-      if (isDay || isMultiDayProduct(cur)) {
+      if (isDay) {
         // 普通商品不能加到时长上
-        var _duration2 = !isNormalProductByDurationSchedule(cur) ? new Decimal(cur._extend.duration || 0) : new Decimal(0);
+        var _duration2 = isDayBookingProduct(cur, state) ? new Decimal(cur._extend.duration || 0) : new Decimal(0);
         current = _duration2;
       } else {
         var _cur$_extend;
         current = new Decimal(flexibleObj.getValue(((_cur$_extend = cur._extend) === null || _cur$_extend === void 0 ? void 0 : _cur$_extend.duration) || 0) || 0);
       }
-      if (isDay || isMultiDayProduct(cur)) {
-        dayDuration = dayDuration.add(current);
-      } else {
-        minuteDuration = minuteDuration.add(current);
-      }
       return pre.add(current);
     }, new Decimal(0));
   }
   return {
     productExpectAmount: price.toNumber(),
-    duration: getDiscountTimeByDayMinutes(dayDuration.toNumber(), minuteDuration.toNumber())
+    duration: getDiscountTime(duration.toNumber(), isDay)
   };
 };
 var getProductItemTax = function getProductItemTax(item, state, options) {

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

@@ -37,12 +37,5 @@ export declare const checkResourcesFormat: (resources: any[], service: any, isCh
  * @Date: 2024-12-23 12:05
  */
 export declare const formatProductPrice: (item: any) => number;
-/**
- * @title: 是否包含跨日预约商品
- * @description:
- * @param {any} data
- * @return {*}
- */
-export declare const getHasMultiDayProduct: (data: any) => any;
 export declare const formatValues: (state: any) => any;
 export declare const checkHolderIsError: (state: any) => any;

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

@@ -281,7 +281,7 @@ var formatSellingPrice = function formatSellingPrice(item) {
   var _item$_extend9;
   return Number((_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.total);
 };
-var formatMetaData = function formatMetaData(item) {
+var formatMetaData = function formatMetaData(item, isMultiDayPrices) {
   var _item$_extend10, _item$_extend11, _item$_extend13, _item$_extend15;
   var metadata = {};
   if ((_item$_extend10 = item._extend) !== null && _item$_extend10 !== void 0 && _item$_extend10.capacity) {
@@ -294,7 +294,7 @@ var formatMetaData = function formatMetaData(item) {
     var _item$_extend12;
     metadata.holder_id = (_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.holder_id;
   }
-  if ((_item$_extend13 = item._extend) !== null && _item$_extend13 !== void 0 && _item$_extend13.multiDayPrices) {
+  if (isMultiDayPrices && (_item$_extend13 = item._extend) !== null && _item$_extend13 !== void 0 && _item$_extend13.multiDayPrices) {
     var _item$_extend14;
     metadata.multiDayPrices = (_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.multiDayPrices;
   }
@@ -386,7 +386,7 @@ var formatProducts = function formatProducts(item, quantity) {
     product_option_item: formatProductOption((_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 || (_item$_extend21 = _item$_extend21.other) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.option),
     product_variant_id: ((_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 || (_item$_extend22 = _item$_extend22.other) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.product_variant_id) || 0,
     discount_list: notManualDiscount,
-    metadata: formatMetaData(item),
+    metadata: formatMetaData(item, false),
     // checkout 需求新增字段
     calculated_original_price: formatOriginalPrice(item),
     calculated_selling_price: formatSellingPrice(item),
@@ -471,21 +471,6 @@ var getHolderByIndex = function getHolderByIndex(holder, index) {
   });
 };
 
-/**
- * @title: 是否包含跨日预约商品
- * @description:
- * @param {any} data
- * @return {*}
- */
-export var getHasMultiDayProduct = function getHasMultiDayProduct(data) {
-  var list = data.service.value;
-  var isHas = list.some(function (item) {
-    var _item$_extend26;
-    return (_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.groupId;
-  });
-  return isHas;
-};
-
 /**
  * @title: 预约商品信息
  * @description:
@@ -519,8 +504,9 @@ var formatBookings = function formatBookings(data, values) {
   var dayParams = {};
   var eventOtherParams = data.eventOtherParams;
   var bookings = [];
+  var obj = {};
   list.forEach(function (item) {
-    var _item$_extend27, _item$_extend32;
+    var _item$_extend30, _item$_extend31;
     // 自定义商品直接使用 _extend 中的数据，并将 id 转换为 0 提交给后端
     if (item.isCustomItem) {
       bookings.push(_objectSpread(_objectSpread({}, item._extend), {}, {
@@ -528,9 +514,6 @@ var formatBookings = function formatBookings(data, values) {
       }));
       return;
     }
-
-    // 当前商品是跨日预约商品
-    var isMultiDay = (_item$_extend27 = item._extend) === null || _item$_extend27 === void 0 ? void 0 : _item$_extend27.groupId;
     var start_date = item._extend.startDate.format('YYYY-MM-DD');
     var end_date = item._extend.endDate.format('YYYY-MM-DD');
     var end_time = item._extend.endDate.format('HH:mm');
@@ -544,9 +527,9 @@ var formatBookings = function formatBookings(data, values) {
 
     // 跨日预约下的普通商品
     if (isDay) {
-      var _item$_extend28, _item$_extend29, _item$_extend30, _item$_extend31;
-      var startDate = ((_item$_extend28 = item._extend) === null || _item$_extend28 === void 0 ? void 0 : _item$_extend28.startDate) || ((_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.start_date);
-      var endDate = ((_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.endDate) || ((_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.end_date);
+      var _item$_extend26, _item$_extend27, _item$_extend28, _item$_extend29;
+      var startDate = ((_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.startDate) || ((_item$_extend27 = item._extend) === null || _item$_extend27 === void 0 ? void 0 : _item$_extend27.start_date);
+      var endDate = ((_item$_extend28 = item._extend) === null || _item$_extend28 === void 0 ? void 0 : _item$_extend28.endDate) || ((_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.end_date);
       var _formatDayTime = formatDayTime({
           startDate: startDate,
           endDate: endDate
@@ -568,13 +551,17 @@ var formatBookings = function formatBookings(data, values) {
         }
       }, 'minutes');
     }
-    if (!((_item$_extend32 = item._extend) !== null && _item$_extend32 !== void 0 && _item$_extend32.unique_identification_number)) {
+
+    // 跨日预约处理： 跨日预约所有数据都在list中， 每一组预约通过groupId进行分组
+    // 通过obj 记录下每个GroupId第一次出现的时机，  第一次出现需要设置 metadata.multiDayPrices
+    // 后续出现不需要设置 metadata.multiDayPrices. 节省体积
+    var isSetGroupId = obj[item === null || item === void 0 || (_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.groupId];
+    if (!((_item$_extend31 = item._extend) !== null && _item$_extend31 !== void 0 && _item$_extend31.unique_identification_number)) {
       var unique_identification_number = getUniqueId();
       item._extend.unique_identification_number = unique_identification_number;
     }
     var booking = _objectSpread(_objectSpread({
       product: formatProducts(item),
-      metadata: formatMetaData(item),
       relation_products: formatRelationDetails(item._extend.relation_details),
       id: item.booking_id || 0,
       relation_id: item._extend.relation_id || 0,
@@ -588,16 +575,20 @@ var formatBookings = function formatBookings(data, values) {
       start_time: start_time,
       end_date: end_date,
       start_date: start_date,
-      duration: isDay || isMultiDay ? 0 : flexibleObj.getValue(item._extend.duration),
+      duration: isDay ? 0 : flexibleObj.getValue(item._extend.duration),
       number: item._extend.capacity ? getSumCapacity({
         cacheItem: item
       }) : item._extend.number || 1,
       resources: formatResource(item),
-      note: item._extend.note
+      note: item._extend.note,
+      "metadata": formatMetaData(item, !isSetGroupId)
     }, eventOtherParams || {}), dayParams);
 
-    // 跨日预约模版或当前是跨日预约商品时
-    if (isDay || isMultiDay) {
+    // 记录下每个GroupId第一次出现的时机
+    if (!isSetGroupId) {
+      obj[item._extend.groupId] = true;
+    }
+    if (isDay) {
       bookings.push(booking);
       return;
     }
@@ -630,16 +621,16 @@ var formatRelationProducts = function formatRelationProducts(data, type) {
   var list = ((_data$service = data.service) === null || _data$service === void 0 ? void 0 : _data$service.value) || [];
   // open items 下的商品
   list = list.filter(function (item) {
-    var _item$_extend33;
+    var _item$_extend32;
     return (
       // 跨日预约把普通商品加在relationProducts 活动预约按之前逻辑
-      type === 'day' ? isNormalProductByDurationSchedule(item) : ((_item$_extend33 = item._extend) === null || _item$_extend33 === void 0 ? void 0 : _item$_extend33.holder_id) && appointmentTypes.includes(item.extension_type)
+      type === 'day' ? isNormalProductByDurationSchedule(item) : ((_item$_extend32 = item._extend) === null || _item$_extend32 === void 0 ? void 0 : _item$_extend32.holder_id) && appointmentTypes.includes(item.extension_type)
     );
   });
   var relationProducts = [];
   relationProducts = list.map(function (item) {
-    var _item$_extend34;
-    if (!((_item$_extend34 = item._extend) !== null && _item$_extend34 !== void 0 && _item$_extend34.unique_identification_number)) {
+    var _item$_extend33;
+    if (!((_item$_extend33 = item._extend) !== null && _item$_extend33 !== void 0 && _item$_extend33.unique_identification_number)) {
       var unique_identification_number = getUniqueId();
       item._extend.unique_identification_number = unique_identification_number;
     }
@@ -658,8 +649,8 @@ var formatNormalProducts = function formatNormalProducts(data) {
   });
   var relationProducts = [];
   relationProducts = list.map(function (item) {
-    var _item$_extend35;
-    if (!((_item$_extend35 = item._extend) !== null && _item$_extend35 !== void 0 && _item$_extend35.unique_identification_number)) {
+    var _item$_extend34;
+    if (!((_item$_extend34 = item._extend) !== null && _item$_extend34 !== void 0 && _item$_extend34.unique_identification_number)) {
       var unique_identification_number = getUniqueId();
       item._extend.unique_identification_number = unique_identification_number;
     }
@@ -716,11 +707,7 @@ export var formatValues = function formatValues(state) {
     relation_products: [],
     metadata: {}
   };
-
-  // 是是跨日预约模版
   var isDay = isDaysBooking(state);
-  // 是否包含跨日预约商品
-  var isHasMultiDay = getHasMultiDayProduct(state);
   var isEvent = isEventBooking(state);
   if (!state.bookingId || isDay) {
     // 备注
@@ -743,8 +730,8 @@ export var formatValues = function formatValues(state) {
   // 主体
   values.holder = formatHolder(state, values);
   // todo
-  if (isEvent) {
-    values.relation_products = formatRelationProducts(state, 'event');
+  if (isDay || isEvent) {
+    values.relation_products = formatRelationProducts(state, isDay ? 'day' : 'event');
   } else {
     var _values$relation_prod;
     values.relation_products = formatNormalProducts(state);
@@ -765,7 +752,7 @@ export var formatValues = function formatValues(state) {
   }
 
   // 跨日预约增加多余参数区分
-  if (isDay || isHasMultiDay) {
+  if (isDay) {
     values.metadata.is_multiday_appointment = 1;
     // is_bundle_price_calculated 用于区分商品的price是总价，还是商品的单价
     // values.is_bundle_price_calculated = 1
@@ -784,19 +771,19 @@ export var checkHolderIsError = function checkHolderIsError(state) {
   var _state$client;
   var errorRowKey = '';
   var holderError = state.service.value.some(function (item) {
-    var _item$_extend37;
+    var _item$_extend36;
     // 普通商品不需要检测holder
     if (isNormalProductByDurationSchedule(item)) {
       return false;
     }
     if (item._extend.quantity === 1 && !item._extend.holder_id) {
-      var _item$_extend36;
-      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend36 = item._extend) === null || _item$_extend36 === void 0 || (_item$_extend36 = _item$_extend36.other) === null || _item$_extend36 === void 0 ? void 0 : _item$_extend36.rowKey);
+      var _item$_extend35;
+      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend35 = item._extend) === null || _item$_extend35 === void 0 || (_item$_extend35 = _item$_extend35.other) === null || _item$_extend35 === void 0 ? void 0 : _item$_extend35.rowKey);
       return true;
     }
-    if (item._extend.quantity > 1 && ((_item$_extend37 = item._extend) === null || _item$_extend37 === void 0 || (_item$_extend37 = _item$_extend37.holder_id) === null || _item$_extend37 === void 0 ? void 0 : _item$_extend37.length) !== item._extend.quantity) {
-      var _item$_extend38;
-      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend38 = item._extend) === null || _item$_extend38 === void 0 || (_item$_extend38 = _item$_extend38.other) === null || _item$_extend38 === void 0 ? void 0 : _item$_extend38.rowKey);
+    if (item._extend.quantity > 1 && ((_item$_extend36 = item._extend) === null || _item$_extend36 === void 0 || (_item$_extend36 = _item$_extend36.holder_id) === null || _item$_extend36 === void 0 ? void 0 : _item$_extend36.length) !== item._extend.quantity) {
+      var _item$_extend37;
+      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend37 = item._extend) === null || _item$_extend37 === void 0 || (_item$_extend37 = _item$_extend37.other) === null || _item$_extend37 === void 0 ? void 0 : _item$_extend37.rowKey);
       return true;
     }
     return false;

package/es/components/booking/forms/sendModal/useSendModal.d.ts

@@ -4,6 +4,6 @@ declare const useSendModal: (bookingId?: number) => {
     setOpen: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     handleOpen: () => void;
     handleValuesChange: (val: any) => void;
-    handleOk: (values: SendModalValues) => Promise<any>;
+    handleOk: (values: SendModalValues) => Promise<boolean | undefined>;
 };
 export default useSendModal;