pb-sxp-ui 1.0.2-alpha.1 → 1.0.3-alpha.1

package/es/core/components/SxpPageRender/ExpandableText.js

@@ -47,7 +47,7 @@ const ExpandableText = ({ text, maxStr = 108, style, className, onClick, foldTex
             }, 100);
         }
     }, [multiRow, text, lineClamp, style, isPost]);
-    return (React.createElement("div", { className: className, style: Object.assign({}, style) },
+    return (React.createElement("div", { className: className, style: Object.assign({}, style), hidden: !text || text === '' },
         React.createElement("div", { ref: multiRow, style: {
                 overflow: 'hidden',
                 WebkitLineClamp: !isShowMore ? lineClamp : '',
@@ -55,7 +55,7 @@ const ExpandableText = ({ text, maxStr = 108, style, className, onClick, foldTex
                 display: '-webkit-box',
                 WebkitBoxOrient: 'vertical',
                 wordBreak: 'break-word'
-            }, dangerouslySetInnerHTML: { __html: text ? text === null || text === void 0 ? void 0 : text.replace(/\n/g, '</br>') : React.createElement(React.Fragment, null) } }),
+            }, dangerouslySetInnerHTML: { __html: text === null || text === void 0 ? void 0 : text.replace(/\n/g, '</br>') } }),
         isShow && text && (React.createElement("span", { style: { textDecoration: 'underline', cursor: 'pointer' }, onClick: onClick !== null && onClick !== void 0 ? onClick : handleClick }, isShowMore ? unfoldText || 'show less' : foldText || 'show more'))));
 };
 export default memo(ExpandableText);

package/es/core/components/SxpPageRender/index.js

@@ -160,7 +160,7 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
             return (_d = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.productPost) === null || _d === void 0 ? void 0 : _d.map((value, index) => {
                 var _a, _b, _c, _d, _e, _f;
                 const Component = withBindDataSource(resolver[(_a = value === null || value === void 0 ? void 0 : value.item) === null || _a === void 0 ? void 0 : _a.type]);
-                return (React.createElement(Component, Object.assign({ key: index, textStyle: (_b = value === null || value === void 0 ? void 0 : value.item) === null || _b === void 0 ? void 0 : _b.textStyle, bindDatas: (_d = (_c = value === null || value === void 0 ? void 0 : value.item) === null || _c === void 0 ? void 0 : _c.bindDatas) !== null && _d !== void 0 ? _d : [] }, (_e = value === null || value === void 0 ? void 0 : value.item) === null || _e === void 0 ? void 0 : _e.props, { event: ((_f = value === null || value === void 0 ? void 0 : value.item) === null || _f === void 0 ? void 0 : _f.event) || {}, schema: schema, id: value === null || value === void 0 ? void 0 : value.id, viewTime: viewTime.current, rec: rec, isPost: true, tipText: tipText, style: { height: '100%', overflow: 'auto' }, data: rec, height: height, width: containerWidth })));
+                return (React.createElement(Component, Object.assign({ key: index, textStyle: (_b = value === null || value === void 0 ? void 0 : value.item) === null || _b === void 0 ? void 0 : _b.textStyle, bindDatas: (_d = (_c = value === null || value === void 0 ? void 0 : value.item) === null || _c === void 0 ? void 0 : _c.bindDatas) !== null && _d !== void 0 ? _d : [] }, (_e = value === null || value === void 0 ? void 0 : value.item) === null || _e === void 0 ? void 0 : _e.props, { event: ((_f = value === null || value === void 0 ? void 0 : value.item) === null || _f === void 0 ? void 0 : _f.event) || {}, schema: schema, id: value === null || value === void 0 ? void 0 : value.id, viewTime: viewTime.current, rec: rec, isPost: true, tipText: tipText, style: { height: '100%', overflow: 'auto' } })));
             });
         }
         return null;

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

@@ -1,5 +1,6 @@
-import React from 'react';
+import React, { CSSProperties } from 'react';
 import { IEditorContext } from '../../../../core/context/EditorContext';
+import { RecItemType } from '../../../../core/components/SxpPageRender/typing';
 import './index.less';
 export interface ICommodityDetailProps {
     content?: string;
@@ -9,6 +10,24 @@ export interface ICommodityDetailProps {
     schema?: IEditorContext['schema'];
     isDefault?: boolean;
     bottom_image?: string;
+    tipText?: {
+        foldText?: string;
+        unfoldText?: string;
+    };
+    isPost?: boolean;
+    viewTime?: any;
+    rec?: RecItemType;
+    swiper: {
+        dotsAlign: 'left' | 'center';
+        delay: number;
+    };
+    commodityStyles?: {
+        title: CSSProperties;
+        collection: CSSProperties;
+        price: CSSProperties;
+        info: CSSProperties;
+    };
+    buttonStyle?: CSSProperties;
 }
 declare const _default: React.NamedExoticComponent<ICommodityDetailProps>;
 export default _default;

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

@@ -1,24 +1,30 @@
 import { __rest } from "tslib";
 import { css } from '@emotion/css';
-import React, { memo, useEffect, useMemo, useRef } from 'react';
+import React, { memo, useEffect, useMemo, useRef, useState } from 'react';
 import { useSxpDataSource } from '../../../../core/hooks';
 import './index.less';
 import { Autoplay, Pagination } from 'swiper/modules';
 import { Swiper, SwiperSlide } from 'swiper/react';
 import { useEventReport } from '../../../../core/hooks/useEventReport';
+import Modal from '../../../../core/components/SxpPageRender/Modal';
+import ExpandableText from '../../../../core/components/SxpPageRender/ExpandableText';
 const CommodityDetail = (_a) => {
-    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-    var { content, style, bgImg, onClick, schema, isDefault, bottom_image } = _a, props = __rest(_a, ["content", "style", "bgImg", "onClick", "schema", "isDefault", "bottom_image"]);
+    var _b, _c, _d, _e, _f, _g, _h, _j;
+    var { content, style, bgImg, onClick, schema, isDefault, bottom_image, tipText, isPost, viewTime, rec, swiper, commodityStyles, buttonStyle } = _a, props = __rest(_a, ["content", "style", "bgImg", "onClick", "schema", "isDefault", "bottom_image", "tipText", "isPost", "viewTime", "rec", "swiper", "commodityStyles", "buttonStyle"]);
     const { sxpParameter } = useSxpDataSource();
     const { popupDetailData, bffEventReport, isPreview, waterFallData } = useSxpDataSource();
     const { jumpToWeb, productView } = useEventReport();
     const curTimeRef = useRef(null);
-    const product = (_b = popupDetailData === null || popupDetailData === void 0 ? void 0 : popupDetailData.video) === null || _b === void 0 ? void 0 : _b.bindProduct;
-    const cta = (_d = (_c = popupDetailData === null || popupDetailData === void 0 ? void 0 : popupDetailData.video) === null || _c === void 0 ? void 0 : _c.bindProduct) === null || _d === void 0 ? void 0 : _d.bindCta;
+    const [showModal, setShowModal] = useState(false);
+    const data = isPost ? rec : popupDetailData;
+    const product = isPost ? data === null || data === void 0 ? void 0 : data.product : (_b = data === null || data === void 0 ? void 0 : data.video) === null || _b === void 0 ? void 0 : _b.bindProduct;
+    const cta = isPost ? (_c = data === null || data === void 0 ? void 0 : data.product) === null || _c === void 0 ? void 0 : _c.bindCta : (_e = (_d = data === null || data === void 0 ? void 0 : data.video) === null || _d === void 0 ? void 0 : _d.bindProduct) === null || _e === void 0 ? void 0 : _e.bindCta;
     const handleLink = () => {
         if (product === null || product === void 0 ? void 0 : product.link) {
             jumpToWeb(popupDetailData, product, cta);
-            productView(popupDetailData, product, cta, curTimeRef.current);
+            if (!isPost) {
+                productView(data, product, cta, viewTime || curTimeRef.current);
+            }
             window.location.href = window.getJointUtmLink(product.link);
         }
     };
@@ -44,11 +50,33 @@ const CommodityDetail = (_a) => {
         }
     }, [product === null || product === void 0 ? void 0 : product.price, product === null || product === void 0 ? void 0 : product.currency]);
     const width = isPreview ? 375 : window.innerWidth;
+    const renderContent = ({ isPost }) => {
+        var _a, _b, _c;
+        return (React.createElement("div", { className: 'pb-commondity-content' },
+            React.createElement("div", { className: 'pb-commondity-content-collection', style: commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.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: commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.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: commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price }, priceText),
+            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
+            collection is unisex and is inspired by the padlock pattern found in the Tiffany Antique Collection. This
+            necklace features a stylish and eye-catching oval clasp chain decorated with a lock pattern. Crafted from
+            18-karat gold, this necklace is embellished with hand-set diamonds.`, maxStr: 79, className: 'pb-commondity-content-info', style: commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.info })));
+    };
+    const renderBtn = () => {
+        var _a;
+        return (React.createElement(React.Fragment, null, (isDefault || (product === null || product === void 0 ? void 0 : product.link)) && (React.createElement("button", { onClick: handleLink, className: 'pb-commondity-btn', style: buttonStyle }, (_a = cta === null || cta === void 0 ? void 0 : cta.enTitle) !== null && _a !== void 0 ? _a : 'Purchase on Website'))));
+    };
     return (React.createElement("div", { className: 'pb-commondity' },
         React.createElement("div", Object.assign({ className: css(Object.assign({}, style)) }, props),
-            product && ((_e = product === null || product === void 0 ? void 0 : product.homePage) === null || _e === void 0 ? void 0 : _e.length) > 0 && (React.createElement(Swiper, { height: width, modules: [Pagination, Autoplay], pagination: { clickable: true, bulletActiveClass: 'swipe-item-active-bullet' }, loop: true, autoplay: {
-                    delay: 3000
-                } }, (_f = product === null || product === void 0 ? void 0 : product.homePage) === null || _f === void 0 ? void 0 : _f.map((src) => {
+            product && ((_f = product === null || product === void 0 ? void 0 : product.homePage) === null || _f === void 0 ? void 0 : _f.length) > 0 && (React.createElement(Swiper, { height: width, modules: [Pagination, Autoplay], pagination: {
+                    clickable: true,
+                    bulletActiveClass: 'swipe-item-active-bullet',
+                    clickableClass: (swiper === null || swiper === void 0 ? void 0 : swiper.dotsAlign) === 'left'
+                        ? 'commondityDetail-swiper-clickable-left'
+                        : 'commondityDetail-swiper-clickable-center'
+                }, loop: true, autoplay: {
+                    delay: (swiper === null || swiper === void 0 ? void 0 : swiper.delay) * 1000
+                } }, (_g = product === null || product === void 0 ? void 0 : product.homePage) === null || _g === void 0 ? void 0 : _g.map((src) => {
                 return (React.createElement(SwiperSlide, { key: src },
                     React.createElement("div", { style: {
                             overflow: 'hidden',
@@ -57,7 +85,7 @@ const CommodityDetail = (_a) => {
                         } },
                         React.createElement("img", { src: src, style: { height: '100%', width: '100%', objectFit: 'cover' } }))));
             }))),
-            !((_g = product === null || product === void 0 ? void 0 : product.homePage) === null || _g === void 0 ? void 0 : _g.length) && (React.createElement("div", { className: css({
+            !((_h = product === null || product === void 0 ? void 0 : product.homePage) === null || _h === void 0 ? void 0 : _h.length) && (React.createElement("div", { className: css({
                     position: 'relative',
                     height: 0,
                     width: '100%',
@@ -70,16 +98,11 @@ const CommodityDetail = (_a) => {
                         top: 0,
                         objectFit: 'cover',
                         width: '100%'
-                    }), src: (_h = sxpParameter === null || sxpParameter === void 0 ? void 0 : sxpParameter.bottom_image) !== null && _h !== void 0 ? _h : bottom_image, alt: '' }))),
-            React.createElement("div", { className: 'pb-commondity-content' },
-                React.createElement("div", { className: 'pb-commondity-content-collection' }, (_j = product === null || product === void 0 ? void 0 : product.collection) !== null && _j !== void 0 ? _j : 'Tiffany Lock'),
-                React.createElement("div", { className: 'pb-commondity-content-title' }, (_k = product === null || product === void 0 ? void 0 : product.title) !== null && _k !== void 0 ? _k : 'Pendant in Yellow Gold with Diamonds, Medium'),
-                React.createElement("div", { className: 'pb-commondity-content-price' }, priceText),
-                React.createElement("div", { className: 'pb-commondity-content-info' }, (_l = product === null || product === void 0 ? void 0 : product.info) !== null && _l !== void 0 ? _l : `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
-            collection is unisex and is inspired by the padlock pattern found in the Tiffany Antique Collection. This
-            necklace features a stylish and eye-catching oval clasp chain decorated with a lock pattern. Crafted from
-            18-karat gold, this necklace is embellished with hand-set diamonds.`))),
-        (isDefault || (product === null || product === void 0 ? void 0 : product.link)) && (React.createElement("button", { onClick: handleLink, className: 'pb-commondity-btn' }, (_m = cta === null || cta === void 0 ? void 0 : cta.enTitle) !== null && _m !== void 0 ? _m : 'Purchase on Website'))));
+                    }), src: (_j = sxpParameter === null || sxpParameter === void 0 ? void 0 : sxpParameter.bottom_image) !== null && _j !== void 0 ? _j : bottom_image, alt: '' }))),
+            renderContent({ isPost })),
+        renderBtn(),
+        React.createElement(Modal, { visible: showModal, onClose: () => setShowModal(false) },
+            renderContent({ isPost: false }),
+            renderBtn())));
 };
 export default memo(CommodityDetail);

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

@@ -1,3 +1,4 @@
+import settingRender from './settingRender';
 import CommodityDetailComponent from '.';
 import { createMaterial } from '../../../../core/create';
 const CommodityDetail = createMaterial(CommodityDetailComponent, {
@@ -5,8 +6,42 @@ const CommodityDetail = createMaterial(CommodityDetailComponent, {
     icon: '',
     category: 'popup',
     type: 'CommodityDetail',
+    related: {
+        settingRender
+    },
     defaulSetting: {
-        props: {},
+        props: {
+            swiper: {
+                dotsAlign: 'center',
+                delay: 3
+            },
+            commodityStyles: {
+                price: {
+                    color: '#000',
+                    fontSize: 18
+                },
+                title: {
+                    color: '#000',
+                    fontSize: 23
+                },
+                collection: {
+                    fontSize: 12,
+                    color: '#000'
+                },
+                info: {
+                    color: 'gray',
+                    fontSize: 12
+                }
+            },
+            buttonStyle: {
+                backgroundColor: '#000',
+                fontSize: 12,
+                height: 45,
+                fontWeight: 'bold',
+                textAlign: 'center',
+                color: 'rgba(255, 255, 255, 0.9)'
+            }
+        },
         style: {}
     },
     w: 100,

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

@@ -0,0 +1,134 @@
+declare const _default: ({
+    title: string;
+    child: ({
+        type: string;
+        label: string;
+        options: {
+            label: string;
+            value: string;
+        }[];
+        name: string[];
+        addonAfter?: undefined;
+    } | {
+        type: string;
+        name: string[];
+        addonAfter: string;
+        label?: undefined;
+        options?: undefined;
+    })[];
+} | {
+    title: string;
+    child: {
+        name: string[];
+        type: string;
+        child: ({
+            label: string;
+            type: string;
+            options: {
+                label: string;
+                value: string;
+            }[];
+            name: string[];
+            initialValue: string;
+            child?: undefined;
+        } | {
+            type: string;
+            label: string;
+            child: ({
+                type: string;
+                name: string[];
+                options?: undefined;
+                addonAfter?: undefined;
+            } | {
+                type: string;
+                options: {
+                    label: string;
+                    value: string;
+                }[];
+                name: string[];
+                addonAfter?: undefined;
+            } | {
+                type: string;
+                addonAfter: string;
+                name: string[];
+                options?: undefined;
+            })[];
+            options?: undefined;
+            name?: undefined;
+            initialValue?: undefined;
+        } | {
+            label: string;
+            type: string;
+            options?: undefined;
+            name?: undefined;
+            initialValue?: undefined;
+            child?: undefined;
+        } | {
+            label: string;
+            type: string;
+            name: string[];
+            options?: undefined;
+            initialValue?: undefined;
+            child?: undefined;
+        })[];
+    }[];
+} | {
+    title: string;
+    child: ({
+        type: string;
+        label: string;
+        name: string[];
+        initialValue: string;
+        child?: undefined;
+    } | {
+        type: string;
+        label: string;
+        child: ({
+            type: string;
+            name: string[];
+            max: number;
+            addonAfter?: undefined;
+        } | {
+            type: string;
+            name: string[];
+            addonAfter: string;
+            max: number;
+        })[];
+        name?: undefined;
+        initialValue?: undefined;
+    } | {
+        type: string;
+        name: string[];
+        label?: undefined;
+        initialValue?: undefined;
+        child?: undefined;
+    } | {
+        type: string;
+        label: string;
+        child: ({
+            type: string;
+            name: string[];
+            initialValue: string;
+            options?: undefined;
+            addonAfter?: undefined;
+        } | {
+            type: string;
+            name: string[];
+            options: {
+                label: string;
+                value: string;
+            }[];
+            initialValue?: undefined;
+            addonAfter?: undefined;
+        } | {
+            type: string;
+            name: string[];
+            addonAfter: string;
+            initialValue?: undefined;
+            options?: undefined;
+        })[];
+        name?: undefined;
+        initialValue?: undefined;
+    })[];
+})[];
+export default _default;

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

@@ -0,0 +1,167 @@
+export default [
+    {
+        title: '商品图片',
+        child: [
+            {
+                type: 'Radius',
+                label: '轮播指示器',
+                options: [
+                    {
+                        label: '居左',
+                        value: 'left'
+                    },
+                    {
+                        label: '居中',
+                        value: 'center'
+                    }
+                ],
+                name: ['props', 'swiper', 'dotsAlign']
+            },
+            {
+                type: 'Number',
+                name: ['props', 'swiper', 'delay'],
+                addonAfter: 's'
+            }
+        ]
+    },
+    {
+        title: '商品文本',
+        child: [
+            {
+                name: ['props', 'commodityStyles'],
+                type: 'SelectLinkage',
+                child: [
+                    {
+                        label: '字段',
+                        type: 'Select',
+                        options: [
+                            {
+                                label: '商品名称',
+                                value: 'title'
+                            },
+                            {
+                                label: '系列名称',
+                                value: 'collection'
+                            },
+                            {
+                                label: '价格',
+                                value: 'price'
+                            },
+                            {
+                                label: '商品描述',
+                                value: 'info'
+                            }
+                        ],
+                        name: ['props', 'commodityStyles', 'field'],
+                        initialValue: 'title'
+                    },
+                    {
+                        type: 'Group',
+                        label: '标题字体',
+                        child: [
+                            {
+                                type: 'Color',
+                                name: ['color']
+                            },
+                            {
+                                type: 'Select',
+                                options: [{ label: '黑体', value: '黑体' }],
+                                name: ['fontFamily']
+                            },
+                            {
+                                type: 'Number',
+                                addonAfter: 'px',
+                                name: ['fontSize']
+                            }
+                        ]
+                    },
+                    {
+                        label: '标题样式',
+                        type: 'TextStyle'
+                    },
+                    {
+                        label: '标题对齐',
+                        type: 'TextAlign'
+                    },
+                    {
+                        label: '默认行数',
+                        type: 'Number',
+                        name: ['lineClamp']
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        title: '购买按钮样式',
+        child: [
+            {
+                type: 'Color',
+                label: '背景色',
+                name: ['props', 'buttonStyle', 'backgroundColor'],
+                initialValue: '#000'
+            },
+            {
+                type: 'Group',
+                label: '尺寸',
+                child: [
+                    {
+                        type: 'Number',
+                        name: ['props', 'buttonStyle', 'height'],
+                        addonAfter: 'H'
+                    }
+                ]
+            },
+            {
+                type: 'Group',
+                label: '圆角',
+                child: [
+                    {
+                        type: 'Slider',
+                        name: ['props', 'buttonStyle', 'borderRadius'],
+                        max: 100
+                    },
+                    {
+                        type: 'Number',
+                        name: ['props', 'buttonStyle', 'borderRadius'],
+                        addonAfter: 'px',
+                        max: 100
+                    }
+                ]
+            },
+            {
+                type: 'TextMargin',
+                name: ['props', 'buttonStyle']
+            },
+            {
+                type: 'Group',
+                label: '字体',
+                child: [
+                    {
+                        type: 'Color',
+                        name: ['props', 'buttonStyle', 'color'],
+                        initialValue: '#fff'
+                    },
+                    {
+                        type: 'Select',
+                        name: ['props', 'buttonStyle', 'fontFamily'],
+                        options: [{ label: '黑体', value: '黑体' }]
+                    },
+                    {
+                        type: 'Number',
+                        name: ['props', 'buttonStyle', 'fontSize'],
+                        addonAfter: 'px'
+                    }
+                ]
+            },
+            {
+                type: 'TextStyle',
+                name: ['props', 'buttonStyle']
+            },
+            {
+                type: 'TextAlign',
+                name: ['props', 'buttonStyle']
+            }
+        ]
+    }
+];

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

@@ -79,7 +79,7 @@ const CommodityDetailDiroNew = (_a) => {
             }
         }
     };
-    const productInfoText = () => {
+    const productInfoText = ({ isPost }) => {
         return (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, { isPost: isPost, onClick: () => setShowModal(true), className: 'pb-commondityDiroNew-info', style: commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.info, foldText: tipText === null || tipText === void 0 ? void 0 : tipText.foldText, unfoldText: tipText === null || tipText === void 0 ? void 0 : tipText.unfoldText, text: (product === null || product === void 0 ? void 0 : product.info) ||
                     `Unveiled at the Spring-Summer 2023 fashion show, the Dior Toujours bag is distinguished by a casual and practical design. Crafted in black calfskin with Macrocannage topstitching, it showcases a spacious interior compartment with a matching pouch to organize essentials. Its leather strap closure keeps items secure while the D of the CD Lock closure twists to adjust the sides and enhance the bag's silhouette. The leather handles can be adjusted using the small notches in order to be able to carry the large bag by hand or wear it over the shoulder. CD Lock and strap closures D.I.O.R. charms Removable interior pouch Adjustable leather handles Dust bag included
@@ -126,7 +126,7 @@ Made in Italy` })));
                         React.createElement("div", { className: 'pb-commondityDiroNew-content-top-price', hidden: !!product && !(product === null || product === void 0 ? void 0 : product.taxInfo), style: commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.taxInfo }, (_l = product === null || product === void 0 ? void 0 : product.taxInfo) !== null && _l !== void 0 ? _l : '税费'))),
                 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: commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.collection }, (product === null || product === void 0 ? void 0 : product.collection) || 'Black Macrocannage Calfskin'),
                 (!product || (product === null || product === void 0 ? void 0 : product.link)) && (React.createElement("button", { onClick: handleLink, className: 'pb-commondityDiroNew-btn', style: buttonStyle }, (_m = cta === null || cta === void 0 ? void 0 : cta.enTitle) !== null && _m !== void 0 ? _m : 'Shop now')),
-                productInfoText())),
-        React.createElement(Modal, { visible: showModal, onClose: () => setShowModal(false) }, productInfoText())));
+                productInfoText({ isPost }))),
+        React.createElement(Modal, { visible: showModal, onClose: () => setShowModal(false) }, productInfoText({ isPost: false }))));
 };
 export default memo(CommodityDetailDiroNew);

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

@@ -39,6 +39,17 @@ const CommodityDetailDiroNew = createMaterial(CommodityDetailDiroNewComponent, {
                     fontSize: 13,
                     textAlign: 'right'
                 }
+            },
+            buttonStyle: {
+                backgroundColor: '#000',
+                fontSize: 12,
+                height: 52,
+                fontWeight: 'bold',
+                textAlign: 'center',
+                color: '#fff',
+                borderRadius: 25,
+                marginTop: 16,
+                marginBottom: 16
             }
         },
         style: {}

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

@@ -96,6 +96,12 @@ declare const _default: ({
         })[];
         name?: undefined;
         initialValue?: undefined;
+    } | {
+        type: string;
+        name: string[];
+        label?: undefined;
+        initialValue?: undefined;
+        child?: undefined;
     } | {
         type: string;
         label: string;
@@ -123,12 +129,6 @@ declare const _default: ({
         })[];
         name?: undefined;
         initialValue?: undefined;
-    } | {
-        type: string;
-        name: string[];
-        label?: undefined;
-        initialValue?: undefined;
-        child?: undefined;
     })[];
 })[];
 export default _default;

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

@@ -133,6 +133,10 @@ export default [
                     }
                 ]
             },
+            {
+                type: 'TextMargin',
+                name: ['props', 'buttonStyle']
+            },
             {
                 type: 'Group',
                 label: '字体',
@@ -161,14 +165,6 @@ export default [
             {
                 type: 'TextAlign',
                 name: ['props', 'buttonStyle']
-            },
-            {
-                type: 'TextSpace',
-                name: ['props', 'buttonStyle']
-            },
-            {
-                type: 'TextMargin',
-                name: ['props', 'buttonStyle']
             }
         ]
     }

package/es/materials/sxp/popup/index.d.ts

@@ -1,5 +1,4 @@
 export * from './AppointForm/material';
 export * from './CommodityDetail/material';
 export * from './Prompt/material';
-export * from './CommodityDetailDiro/material';
 export * from './CommodityDetailDiroNew/material';

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

@@ -1,5 +1,4 @@
 export * from './AppointForm/material';
 export * from './CommodityDetail/material';
 export * from './Prompt/material';
-export * from './CommodityDetailDiro/material';
 export * from './CommodityDetailDiroNew/material';

package/lib/core/components/SxpPageRender/ExpandableText.js

@@ -50,7 +50,7 @@ const ExpandableText = ({ text, maxStr = 108, style, className, onClick, foldTex
             }, 100);
         }
     }, [multiRow, text, lineClamp, style, isPost]);
-    return (react_1.default.createElement("div", { className: className, style: Object.assign({}, style) },
+    return (react_1.default.createElement("div", { className: className, style: Object.assign({}, style), hidden: !text || text === '' },
         react_1.default.createElement("div", { ref: multiRow, style: {
                 overflow: 'hidden',
                 WebkitLineClamp: !isShowMore ? lineClamp : '',
@@ -58,7 +58,7 @@ const ExpandableText = ({ text, maxStr = 108, style, className, onClick, foldTex
                 display: '-webkit-box',
                 WebkitBoxOrient: 'vertical',
                 wordBreak: 'break-word'
-            }, dangerouslySetInnerHTML: { __html: text ? text === null || text === void 0 ? void 0 : text.replace(/\n/g, '</br>') : react_1.default.createElement(react_1.default.Fragment, null) } }),
+            }, dangerouslySetInnerHTML: { __html: text === null || text === void 0 ? void 0 : text.replace(/\n/g, '</br>') } }),
         isShow && text && (react_1.default.createElement("span", { style: { textDecoration: 'underline', cursor: 'pointer' }, onClick: onClick !== null && onClick !== void 0 ? onClick : handleClick }, isShowMore ? unfoldText || 'show less' : foldText || 'show more'))));
 };
 exports.default = (0, react_1.memo)(ExpandableText);