@pisell/private-materials 6.3.119 → 6.3.120

package/es/plus/skuOptionsSelection/components/OptionsCard/index.less

@@ -32,9 +32,10 @@
   &-item {
     position: relative;
     display: flex;
+    padding: 16px 16px 0 16px;
     flex-direction: column;
     align-items: flex-start;
-
+    gap: 20px;
     border-radius: 12px;
     background: #f5f5f5;
 
@@ -54,20 +55,6 @@
       font-weight: 400;
     }
 
-    &-section {
-      width: 100%;
-      padding: 16px 16px 0 16px;
-      display: flex;
-      flex-direction: column;
-      gap: 20px;
-
-      &-divider {
-        width: 100%;
-        height: 1px;
-        background: #d0d5dd;
-      }
-    }
-
     &-content {
       width: 100%;
       display: flex;
@@ -78,11 +65,9 @@
         display: flex;
         justify-content: space-between;
         align-items: center;
-        gap: 4px;
       }
 
       &-title {
-        flex: 1;
         color: #101828;
         font-size: 14px;
         font-weight: 600;
@@ -104,18 +89,18 @@
 
     &-footer {
       width: 100%;
-      height: 56px;
+      min-height: 56px;
       display: flex;
       align-items: center;
-      justify-content: space-between;
+      border-top: 1px solid #d0d5dd;
 
       &-stepper {
-        height: 100%;
         display: flex;
+        flex: 1;
       }
 
       &-info {
-        padding: 0 16px;
+        padding-left: 12px;
         display: flex;
         align-items: center;
         justify-content: space-between;
@@ -125,4 +110,4 @@
       }
     }
   }
-}
+}

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

@@ -15,7 +15,6 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useMemo, useState, useRef, useEffect } from 'react';
 import { PisellModal, Button } from '@pisell/materials';
-import { locales } from '@pisell/utils';
 import Selector from "../../../../pro/Selector";
 import NumericStepper from "../../../../pro/NumericStepper";
 import { useStore } from "../../hooks";
@@ -39,7 +38,6 @@ var OptionsModal = function OptionsModal(props) {
   var customConfig = useStore(function (s) {
     return s.customConfig;
   });
-  console.log(customConfig, 'customConfig>>>>>>>');
   useEffect(function () {
     var _props$modalValue;
     if (!!(props !== null && props !== void 0 && (_props$modalValue = props.modalValue) !== null && _props$modalValue !== void 0 && _props$modalValue.quantity)) {
@@ -120,19 +118,24 @@ var OptionsModal = function OptionsModal(props) {
     title: title,
     footer: /*#__PURE__*/React.createElement("div", {
       className: "pisell-plus-sku-options-card-footer"
-    }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(NumericStepper, {
+    }, /*#__PURE__*/React.createElement(NumericStepper, {
       min: canSelectedMin,
       max: canSelectedMax,
       value: stepNumber,
       onChange: function onChange(value) {
         setStepNumber(value);
-      }
-    })), /*#__PURE__*/React.createElement(Button, {
+      },
+      showInput: true
+    }), /*#__PURE__*/React.createElement(Button, {
       type: "primary",
       onClick: handleConfirm,
       size: "large",
-      block: true
-    }, locales.getText('pisell2.skuOptionsSelection.optionItemCard.confirm'))),
+      block: true,
+      style: {
+        backgroundColor: '#7F56D9',
+        borderColor: '#7F56D9'
+      }
+    }, "\u786E\u5B9A")),
     footerDivider: false,
     destroyOnClose: true,
     bodyStyle: {

package/es/plus/skuOptionsSelection/index.js

@@ -114,15 +114,14 @@ var SKUOptionsSelection = /*#__PURE__*/forwardRef(function (props, ref) {
     value: selectorValue,
     onChange: function onChange(values) {
       var _props$onChange;
-      console.log('selector_onChange_values>>>>>>>', values);
+      console.log('total_values>>>>>', values);
       actions.updateSelectorValue(values);
       var transformValue = transformSelectorValueToValue(values);
-      console.log('selector_onChange_transformValue>>>>>>>', transformValue);
+      console.log('transform_total_values>>>>>', transformValue);
       props === null || props === void 0 || (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, transformValue);
     },
     style: props === null || props === void 0 ? void 0 : props.style,
-    customScrollParent: props === null || props === void 0 ? void 0 : props.customScrollParent,
-    theme: props === null || props === void 0 ? void 0 : props.theme
+    customScrollParent: props === null || props === void 0 ? void 0 : props.customScrollParent
   });
 });
 export default SKUOptionsSelection;

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

@@ -8,7 +8,6 @@ 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;
@@ -19,7 +18,6 @@ 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;
@@ -30,29 +28,6 @@ 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/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

@@ -64,40 +64,24 @@ export var transformSelectorValueToValue = function transformSelectorValueToValu
                 var _itemDataItem = _item === null || _item === void 0 || (_item$data = _item.data) === null || _item$data === void 0 ? void 0 : _item$data[key];
                 if (Array.isArray(_itemDataItem)) {
                   _itemDataItem.forEach(function (_itemDataItem_item) {
-                    var _itemDataItem_item$da;
                     totalPrice = totalPrice.plus(new Decimal((_itemDataItem_item === null || _itemDataItem_item === void 0 ? void 0 : _itemDataItem_item.totalPrice) || 0));
-                    _newData.option.push(_objectSpread(_objectSpread({}, (_itemDataItem_item === null || _itemDataItem_item === void 0 ? void 0 : _itemDataItem_item.data) || {}), {}, {
-                      product_option_item_id: _itemDataItem_item === null || _itemDataItem_item === void 0 || (_itemDataItem_item$da = _itemDataItem_item.data) === null || _itemDataItem_item$da === void 0 ? void 0 : _itemDataItem_item$da.id
-                    }));
+                    _newData.option.push(_objectSpread({}, (_itemDataItem_item === null || _itemDataItem_item === void 0 ? void 0 : _itemDataItem_item.data) || {}));
                   });
                 } else {
-                  var _itemDataItem$data;
                   totalPrice = totalPrice.plus(new Decimal((_itemDataItem === null || _itemDataItem === void 0 ? void 0 : _itemDataItem.totalPrice) || 0));
-                  _newData.option.push(_objectSpread(_objectSpread({}, (_itemDataItem === null || _itemDataItem === void 0 ? void 0 : _itemDataItem.data) || {}), {}, {
-                    product_option_item_id: _itemDataItem === null || _itemDataItem === void 0 || (_itemDataItem$data = _itemDataItem.data) === null || _itemDataItem$data === void 0 ? void 0 : _itemDataItem$data.id
-                  }));
+                  _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;
               _newData.num = (_item === null || _item === void 0 ? void 0 : _item.quantity) || 0;
-              // 必须：构建一个新的 bundle_product_id
-              _newData._bundle_product_id = _newData === null || _newData === void 0 ? void 0 : _newData.bundle_product_id;
               transformValue.bundle.push(_newData);
             }
           });
         } 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;
-          // 必须：构建一个新的 bundle_product_id
-          _newData._bundle_product_id = _newData === null || _newData === void 0 ? void 0 : _newData.bundle_product_id;
-          transformValue.bundle.push(_newData);
+          transformValue.bundle.push(item === null || item === void 0 ? void 0 : item.data);
         }
       });
     });
@@ -121,10 +105,7 @@ export var transformSelectorValueToValue = function transformSelectorValueToValu
       }
       (_groupItemValue2 = _groupItemValue) === null || _groupItemValue2 === void 0 || _groupItemValue2.forEach(function (item) {
         if (item !== null && item !== void 0 && item.data) {
-          var _item$data2;
-          transformValue.option.push(_objectSpread(_objectSpread({}, (item === null || item === void 0 ? void 0 : item.data) || {}), {}, {
-            product_option_item_id: item === null || item === void 0 || (_item$data2 = item.data) === null || _item$data2 === void 0 ? void 0 : _item$data2.id
-          }));
+          transformValue.option.push(item === null || item === void 0 ? void 0 : item.data);
         }
       });
     });
@@ -150,9 +131,9 @@ export var transformSelectorValueToValue = function transformSelectorValueToValu
       }
       (_groupItemValue3 = _groupItemValue) === null || _groupItemValue3 === void 0 || _groupItemValue3.forEach(function (item) {
         if (item !== null && item !== void 0 && item.data) {
-          var _item$data3, _item$data4, _item$data5;
-          selectedVariantIds.push("".concat(item === null || item === void 0 || (_item$data3 = item.data) === null || _item$data3 === void 0 ? void 0 : _item$data3.variant_group_id, ":").concat(item === null || item === void 0 || (_item$data4 = item.data) === null || _item$data4 === void 0 ? void 0 : _item$data4.id));
-          selectedVariantOptionString.push("".concat(variantGroupItem === null || variantGroupItem === void 0 ? void 0 : variantGroupItem.name, ":").concat(item === null || item === void 0 || (_item$data5 = item.data) === null || _item$data5 === void 0 ? void 0 : _item$data5.name));
+          var _item$data2, _item$data3, _item$data4;
+          selectedVariantIds.push("".concat(item === null || item === void 0 || (_item$data2 = item.data) === null || _item$data2 === void 0 ? void 0 : _item$data2.variant_group_id, ":").concat(item === null || item === void 0 || (_item$data3 = item.data) === null || _item$data3 === void 0 ? void 0 : _item$data3.id));
+          selectedVariantOptionString.push("".concat(variantGroupItem === null || variantGroupItem === void 0 ? void 0 : variantGroupItem.name, ":").concat(item === null || item === void 0 || (_item$data4 = item.data) === null || _item$data4 === void 0 ? void 0 : _item$data4.name));
         }
       });
     });
@@ -172,6 +153,5 @@ export var transformSelectorValueToValue = function transformSelectorValueToValu
       }
     }
   }
-  console.log('transformSelectorValueToValue>>>>>', transformValue);
   return transformValue;
 };