@pisell/private-materials 6.6.5 → 6.6.7

package/es/components/systemSettings/registry/utils/typeValidation.js

@@ -0,0 +1,284 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+/**
+ * 类型验证工具函数
+ * 用于验证默认值是否符合指定的字段类型
+ */
+
+/**
+ * 验证字符串类型
+ */
+var validateString = function validateString(value) {
+  if (value === null || value === undefined || value === '') {
+    return {
+      isValid: true
+    };
+  }
+  if (typeof value === 'string') {
+    return {
+      isValid: true
+    };
+  }
+  return {
+    isValid: false,
+    error: '默认值必须是字符串类型'
+  };
+};
+
+/**
+ * 验证整数类型
+ */
+var validateInteger = function validateInteger(value) {
+  if (value === null || value === undefined || value === '') {
+    return {
+      isValid: true
+    };
+  }
+
+  // 如果是数字，检查是否为整数
+  if (typeof value === 'number') {
+    if (!Number.isInteger(value)) {
+      return {
+        isValid: false,
+        error: '默认值必须是整数'
+      };
+    }
+    return {
+      isValid: true
+    };
+  }
+
+  // 如果是字符串，尝试转换
+  if (typeof value === 'string') {
+    var trimmed = value.trim();
+    if (trimmed === '') {
+      return {
+        isValid: true
+      };
+    }
+    var num = Number(trimmed);
+    if (isNaN(num) || !Number.isInteger(num)) {
+      return {
+        isValid: false,
+        error: '默认值必须是有效的整数'
+      };
+    }
+    return {
+      isValid: true
+    };
+  }
+  return {
+    isValid: false,
+    error: '默认值必须是有效的整数'
+  };
+};
+
+/**
+ * 验证浮点数类型
+ */
+var validateFloat = function validateFloat(value) {
+  if (value === null || value === undefined || value === '') {
+    return {
+      isValid: true
+    };
+  }
+
+  // 如果是数字，检查是否有效
+  if (typeof value === 'number') {
+    if (!isFinite(value)) {
+      return {
+        isValid: false,
+        error: '默认值必须是有效的数字'
+      };
+    }
+    return {
+      isValid: true
+    };
+  }
+
+  // 如果是字符串，尝试转换
+  if (typeof value === 'string') {
+    var trimmed = value.trim();
+    if (trimmed === '') {
+      return {
+        isValid: true
+      };
+    }
+    var num = Number(trimmed);
+    if (isNaN(num) || !isFinite(num)) {
+      return {
+        isValid: false,
+        error: '默认值必须是有效的数字'
+      };
+    }
+    return {
+      isValid: true
+    };
+  }
+  return {
+    isValid: false,
+    error: '默认值必须是有效的数字'
+  };
+};
+
+/**
+ * 验证布尔类型
+ */
+var validateBoolean = function validateBoolean(value) {
+  if (value === null || value === undefined || value === '') {
+    return {
+      isValid: true
+    };
+  }
+
+  // 如果是字符串，只接受 'true' 或 'false'
+  if (typeof value === 'string') {
+    var trimmed = value.trim().toLowerCase();
+    if (trimmed === '') {
+      return {
+        isValid: true
+      };
+    }
+    if (trimmed !== 'true' && trimmed !== 'false') {
+      return {
+        isValid: false,
+        error: '默认值必须是 true 或 false'
+      };
+    }
+    return {
+      isValid: true
+    };
+  }
+
+  // 如果是布尔类型
+  if (typeof value === 'boolean') {
+    return {
+      isValid: true
+    };
+  }
+  return {
+    isValid: false,
+    error: '默认值必须是 true 或 false'
+  };
+};
+
+/**
+ * 验证数组类型（JSON对象/数组）
+ */
+var validateArray = function validateArray(value) {
+  if (value === null || value === undefined || value === '') {
+    return {
+      isValid: true
+    };
+  }
+
+  // 如果是字符串，尝试解析为JSON
+  if (typeof value === 'string') {
+    var trimmed = value.trim();
+    if (trimmed === '') {
+      return {
+        isValid: true
+      };
+    }
+    try {
+      var parsed = JSON.parse(trimmed);
+      // 检查解析后的值是否为对象或数组
+      if (_typeof(parsed) !== 'object' || parsed === null) {
+        return {
+          isValid: false,
+          error: '默认值必须是有效的JSON对象或数组'
+        };
+      }
+      return {
+        isValid: true
+      };
+    } catch (error) {
+      return {
+        isValid: false,
+        error: '默认值必须是有效的JSON对象或数组'
+      };
+    }
+  }
+
+  // 如果是对象或数组
+  if (_typeof(value) === 'object' && value !== null) {
+    return {
+      isValid: true
+    };
+  }
+  return {
+    isValid: false,
+    error: '默认值必须是有效的JSON对象或数组'
+  };
+};
+
+/**
+ * 根据字段类型验证默认值
+ */
+export var validateDefaultValue = function validateDefaultValue(fieldType, defaultValue) {
+  if (!fieldType) {
+    return {
+      isValid: false,
+      error: '字段类型不能为空'
+    };
+  }
+  switch (fieldType.toLowerCase()) {
+    case 'string':
+      return validateString(defaultValue);
+    case 'integer':
+      return validateInteger(defaultValue);
+    case 'float':
+      return validateFloat(defaultValue);
+    case 'boolean':
+      return validateBoolean(defaultValue);
+    case 'array':
+      return validateArray(defaultValue);
+    default:
+      return {
+        isValid: false,
+        error: "\u4E0D\u652F\u6301\u7684\u5B57\u6BB5\u7C7B\u578B: ".concat(fieldType)
+      };
+  }
+};
+
+/**
+ * 解析默认值为对应的类型
+ */
+export var parseDefaultValue = function parseDefaultValue(fieldType, defaultValue) {
+  if (defaultValue === null || defaultValue === undefined || defaultValue === '') {
+    return null;
+  }
+  switch (fieldType.toLowerCase()) {
+    case 'string':
+      return String(defaultValue);
+    case 'integer':
+      if (typeof defaultValue === 'string') {
+        var trimmed = defaultValue.trim();
+        if (trimmed === '') return null;
+        return parseInt(trimmed, 10);
+      }
+      return defaultValue;
+    case 'float':
+      if (typeof defaultValue === 'string') {
+        var _trimmed = defaultValue.trim();
+        if (_trimmed === '') return null;
+        return parseFloat(_trimmed);
+      }
+      return defaultValue;
+    case 'boolean':
+      if (typeof defaultValue === 'string') {
+        var _trimmed2 = defaultValue.trim().toLowerCase();
+        if (_trimmed2 === '') return null;
+        return _trimmed2 === 'true';
+      }
+      return Boolean(defaultValue);
+    case 'array':
+      if (typeof defaultValue === 'string') {
+        var _trimmed3 = defaultValue.trim();
+        if (_trimmed3 === '') return null;
+        return JSON.parse(_trimmed3);
+      }
+      return defaultValue;
+    default:
+      return defaultValue;
+  }
+};

package/es/components/systemSettings/registry/utils/validators.js

@@ -0,0 +1,44 @@
+/**
+ * 验证器工具函数
+ */
+
+/**
+ * 创建带前缀的应用标识符验证器
+ * 用于验证设置项的键格式
+ */
+export var createPrefixedAppIdentifierValidator = function createPrefixedAppIdentifierValidator(sectionCode) {
+  return function (_, value) {
+    if (!value) {
+      return Promise.resolve();
+    }
+
+    // 检查是否以section code开头
+    var expectedPrefix = "".concat(sectionCode, ".");
+    if (!value.startsWith(expectedPrefix)) {
+      return Promise.reject(new Error("\u952E\u5FC5\u987B\u4EE5 \"".concat(expectedPrefix, "\" \u5F00\u5934")));
+    }
+
+    // 检查剩余部分的格式
+    var remainingPart = value.substring(expectedPrefix.length);
+    if (!remainingPart) {
+      return Promise.reject(new Error('键不能只包含前缀'));
+    }
+
+    // 验证格式：只能包含小写字母、数字、点、下划线
+    var validPattern = /^[a-z0-9._]+$/;
+    if (!validPattern.test(remainingPart)) {
+      return Promise.reject(new Error('键只能包含小写字母、数字、点、下划线'));
+    }
+
+    // 不能以点或下划线开头或结尾
+    if (remainingPart.startsWith('.') || remainingPart.startsWith('_') || remainingPart.endsWith('.') || remainingPart.endsWith('_')) {
+      return Promise.reject(new Error('键不能以点或下划线开头或结尾'));
+    }
+
+    // 不能包含连续的点或下划线
+    if (remainingPart.includes('..') || remainingPart.includes('__') || remainingPart.includes('._') || remainingPart.includes('_.')) {
+      return Promise.reject(new Error('键不能包含连续的点或下划线'));
+    }
+    return Promise.resolve();
+  };
+};

package/es/components/ticketBooking/components/addServiceVariant/addService.js

@@ -51,7 +51,7 @@ var productListSetting = {
   isStock: 0
 };
 var AddSerivce = function AddSerivce(props) {
-  var _context$appHelper, _context$appHelper$ge, _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _state$bookingConfig2, _state$client2;
+  var _context$appHelper, _context$appHelper2, _context$appHelper2$g, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _state$bookingConfig2, _state$client2;
   var onEdit = props.onEdit,
     state = props.state,
     dispatch = props.dispatch,
@@ -59,6 +59,8 @@ var AddSerivce = function AddSerivce(props) {
     renderMode = _props$renderMode === void 0 ? 'current' : _props$renderMode,
     productDisplayConfig = props.productDisplayConfig;
   var context = useEngineContext();
+  var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
+    getData = _context$appHelper$ut.getData;
   var notAvailableRef = useRef(null);
   request.setRequest(context.appHelper.utils.request);
   var isActive = useIsActive();
@@ -71,7 +73,7 @@ var AddSerivce = function AddSerivce(props) {
     }),
     createBookingData = _useService.createBookingData,
     createBooking = _useService.createBooking;
-  var isBooking4 = isBooking4Shop(((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getData) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.call(_context$appHelper, 'shop_id')) || ((_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), state === null || state === void 0 ? void 0 : state.renderType, (_context$appHelper$ut3 = context.appHelper.utils) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.businessUtils);
+  var isBooking4 = isBooking4Shop(((_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 || (_context$appHelper2 = _context$appHelper2.utils) === null || _context$appHelper2 === void 0 || (_context$appHelper2$g = _context$appHelper2.getData) === null || _context$appHelper2$g === void 0 ? void 0 : _context$appHelper2$g.call(_context$appHelper2, 'shop_id')) || ((_context$appHelper$ut2 = context.appHelper.utils.store) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut2.getState) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.call(_context$appHelper$ut2)) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.global) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.globalConfig) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.id), state === null || state === void 0 ? void 0 : state.renderType, (_context$appHelper$ut4 = context.appHelper.utils) === null || _context$appHelper$ut4 === void 0 ? void 0 : _context$appHelper$ut4.businessUtils);
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     currentProduct = _useState2[0],
@@ -218,8 +220,8 @@ var AddSerivce = function AddSerivce(props) {
   // 处理添加服务的逻辑（提取为独立函数，方便跨日商品确认后调用）
   var processAddService = useMemoizedFn( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item, _detail, e, notShowToast, startDate, endDate) {
-      var _state$client3, _state$bookingConfig3;
-      var other, cacheItem, _total, _isEdit, _stateRef$current$ser, isMultiDay, getMultiDayCacheItem, res, _state$bookingConfig4, _addService2, _list, quantity, _context$appHelper$ut4, _context$appHelper$ut5, val, sendData, _window$openBookingEd, _window;
+      var _state$bookingConfig3, _state$client3, _state$bookingConfig4;
+      var other, cacheItem, _total, _isEdit, _stateRef$current$ser, isMultiDay, getMultiDayCacheItem, res, _state$bookingConfig5, _addService2, _list, quantity, _context$appHelper$ut5, _context$appHelper$ut6, val, sendData, _window$openBookingEd, _window;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -229,13 +231,16 @@ var AddSerivce = function AddSerivce(props) {
               product_id: item.id,
               _id: getUniqueId(),
               _key: e.key,
+              is_price_include_tax: getData('is_price_include_tax'),
               _extend: {
                 start_date: startDate,
                 quantity: (e === null || e === void 0 ? void 0 : e.quantity) || 1,
                 price: _detail.price,
                 product_name: item.title,
                 other: other,
-                end_date: endDate
+                end_date: endDate,
+                isFormSubject: (state === null || state === void 0 || (_state$bookingConfig3 = state.bookingConfig) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.config) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.basic) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.appointment_subject) === null || _state$bookingConfig3 === void 0 ? void 0 : _state$bookingConfig3.type) === 'form',
+                isNormalProduct: isNormalProductByDurationSchedule(item)
               },
               new: 1
             });
@@ -287,7 +292,7 @@ var AddSerivce = function AddSerivce(props) {
                 return _ref2.apply(this, arguments);
               };
             }(); // 如果没有 holder 数据，且此时要求选择 holder，则弹出 holder 弹窗
-            if (!(!isNormalProductByDurationSchedule(cacheItem) && (!cacheItem._extend.holder_id || !cacheItem._extend.holder_id.length) && !isWalkIn((_state$client3 = state.client) === null || _state$client3 === void 0 || (_state$client3 = _state$client3.value) === null || _state$client3 === void 0 ? void 0 : _state$client3.id) && (state === null || state === void 0 || (_state$bookingConfig3 = state.bookingConfig) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.config) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.basic) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.appointment_subject) === null || _state$bookingConfig3 === void 0 ? void 0 : _state$bookingConfig3.show_hold_on_add_cart) !== 0)) {
+            if (!(!isNormalProductByDurationSchedule(cacheItem) && (!cacheItem._extend.holder_id || !cacheItem._extend.holder_id.length) && !isWalkIn((_state$client3 = state.client) === null || _state$client3 === void 0 || (_state$client3 = _state$client3.value) === null || _state$client3 === void 0 ? void 0 : _state$client3.id) && (state === null || state === void 0 || (_state$bookingConfig4 = state.bookingConfig) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.config) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.basic) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.appointment_subject) === null || _state$bookingConfig4 === void 0 ? void 0 : _state$bookingConfig4.show_hold_on_add_cart) !== 0)) {
               _context2.next = 22;
               break;
             }
@@ -303,7 +308,7 @@ var AddSerivce = function AddSerivce(props) {
             _context2.next = 22;
             break;
           case 20:
-            if (!((state === null || state === void 0 || (_state$bookingConfig4 = state.bookingConfig) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.config) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.basic) === null || _state$bookingConfig4 === void 0 ? void 0 : _state$bookingConfig4.subject_require) === 'require')) {
+            if (!((state === null || state === void 0 || (_state$bookingConfig5 = state.bookingConfig) === null || _state$bookingConfig5 === void 0 || (_state$bookingConfig5 = _state$bookingConfig5.config) === null || _state$bookingConfig5 === void 0 || (_state$bookingConfig5 = _state$bookingConfig5.basic) === null || _state$bookingConfig5 === void 0 ? void 0 : _state$bookingConfig5.subject_require) === 'require')) {
               _context2.next = 22;
               break;
             }
@@ -336,7 +341,7 @@ var AddSerivce = function AddSerivce(props) {
               }
             }));
             try {
-              if (((_context$appHelper$ut4 = context.appHelper.utils.store) === null || _context$appHelper$ut4 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut4.getState) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.call(_context$appHelper$ut4)) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.global) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.globalConfig) === null || _context$appHelper$ut5 === void 0 ? void 0 : _context$appHelper$ut5.id) === 2155) {
+              if (((_context$appHelper$ut5 = context.appHelper.utils.store) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut6 = _context$appHelper$ut5.getState) === null || _context$appHelper$ut6 === void 0 || (_context$appHelper$ut6 = _context$appHelper$ut6.call(_context$appHelper$ut5)) === null || _context$appHelper$ut6 === void 0 || (_context$appHelper$ut6 = _context$appHelper$ut6.global) === null || _context$appHelper$ut6 === void 0 || (_context$appHelper$ut6 = _context$appHelper$ut6.globalConfig) === null || _context$appHelper$ut6 === void 0 ? void 0 : _context$appHelper$ut6.id) === 2155) {
                 val = _list === null || _list === void 0 ? void 0 : _list.map(function (s) {
                   return {
                     product_id: s === null || s === void 0 ? void 0 : s.product_id,

package/es/components/ticketBooking/components/addServiceVariant/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ProductDisplayConfig, ProductDisplayPresetKey } from '../ProductDisplayAdapter/types';
 interface AddServiceVariantProps {
     globalState: any;

package/es/components/ticketBooking/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ProductDisplayConfig, ProductDisplayPresetKey } from './components/ProductDisplayAdapter/types';
 import './index.less';
 interface TicketBookingProps {

package/es/components/ticketBooking/utils/index.d.ts

@@ -47,7 +47,7 @@ declare type ScanData = {
     };
 };
 export declare const formatScanCustomer: (data: ScanData) => {
-    searchType: "customer" | "wallet" | "walletPass" | "product" | "local_product";
+    searchType: "product" | "customer" | "wallet" | "walletPass" | "local_product";
     data: any;
     scanCode: string;
 } | null;
@@ -79,7 +79,11 @@ export declare const rulesHooks: {
         num: any;
         quantity: any;
         vouchersApplicable: any;
+        holder_id: any;
+        isNeedHolder: any;
         startDate: any;
+        bundle: any;
+        options: any;
     };
     setProduct(product: Record<string, any>, values: {
         total: number;

package/es/components/ticketBooking/utils/index.js

@@ -160,21 +160,30 @@ export var addService = function addService(list, addItem, state, isMultiDay) {
     // 是否设置过 只追加到第一个中
     var isSetCount = false;
     value = list.map(function (item) {
+      var _item$_extend;
       // 是否商品券折扣的商品
       var isGoodPassDiscountProduct = (item.discount_list || []).some(function (item) {
         return item.type === 'good_pass';
       });
       var isEdit = item === null || item === void 0 ? void 0 : item.edit;
-      if (isSameProduct(item, addItem) && !isSetCount && !isGoodPassDiscountProduct && !isEdit) {
-        var _item$_extend, _addItem$_extend, _item$_extend2;
+      // 子商品是否有商品券折扣的商品
+      var bundleDiscountList = [];
+      ((item === null || item === void 0 || (_item$_extend = item._extend) === null || _item$_extend === void 0 || (_item$_extend = _item$_extend.other) === null || _item$_extend === void 0 ? void 0 : _item$_extend.bundle) || []).forEach(function (item) {
+        bundleDiscountList.push.apply(bundleDiscountList, _toConsumableArray((item === null || item === void 0 ? void 0 : item.discount_list) || []));
+      });
+      var isGoodPassBundleProduct = bundleDiscountList.some(function (item) {
+        return item.type === 'good_pass';
+      });
+      if (isSameProduct(item, addItem) && !isSetCount && !isGoodPassDiscountProduct && !isEdit && !isGoodPassBundleProduct) {
+        var _item$_extend2, _addItem$_extend, _item$_extend3;
         isNotSame = false;
-        var quantity = ((item === null || item === void 0 || (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.quantity) || 1) + ((addItem === null || addItem === void 0 || (_addItem$_extend = addItem._extend) === null || _addItem$_extend === void 0 ? void 0 : _addItem$_extend.quantity) || 1);
+        var quantity = ((item === null || item === void 0 || (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.quantity) || 1) + ((addItem === null || addItem === void 0 || (_addItem$_extend = addItem._extend) === null || _addItem$_extend === void 0 ? void 0 : _addItem$_extend.quantity) || 1);
         count = quantity;
         isSetCount = true;
         return _objectSpread(_objectSpread({}, item), {}, {
           _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
             quantity: quantity,
-            other: _objectSpread(_objectSpread({}, ((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.other) || {}), {}, {
+            other: _objectSpread(_objectSpread({}, ((_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.other) || {}), {}, {
               quantity: quantity
             })
           })
@@ -255,11 +264,11 @@ export var getIsShowNumber = function getIsShowNumber(item, state) {
 
 // 生成服务key
 export var genServiceKey = function genServiceKey(item) {
-  var _item$_extend3, _item$_extend4, _item$_extend5;
+  var _item$_extend4, _item$_extend5, _item$_extend6;
   var product_id = item.product_id;
-  var durationKey = (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.duration;
-  var start_time = (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.start_time;
-  var total = (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.total;
+  var durationKey = (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.duration;
+  var start_time = (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.start_time;
+  var total = (_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.total;
   var resourceKey = '';
   Object.values(item._extend.resource || []).forEach(function (resources) {
     resources.forEach(function (resource) {
@@ -271,15 +280,15 @@ export var genServiceKey = function genServiceKey(item) {
 //
 // 生成 holder key
 export var genHolderKey = function genHolderKey(item) {
-  var _item$_extend6;
+  var _item$_extend7;
   var product_id = item.product_id;
   var holder_id;
-  if (isArr((_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.holder_id)) {
-    var _item$_extend7;
-    holder_id = (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.holder_id.join('-');
-  } else {
+  if (isArr((_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.holder_id)) {
     var _item$_extend8;
-    holder_id = (_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.holder_id;
+    holder_id = (_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.holder_id.join('-');
+  } else {
+    var _item$_extend9;
+    holder_id = (_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.holder_id;
   }
   return "".concat(product_id, "-").concat(holder_id);
 };
@@ -378,18 +387,23 @@ export var getShopDiscountKey = function getShopDiscountKey(osKey) {
 export var rulesHooks = {
   // 获取商品关键信息
   getProduct: function getProduct(product) {
+    var _product$_extend, _product$_extend2, _product$_extend3, _product$_extend4;
     var detail = {
       booking_id: product.booking_id,
       id: product.id,
       _id: product._id,
-      price: product.price,
+      price: product._extend.price,
       total: product._extend.total,
       discount_list: product.discount_list,
       origin_total: product._extend.origin_total,
       num: product._extend.quantity,
       quantity: product._extend.quantity || 1,
       vouchersApplicable: product.vouchersApplicable,
-      startDate: product._extend.startDate
+      holder_id: (_product$_extend = product._extend) === null || _product$_extend === void 0 ? void 0 : _product$_extend.holder_id,
+      isNeedHolder: product._extend.isFormSubject && !product._extend.isNormalProduct,
+      startDate: (_product$_extend2 = product._extend) === null || _product$_extend2 === void 0 ? void 0 : _product$_extend2.startDate,
+      bundle: ((_product$_extend3 = product._extend) === null || _product$_extend3 === void 0 || (_product$_extend3 = _product$_extend3.other) === null || _product$_extend3 === void 0 ? void 0 : _product$_extend3.bundle) || [],
+      options: ((_product$_extend4 = product._extend) === null || _product$_extend4 === void 0 || (_product$_extend4 = _product$_extend4.other) === null || _product$_extend4 === void 0 ? void 0 : _product$_extend4.option) || []
     };
     return detail;
   },
@@ -397,8 +411,14 @@ export var rulesHooks = {
     var detail = _objectSpread(_objectSpread({}, product), {}, {
       _id: values._id || product._id,
       discount_list: values.discount_list,
-      _extend: _objectSpread(_objectSpread(_objectSpread({}, product._extend), 'total' in values ? {
+      _extend: _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, product._extend), {}, {
+        other: _objectSpread(_objectSpread({}, product._extend.other), 'bundle' in values ? {
+          bundle: values.bundle
+        } : {})
+      }, 'total' in values ? {
         total: values.total
+      } : {}), 'main_product_selling_price' in values ? {
+        main_product_selling_price: values.main_product_selling_price
       } : {}), 'quantity' in values ? {
         quantity: values.quantity
       } : {})

package/es/components/walletList/index.d.ts

@@ -1,28 +1,3 @@
-import React from 'react';
 import './index.less';
-declare module 'react' {
-    interface HTMLAttributes<T> {
-        role?: string;
-    }
-}
-declare global {
-    namespace JSX {
-        interface IntrinsicElements {
-            div: React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement> & {
-                children?: React.ReactNode;
-                onClick?: React.MouseEventHandler<HTMLDivElement>;
-                onMouseDown?: React.MouseEventHandler<HTMLDivElement>;
-                onMouseUp?: React.MouseEventHandler<HTMLDivElement>;
-                onTouchStart?: React.TouchEventHandler<HTMLDivElement>;
-                onTouchEnd?: React.TouchEventHandler<HTMLDivElement>;
-                role?: string;
-            };
-            img: React.DetailedHTMLProps<React.ImgHTMLAttributes<HTMLImageElement>, HTMLImageElement>;
-            span: React.DetailedHTMLProps<React.HTMLAttributes<HTMLSpanElement>, HTMLSpanElement> & {
-                children?: React.ReactNode;
-            };
-        }
-    }
-}
 declare const WalletList: (props: any) => JSX.Element;
 export default WalletList;