@pisell/private-materials 6.3.63 → 6.3.65

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

@@ -59,50 +59,47 @@ var transformSelectorValueToValue = (selectorValue) => {
       if (!groupId || !groupItemValue) {
         return;
       }
-      if (Array.isArray(groupItemValue)) {
-        groupItemValue.forEach((item) => {
-          const { _data, ...rest } = (item == null ? void 0 : item.data) || {};
-          if (_data) {
-            _data == null ? void 0 : _data.forEach((_item) => {
-              if (_item == null ? void 0 : _item.data) {
-                let _newData = { ...rest, option: [] };
-                let totalPrice = new import_decimal.default(0);
-                Object.keys(_item == null ? void 0 : _item.data).forEach((key) => {
-                  var _a2;
-                  const _itemDataItem = (_a2 = _item == null ? void 0 : _item.data) == null ? void 0 : _a2[key];
-                  if (Array.isArray(_itemDataItem)) {
-                    _itemDataItem.forEach(
-                      (_itemDataItem_item) => {
-                        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) || {}
-                        });
-                      }
-                    );
-                  } else {
-                    totalPrice = totalPrice.plus(
-                      new import_decimal.default((_itemDataItem == null ? void 0 : _itemDataItem.totalPrice) || 0)
-                    );
-                    _newData.option.push({ ...(_itemDataItem == null ? void 0 : _itemDataItem.data) || {} });
-                  }
-                });
-                _newData.price = totalPrice.plus(new import_decimal.default((rest == null ? void 0 : rest.price) || 0)).toFixed(2);
-                _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;
-                transformValue.bundle.push(_newData);
-              }
-            });
-          } else {
-            transformValue.bundle.push(item == null ? void 0 : item.data);
-          }
-        });
-      } else {
-        transformValue.bundle.push(groupItemValue == null ? void 0 : groupItemValue.data);
-      }
+      const _groupItemValue = Array.isArray(groupItemValue) ? groupItemValue : [groupItemValue];
+      _groupItemValue.forEach((item) => {
+        const { _data, ...rest } = (item == null ? void 0 : item.data) || {};
+        if (_data) {
+          _data == null ? void 0 : _data.forEach((_item) => {
+            if (_item == null ? void 0 : _item.data) {
+              let _newData = { ...rest, option: [] };
+              let totalPrice = new import_decimal.default(0);
+              Object.keys(_item == null ? void 0 : _item.data).forEach((key) => {
+                var _a2;
+                const _itemDataItem = (_a2 = _item == null ? void 0 : _item.data) == null ? void 0 : _a2[key];
+                if (Array.isArray(_itemDataItem)) {
+                  _itemDataItem.forEach(
+                    (_itemDataItem_item) => {
+                      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) || {}
+                      });
+                    }
+                  );
+                } else {
+                  totalPrice = totalPrice.plus(
+                    new import_decimal.default((_itemDataItem == null ? void 0 : _itemDataItem.totalPrice) || 0)
+                  );
+                  _newData.option.push({ ...(_itemDataItem == null ? void 0 : _itemDataItem.data) || {} });
+                }
+              });
+              _newData.price = totalPrice.plus(new import_decimal.default((rest == null ? void 0 : rest.price) || 0)).toFixed(2);
+              _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;
+              transformValue.bundle.push(_newData);
+            }
+          });
+        } else {
+          transformValue.bundle.push(item == null ? void 0 : item.data);
+        }
+      });
     });
   }
   if ((_c = dataSource == null ? void 0 : dataSource.option_group) == null ? void 0 : _c.length) {

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

@@ -70,11 +70,12 @@ 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((v == null ? void 0 : v.quantity) || 1).toNumber()
+        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) => {
@@ -170,7 +171,10 @@ var createBundleValue = (v, dataSource) => {
       _createdValue.data._data = _data;
     }
     _createdValue.quantity = (_createdValue.quantity || 0) + ((v1 == null ? void 0 : v1.quantity) || 0);
-    _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)).toNumber();
+    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();
   });
   return _createdValue;
 };
@@ -180,11 +184,12 @@ var createOptionValue = (v, bundleItem) => {
   (_b = (_a = v == null ? void 0 : v.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,
       value: v1 == null ? void 0 : v1.id,
-      totalPrice: new import_decimal.default((v1 == null ? void 0 : v1.price) || 0).times((v1 == null ? void 0 : v1.quantity) || 1).toNumber()
+      totalPrice: new import_decimal.default((v1 == null ? void 0 : v1.price) || 0).times(pricePrefix).times((v1 == null ? void 0 : v1.quantity) || 1).toNumber()
     };
     if (_createdValue == null ? void 0 : _createdValue[_optionGroupId]) {
       (_a2 = _createdValue == null ? void 0 : _createdValue[_optionGroupId]) == null ? void 0 : _a2.push(_tempValue);

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

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

package/lib/plus/walletPassGallery/components/passDetail/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
 interface PassDetailProps {
     dataSource?: any | null;
@@ -6,5 +5,5 @@ interface PassDetailProps {
     buttonGroupList?: any[][];
     showTimeLine?: boolean;
 }
-declare const PassDetail: (props: PassDetailProps) => React.JSX.Element | null;
+declare const PassDetail: (props: PassDetailProps) => JSX.Element | null;
 export default PassDetail;

package/lib/plus/walletPassGallery/components/passList/index.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+/// <reference types="react" />
 interface IPassListProps {
     dataSource: any[];
     value?: string | number;
@@ -9,5 +9,5 @@ interface IPassListProps {
     loading?: boolean;
     onEditHolder?: (info: any) => void;
 }
-declare const PassList: (props: IPassListProps) => React.JSX.Element;
+declare const PassList: (props: IPassListProps) => JSX.Element;
 export default PassList;

package/lib/plus/walletPassGallery/components/timelineSection/index.d.ts

@@ -1,9 +1,9 @@
-import React from 'react';
+/// <reference types="react" />
 import './index.less';
 interface TimelineSectionProps {
     code: string;
     tag: string;
     timezone: string;
 }
-declare const TimelineSection: (props: TimelineSectionProps) => React.JSX.Element;
+declare const TimelineSection: (props: TimelineSectionProps) => JSX.Element;
 export default TimelineSection;

package/lib/plus/walletPassGallery/components/usageRule/index.d.ts

@@ -5,5 +5,5 @@ interface UsageRulesProps {
     style?: React.CSSProperties;
     dataSource?: any;
 }
-declare function UsageRules({ className, style, dataSource }: UsageRulesProps): React.JSX.Element | null;
+declare function UsageRules({ className, style, dataSource }: UsageRulesProps): JSX.Element | null;
 export default UsageRules;

package/lib/plus/walletPassGallery/index.d.ts

@@ -1,7 +1,6 @@
-import React from 'react';
 import './index.less';
 export interface WalletPassGalleryProps {
     [key: string]: any;
 }
-declare const WalletPassGallery: (props: WalletPassGalleryProps) => React.JSX.Element;
+declare const WalletPassGallery: (props: WalletPassGalleryProps) => JSX.Element;
 export default WalletPassGallery;

package/lib/pro/Cards/components/SKUCard/index.js

@@ -34,6 +34,7 @@ __export(SKUCard_exports, {
 module.exports = __toCommonJS(SKUCard_exports);
 var import_react = __toESM(require("react"));
 var import_materials = require("@pisell/materials");
+var import_utils = require("@pisell/utils");
 var import_classnames = __toESM(require("classnames"));
 var import_index = require("./index.less");
 var SKUCard = ({
@@ -162,7 +163,7 @@ var SKUCard = ({
       !!cover ? /* @__PURE__ */ import_react.default.createElement(
         "img",
         {
-          src: cover,
+          src: import_utils.image.ali(cover, 360),
           alt: title,
           className: "pisell-pro-cards-sku-card-image"
         }

package/lib/pro/Login2.0/components/ForgotPasswordFlow.d.ts

@@ -1,11 +1,4 @@
-/**
- * 忘记密码流程组件
- * 包含三个步骤：
- * 1. 确认邮箱 (ConfirmEmail)
- * 2. 输入验证码 (CodeInput)
- * 3. 设置新密码 (SetPassword)
- */
-import React from 'react';
+/// <reference types="react" />
 import { PhoneValueObject } from './PhoneInput';
 export interface ForgotPasswordFlowProps {
     /** 初始账号（可选，如果用户在登录页已输入） */
@@ -34,5 +27,5 @@ export interface ForgotPasswordFlowProps {
         currency_code: string;
     }>;
 }
-declare function ForgotPasswordFlow({ initialEmail, accountType, onSendCode, onVerifyCode, onResetPassword, onSendResetLink, onBack, loading, countdown, countries, }: ForgotPasswordFlowProps): React.JSX.Element | null;
+declare function ForgotPasswordFlow({ initialEmail, accountType, onSendCode, onVerifyCode, onResetPassword, onSendResetLink, onBack, loading, countdown, countries, }: ForgotPasswordFlowProps): JSX.Element | null;
 export default ForgotPasswordFlow;

package/lib/pro/Login2.0/components/LoginCodeInput.d.ts

@@ -1,8 +1,4 @@
-/**
- * 登录验证码输入组件
- * 复用 Register2 的 CodeInput 样式和逻辑
- */
-import React from 'react';
+/// <reference types="react" />
 export interface LoginCodeInputProps {
     /** 账号（邮箱或手机号） */
     account: string;
@@ -27,5 +23,5 @@ export interface LoginCodeInputProps {
     /** 当用户输入时清除错误的回调 */
     onClearError?: () => void;
 }
-declare function LoginCodeInput({ account, accountType, codeLength, onSubmit, onResend, onBack, countdown, loading, submitButtonText, error, onClearError, }: LoginCodeInputProps): React.JSX.Element;
+declare function LoginCodeInput({ account, accountType, codeLength, onSubmit, onResend, onBack, countdown, loading, submitButtonText, error, onClearError, }: LoginCodeInputProps): JSX.Element;
 export default LoginCodeInput;

package/lib/pro/Login2.0/components/PhoneInput.d.ts

@@ -49,5 +49,5 @@ export interface PhoneInputProps {
  * 支持国际区号选择和手机号输入
  * 值格式：+区号+手机号，例如：+8613800138000 或 +15551234567
  */
-declare function PhoneInput({ value, onChange, placeholder, onKeyDown, size, disabled, className, countries, defaultCountry, valueFormat, }: PhoneInputProps): React.JSX.Element;
+declare function PhoneInput({ value, onChange, placeholder, onKeyDown, size, disabled, className, countries, defaultCountry, valueFormat, }: PhoneInputProps): JSX.Element;
 export default PhoneInput;

package/lib/pro/Login2.0/steps/CodeInput.d.ts

@@ -1,8 +1,4 @@
-/**
- * 验证码输入页面（对应图3）
- * 支持邮箱和手机号两种账号类型
- */
-import React from 'react';
+/// <reference types="react" />
 import type { RegisterFlowData } from '../shared/registerFlow';
 export interface CodeInputProps {
     /** 流程数据 */
@@ -24,5 +20,5 @@ export interface CodeInputProps {
     /** 当用户输入时清除错误的回调 */
     onClearError?: () => void;
 }
-declare function CodeInput({ flowData, codeLength, onSubmit, onResend, onBack, countdown, loading, error, onClearError, }: CodeInputProps): React.JSX.Element;
+declare function CodeInput({ flowData, codeLength, onSubmit, onResend, onBack, countdown, loading, error, onClearError, }: CodeInputProps): JSX.Element;
 export default CodeInput;

package/lib/pro/Login2.0/steps/EmailAlreadyRegistered.d.ts

@@ -1,8 +1,4 @@
-/**
- * 账号已注册错误页面（对应图2）
- * 支持邮箱和手机号两种账号类型
- */
-import React from 'react';
+/// <reference types="react" />
 import type { RegisterFlowData } from '../shared/registerFlow';
 export interface EmailAlreadyRegisteredProps {
     /** 流程数据 */
@@ -12,5 +8,5 @@ export interface EmailAlreadyRegisteredProps {
     /** 返回重新输入 */
     onBack?: () => void;
 }
-declare function EmailAlreadyRegistered({ flowData, onGoToLogin, onBack, }: EmailAlreadyRegisteredProps): React.JSX.Element;
+declare function EmailAlreadyRegistered({ flowData, onGoToLogin, onBack, }: EmailAlreadyRegisteredProps): JSX.Element;
 export default EmailAlreadyRegistered;

package/lib/pro/Login2.0/steps/EmailLinkAlreadyUsed.d.ts

@@ -1,10 +1,7 @@
-/**
- * 邮件链接已使用页面 - 对应图3
- */
-import React from 'react';
+/// <reference types="react" />
 export interface EmailLinkAlreadyUsedProps {
     /** 跳转到登录页回调 */
     onGoToLogin?: () => void;
 }
-declare function EmailLinkAlreadyUsed({ onGoToLogin }: EmailLinkAlreadyUsedProps): React.JSX.Element;
+declare function EmailLinkAlreadyUsed({ onGoToLogin }: EmailLinkAlreadyUsedProps): JSX.Element;
 export default EmailLinkAlreadyUsed;

package/lib/pro/Login2.0/steps/EmailLinkExpired.d.ts

@@ -1,12 +1,9 @@
-/**
- * 邮件链接已过期页面 - 对应图2
- */
-import React from 'react';
+/// <reference types="react" />
 export interface EmailLinkExpiredProps {
     /** 返回注册页回调 */
     onBackToRegistration?: () => void;
     /** 跳转到登录页回调 */
     onGoToLogin?: () => void;
 }
-declare function EmailLinkExpired({ onBackToRegistration, onGoToLogin }: EmailLinkExpiredProps): React.JSX.Element;
+declare function EmailLinkExpired({ onBackToRegistration, onGoToLogin }: EmailLinkExpiredProps): JSX.Element;
 export default EmailLinkExpired;

package/lib/pro/Login2.0/steps/SetPassword.d.ts

@@ -1,7 +1,4 @@
-/**
- * 设置密码页面（对应图5）
- */
-import React from 'react';
+/// <reference types="react" />
 import type { RegisterFlowData } from '../shared/registerFlow';
 import { PasswordRuleConfig } from '../hooks/usePasswordValidationRules';
 export interface SetPasswordProps {
@@ -18,5 +15,5 @@ export interface SetPasswordProps {
     /** 场景类型：create 表示注册场景，reset 表示修改密码场景 */
     scenario?: 'create' | 'reset';
 }
-declare function SetPassword({ flowData, onSubmit, onBack, loading, passwordRules, scenario, }: SetPasswordProps): React.JSX.Element;
+declare function SetPassword({ flowData, onSubmit, onBack, loading, passwordRules, scenario, }: SetPasswordProps): JSX.Element;
 export default SetPassword;

package/lib/pro/Login2.0/steps/VerificationSuccess.d.ts

@@ -1,11 +1,8 @@
-/**
- * 验证成功页面（对应图4）
- */
-import React from 'react';
+/// <reference types="react" />
 import type { RegisterFlowData } from '../shared/registerFlow';
 export interface VerificationSuccessProps {
     /** 流程数据 */
     flowData: RegisterFlowData;
 }
-declare function VerificationSuccess({ flowData }: VerificationSuccessProps): React.JSX.Element;
+declare function VerificationSuccess({ flowData }: VerificationSuccessProps): JSX.Element;
 export default VerificationSuccess;

package/lib/pro/Login2.0/steps/VerifyingEmailLink.d.ts

@@ -1,10 +1,7 @@
-/**
- * 验证邮件链接中（Loading 状态）- 对应图1
- */
-import React from 'react';
+/// <reference types="react" />
 export interface VerifyingEmailLinkProps {
     /** 加载提示文本（可选，不传则使用国际化默认文本） */
     loadingText?: string;
 }
-declare function VerifyingEmailLink({ loadingText }: VerifyingEmailLinkProps): React.JSX.Element;
+declare function VerifyingEmailLink({ loadingText }: VerifyingEmailLinkProps): JSX.Element;
 export default VerifyingEmailLink;

package/lib/pro/Login2.0/steps/WaitEmailLink.d.ts

@@ -1,7 +1,4 @@
-/**
- * 等待邮件链接验证页面（对应图1）
- */
-import React from 'react';
+/// <reference types="react" />
 import type { RegisterFlowData, VerificationMethod } from '../shared/registerFlow';
 export interface WaitEmailLinkProps {
     /** 流程数据 */
@@ -17,5 +14,5 @@ export interface WaitEmailLinkProps {
     /** 验证方式 */
     verificationMethod?: VerificationMethod;
 }
-declare function WaitEmailLink({ flowData, onResend, onBack, onEditEmail, countdown, verificationMethod, }: WaitEmailLinkProps): React.JSX.Element;
+declare function WaitEmailLink({ flowData, onResend, onBack, onEditEmail, countdown, verificationMethod, }: WaitEmailLinkProps): JSX.Element;
 export default WaitEmailLink;

package/lib/pro/Selector/Item.d.ts

@@ -10,5 +10,5 @@ export interface IItemProps {
     values: any;
     children?: React.ReactNode;
 }
-declare const Item: (props: IItemProps) => React.JSX.Element;
+declare const Item: (props: IItemProps) => JSX.Element;
 export default Item;

package/lib/pro/Selector/demo.d.ts

@@ -1,3 +1,2 @@
-import React from 'react';
-declare const SelectorDemo: () => React.JSX.Element;
+declare const SelectorDemo: () => JSX.Element;
 export default SelectorDemo;

package/lib/pro/pisellPaymentList/example.d.ts

@@ -4,17 +4,16 @@
  * 这个文件演示了如何使用 PisellPaymentList 和 PisellPaymentListItem 组件
  * 包括如何通过 Context 访问父组件配置
  */
-import React from 'react';
-export declare const BasicExample: () => React.JSX.Element;
-export declare const ChildrenExample: () => React.JSX.Element;
-export declare const CustomItemExample: () => React.JSX.Element;
-export declare const MethodConfigExample: () => React.JSX.Element;
-export declare const FullFeatureExample: () => React.JSX.Element;
+export declare const BasicExample: () => JSX.Element;
+export declare const ChildrenExample: () => JSX.Element;
+export declare const CustomItemExample: () => JSX.Element;
+export declare const MethodConfigExample: () => JSX.Element;
+export declare const FullFeatureExample: () => JSX.Element;
 declare const _default: {
-    BasicExample: () => React.JSX.Element;
-    ChildrenExample: () => React.JSX.Element;
-    CustomItemExample: () => React.JSX.Element;
-    MethodConfigExample: () => React.JSX.Element;
-    FullFeatureExample: () => React.JSX.Element;
+    BasicExample: () => JSX.Element;
+    ChildrenExample: () => JSX.Element;
+    CustomItemExample: () => JSX.Element;
+    MethodConfigExample: () => JSX.Element;
+    FullFeatureExample: () => JSX.Element;
 };
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.3.63",
+  "version": "6.3.65",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -78,8 +78,8 @@
     "styled-components": "^6.0.0-rc.3",
     "@pisell/date-picker": "3.0.7",
     "@pisell/icon": "0.0.11",
-    "@pisell/materials": "6.3.21",
-    "@pisell/utils": "3.0.4"
+    "@pisell/utils": "3.0.4",
+    "@pisell/materials": "6.3.21"
   },
   "peerDependencies": {
     "react": "^18.0.0",