pb-sxp-ui 1.0.99 → 1.0.101

package/es/materials/sxp/popup/AppointForm/index.js

@@ -1,15 +1,16 @@
 import { __awaiter, __rest } from "tslib";
 import { css } from '@emotion/css';
-import React, { memo, useMemo, useRef, useState } from 'react';
+import React, { memo, useCallback, useMemo, useState } from 'react';
 import { cloneDeep, debounce } from 'lodash';
 import { useSxpDataSource } from '../../../../core/hooks';
 import './index.less';
 import { useEventReport } from '../../../../core/hooks/useEventReport';
+import { setFontForText } from '../../../../core/utils/tool';
+import Form from './Form';
 const AppointForm = (_a) => {
-    var { columns, style, title, textStyle, submitBgColor, submitColor, submitText, layoutType, isExternalLink, isPopup, onClick, onClose, submitButtonStyle } = _a, props = __rest(_a, ["columns", "style", "title", "textStyle", "submitBgColor", "submitColor", "submitText", "layoutType", "isExternalLink", "isPopup", "onClick", "onClose", "submitButtonStyle"]);
+    var { columns, style, title, textStyle, submitBgColor, submitColor, submitText, layoutType = 'inline', isExternalLink, isPopup, onClick, onClose, submitButtonStyle } = _a, props = __rest(_a, ["columns", "style", "title", "textStyle", "submitBgColor", "submitColor", "submitText", "layoutType", "isExternalLink", "isPopup", "onClick", "onClose", "submitButtonStyle"]);
     const { submitForm, popupDetailData } = useSxpDataSource();
     const { jumpToWeb } = useEventReport();
-    const formRef = useRef();
     const [loading, setLoading] = useState(false);
     const defaultColumns = useMemo(() => [
         {
@@ -37,27 +38,26 @@ const AppointForm = (_a) => {
             key: '4'
         }
     ], []);
+    const [formData, setFormData] = useState({});
     const columnsData = useMemo(() => {
-        if (layoutType === undefined) {
-            const list = cloneDeep(columns) || defaultColumns;
-            return list === null || list === void 0 ? void 0 : list.map((obj) => (Object.assign(Object.assign({}, obj), { title: undefined, fieldProps: { placeholder: obj === null || obj === void 0 ? void 0 : obj.title } })));
-        }
-        else {
-            return cloneDeep(columns) || defaultColumns;
-        }
-    }, [layoutType, columns, defaultColumns]);
+        return cloneDeep(columns) || defaultColumns;
+    }, [columns, defaultColumns]);
+    const handleChange = useCallback((e) => {
+        const { name, value } = e.target;
+        setFormData(Object.assign(Object.assign({}, formData), { [name]: value }));
+    }, [formData]);
     const handleSubmit = debounce(() => __awaiter(void 0, void 0, void 0, function* () {
-        var _b, _c, _d, _e, _f, _g;
-        const vals = yield ((_b = formRef === null || formRef === void 0 ? void 0 : formRef.current) === null || _b === void 0 ? void 0 : _b.getFieldsValue());
+        var _b, _c, _d, _e, _f;
+        const vals = formData;
         if (!vals)
             return;
-        const arr = (_d = (_c = Object.keys(vals)) === null || _c === void 0 ? void 0 : _c.map((key) => {
+        const arr = (_c = (_b = Object.keys(vals)) === null || _b === void 0 ? void 0 : _b.map((key) => {
             var _a;
             return ({
                 name: key,
                 value: (_a = vals[key]) !== null && _a !== void 0 ? _a : ''
             });
-        })) === null || _d === void 0 ? void 0 : _d.filter((item) => item === null || item === void 0 ? void 0 : item.value);
+        })) === null || _c === void 0 ? void 0 : _c.filter((item) => item === null || item === void 0 ? void 0 : item.value);
         if (!arr || !(arr === null || arr === void 0 ? void 0 : arr.length))
             return;
         setLoading(true);
@@ -66,8 +66,8 @@ const AppointForm = (_a) => {
         if (res) {
             if (isExternalLink) {
                 const data = popupDetailData;
-                const product = (_e = data === null || data === void 0 ? void 0 : data.video) === null || _e === void 0 ? void 0 : _e.bindProduct;
-                const cta = (_g = (_f = data === null || data === void 0 ? void 0 : data.video) === null || _f === void 0 ? void 0 : _f.bindProduct) === null || _g === void 0 ? void 0 : _g.bindCta;
+                const product = (_d = data === null || data === void 0 ? void 0 : data.video) === null || _d === void 0 ? void 0 : _d.bindProduct;
+                const cta = (_f = (_e = data === null || data === void 0 ? void 0 : data.video) === null || _e === void 0 ? void 0 : _e.bindProduct) === null || _f === void 0 ? void 0 : _f.bindCta;
                 const position = popupDetailData === null || popupDetailData === void 0 ? void 0 : popupDetailData.index;
                 jumpToWeb(data, product, cta, position);
             }
@@ -78,10 +78,15 @@ const AppointForm = (_a) => {
         }
     }), 1000);
     return (React.createElement("div", { className: 'pb-appoint-form' },
-        React.createElement("div", { className: `pb-appoint-form-title ${css(Object.assign({}, textStyle))}` }, title),
+        React.createElement("div", { className: `pb-appoint-form-title ${css(Object.assign({}, textStyle))}`, dangerouslySetInnerHTML: {
+                __html: setFontForText(title, textStyle)
+            } }),
         React.createElement("div", Object.assign({ className: css(Object.assign({}, style)) }, props),
-            React.createElement("div", { className: 'pb-appoint-form-container' })),
+            React.createElement("div", { className: 'pb-appoint-form-container' },
+                React.createElement(Form, { columns: columnsData, layout: layoutType, onChange: handleChange }))),
         React.createElement("div", { className: 'pb-appoint-form-btn-wrapper' },
-            React.createElement("button", { "aria-label": submitText, onClick: handleSubmit, className: 'pb-appoint-form-btn', style: Object.assign({ color: submitColor, background: submitBgColor }, submitButtonStyle) }, loading ? React.createElement(React.Fragment, null, "loading...") : submitText))));
+            React.createElement("button", { "aria-label": submitText, onClick: handleSubmit, className: 'pb-appoint-form-btn', style: Object.assign({ color: submitColor, background: submitBgColor }, submitButtonStyle), dangerouslySetInnerHTML: {
+                    __html: setFontForText(loading ? 'loading...' : submitText, submitButtonStyle)
+                } }))));
 };
 export default memo(AppointForm);

package/es/materials/sxp/popup/AppointForm/settingRender.d.ts

@@ -15,27 +15,24 @@ declare const _default: ({
     } | {
         type: string;
         label: string;
-        child: ({
+        child: {
             type: string;
             name: string[];
-            options?: undefined;
-            initialValue?: undefined;
-            addonAfter?: undefined;
-        } | {
+            bottomText: string;
+        }[];
+        name?: undefined;
+        options?: undefined;
+    } | {
+        type: string;
+        label: string;
+        child: ({
             type: string;
             name: string[];
-            options: {
-                label: string;
-                value: string;
-            }[];
-            initialValue: string;
             addonAfter?: undefined;
         } | {
             type: string;
             name: string[];
             addonAfter: string;
-            options?: undefined;
-            initialValue?: undefined;
         })[];
         name?: undefined;
         options?: undefined;
@@ -58,20 +55,12 @@ declare const _default: ({
             type: string;
             name: string[];
             initialValue: string;
-            options?: undefined;
-            addonAfter?: undefined;
-        } | {
-            type: string;
-            name: string[];
-            options: any[];
-            initialValue: any;
             addonAfter?: undefined;
         } | {
             type: string;
             name: string[];
             addonAfter: string;
             initialValue: number;
-            options?: undefined;
         })[];
         name?: undefined;
         options?: undefined;

package/es/materials/sxp/popup/AppointForm/settingRender.js

@@ -1,5 +1,3 @@
-var _a, _b, _c;
-import defaultSetting, { fontOptions } from '../../defaultSetting';
 export default [
     {
         type: 'Text',
@@ -19,14 +17,24 @@ export default [
                 label: '标题字体',
                 child: [
                     {
-                        type: 'Color',
-                        name: ['textStyle', 'color']
+                        type: 'Select',
+                        name: ['testStyle', 'fontFamily-cn'],
+                        bottomText: '中文字体'
                     },
                     {
                         type: 'Select',
-                        name: ['textStyle', 'fontFamily'],
-                        options: fontOptions,
-                        initialValue: (_a = fontOptions === null || fontOptions === void 0 ? void 0 : fontOptions[0]) === null || _a === void 0 ? void 0 : _a.value
+                        name: ['testStyle', 'fontFamily-en'],
+                        bottomText: '英文/其他字体'
+                    }
+                ]
+            },
+            {
+                type: 'Group',
+                label: '',
+                child: [
+                    {
+                        type: 'Color',
+                        name: ['textStyle', 'color']
                     },
                     {
                         type: 'Number',
@@ -74,15 +82,25 @@ export default [
                 label: '提交按钮字体',
                 child: [
                     {
-                        type: 'Color',
-                        name: ['props', 'submitButtonStyle', 'color'],
-                        initialValue: '#fff'
+                        type: 'Select',
+                        name: ['props', 'submitButtonStyle', 'fontFamily-cn'],
+                        bottomText: '中文字体'
                     },
                     {
                         type: 'Select',
-                        name: ['props', 'submitButtonStyle', 'fontFamily'],
-                        options: defaultSetting === null || defaultSetting === void 0 ? void 0 : defaultSetting.fontOptions,
-                        initialValue: (_c = (_b = defaultSetting === null || defaultSetting === void 0 ? void 0 : defaultSetting.fontOptions) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.value
+                        name: ['props', 'submitButtonStyle', 'fontFamily-en'],
+                        bottomText: '英文/其他字体'
+                    }
+                ]
+            },
+            {
+                type: 'Group',
+                label: '',
+                child: [
+                    {
+                        type: 'Color',
+                        name: ['props', 'submitButtonStyle', 'color'],
+                        initialValue: '#fff'
                     },
                     {
                         type: 'Number',

package/es/materials/sxp/popup/CommodityDetail/index.js

@@ -9,6 +9,7 @@ import { useEventReport } from '../../../../core/hooks/useEventReport';
 import Modal from '../../../../core/components/SxpPageRender/Modal';
 import ExpandableText from '../../../../core/components/SxpPageRender/ExpandableText';
 import FormatImage from '../../../../core/components/SxpPageRender/FormatImage';
+import { setFontForText } from '../../../../core/utils/tool';
 const CommodityDetail = (_a) => {
     var _b, _c, _d, _e, _f, _g, _h, _j, _k;
     var { content, style, bgImg, onClick, schema, isDefault, bottom_image, tipText, isPost, viewTime, rec, swiper, commodityStyles, buttonStyle, index } = _a, props = __rest(_a, ["content", "style", "bgImg", "onClick", "schema", "isDefault", "bottom_image", "tipText", "isPost", "viewTime", "rec", "swiper", "commodityStyles", "buttonStyle", "index"]);
@@ -62,9 +63,15 @@ const CommodityDetail = (_a) => {
     const renderContent = ({ isPost }) => {
         var _a, _b, _c;
         return (React.createElement("div", null,
-            React.createElement("div", { className: 'pb-commondity-content-collection', style: getStyle(commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.collection), hidden: !!product && (!(product === null || product === void 0 ? void 0 : product.collection) || (product === null || product === void 0 ? void 0 : product.collection) === '') }, (_a = product === null || product === void 0 ? void 0 : product.collection) !== null && _a !== void 0 ? _a : 'Tiffany Lock'),
-            React.createElement("div", { className: 'pb-commondity-content-title', style: getStyle(commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.title), hidden: !!product && !(product === null || product === void 0 ? void 0 : product.title) }, (_b = product === null || product === void 0 ? void 0 : product.title) !== null && _b !== void 0 ? _b : 'Pendant in Yellow Gold with Diamonds, Medium'),
-            React.createElement("div", { className: 'pb-commondity-content-price', style: getStyle(commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price), hidden: !!product && !(product === null || product === void 0 ? void 0 : product.price) }, priceText),
+            React.createElement("div", { className: 'pb-commondity-content-collection', style: getStyle(commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.collection), hidden: !!product && (!(product === null || product === void 0 ? void 0 : product.collection) || (product === null || product === void 0 ? void 0 : product.collection) === ''), dangerouslySetInnerHTML: {
+                    __html: setFontForText((_a = product === null || product === void 0 ? void 0 : product.collection) !== null && _a !== void 0 ? _a : 'Tiffany Lock', commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.collection)
+                } }),
+            React.createElement("div", { className: 'pb-commondity-content-title', style: getStyle(commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.title), hidden: !!product && !(product === null || product === void 0 ? void 0 : product.title), dangerouslySetInnerHTML: {
+                    __html: setFontForText((_b = product === null || product === void 0 ? void 0 : product.title) !== null && _b !== void 0 ? _b : 'Pendant in Yellow Gold with Diamonds, Medium', commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.title)
+                } }),
+            React.createElement("div", { className: 'pb-commondity-content-price', style: getStyle(commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price), hidden: !!product && !(product === null || product === void 0 ? void 0 : product.price), dangerouslySetInnerHTML: {
+                    __html: setFontForText(priceText, commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price)
+                } }),
             React.createElement("div", { hidden: !!product && (!(product === null || product === void 0 ? void 0 : product.info) || (product === null || product === void 0 ? void 0 : product.info) === '') },
                 React.createElement(ExpandableText, { foldText: tipText === null || tipText === void 0 ? void 0 : tipText.foldText, unfoldText: tipText === null || tipText === void 0 ? void 0 : tipText.unfoldText, onClick: () => setShowModal(true), isPost: isPost, text: (_c = product === null || product === void 0 ? void 0 : product.info) !== null && _c !== void 0 ? _c : `The design inspiration of Tiffany Lock series comes from the power of connection and inclusiveness, and the
             bold and avant-garde visual design interprets the emotional bond connecting my heart. The Tiffany Lock
@@ -74,7 +81,10 @@ const CommodityDetail = (_a) => {
     };
     const renderBtn = () => {
         var _a, _b;
-        return (React.createElement(React.Fragment, null, (isDefault || (product === null || product === void 0 ? void 0 : product.link)) && (React.createElement("button", { "aria-label": (_a = cta === null || cta === void 0 ? void 0 : cta.enTitle) !== null && _a !== void 0 ? _a : 'Purchase on Website', onClick: handleLink, className: 'pb-commondity-btn', style: buttonStyle }, (_b = cta === null || cta === void 0 ? void 0 : cta.enTitle) !== null && _b !== void 0 ? _b : 'Purchase on Website'))));
+        return (React.createElement(React.Fragment, null, (isDefault || (product === null || product === void 0 ? void 0 : product.link)) && (React.createElement("button", { "aria-label": (_a = cta === null || cta === void 0 ? void 0 : cta.enTitle) !== null && _a !== void 0 ? _a : 'Purchase on Website', onClick: handleLink, className: 'pb-commondity-btn', style: buttonStyle },
+            React.createElement("span", { dangerouslySetInnerHTML: {
+                    __html: setFontForText((_b = cta === null || cta === void 0 ? void 0 : cta.enTitle) !== null && _b !== void 0 ? _b : 'Purchase on Website', buttonStyle)
+                } })))));
     };
     const getStyle = useCallback((style) => {
         if (style === null || style === void 0 ? void 0 : style.lineClamp) {

package/es/materials/sxp/popup/CommodityDetail/settingRender.d.ts

@@ -62,27 +62,25 @@ declare const _default: ({
         } | {
             type: string;
             label: string;
-            child: ({
+            child: {
                 type: string;
                 name: string[];
-                options?: undefined;
-                initialValue?: undefined;
-                addonAfter?: undefined;
-            } | {
+                bottomText: string;
+            }[];
+            options?: undefined;
+            name?: undefined;
+            initialValue?: undefined;
+        } | {
+            type: string;
+            label: string;
+            child: ({
                 type: string;
-                options: {
-                    label: string;
-                    value: string;
-                }[];
                 name: string[];
-                initialValue: string;
                 addonAfter?: undefined;
             } | {
                 type: string;
                 addonAfter: string;
                 name: string[];
-                options?: undefined;
-                initialValue?: undefined;
             })[];
             options?: undefined;
             name?: undefined;
@@ -136,19 +134,19 @@ declare const _default: ({
     } | {
         type: string;
         label: string;
-        child: ({
+        child: {
             type: string;
             name: string[];
-            initialValue: string;
-            options?: undefined;
-            addonAfter?: undefined;
-        } | {
+            bottomText: string;
+        }[];
+        name?: undefined;
+        initialValue?: undefined;
+    } | {
+        type: string;
+        label: string;
+        child: ({
             type: string;
             name: string[];
-            options: {
-                label: string;
-                value: string;
-            }[];
             initialValue: string;
             addonAfter?: undefined;
         } | {
@@ -156,7 +154,6 @@ declare const _default: ({
             name: string[];
             addonAfter: string;
             initialValue?: undefined;
-            options?: undefined;
         })[];
         name?: undefined;
         initialValue?: undefined;

package/es/materials/sxp/popup/CommodityDetail/settingRender.js

@@ -1,5 +1,3 @@
-var _a, _b;
-import { fontOptions } from '../../defaultSetting';
 export default [
     {
         title: '商品图片',
@@ -92,14 +90,24 @@ export default [
                         label: '标题字体',
                         child: [
                             {
-                                type: 'Color',
-                                name: ['color']
+                                type: 'Select',
+                                name: ['fontFamily-cn'],
+                                bottomText: '中文字体'
                             },
                             {
                                 type: 'Select',
-                                options: fontOptions,
-                                name: ['fontFamily'],
-                                initialValue: (_a = fontOptions === null || fontOptions === void 0 ? void 0 : fontOptions[0]) === null || _a === void 0 ? void 0 : _a.value
+                                name: ['fontFamily-en'],
+                                bottomText: '英文/其他字体'
+                            }
+                        ]
+                    },
+                    {
+                        type: 'Group',
+                        label: '',
+                        child: [
+                            {
+                                type: 'Color',
+                                name: ['color']
                             },
                             {
                                 type: 'Number',
@@ -171,15 +179,25 @@ export default [
                 label: '字体',
                 child: [
                     {
-                        type: 'Color',
-                        name: ['props', 'buttonStyle', 'color'],
-                        initialValue: '#fff'
+                        type: 'Select',
+                        name: ['props', 'buttonStyle', 'fontFamily-cn'],
+                        bottomText: '中文字体'
                     },
                     {
                         type: 'Select',
-                        name: ['props', 'buttonStyle', 'fontFamily'],
-                        options: fontOptions,
-                        initialValue: (_b = fontOptions === null || fontOptions === void 0 ? void 0 : fontOptions[0]) === null || _b === void 0 ? void 0 : _b.value
+                        name: ['props', 'buttonStyle', 'fontFamily-en'],
+                        bottomText: '英文/其他字体'
+                    }
+                ]
+            },
+            {
+                type: 'Group',
+                label: '',
+                child: [
+                    {
+                        type: 'Color',
+                        name: ['props', 'buttonStyle', 'color'],
+                        initialValue: '#fff'
                     },
                     {
                         type: 'Number',

package/es/materials/sxp/popup/CommodityDetailDiroNew/index.js

@@ -9,6 +9,7 @@ import Modal from '../../../../core/components/SxpPageRender/Modal';
 import ExpandableText from '../../../../core/components/SxpPageRender/ExpandableText';
 import { useEventReport } from '../../../../core/hooks/useEventReport';
 import FormatImage from '../../../../core/components/SxpPageRender/FormatImage';
+import { setFontForText } from '../../../../core/utils/tool';
 const CommodityDetailDiroNew = (_a) => {
     var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
     var { style, isDefault, rec, viewTime, isPost, bottom_image, tipText, swiper, commodityStyles, buttonStyle, index } = _a, props = __rest(_a, ["style", "isDefault", "rec", "viewTime", "isPost", "bottom_image", "tipText", "swiper", "commodityStyles", "buttonStyle", "index"]);
@@ -142,12 +143,23 @@ Made in Italy` })));
             React.createElement("div", { className: 'pb-commondityDiroNew-content' },
                 React.createElement("div", { className: 'pb-commondityDiroNew-content-top' },
                     React.createElement("div", { className: 'pb-commondityDiroNew-content-top-left' },
-                        React.createElement("div", { className: 'pb-commondityDiroNew-content-top-left-title', style: getStyle(commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.title) }, (_l = product === null || product === void 0 ? void 0 : product.title) !== null && _l !== void 0 ? _l : 'Large Dior Toujours BagLarge'),
-                        React.createElement("div", { className: 'pb-commondityDiroNew-content-collection', hidden: !!product && (!(product === null || product === void 0 ? void 0 : product.collection) || (product === null || product === void 0 ? void 0 : product.collection) === ''), style: getStyle(commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.collection) }, (product === null || product === void 0 ? void 0 : product.collection) || 'Black Macrocannage CalfskinLarge')),
+                        React.createElement("div", { className: 'pb-commondityDiroNew-content-top-left-title', style: getStyle(commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.title), dangerouslySetInnerHTML: {
+                                __html: setFontForText((_l = product === null || product === void 0 ? void 0 : product.title) !== null && _l !== void 0 ? _l : 'Large Dior Toujours BagLarge', commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.title)
+                            } }),
+                        React.createElement("div", { className: 'pb-commondityDiroNew-content-collection', hidden: !!product && (!(product === null || product === void 0 ? void 0 : product.collection) || (product === null || product === void 0 ? void 0 : product.collection) === ''), style: getStyle(commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.collection), dangerouslySetInnerHTML: {
+                                __html: setFontForText((product === null || product === void 0 ? void 0 : product.collection) || 'Black Macrocannage CalfskinLarge', commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.collection)
+                            } })),
                     React.createElement("div", { className: 'pb-commondityDiroNew-content-top-right' },
-                        React.createElement("div", { className: 'pb-commondityDiroNew-content-top-right-price', hidden: !!product && !(product === null || product === void 0 ? void 0 : product.price), style: getStyle(commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price) }, priceText),
-                        React.createElement("div", { className: 'pb-commondityDiroNew-content-top-right-price', hidden: !!product && !(product === null || product === void 0 ? void 0 : product.taxInfo), style: getStyle(commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.taxInfo) }, (_m = product === null || product === void 0 ? void 0 : product.taxInfo) !== null && _m !== void 0 ? _m : '税费'))),
-                (!product || (product === null || product === void 0 ? void 0 : product.link)) && (React.createElement("button", { "aria-label": (_o = cta === null || cta === void 0 ? void 0 : cta.enTitle) !== null && _o !== void 0 ? _o : 'Shop now', onClick: handleLink, className: 'pb-commondityDiroNew-btn', style: buttonStyle }, (_p = cta === null || cta === void 0 ? void 0 : cta.enTitle) !== null && _p !== void 0 ? _p : 'Shop now')),
+                        React.createElement("div", { className: 'pb-commondityDiroNew-content-top-right-price', hidden: !!product && !(product === null || product === void 0 ? void 0 : product.price), style: getStyle(commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price), dangerouslySetInnerHTML: {
+                                __html: setFontForText(priceText, commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price)
+                            } }),
+                        React.createElement("div", { className: 'pb-commondityDiroNew-content-top-right-price', hidden: !!product && !(product === null || product === void 0 ? void 0 : product.taxInfo), style: getStyle(commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.taxInfo), dangerouslySetInnerHTML: {
+                                __html: setFontForText((_m = product === null || product === void 0 ? void 0 : product.taxInfo) !== null && _m !== void 0 ? _m : '税费', commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.taxInfo)
+                            } }))),
+                (!product || (product === null || product === void 0 ? void 0 : product.link)) && (React.createElement("button", { "aria-label": (_o = cta === null || cta === void 0 ? void 0 : cta.enTitle) !== null && _o !== void 0 ? _o : 'Shop now', onClick: handleLink, className: 'pb-commondityDiroNew-btn', style: buttonStyle },
+                    React.createElement("span", { dangerouslySetInnerHTML: {
+                            __html: setFontForText((_p = cta === null || cta === void 0 ? void 0 : cta.enTitle) !== null && _p !== void 0 ? _p : 'Shop now', buttonStyle)
+                        } }))),
                 productInfoText({ isPost }))),
         React.createElement(Modal, { visible: showModal, onClose: () => setShowModal(false) }, productInfoText({ isPost: false }))));
 };

package/es/materials/sxp/popup/CommodityDetailDiroNew/settingRender.d.ts

@@ -50,27 +50,25 @@ declare const _default: ({
         } | {
             type: string;
             label: string;
-            child: ({
+            child: {
                 type: string;
                 name: string[];
-                options?: undefined;
-                initialValue?: undefined;
-                addonAfter?: undefined;
-            } | {
+                bottomText: string;
+            }[];
+            options?: undefined;
+            name?: undefined;
+            initialValue?: undefined;
+        } | {
+            type: string;
+            label: string;
+            child: ({
                 type: string;
-                options: {
-                    label: string;
-                    value: string;
-                }[];
                 name: string[];
-                initialValue: string;
                 addonAfter?: undefined;
             } | {
                 type: string;
                 addonAfter: string;
                 name: string[];
-                options?: undefined;
-                initialValue?: undefined;
             })[];
             options?: undefined;
             name?: undefined;
@@ -124,19 +122,19 @@ declare const _default: ({
     } | {
         type: string;
         label: string;
-        child: ({
+        child: {
             type: string;
             name: string[];
-            initialValue: string;
-            options?: undefined;
-            addonAfter?: undefined;
-        } | {
+            bottomText: string;
+        }[];
+        name?: undefined;
+        initialValue?: undefined;
+    } | {
+        type: string;
+        label: string;
+        child: ({
             type: string;
             name: string[];
-            options: {
-                label: string;
-                value: string;
-            }[];
             initialValue: string;
             addonAfter?: undefined;
         } | {
@@ -144,7 +142,6 @@ declare const _default: ({
             name: string[];
             addonAfter: string;
             initialValue?: undefined;
-            options?: undefined;
         })[];
         name?: undefined;
         initialValue?: undefined;

package/es/materials/sxp/popup/CommodityDetailDiroNew/settingRender.js

@@ -1,5 +1,3 @@
-var _a, _b;
-import { fontOptions } from '../../defaultSetting';
 export default [
     {
         title: '商品图片',
@@ -79,14 +77,24 @@ export default [
                         label: '标题字体',
                         child: [
                             {
-                                type: 'Color',
-                                name: ['color']
+                                type: 'Select',
+                                name: ['fontFamily-cn'],
+                                bottomText: '中文字体'
                             },
                             {
                                 type: 'Select',
-                                options: fontOptions,
-                                name: ['fontFamily'],
-                                initialValue: (_a = fontOptions === null || fontOptions === void 0 ? void 0 : fontOptions[0]) === null || _a === void 0 ? void 0 : _a.value
+                                name: ['fontFamily-en'],
+                                bottomText: '英文/其他字体'
+                            }
+                        ]
+                    },
+                    {
+                        type: 'Group',
+                        label: '',
+                        child: [
+                            {
+                                type: 'Color',
+                                name: ['color']
                             },
                             {
                                 type: 'Number',
@@ -158,15 +166,25 @@ export default [
                 label: '字体',
                 child: [
                     {
-                        type: 'Color',
-                        name: ['props', 'buttonStyle', 'color'],
-                        initialValue: '#fff'
+                        type: 'Select',
+                        name: ['props', 'buttonStyle', 'fontFamily-cn'],
+                        bottomText: '中文字体'
                     },
                     {
                         type: 'Select',
-                        name: ['props', 'buttonStyle', 'fontFamily'],
-                        options: fontOptions,
-                        initialValue: (_b = fontOptions === null || fontOptions === void 0 ? void 0 : fontOptions[0]) === null || _b === void 0 ? void 0 : _b.value
+                        name: ['props', 'buttonStyle', 'fontFamily-en'],
+                        bottomText: '英文/其他字体'
+                    }
+                ]
+            },
+            {
+                type: 'Group',
+                label: '',
+                child: [
+                    {
+                        type: 'Color',
+                        name: ['props', 'buttonStyle', 'color'],
+                        initialValue: '#fff'
                     },
                     {
                         type: 'Number',

package/es/materials/sxp/popup/Prompt/index.js

@@ -6,6 +6,7 @@ import { getMediaValueByMode } from '../../../../core/utils/materials';
 import './index.less';
 import { useSxpDataSource } from '../../../../core/hooks';
 import { useEventReport } from '../../../../core/hooks/useEventReport';
+import { setFontForText } from '../../../../core/utils/tool';
 const Prompt = (_a) => {
     var { content, btnText, style, icon, isPopup, isExternalLink, onClose, onClick, submitButtonStyle } = _a, props = __rest(_a, ["content", "btnText", "style", "icon", "isPopup", "isExternalLink", "onClose", "onClick", "submitButtonStyle"]);
     const { popupDetailData } = useSxpDataSource();
@@ -29,6 +30,8 @@ const Prompt = (_a) => {
         React.createElement("div", { className: 'pb-prompt-icon' },
             React.createElement("img", { width: '100%', src: iconSrc !== null && iconSrc !== void 0 ? iconSrc : success, alt: 'success image' })),
         React.createElement("div", { className: 'pb-prompt-content' }, content),
-        React.createElement("button", { "aria-label": btnText, className: 'pb-prompt-btn', style: submitButtonStyle, onClick: handleOk }, btnText)));
+        React.createElement("button", { "aria-label": btnText, className: 'pb-prompt-btn', style: submitButtonStyle, onClick: handleOk, dangerouslySetInnerHTML: {
+                __html: setFontForText(btnText, submitButtonStyle)
+            } })));
 };
 export default memo(Prompt);

package/es/materials/sxp/popup/Prompt/settingRender.d.ts

@@ -15,24 +15,26 @@ declare const _default: {
     } | {
         type: string;
         label: string;
-        child: ({
+        child: {
             type: string;
             name: string[];
-            initialValue: string;
-            options?: undefined;
-            addonAfter?: undefined;
-        } | {
+            bottomText: string;
+        }[];
+        name?: undefined;
+        mediaType?: undefined;
+    } | {
+        type: string;
+        label: string;
+        child: ({
             type: string;
             name: string[];
-            options: any[];
-            initialValue: any;
+            initialValue: string;
             addonAfter?: undefined;
         } | {
             type: string;
             name: string[];
             addonAfter: string;
             initialValue: number;
-            options?: undefined;
         })[];
         name?: undefined;
         mediaType?: undefined;