@pisell/private-materials 6.3.122 → 6.3.124

package/lib/plus/skuOptionsSelection/components/OptionsModal/index.js

@@ -34,6 +34,7 @@ __export(OptionsModal_exports, {
 module.exports = __toCommonJS(OptionsModal_exports);
 var import_react = __toESM(require("react"));
 var import_materials = require("@pisell/materials");
+var import_utils = require("@pisell/utils");
 var import_Selector = __toESM(require("../../../../pro/Selector"));
 var import_NumericStepper = __toESM(require("../../../../pro/NumericStepper"));
 var import_hooks = require("../../hooks");
@@ -45,6 +46,7 @@ var OptionsModal = (props) => {
   const [stepNumber, setStepNumber] = (0, import_react.useState)(1);
   const [modalValue, setModalValue] = (0, import_react.useState)((props == null ? void 0 : props.modalValue) || {});
   const customConfig = (0, import_hooks.useStore)((s) => s.customConfig);
+  console.log(customConfig, "customConfig>>>>>>>");
   (0, import_react.useEffect)(() => {
     var _a2, _b2;
     if (!!((_a2 = props == null ? void 0 : props.modalValue) == null ? void 0 : _a2.quantity)) {
@@ -89,7 +91,7 @@ var OptionsModal = (props) => {
       open,
       onCancel,
       title,
-      footer: /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-plus-sku-options-card-footer" }, /* @__PURE__ */ import_react.default.createElement(
+      footer: /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-plus-sku-options-card-footer" }, /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement(
         import_NumericStepper.default,
         {
           min: canSelectedMin,
@@ -97,19 +99,17 @@ var OptionsModal = (props) => {
           value: stepNumber,
           onChange: (value) => {
             setStepNumber(value);
-          },
-          showInput: true
+          }
         }
-      ), /* @__PURE__ */ import_react.default.createElement(
+      )), /* @__PURE__ */ import_react.default.createElement(
         import_materials.Button,
         {
           type: "primary",
           onClick: handleConfirm,
           size: "large",
-          block: true,
-          style: { backgroundColor: "#7F56D9", borderColor: "#7F56D9" }
+          block: true
         },
-        "确定"
+        import_utils.locales.getText("pisell2.skuOptionsSelection.optionItemCard.confirm")
       )),
       footerDivider: false,
       destroyOnClose: true,

package/lib/plus/skuOptionsSelection/index.js

@@ -129,14 +129,15 @@ var SKUOptionsSelection = (0, import_react.forwardRef)((props, ref) => {
       value: selectorValue,
       onChange: (values) => {
         var _a;
-        console.log("total_values>>>>>", values);
+        console.log("selector_onChange_values>>>>>>>", values);
         import_store.actions.updateSelectorValue(values);
         const transformValue = (0, import_utils2.transformSelectorValueToValue)(values);
-        console.log("transform_total_values>>>>>", transformValue);
+        console.log("selector_onChange_transformValue>>>>>>>", transformValue);
         (_a = props == null ? void 0 : props.onChange) == null ? void 0 : _a.call(props, transformValue);
       },
       style: props == null ? void 0 : props.style,
-      customScrollParent: props == null ? void 0 : props.customScrollParent
+      customScrollParent: props == null ? void 0 : props.customScrollParent,
+      theme: props == null ? void 0 : props.theme
     }
   );
 });

package/lib/plus/skuOptionsSelection/locales.d.ts

@@ -8,6 +8,7 @@ declare const _default: {
         'pisell2.skuOptionsSelection.variantItemCard.price': string;
         'pisell2.skuOptionsSelection.optionItemCard.typeText': string;
         'pisell2.skuOptionsSelection.optionItemCard.overSelected': string;
+        'pisell2.skuOptionsSelection.optionItemCard.confirm': string;
     };
     'zh-CN': {
         'pisell2.skuOptionsSelection.title': string;
@@ -18,6 +19,7 @@ declare const _default: {
         'pisell2.skuOptionsSelection.variantItemCard.price': string;
         'pisell2.skuOptionsSelection.optionItemCard.typeText': string;
         'pisell2.skuOptionsSelection.optionItemCard.overSelected': string;
+        'pisell2.skuOptionsSelection.optionItemCard.confirm': string;
     };
     'zh-HK': {
         'pisell2.skuOptionsSelection.title': string;
@@ -28,6 +30,29 @@ declare const _default: {
         'pisell2.skuOptionsSelection.variantItemCard.price': string;
         'pisell2.skuOptionsSelection.optionItemCard.typeText': string;
         'pisell2.skuOptionsSelection.optionItemCard.overSelected': string;
+        'pisell2.skuOptionsSelection.optionItemCard.confirm': string;
+    };
+    ja: {
+        'pisell2.skuOptionsSelection.title': string;
+        'pisell2.skuOptionsSelection.titleExtra.alreadySelected': string;
+        'pisell2.skuOptionsSelection.titleExtra.totalPrice': string;
+        'pisell2.skuOptionsSelection.optionItemCard.editSelections': string;
+        'pisell2.skuOptionsSelection.variantItemCard.soldOut': string;
+        'pisell2.skuOptionsSelection.variantItemCard.price': string;
+        'pisell2.skuOptionsSelection.optionItemCard.typeText': string;
+        'pisell2.skuOptionsSelection.optionItemCard.overSelected': string;
+        'pisell2.skuOptionsSelection.optionItemCard.confirm': string;
+    };
+    pt: {
+        'pisell2.skuOptionsSelection.title': string;
+        'pisell2.skuOptionsSelection.titleExtra.alreadySelected': string;
+        'pisell2.skuOptionsSelection.titleExtra.totalPrice': string;
+        'pisell2.skuOptionsSelection.optionItemCard.editSelections': string;
+        'pisell2.skuOptionsSelection.variantItemCard.soldOut': string;
+        'pisell2.skuOptionsSelection.variantItemCard.price': string;
+        'pisell2.skuOptionsSelection.optionItemCard.typeText': string;
+        'pisell2.skuOptionsSelection.optionItemCard.overSelected': string;
+        'pisell2.skuOptionsSelection.optionItemCard.confirm': string;
     };
 };
 export default _default;

package/lib/plus/skuOptionsSelection/locales.js

@@ -31,7 +31,8 @@ var locales_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.overSelected": "Over selected",
+    "pisell2.skuOptionsSelection.optionItemCard.confirm": "Confirm"
   },
   "zh-CN": {
     "pisell2.skuOptionsSelection.title": "SKU 选项选择",
@@ -41,7 +42,8 @@ var locales_default = {
     "pisell2.skuOptionsSelection.variantItemCard.soldOut": "库存不足",
     "pisell2.skuOptionsSelection.variantItemCard.price": "价格",
     "pisell2.skuOptionsSelection.optionItemCard.typeText": "类型",
-    "pisell2.skuOptionsSelection.optionItemCard.overSelected": "已达上限"
+    "pisell2.skuOptionsSelection.optionItemCard.overSelected": "已达上限",
+    "pisell2.skuOptionsSelection.optionItemCard.confirm": "确定"
   },
   "zh-HK": {
     "pisell2.skuOptionsSelection.title": "SKU 選項選擇",
@@ -51,6 +53,29 @@ var locales_default = {
     "pisell2.skuOptionsSelection.variantItemCard.soldOut": "庫存不足",
     "pisell2.skuOptionsSelection.variantItemCard.price": "價格",
     "pisell2.skuOptionsSelection.optionItemCard.typeText": "類型",
-    "pisell2.skuOptionsSelection.optionItemCard.overSelected": "已達上限"
+    "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"
   }
 };

package/lib/plus/skuOptionsSelection/store/store.js

@@ -46,7 +46,8 @@ var initialState = {
   selectorValue: {},
   skuCardConfig: import_types.defaultSkuCardConfig,
   customConfig: {
-    modalWidth: "480px"
+    modalWidth: "480px",
+    selectorLayout: null
   }
 };
 var store = (0, import_createStore.default)(initialState);

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

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

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

@@ -37,15 +37,21 @@ var import_OptionsCard = __toESM(require("../components/OptionsCard"));
 var import_NormalCard = __toESM(require("../components/NormalCard"));
 var import_TitleExtra = __toESM(require("../components/TitleExtra"));
 var import_checkSkuStatus = require("./checkSkuStatus");
+var import_store = __toESM(require("../store/store"));
 var transformBundleGroup = (bundleGroup) => {
+  var _a;
   if (!Array.isArray(bundleGroup)) return [];
+  const selectorLayout = ((_a = import_store.default.getState().customConfig) == null ? void 0 : _a.selectorLayout) || null;
   const formattedGroup = bundleGroup.map((item) => {
-    var _a;
-    const selectorOptionsDataSource = (_a = item == null ? void 0 : item.bundle_item) == null ? void 0 : _a.map((bundleItem) => {
+    var _a2;
+    const selectorOptionsDataSource = (_a2 = item == null ? void 0 : item.bundle_item) == null ? void 0 : _a2.map((bundleItem) => {
       const { canSell, hasStock } = (0, import_checkSkuStatus.checkSkuStockCanSell)(bundleItem);
       const disabled = (0, import_checkSkuStatus.checkSkuDisabled)(bundleItem, canSell);
       return {
-        _original: { ...bundleItem || {}, _bundle_product_id: bundleItem == null ? void 0 : bundleItem.bundle_product_id },
+        _original: {
+          ...bundleItem || {},
+          _bundle_product_id: bundleItem == null ? void 0 : bundleItem.bundle_product_id
+        },
         // 渲染需要的数据源
         id: bundleItem == null ? void 0 : bundleItem.id,
         title: (bundleItem == null ? void 0 : bundleItem.title) || "",
@@ -56,10 +62,7 @@ var transformBundleGroup = (bundleGroup) => {
           max: bundleItem == null ? void 0 : bundleItem.max_quantity,
           autoValidate: true
         },
-        _extra: {
-          canSell,
-          hasStock
-        }
+        _extra: { canSell, hasStock, disabled }
       };
     });
     const selectorDataSource = {
@@ -82,12 +85,15 @@ var transformBundleGroup = (bundleGroup) => {
         }
       },
       stepperProps: {
-        showInput: true
+        horizontalPadding: "8px"
       }
     };
+    if (!!selectorLayout) {
+      selectorDataSource.layout = selectorLayout;
+    }
     selectorDataSource.renderItem = (itemProps) => {
-      var _a2, _b, _c;
-      if (!!((_c = (_b = (_a2 = itemProps == null ? void 0 : itemProps.dataSource) == null ? void 0 : _a2._original) == null ? void 0 : _b.option_group) == null ? void 0 : _c.length)) {
+      var _a3, _b, _c;
+      if (!!((_c = (_b = (_a3 = itemProps == null ? void 0 : itemProps.dataSource) == null ? void 0 : _a3._original) == null ? void 0 : _b.option_group) == null ? void 0 : _c.length)) {
         return /* @__PURE__ */ import_react.default.createElement(
           import_OptionsCard.default,
           {

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

@@ -36,11 +36,14 @@ var import_react = __toESM(require("react"));
 var import_NormalCard = __toESM(require("../components/NormalCard"));
 var import_TitleExtra = __toESM(require("../components/TitleExtra"));
 var import_checkSkuStatus = require("./checkSkuStatus");
+var import_store = __toESM(require("../store/store"));
 var transformOptionGroup = (optionGroup) => {
+  var _a;
   if (!Array.isArray(optionGroup)) return [];
+  const selectorLayout = ((_a = import_store.default.getState().customConfig) == null ? void 0 : _a.selectorLayout) || null;
   const formattedGroup = optionGroup.map((item) => {
-    var _a;
-    const selectorOptionsDataSource = (_a = item == null ? void 0 : item.option_item) == null ? void 0 : _a.map(
+    var _a2;
+    const selectorOptionsDataSource = (_a2 = item == null ? void 0 : item.option_item) == null ? void 0 : _a2.map(
       (optionItem) => {
         const { canSell, hasStock } = (0, import_checkSkuStatus.checkSkuStockCanSell)(optionItem);
         const disabled = (0, import_checkSkuStatus.checkSkuDisabled)(optionItem, canSell);
@@ -58,10 +61,7 @@ var transformOptionGroup = (optionGroup) => {
             max: optionItem == null ? void 0 : optionItem.max_quantity,
             autoValidate: true
           },
-          _extra: {
-            canSell,
-            hasStock
-          }
+          _extra: { canSell, hasStock, disabled }
         };
       }
     );
@@ -91,9 +91,12 @@ var transformOptionGroup = (optionGroup) => {
         }
       },
       stepperProps: {
-        showInput: true
+        horizontalPadding: "8px"
       }
     };
+    if (!!selectorLayout) {
+      selectorDataSource.layout = selectorLayout;
+    }
     selectorDataSource.renderItem = (itemProps) => {
       return /* @__PURE__ */ import_react.default.createElement(
         import_NormalCard.default,

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

@@ -68,16 +68,18 @@ var transformSelectorValueToValue = (selectorValue) => {
               let _newData = { ...rest, option: [] };
               let totalPrice = new import_decimal.default(0);
               Object.keys(_item == null ? void 0 : _item.data).forEach((key) => {
-                var _a2;
+                var _a2, _b2;
                 const _itemDataItem = (_a2 = _item == null ? void 0 : _item.data) == null ? void 0 : _a2[key];
                 if (Array.isArray(_itemDataItem)) {
                   _itemDataItem.forEach(
                     (_itemDataItem_item) => {
+                      var _a3;
                       totalPrice = totalPrice.plus(
                         new import_decimal.default((_itemDataItem_item == null ? void 0 : _itemDataItem_item.totalPrice) || 0)
                       );
                       _newData.option.push({
-                        ...(_itemDataItem_item == null ? void 0 : _itemDataItem_item.data) || {}
+                        ...(_itemDataItem_item == null ? void 0 : _itemDataItem_item.data) || {},
+                        product_option_item_id: (_a3 = _itemDataItem_item == null ? void 0 : _itemDataItem_item.data) == null ? void 0 : _a3.id
                       });
                     }
                   );
@@ -85,19 +87,30 @@ var transformSelectorValueToValue = (selectorValue) => {
                   totalPrice = totalPrice.plus(
                     new import_decimal.default((_itemDataItem == null ? void 0 : _itemDataItem.totalPrice) || 0)
                   );
-                  _newData.option.push({ ...(_itemDataItem == null ? void 0 : _itemDataItem.data) || {} });
+                  _newData.option.push({
+                    ...(_itemDataItem == null ? void 0 : _itemDataItem.data) || {},
+                    product_option_item_id: (_b2 = _itemDataItem == null ? void 0 : _itemDataItem.data) == null ? void 0 : _b2.id
+                  });
                 }
               });
-              _newData.price = totalPrice.plus(new import_decimal.default((rest == null ? void 0 : rest.price) || 0)).toFixed(2);
+              const _restPricePrefix = (rest == null ? void 0 : rest.price_type) === "markdown" ? -1 : 1;
+              _newData.price = totalPrice.plus(new import_decimal.default((rest == null ? void 0 : rest.price) || 0).times(_restPricePrefix)).toString();
               _newData.original_price = _newData == null ? void 0 : _newData.price;
               _newData.original_total = _newData == null ? void 0 : _newData.price;
               _newData.quantity = (_item == null ? void 0 : _item.quantity) || 0;
               _newData.num = (_item == null ? void 0 : _item.quantity) || 0;
+              _newData._bundle_product_id = _newData == null ? void 0 : _newData.bundle_product_id;
               transformValue.bundle.push(_newData);
             }
           });
         } else {
-          transformValue.bundle.push(item == null ? void 0 : item.data);
+          const _newData = { ...(item == null ? void 0 : item.data) || {} };
+          const _pricePrefix = (_newData == null ? void 0 : _newData.price_type) === "markdown" ? -1 : 1;
+          _newData.price = new import_decimal.default((_newData == null ? void 0 : _newData.price) || 0).times(_pricePrefix).toString();
+          _newData.original_price = _newData == null ? void 0 : _newData.price;
+          _newData.original_total = _newData == null ? void 0 : _newData.price;
+          _newData._bundle_product_id = _newData == null ? void 0 : _newData.bundle_product_id;
+          transformValue.bundle.push(_newData);
         }
       });
     });
@@ -116,8 +129,12 @@ var transformSelectorValueToValue = (selectorValue) => {
         _groupItemValue = [groupItemValue];
       }
       _groupItemValue == null ? void 0 : _groupItemValue.forEach((item) => {
+        var _a2;
         if (item == null ? void 0 : item.data) {
-          transformValue.option.push(item == null ? void 0 : item.data);
+          transformValue.option.push({
+            ...(item == null ? void 0 : item.data) || {},
+            product_option_item_id: (_a2 = item == null ? void 0 : item.data) == null ? void 0 : _a2.id
+          });
         }
       });
     });
@@ -163,6 +180,7 @@ var transformSelectorValueToValue = (selectorValue) => {
       }
     }
   }
+  console.log("transformSelectorValueToValue>>>>>", transformValue);
   return transformValue;
 };
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -34,11 +34,12 @@ __export(transformValueToSelectorValue_exports, {
 module.exports = __toCommonJS(transformValueToSelectorValue_exports);
 var import_decimal = __toESM(require("decimal.js"));
 var transformValueToSelectorValue = (value, dataSource) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
+  var _a, _b, _c, _d, _e, _f;
+  console.log("transformValueToSelectorValue_value>>>>>>>", value);
   if (!value || !dataSource || ((_a = Object.keys(value || {})) == null ? void 0 : _a.length) === 0 || ((_b = Object.keys(dataSource || {})) == null ? void 0 : _b.length) === 0) {
     return {};
   }
-  const transformValue = {};
+  let transformValue = {};
   if (value == null ? void 0 : value.bundle) {
     const newBundle = (_c = value == null ? void 0 : value.bundle) == null ? void 0 : _c.reduce((acc, v) => {
       var _a2, _b2, _c2, _d2;
@@ -69,42 +70,14 @@ var transformValueToSelectorValue = (value, dataSource) => {
     });
   }
   if (value == null ? void 0 : value.option) {
-    const createOptionValue2 = (v) => {
-      const pricePrefix = (v == null ? void 0 : v.price_type) === "markdown" ? -1 : 1;
-      return {
-        data: { ...v || {} },
-        quantity: (v == null ? void 0 : v.quantity) || 1,
-        value: v == null ? void 0 : v.id,
-        totalPrice: new import_decimal.default((v == null ? void 0 : v.price) || 0).times(pricePrefix).times((v == null ? void 0 : v.quantity) || 1).toNumber()
-      };
-    };
-    (_f = (_e = value == null ? void 0 : value.option) == null ? void 0 : _e.forEach) == null ? void 0 : _f.call(_e, (v1) => {
-      var _a2;
-      console.log("v1>>>>>", transformValue[v1 == null ? void 0 : v1.group_id], transformValue);
-      const _optionGroupId = v1 == null ? void 0 : v1.option_group_id;
-      if (transformValue[_optionGroupId]) {
-        transformValue[_optionGroupId] = [
-          ...transformValue[_optionGroupId] || [],
-          createOptionValue2(v1)
-        ];
-      } else {
-        const groupItem = (_a2 = dataSource == null ? void 0 : dataSource.option_group) == null ? void 0 : _a2.find((v2) => {
-          return (v2 == null ? void 0 : v2.id) === _optionGroupId;
-        });
-        if ((groupItem == null ? void 0 : groupItem.is_multiple) == 1) {
-          transformValue[_optionGroupId] = [createOptionValue2(v1)];
-        } else {
-          transformValue[_optionGroupId] = createOptionValue2(v1);
-        }
-      }
-    });
+    transformValue = createOptionValue(transformValue, value, dataSource);
   }
   if (value == null ? void 0 : value.product_variant_id) {
-    const filteredVariant = (_g = dataSource == null ? void 0 : dataSource.variant) == null ? void 0 : _g.find((item) => {
+    const filteredVariant = (_e = dataSource == null ? void 0 : dataSource.variant) == null ? void 0 : _e.find((item) => {
       return (item == null ? void 0 : item.id) === (value == null ? void 0 : value.product_variant_id);
     });
     if (!!filteredVariant) {
-      const ids = ((_h = filteredVariant == null ? void 0 : filteredVariant.sku_ids) == null ? void 0 : _h.split("_")) || [];
+      const ids = ((_f = filteredVariant == null ? void 0 : filteredVariant.sku_ids) == null ? void 0 : _f.split("_")) || [];
       ids.forEach((id) => {
         var _a2;
         const [variantGroupId, variantId] = id.split(":");
@@ -158,11 +131,12 @@ var createBundleValue = (v, dataSource) => {
   if (!_createdValue) {
     return null;
   }
+  let totalQuantity = 0;
   (_d = (_c = v == null ? void 0 : v.bundleOptions) == null ? void 0 : _c.forEach) == null ? void 0 : _d.call(_c, (v1) => {
     var _a2, _b2;
     if ((_a2 = v1 == null ? void 0 : v1.option) == null ? void 0 : _a2.length) {
       const _data = ((_b2 = _createdValue == null ? void 0 : _createdValue.data) == null ? void 0 : _b2._data) || [];
-      const _createdValueData = createOptionValue(v1, findedBundleItem);
+      const _createdValueData = createOptionValue({}, v1, findedBundleItem);
       _data.push({
         value: v1 == null ? void 0 : v1.id,
         data: _createdValueData,
@@ -170,37 +144,52 @@ var createBundleValue = (v, dataSource) => {
       });
       _createdValue.data._data = _data;
     }
-    _createdValue.quantity = (_createdValue.quantity || 0) + ((v1 == null ? void 0 : v1.quantity) || 0);
-    const _pricePrefix = (findedBundleItem == null ? void 0 : findedBundleItem.price_type) === "markdown" ? -1 : 1;
-    _createdValue.totalPrice = new import_decimal.default(_createdValue.totalPrice || 0).plus(
-      new import_decimal.default((v1 == null ? void 0 : v1.price) || 0).times((v1 == null ? void 0 : v1.quantity) || 1).times(_pricePrefix)
-    ).toNumber();
+    totalQuantity = totalQuantity + ((v1 == null ? void 0 : v1.quantity) || (v1 == null ? void 0 : v1.num) || 1);
+    const _price = (v1 == null ? void 0 : v1.price) || (findedBundleItem == null ? void 0 : findedBundleItem.price) || 0;
+    _createdValue.totalPrice = new import_decimal.default(_createdValue.totalPrice || 0).plus(new import_decimal.default(_price).times((v1 == null ? void 0 : v1.quantity) || (v1 == null ? void 0 : v1.num) || 1)).toNumber();
   });
+  _createdValue.quantity = totalQuantity;
+  _createdValue.data.quantity = totalQuantity;
+  _createdValue.data.num = totalQuantity;
   return _createdValue;
 };
-var createOptionValue = (v, bundleItem) => {
+var createOptionValue = (initValue, value, dataSource) => {
   var _a, _b;
-  const _createdValue = {};
-  (_b = (_a = v == null ? void 0 : v.option) == null ? void 0 : _a.forEach) == null ? void 0 : _b.call(_a, (v1) => {
+  let _createdValue = initValue || {};
+  (_b = (_a = value == null ? void 0 : value.option) == null ? void 0 : _a.forEach) == null ? void 0 : _b.call(_a, (v1) => {
     var _a2, _b2;
     const _optionGroupId = v1 == null ? void 0 : v1.option_group_id;
-    const pricePrefix = (v1 == null ? void 0 : v1.price_type) === "markdown" ? -1 : 1;
-    const _tempValue = {
-      data: { ...v1 || {} },
-      quantity: (v1 == null ? void 0 : v1.quantity) || 1,
+    const matchedGroup = (_a2 = dataSource == null ? void 0 : dataSource.option_group) == null ? void 0 : _a2.find(
+      (v2) => (v2 == null ? void 0 : v2.id) === _optionGroupId
+    );
+    const matchedOptionItem = (_b2 = matchedGroup == null ? void 0 : matchedGroup.option_item) == null ? void 0 : _b2.find(
+      (v3) => (v3 == null ? void 0 : v3.id) === (v1 == null ? void 0 : v1.id)
+    );
+    const _num = (v1 == null ? void 0 : v1.quantity) || (v1 == null ? void 0 : v1.num) || 1;
+    const _price = (matchedOptionItem == null ? void 0 : matchedOptionItem.add_price) || 0;
+    const _tempOptionValue = {
+      data: {
+        ...matchedOptionItem || {},
+        ...v1 || {},
+        num: _num,
+        price: _price,
+        original_price: _price,
+        original_total: _price
+      },
+      quantity: _num,
       value: v1 == null ? void 0 : v1.id,
-      totalPrice: new import_decimal.default((v1 == null ? void 0 : v1.price) || 0).times(pricePrefix).times((v1 == null ? void 0 : v1.quantity) || 1).toNumber()
+      totalPrice: new import_decimal.default((matchedOptionItem == null ? void 0 : matchedOptionItem.add_price) || 0).times(_num).toNumber()
     };
-    if (_createdValue == null ? void 0 : _createdValue[_optionGroupId]) {
-      (_a2 = _createdValue == null ? void 0 : _createdValue[_optionGroupId]) == null ? void 0 : _a2.push(_tempValue);
+    if (_createdValue[_optionGroupId]) {
+      _createdValue[_optionGroupId] = [
+        ..._createdValue[_optionGroupId] || [],
+        _tempOptionValue
+      ];
     } else {
-      const optionGroupItem = (_b2 = bundleItem == null ? void 0 : bundleItem.option_group) == null ? void 0 : _b2.find((v2) => {
-        return (v2 == null ? void 0 : v2.id) === (v1 == null ? void 0 : v1.option_group_id);
-      });
-      if ((optionGroupItem == null ? void 0 : optionGroupItem.is_multiple) == 1) {
-        _createdValue[_optionGroupId] = [_tempValue];
+      if ((matchedGroup == null ? void 0 : matchedGroup.is_multiple) == 1) {
+        _createdValue[_optionGroupId] = [_tempOptionValue];
       } else {
-        _createdValue[_optionGroupId] = _tempValue;
+        _createdValue[_optionGroupId] = _tempOptionValue;
       }
     }
   });

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

@@ -37,9 +37,10 @@ var import_store = __toESM(require("../store/store"));
 var import_VariantCard = __toESM(require("../components/VariantCard"));
 var import_checkSkuStatus = require("./checkSkuStatus");
 var transformVariantGroup = (variantGroup) => {
-  var _a;
+  var _a, _b;
   if (!Array.isArray(variantGroup)) return [];
   const variantProducts = ((_a = import_store.default.getState().dataSource) == null ? void 0 : _a.variant) || [];
+  const selectorLayout = ((_b = import_store.default.getState().customConfig) == null ? void 0 : _b.selectorLayout) || null;
   const formattedGroup = variantGroup.map((item) => {
     var _a2;
     const selectorOptionsDataSource = (_a2 = item == null ? void 0 : item.variant_item) == null ? void 0 : _a2.map(
@@ -61,10 +62,7 @@ var transformVariantGroup = (variantGroup) => {
           ruleConfig: {
             autoValidate: true
           },
-          _extra: {
-            canSell,
-            hasStock
-          }
+          _extra: { canSell, hasStock, disabled }
         };
       }
     );
@@ -92,16 +90,19 @@ var transformVariantGroup = (variantGroup) => {
         }
       },
       stepperProps: {
-        showInput: true
+        horizontalPadding: "8px"
       }
     };
+    if (!!selectorLayout) {
+      selectorDataSource.layout = selectorLayout;
+    }
     selectorDataSource.renderItem = (itemProps) => {
-      var _a3, _b, _c;
+      var _a3, _b2, _c;
       const { canSell, hasStock } = (0, import_checkSkuStatus.checkVariantStockByValue)(
         (_a3 = itemProps == null ? void 0 : itemProps.dataSource) == null ? void 0 : _a3._original
       );
       const price = getVariantItemFixedPriceByValue({
-        variantItem: (_b = itemProps == null ? void 0 : itemProps.dataSource) == null ? void 0 : _b._original,
+        variantItem: (_b2 = itemProps == null ? void 0 : itemProps.dataSource) == null ? void 0 : _b2._original,
         variantProducts
       });
       const _dataSource = {

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

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