@pisell/private-materials 6.3.118 → 6.3.120

package/es/plus/skuOptionsSelection/locales.js

@@ -7,8 +7,7 @@ export default {
     'pisell2.skuOptionsSelection.variantItemCard.soldOut': 'Out of stock',
     'pisell2.skuOptionsSelection.variantItemCard.price': 'Price',
     'pisell2.skuOptionsSelection.optionItemCard.typeText': 'Type',
-    'pisell2.skuOptionsSelection.optionItemCard.overSelected': 'Over selected',
-    'pisell2.skuOptionsSelection.optionItemCard.confirm': 'Confirm'
+    'pisell2.skuOptionsSelection.optionItemCard.overSelected': 'Over selected'
   },
   'zh-CN': {
     'pisell2.skuOptionsSelection.title': 'SKU 选项选择',
@@ -18,8 +17,7 @@ export default {
     'pisell2.skuOptionsSelection.variantItemCard.soldOut': '库存不足',
     'pisell2.skuOptionsSelection.variantItemCard.price': '价格',
     'pisell2.skuOptionsSelection.optionItemCard.typeText': '类型',
-    'pisell2.skuOptionsSelection.optionItemCard.overSelected': '已达上限',
-    'pisell2.skuOptionsSelection.optionItemCard.confirm': '确定'
+    'pisell2.skuOptionsSelection.optionItemCard.overSelected': '已达上限'
   },
   'zh-HK': {
     'pisell2.skuOptionsSelection.title': 'SKU 選項選擇',
@@ -29,29 +27,6 @@ export default {
     'pisell2.skuOptionsSelection.variantItemCard.soldOut': '庫存不足',
     'pisell2.skuOptionsSelection.variantItemCard.price': '價格',
     'pisell2.skuOptionsSelection.optionItemCard.typeText': '類型',
-    'pisell2.skuOptionsSelection.optionItemCard.overSelected': '已達上限',
-    'pisell2.skuOptionsSelection.optionItemCard.confirm': '確定'
-  },
-  ja: {
-    'pisell2.skuOptionsSelection.title': 'SKUオプション選択',
-    'pisell2.skuOptionsSelection.titleExtra.alreadySelected': '選択済み：{{num}}',
-    'pisell2.skuOptionsSelection.titleExtra.totalPrice': '小計：{{price}}',
-    'pisell2.skuOptionsSelection.optionItemCard.editSelections': '選択を編集',
-    'pisell2.skuOptionsSelection.variantItemCard.soldOut': '在庫切れ',
-    'pisell2.skuOptionsSelection.variantItemCard.price': '価格',
-    'pisell2.skuOptionsSelection.optionItemCard.typeText': 'タイプ',
-    'pisell2.skuOptionsSelection.optionItemCard.overSelected': '上限に達しました',
-    'pisell2.skuOptionsSelection.optionItemCard.confirm': '確定'
-  },
-  pt: {
-    'pisell2.skuOptionsSelection.title': 'Seleção de Opções SKU',
-    'pisell2.skuOptionsSelection.titleExtra.alreadySelected': 'Selecionado: {{num}}',
-    'pisell2.skuOptionsSelection.titleExtra.totalPrice': 'Subtotal: {{price}}',
-    'pisell2.skuOptionsSelection.optionItemCard.editSelections': 'Editar seleções',
-    'pisell2.skuOptionsSelection.variantItemCard.soldOut': 'Esgotado',
-    'pisell2.skuOptionsSelection.variantItemCard.price': 'Preço',
-    'pisell2.skuOptionsSelection.optionItemCard.typeText': 'Tipo',
-    'pisell2.skuOptionsSelection.optionItemCard.overSelected': 'Limite excedido',
-    'pisell2.skuOptionsSelection.optionItemCard.confirm': 'Confirmar'
+    'pisell2.skuOptionsSelection.optionItemCard.overSelected': '已達上限'
   }
 };

package/es/plus/skuOptionsSelection/store/store.js

@@ -11,8 +11,7 @@ export var initialState = {
   selectorValue: {},
   skuCardConfig: defaultSkuCardConfig,
   customConfig: {
-    modalWidth: '480px',
-    selectorLayout: null
+    modalWidth: '480px'
   }
 };
 var store = createStore(initialState);

package/es/plus/skuOptionsSelection/types.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="react" />
-import { LayoutConfig } from '../../pro/Selector/types';
 /**
  * SKU Card 文本样式配置
  */
@@ -30,13 +29,6 @@ export interface SkuCardImageConfig {
     /** 边框 */
     border?: string;
 }
-/**
- * SKU Card 禁用文本配置
- */
-export interface SkuCardDisabledTextConfig extends Omit<SkuCardTextConfig, 'lineClamp'> {
-    /** 文本（可能是多语言） */
-    text?: string;
-}
 /**
  * SKU Card 配置
  */
@@ -54,8 +46,6 @@ export interface SkuCardConfig {
      * - 默认不展示，避免影响现有业务 UI
      */
     variantPriceVisible?: boolean;
-    /** 禁用文本配置 */
-    disabledText?: SkuCardDisabledTextConfig;
 }
 /**
  * SKU store状态类型
@@ -77,20 +67,11 @@ export interface SkuSelectionState {
     selectorValue: Record<string | number, any>;
     /** SKU Card 配置 */
     skuCardConfig: SkuCardConfig;
-    /** 自定义样式 */
     style?: React.CSSProperties;
     /** 样式配置 */
     customConfig?: {
         /** 弹窗宽度 */
         modalWidth?: number | string;
-        /** 选项布局 */
-        selectorLayout?: LayoutConfig | null;
-    };
-    /** 主题 */
-    theme?: {
-        token?: {
-            colorPrimary?: string;
-        };
     };
 }
 /** SKU Card 默认配置 */
@@ -117,14 +98,6 @@ export interface IProps {
     customConfig?: {
         /** 弹窗宽度 */
         modalWidth?: number | string;
-        /** 选项布局 */
-        selectorLayout?: LayoutConfig | null;
-    };
-    /** 主题 */
-    theme: {
-        token?: {
-            colorPrimary?: string;
-        };
     };
 }
 export interface DataSource {
@@ -434,8 +407,6 @@ export interface SkuValue {
     product_option_string?: string;
     /** 套餐商品组数据 */
     bundle: Array<any>;
-    /** 价格 */
-    price?: string | number;
     /** 单规格组数据 */
     option: Array<OptionItem & {
         num: number;

package/es/plus/skuOptionsSelection/types.js

@@ -6,10 +6,6 @@
  * SKU Card 图片配置
  */
 
-/**
- * SKU Card 禁用文本配置
- */
-
 /**
  * SKU Card 配置
  */

package/es/plus/skuOptionsSelection/utils/transformBundleGroup.js

@@ -10,16 +10,11 @@ import OptionsCard from "../components/OptionsCard";
 import NormalCard from "../components/NormalCard";
 import TitleExtra from "../components/TitleExtra";
 import { checkSkuDisabled, checkSkuStockCanSell } from "./checkSkuStatus";
-import store from "../store/store";
 
 // 定义基础数据类型（根据实际情况补充字段）
 
 export var transformBundleGroup = function transformBundleGroup(bundleGroup) {
-  var _store$getState$custo;
   if (!Array.isArray(bundleGroup)) return [];
-
-  // 获取自定义Selector布局配置
-  var selectorLayout = ((_store$getState$custo = store.getState().customConfig) === null || _store$getState$custo === void 0 ? void 0 : _store$getState$custo.selectorLayout) || null;
   var formattedGroup = bundleGroup.map(function (item) {
     var _item$bundle_item;
     // Selector中选项数据源
@@ -44,8 +39,7 @@ export var transformBundleGroup = function transformBundleGroup(bundleGroup) {
         },
         _extra: {
           canSell: canSell,
-          hasStock: hasStock,
-          disabled: disabled
+          hasStock: hasStock
         }
       };
     });
@@ -74,12 +68,9 @@ export var transformBundleGroup = function transformBundleGroup(bundleGroup) {
         }
       },
       stepperProps: {
-        horizontalPadding: '8px'
+        showInput: true
       }
     };
-    if (!!selectorLayout) {
-      selectorDataSource.layout = selectorLayout;
-    }
 
     // 渲染选项卡片
     selectorDataSource.renderItem = function (itemProps) {

package/es/plus/skuOptionsSelection/utils/transformOptionGroup.js

@@ -9,13 +9,8 @@ import React from 'react';
 import NormalCard from "../components/NormalCard";
 import TitleExtra from "../components/TitleExtra";
 import { checkSkuDisabled, checkSkuStockCanSell } from "./checkSkuStatus";
-import store from "../store/store";
 export var transformOptionGroup = function transformOptionGroup(optionGroup) {
-  var _store$getState$custo;
   if (!Array.isArray(optionGroup)) return [];
-
-  // 获取自定义Selector布局配置
-  var selectorLayout = ((_store$getState$custo = store.getState().customConfig) === null || _store$getState$custo === void 0 ? void 0 : _store$getState$custo.selectorLayout) || null;
   var formattedGroup = optionGroup.map(function (item) {
     var _item$option_item;
     // Selector中选项数据源
@@ -39,8 +34,7 @@ export var transformOptionGroup = function transformOptionGroup(optionGroup) {
         },
         _extra: {
           canSell: canSell,
-          hasStock: hasStock,
-          disabled: disabled
+          hasStock: hasStock
         }
       };
     });
@@ -75,12 +69,9 @@ export var transformOptionGroup = function transformOptionGroup(optionGroup) {
         }
       },
       stepperProps: {
-        horizontalPadding: '8px'
+        showInput: true
       }
     };
-    if (!!selectorLayout) {
-      selectorDataSource.layout = selectorLayout;
-    }
 
     // 渲染选项卡片
     selectorDataSource.renderItem = function (itemProps) {

package/es/plus/skuOptionsSelection/utils/transformSelectorValueToValue.js

@@ -72,8 +72,7 @@ export var transformSelectorValueToValue = function transformSelectorValueToValu
                   _newData.option.push(_objectSpread({}, (_itemDataItem === null || _itemDataItem === void 0 ? void 0 : _itemDataItem.data) || {}));
                 }
               });
-              var _restPricePrefix = (rest === null || rest === void 0 ? void 0 : rest.price_type) === 'markdown' ? -1 : 1;
-              _newData.price = totalPrice.plus(new Decimal((rest === null || rest === void 0 ? void 0 : rest.price) || 0).times(_restPricePrefix)).toString();
+              _newData.price = totalPrice.plus(new Decimal((rest === null || rest === void 0 ? void 0 : rest.price) || 0)).toFixed(2);
               _newData.original_price = _newData === null || _newData === void 0 ? void 0 : _newData.price;
               _newData.original_total = _newData === null || _newData === void 0 ? void 0 : _newData.price;
               _newData.quantity = (_item === null || _item === void 0 ? void 0 : _item.quantity) || 0;
@@ -82,12 +81,7 @@ export var transformSelectorValueToValue = function transformSelectorValueToValu
             }
           });
         } else {
-          var _newData = _objectSpread({}, (item === null || item === void 0 ? void 0 : item.data) || {});
-          var _pricePrefix = (_newData === null || _newData === void 0 ? void 0 : _newData.price_type) === 'markdown' ? -1 : 1;
-          _newData.price = new Decimal((_newData === null || _newData === void 0 ? void 0 : _newData.price) || 0).times(_pricePrefix).toString();
-          _newData.original_price = _newData === null || _newData === void 0 ? void 0 : _newData.price;
-          _newData.original_total = _newData === null || _newData === void 0 ? void 0 : _newData.price;
-          transformValue.bundle.push(_newData);
+          transformValue.bundle.push(item === null || item === void 0 ? void 0 : item.data);
         }
       });
     });
@@ -159,6 +153,5 @@ export var transformSelectorValueToValue = function transformSelectorValueToValu
       }
     }
   }
-  console.log('transformSelectorValueToValue>>>>>', transformValue);
   return transformValue;
 };

package/es/plus/skuOptionsSelection/utils/transformValueToSelectorValue.js

@@ -1,13 +1,13 @@
 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); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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); }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 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); }
@@ -21,7 +21,6 @@ import Decimal from 'decimal.js';
  */
 export var transformValueToSelectorValue = function transformValueToSelectorValue(value, dataSource) {
   var _Object$keys, _Object$keys2;
-  console.log('transformValueToSelectorValue_value>>>>>>>', value);
   if (!value || !dataSource || ((_Object$keys = Object.keys(value || {})) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length) === 0 || ((_Object$keys2 = Object.keys(dataSource || {})) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.length) === 0) {
     return {};
   }
@@ -62,7 +61,35 @@ export var transformValueToSelectorValue = function transformValueToSelectorValu
 
   // 单规格商品数据
   if (value !== null && value !== void 0 && value.option) {
-    transformValue = createOptionValue(transformValue, value, dataSource);
+    var _value$option, _value$option$forEach;
+    var _createOptionValue = function _createOptionValue(v) {
+      var pricePrefix = (v === null || v === void 0 ? void 0 : v.price_type) === 'markdown' ? -1 : 1;
+      return {
+        data: _objectSpread({}, v || {}),
+        quantity: (v === null || v === void 0 ? void 0 : v.quantity) || 1,
+        value: v === null || v === void 0 ? void 0 : v.id,
+        totalPrice: new Decimal((v === null || v === void 0 ? void 0 : v.price) || 0).times(pricePrefix).times((v === null || v === void 0 ? void 0 : v.quantity) || 1).toNumber()
+      };
+    };
+    value === null || value === void 0 || (_value$option = value.option) === null || _value$option === void 0 || (_value$option$forEach = _value$option.forEach) === null || _value$option$forEach === void 0 || _value$option$forEach.call(_value$option, function (v1) {
+      // 1.首先判定transformValue中是否存在该group的key，如果存在则需要将v1的数据合并到transformValue中
+      console.log('v1>>>>>', transformValue[v1 === null || v1 === void 0 ? void 0 : v1.group_id], transformValue);
+      var _optionGroupId = v1 === null || v1 === void 0 ? void 0 : v1.option_group_id;
+      if (transformValue[_optionGroupId]) {
+        transformValue[_optionGroupId] = [].concat(_toConsumableArray(transformValue[_optionGroupId] || []), [_createOptionValue(v1)]);
+      } else {
+        var _dataSource$option_gr;
+        // 从dataSource中的option_group中匹配出group数据，判断该group是单选还是多选
+        var groupItem = dataSource === null || dataSource === void 0 || (_dataSource$option_gr = dataSource.option_group) === null || _dataSource$option_gr === void 0 ? void 0 : _dataSource$option_gr.find(function (v2) {
+          return (v2 === null || v2 === void 0 ? void 0 : v2.id) === _optionGroupId;
+        });
+        if ((groupItem === null || groupItem === void 0 ? void 0 : groupItem.is_multiple) == 1) {
+          transformValue[_optionGroupId] = [_createOptionValue(v1)];
+        } else {
+          transformValue[_optionGroupId] = _createOptionValue(v1);
+        }
+      }
+    });
   }
 
   // 组合规格商品数据
@@ -144,13 +171,12 @@ var createBundleValue = function createBundleValue(v, dataSource) {
   if (!_createdValue) {
     return null;
   }
-  var totalQuantity = 0;
   v === null || v === void 0 || (_v$bundleOptions = v.bundleOptions) === null || _v$bundleOptions === void 0 || (_v$bundleOptions$forE = _v$bundleOptions.forEach) === null || _v$bundleOptions$forE === void 0 || _v$bundleOptions$forE.call(_v$bundleOptions, function (v1) {
     var _v1$option, _findedBundleItem2;
     if (v1 !== null && v1 !== void 0 && (_v1$option = v1.option) !== null && _v1$option !== void 0 && _v1$option.length) {
       var _createdValue2;
       var _data = ((_createdValue2 = _createdValue) === null || _createdValue2 === void 0 || (_createdValue2 = _createdValue2.data) === null || _createdValue2 === void 0 ? void 0 : _createdValue2._data) || [];
-      var _createdValueData = createOptionValue({}, v1, findedBundleItem);
+      var _createdValueData = createOptionValue(v1, findedBundleItem);
       _data.push({
         value: v1 === null || v1 === void 0 ? void 0 : v1.id,
         data: _createdValueData,
@@ -158,58 +184,41 @@ var createBundleValue = function createBundleValue(v, dataSource) {
       });
       _createdValue.data._data = _data;
     }
-    // 计算总数量，优先使用quantity，没有的话则使用num
-    totalQuantity = totalQuantity + ((v1 === null || v1 === void 0 ? void 0 : v1.quantity) || (v1 === null || v1 === void 0 ? void 0 : v1.num) || 1);
-    // 优先传入的价格，没有的话则从原始数据中获取
-    var _price = (v1 === null || v1 === void 0 ? void 0 : v1.price) || ((_findedBundleItem2 = findedBundleItem) === null || _findedBundleItem2 === void 0 ? void 0 : _findedBundleItem2.price) || 0;
-    _createdValue.totalPrice = new Decimal(_createdValue.totalPrice || 0).plus(new Decimal(_price).times((v1 === null || v1 === void 0 ? void 0 : v1.quantity) || 1)).toNumber();
+    _createdValue.quantity = (_createdValue.quantity || 0) + ((v1 === null || v1 === void 0 ? void 0 : v1.quantity) || 0);
+    var _pricePrefix = ((_findedBundleItem2 = findedBundleItem) === null || _findedBundleItem2 === void 0 ? void 0 : _findedBundleItem2.price_type) === 'markdown' ? -1 : 1;
+    _createdValue.totalPrice = new Decimal(_createdValue.totalPrice || 0).plus(new Decimal((v1 === null || v1 === void 0 ? void 0 : v1.price) || 0).times((v1 === null || v1 === void 0 ? void 0 : v1.quantity) || 1).times(_pricePrefix)).toNumber();
   });
-  _createdValue.quantity = totalQuantity;
-  _createdValue.data.quantity = totalQuantity;
-  _createdValue.data.num = totalQuantity;
   return _createdValue;
 };
 
 /**
- * 创建单规格商品value
+ * 创建套餐中单规格商品数据
  */
-var createOptionValue = function createOptionValue(initValue, value, dataSource) {
-  var _value$option, _value$option$forEach;
-  var _createdValue = initValue || {};
-  value === null || value === void 0 || (_value$option = value.option) === null || _value$option === void 0 || (_value$option$forEach = _value$option.forEach) === null || _value$option$forEach === void 0 || _value$option$forEach.call(_value$option, function (v1) {
-    var _dataSource$option_gr, _matchedGroup$option_;
+var createOptionValue = function createOptionValue(v, bundleItem) {
+  var _v$option, _v$option$forEach;
+  var _createdValue = {};
+  v === null || v === void 0 || (_v$option = v.option) === null || _v$option === void 0 || (_v$option$forEach = _v$option.forEach) === null || _v$option$forEach === void 0 || _v$option$forEach.call(_v$option, function (v1) {
     var _optionGroupId = v1 === null || v1 === void 0 ? void 0 : v1.option_group_id;
-    // 从dataSource?.option_group的option_item中匹配出option数据
-    var matchedGroup = dataSource === null || dataSource === void 0 || (_dataSource$option_gr = dataSource.option_group) === null || _dataSource$option_gr === void 0 ? void 0 : _dataSource$option_gr.find(function (v2) {
-      return (v2 === null || v2 === void 0 ? void 0 : v2.id) === _optionGroupId;
-    });
-    var matchedOptionItem = matchedGroup === null || matchedGroup === void 0 || (_matchedGroup$option_ = matchedGroup.option_item) === null || _matchedGroup$option_ === void 0 ? void 0 : _matchedGroup$option_.find(function (v3) {
-      return (v3 === null || v3 === void 0 ? void 0 : v3.id) === (v1 === null || v1 === void 0 ? void 0 : v1.id);
-    });
-    var _num = (v1 === null || v1 === void 0 ? void 0 : v1.quantity) || (v1 === null || v1 === void 0 ? void 0 : v1.num) || 1;
-    // 使用原始数据中的价格
-    var _price = (matchedOptionItem === null || matchedOptionItem === void 0 ? void 0 : matchedOptionItem.add_price) || 0;
-    var _tempOptionValue = {
-      data: _objectSpread(_objectSpread(_objectSpread({}, matchedOptionItem || {}), v1 || {}), {}, {
-        num: _num,
-        price: _price,
-        original_price: _price,
-        original_total: _price
-      }),
-      quantity: _num,
+    var pricePrefix = (v1 === null || v1 === void 0 ? void 0 : v1.price_type) === 'markdown' ? -1 : 1;
+    var _tempValue = {
+      data: _objectSpread({}, v1 || {}),
+      quantity: (v1 === null || v1 === void 0 ? void 0 : v1.quantity) || 1,
       value: v1 === null || v1 === void 0 ? void 0 : v1.id,
-      totalPrice: new Decimal((matchedOptionItem === null || matchedOptionItem === void 0 ? void 0 : matchedOptionItem.add_price) || 0).times(_num).toNumber()
+      totalPrice: new Decimal((v1 === null || v1 === void 0 ? void 0 : v1.price) || 0).times(pricePrefix).times((v1 === null || v1 === void 0 ? void 0 : v1.quantity) || 1).toNumber()
     };
-
-    // 首先判定_createdValue中是否存在该group的key，如果存在则需要将v1的数据合并到_createdValue中
-    if (_createdValue[_optionGroupId]) {
-      _createdValue[_optionGroupId] = [].concat(_toConsumableArray(_createdValue[_optionGroupId] || []), [_tempOptionValue]);
+    if (_createdValue !== null && _createdValue !== void 0 && _createdValue[_optionGroupId]) {
+      var _createdValue$_option;
+      _createdValue === null || _createdValue === void 0 || (_createdValue$_option = _createdValue[_optionGroupId]) === null || _createdValue$_option === void 0 || _createdValue$_option.push(_tempValue);
     } else {
-      // 从dataSource中的option_group中匹配出group数据，判断该group是单选还是多选
-      if ((matchedGroup === null || matchedGroup === void 0 ? void 0 : matchedGroup.is_multiple) == 1) {
-        _createdValue[_optionGroupId] = [_tempOptionValue];
+      var _bundleItem$option_gr;
+      // 需要从当前选项的option_group中匹配数据，判定出当前是单选还是多选
+      var optionGroupItem = bundleItem === null || bundleItem === void 0 || (_bundleItem$option_gr = bundleItem.option_group) === null || _bundleItem$option_gr === void 0 ? void 0 : _bundleItem$option_gr.find(function (v2) {
+        return (v2 === null || v2 === void 0 ? void 0 : v2.id) === (v1 === null || v1 === void 0 ? void 0 : v1.option_group_id);
+      });
+      if ((optionGroupItem === null || optionGroupItem === void 0 ? void 0 : optionGroupItem.is_multiple) == 1) {
+        _createdValue[_optionGroupId] = [_tempValue];
       } else {
-        _createdValue[_optionGroupId] = _tempOptionValue;
+        _createdValue[_optionGroupId] = _tempValue;
       }
     }
   });

package/es/plus/skuOptionsSelection/utils/transformVariantGroup.js

@@ -10,11 +10,9 @@ import store from "../store/store";
 import VariantCard from "../components/VariantCard";
 import { checkVariantStockCanSell, checkSkuDisabled, checkVariantStockByValue } from "./checkSkuStatus";
 export var transformVariantGroup = function transformVariantGroup(variantGroup) {
-  var _store$getState$dataS, _store$getState$custo;
+  var _store$getState$dataS;
   if (!Array.isArray(variantGroup)) return [];
   var variantProducts = ((_store$getState$dataS = store.getState().dataSource) === null || _store$getState$dataS === void 0 ? void 0 : _store$getState$dataS.variant) || [];
-  // 获取自定义Selector布局配置
-  var selectorLayout = ((_store$getState$custo = store.getState().customConfig) === null || _store$getState$custo === void 0 ? void 0 : _store$getState$custo.selectorLayout) || null;
   var formattedGroup = variantGroup.map(function (item) {
     var _item$variant_item;
     // Selector中选项数据源
@@ -40,8 +38,7 @@ export var transformVariantGroup = function transformVariantGroup(variantGroup)
         },
         _extra: {
           canSell: canSell,
-          hasStock: hasStock,
-          disabled: disabled
+          hasStock: hasStock
         }
       };
     });
@@ -74,12 +71,9 @@ export var transformVariantGroup = function transformVariantGroup(variantGroup)
         }
       },
       stepperProps: {
-        horizontalPadding: '8px'
+        showInput: true
       }
     };
-    if (!!selectorLayout) {
-      selectorDataSource.layout = selectorLayout;
-    }
 
     // 渲染选项卡片
     selectorDataSource.renderItem = function (itemProps) {

package/es/plus/walletEditor/components/relationProduct/index.d.ts

@@ -1,6 +1,7 @@
+import React from 'react';
 import './index.less';
 declare const RelationProduct: ({ value, onChange, }: {
     value?: string[] | undefined;
     onChange?: ((val: string[]) => void) | undefined;
-}) => JSX.Element | null;
+}) => React.JSX.Element | null;
 export default RelationProduct;

package/es/plus/walletEditor/components/sortableWalletPassTypes/index.d.ts

@@ -6,8 +6,6 @@ export interface MultiLanguageTitle {
     en?: string;
     'zh-CN'?: string;
     'zh-HK'?: string;
-    'ja'?: string;
-    'pt'?: string;
 }
 export interface WalletPassItem {
     /** 钱包通行证类型 */

package/es/plus/walletEditor/components/sortableWalletPassTypes/index.js

@@ -31,9 +31,7 @@ export var DEFAULT_WALLET_PASS_TYPES_CONFIG = [{
     original: 'Balance',
     en: 'Balance',
     'zh-CN': '余额',
-    'zh-HK': '餘額',
-    'ja': '残高',
-    'pt': 'Saldo'
+    'zh-HK': '餘額'
   }
 }, {
   type: 'point',
@@ -41,9 +39,7 @@ export var DEFAULT_WALLET_PASS_TYPES_CONFIG = [{
     original: 'Points',
     en: 'Points',
     'zh-CN': '积分',
-    'zh-HK': '積分',
-    'ja': 'ポイント',
-    'pt': 'Pontos'
+    'zh-HK': '積分'
   }
 }, {
   type: 'voucher',
@@ -51,9 +47,7 @@ export var DEFAULT_WALLET_PASS_TYPES_CONFIG = [{
     original: 'Voucher',
     en: 'Voucher',
     'zh-CN': '代金券',
-    'zh-HK': '代金券',
-    'ja': 'クーポン',
-    'pt': 'Cupom'
+    'zh-HK': '代金券'
   }
 }, {
   type: 'discount',
@@ -61,9 +55,7 @@ export var DEFAULT_WALLET_PASS_TYPES_CONFIG = [{
     original: 'Discount',
     en: 'Discount',
     'zh-CN': '折扣券',
-    'zh-HK': '折扣券',
-    'ja': '割引カード',
-    'pt': 'Cartão de desconto'
+    'zh-HK': '折扣券'
   }
 }];
 var SortableWalletPassTypes = function SortableWalletPassTypes(props) {

package/es/plus/walletEditor/locales.d.ts

@@ -131,93 +131,5 @@ declare const _default: {
         'pisell2.wallet-editor.holder.required': string;
         'pisell2.wallet-editor.holder.invalid': string;
     };
-    ja: {
-        walletName: string;
-        validityPeriod: string;
-        linkedPasses: string;
-        linkedPassesDesc: string;
-        sort: string;
-        status: string;
-        distributionConditions: string;
-        selectPasses: string;
-        backgroundImage: string;
-        advancedSettings: string;
-        sendConfig: string;
-        displaySettings: string;
-        viewPreview: string;
-        coverImage: string;
-        icon: string;
-        upload: string;
-        enable: string;
-        disable: string;
-        barCode: string;
-        qrCode: string;
-        day: string;
-        days: string;
-        month: string;
-        months: string;
-        year: string;
-        years: string;
-        forever: string;
-        custom: string;
-        balance: string;
-        point: string;
-        voucher: string;
-        discount: string;
-        rechargeable: string;
-        pleaseInputWalletName: string;
-        enterCoverImageURL: string;
-        enterJSONConfig: string;
-        selectValidityPeriod: string;
-        selectCustomDate: string;
-        registerToIssue: string;
-        'pisell2.wallet-editor.holder': string;
-        'pisell2.wallet-editor.holder.required': string;
-        'pisell2.wallet-editor.holder.invalid': string;
-    };
-    pt: {
-        walletName: string;
-        validityPeriod: string;
-        linkedPasses: string;
-        linkedPassesDesc: string;
-        sort: string;
-        status: string;
-        distributionConditions: string;
-        selectPasses: string;
-        backgroundImage: string;
-        advancedSettings: string;
-        sendConfig: string;
-        displaySettings: string;
-        viewPreview: string;
-        coverImage: string;
-        icon: string;
-        upload: string;
-        enable: string;
-        disable: string;
-        barCode: string;
-        qrCode: string;
-        day: string;
-        days: string;
-        month: string;
-        months: string;
-        year: string;
-        years: string;
-        forever: string;
-        custom: string;
-        balance: string;
-        point: string;
-        voucher: string;
-        discount: string;
-        rechargeable: string;
-        pleaseInputWalletName: string;
-        enterCoverImageURL: string;
-        enterJSONConfig: string;
-        selectValidityPeriod: string;
-        selectCustomDate: string;
-        registerToIssue: string;
-        'pisell2.wallet-editor.holder': string;
-        'pisell2.wallet-editor.holder.required': string;
-        'pisell2.wallet-editor.holder.invalid': string;
-    };
 };
 export default _default;