pb-sxp-ui 1.2.10 → 1.3.0

package/es/core/hooks/useEventReport.js

@@ -4,7 +4,7 @@ import { DEFAULT_TAG } from '../context/SxpDataSourceProvider';
 export function useEventReport() {
     const { bffEventReport, popupDetailData, waterFallData, isFromHashtag } = useSxpDataSource();
     const jumpToWeb = useCallback((data, product, cta, position) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9;
         let fromKName = '';
         if (popupDetailData && (((_b = (_a = data === null || data === void 0 ? void 0 : data.video) === null || _a === void 0 ? void 0 : _a.bindProducts) === null || _b === void 0 ? void 0 : _b.length) || ((_c = data === null || data === void 0 ? void 0 : data.video) === null || _c === void 0 ? void 0 : _c.bindProduct))) {
             fromKName = 'pdpPage';
@@ -21,21 +21,22 @@ export function useEventReport() {
         else if (data === null || data === void 0 ? void 0 : data.product) {
             fromKName = 'productPage';
         }
+        const contentTags = (_p = (_m = (_h = product === null || product === void 0 ? void 0 : product.tags) !== null && _h !== void 0 ? _h : (_l = (_k = (_j = data === null || data === void 0 ? void 0 : data.video) === null || _j === void 0 ? void 0 : _j.bindProducts) === null || _k === void 0 ? void 0 : _k[0]) === null || _l === void 0 ? void 0 : _l.tags) !== null && _m !== void 0 ? _m : (_o = data === null || data === void 0 ? void 0 : data.video) === null || _o === void 0 ? void 0 : _o.tags) !== null && _p !== void 0 ? _p : (_q = data === null || data === void 0 ? void 0 : data.product) === null || _q === void 0 ? void 0 : _q.tags;
         bffEventReport === null || bffEventReport === void 0 ? void 0 : bffEventReport({
             eventInfo: {
                 eventSubject: 'jumpToWeb',
                 eventDescription: 'User jumped to website',
-                productId: (_h = product === null || product === void 0 ? void 0 : product.itemId) !== null && _h !== void 0 ? _h : '',
-                productName: (_j = product === null || product === void 0 ? void 0 : product.title) !== null && _j !== void 0 ? _j : '',
+                productId: (_r = product === null || product === void 0 ? void 0 : product.itemId) !== null && _r !== void 0 ? _r : '',
+                productName: (_s = product === null || product === void 0 ? void 0 : product.title) !== null && _s !== void 0 ? _s : '',
                 price: (product === null || product === void 0 ? void 0 : product.price) ? (product === null || product === void 0 ? void 0 : product.price) + '' : '0',
-                productCollection: (_k = product === null || product === void 0 ? void 0 : product.collection) !== null && _k !== void 0 ? _k : '',
+                productCollection: (_t = product === null || product === void 0 ? void 0 : product.collection) !== null && _t !== void 0 ? _t : '',
                 fromKName,
                 fromKPage: location === null || location === void 0 ? void 0 : location.href,
-                contentTags: (product === null || product === void 0 ? void 0 : product.tags) ? JSON.stringify(product === null || product === void 0 ? void 0 : product.tags) : '',
+                contentTags: contentTags ? JSON.stringify(contentTags) : '',
                 position: position + '',
-                contentId: (_m = (_l = data === null || data === void 0 ? void 0 : data.video) === null || _l === void 0 ? void 0 : _l.itemId) !== null && _m !== void 0 ? _m : '',
-                ctatId: (_o = cta === null || cta === void 0 ? void 0 : cta.itemId) !== null && _o !== void 0 ? _o : '',
-                traceInfo: (_1 = (_y = (_w = (_s = (_p = product === null || product === void 0 ? void 0 : product.traceInfo) !== null && _p !== void 0 ? _p : (_r = (_q = data === null || data === void 0 ? void 0 : data.video) === null || _q === void 0 ? void 0 : _q.bindProduct) === null || _r === void 0 ? void 0 : _r.traceInfo) !== null && _s !== void 0 ? _s : (_v = (_u = (_t = data === null || data === void 0 ? void 0 : data.video) === null || _t === void 0 ? void 0 : _t.bindProducts) === null || _u === void 0 ? void 0 : _u[0]) === null || _v === void 0 ? void 0 : _v.traceInfo) !== null && _w !== void 0 ? _w : (_x = data === null || data === void 0 ? void 0 : data.product) === null || _x === void 0 ? void 0 : _x.traceInfo) !== null && _y !== void 0 ? _y : (_0 = (_z = data === null || data === void 0 ? void 0 : data.video) === null || _z === void 0 ? void 0 : _z.bindCta) === null || _0 === void 0 ? void 0 : _0.traceInfo) !== null && _1 !== void 0 ? _1 : ''
+                contentId: (_v = (_u = data === null || data === void 0 ? void 0 : data.video) === null || _u === void 0 ? void 0 : _u.itemId) !== null && _v !== void 0 ? _v : '',
+                ctatId: (_w = cta === null || cta === void 0 ? void 0 : cta.itemId) !== null && _w !== void 0 ? _w : '',
+                traceInfo: (_9 = (_6 = (_4 = (_0 = (_x = product === null || product === void 0 ? void 0 : product.traceInfo) !== null && _x !== void 0 ? _x : (_z = (_y = data === null || data === void 0 ? void 0 : data.video) === null || _y === void 0 ? void 0 : _y.bindProduct) === null || _z === void 0 ? void 0 : _z.traceInfo) !== null && _0 !== void 0 ? _0 : (_3 = (_2 = (_1 = data === null || data === void 0 ? void 0 : data.video) === null || _1 === void 0 ? void 0 : _1.bindProducts) === null || _2 === void 0 ? void 0 : _2[0]) === null || _3 === void 0 ? void 0 : _3.traceInfo) !== null && _4 !== void 0 ? _4 : (_5 = data === null || data === void 0 ? void 0 : data.product) === null || _5 === void 0 ? void 0 : _5.traceInfo) !== null && _6 !== void 0 ? _6 : (_8 = (_7 = data === null || data === void 0 ? void 0 : data.video) === null || _7 === void 0 ? void 0 : _7.bindCta) === null || _8 === void 0 ? void 0 : _8.traceInfo) !== null && _9 !== void 0 ? _9 : ''
             }
         });
     }, [bffEventReport, popupDetailData, isFromHashtag]);

package/es/core/utils/tool.d.ts

@@ -7,4 +7,8 @@ interface IfontType {
     'fontFamily-en': string;
 }
 export declare const setFontForText: (textContent?: string | null, style?: IfontType | any) => string;
-export { uuid, getIndexByblockType };
+declare function getBrowserInfo(): string;
+declare function getSystem(): string;
+declare function getDevice(): string;
+declare function getCookie(val: string): string;
+export { uuid, getIndexByblockType, getBrowserInfo, getDevice, getSystem, getCookie };

package/es/core/utils/tool.js

@@ -88,4 +88,72 @@ export const setFontForText = (textContent, style) => {
     }
     return content;
 };
-export { uuid, getIndexByblockType };
+function getBrowserInfo() {
+    var _a, _b, _c, _d, _e, _f, _g;
+    let userAgent = self.navigator.userAgent;
+    if (!userAgent)
+        return 'Unknown';
+    if (/edge\/([\d\.]+)/i.exec(userAgent))
+        return `Edge ${(_a = /edge\/([\d\.]+)/i.exec(userAgent)) === null || _a === void 0 ? void 0 : _a[1]}`;
+    if (/edg\/([\d\.]+)/i.exec(userAgent))
+        return `Edge(Chromium) ${(_b = /edge\/([\d\.]+)/i.exec(userAgent)) === null || _b === void 0 ? void 0 : _b[1]}`;
+    if (/msie/i.test(userAgent))
+        return `Internet Explorer ${(_c = /msie ([\d\.]+)/i.exec(userAgent)) === null || _c === void 0 ? void 0 : _c[1]}`;
+    if (/Trident/i.test(userAgent))
+        return `Internet Explorer ${(_d = /rv:([\d\.]+)/i.exec(userAgent)) === null || _d === void 0 ? void 0 : _d[1]}`;
+    if (/chrome/i.test(userAgent))
+        return `Chrome ${(_e = /chrome\/([\d\.]+)/i.exec(userAgent)) === null || _e === void 0 ? void 0 : _e[1]}`;
+    if (/firefox/i.test(userAgent))
+        return `Firefox ${(_f = /firefox\/([\d\.]+)/i.exec(userAgent)) === null || _f === void 0 ? void 0 : _f[1]}`;
+    if (/safari/i.test(userAgent))
+        return `Safari ${(_g = /version\/([\d\.]+)/i.exec(userAgent)) === null || _g === void 0 ? void 0 : _g[1]}`;
+    return 'Unknown';
+}
+function getSystem() {
+    var _a, _b, _c;
+    let userAgent = self.navigator.userAgent;
+    if (!userAgent)
+        return 'Unknown';
+    if (/iphone/i.test(userAgent))
+        return `IOS ${(_a = userAgent.match(/OS\s(.*?)\slike/)) === null || _a === void 0 ? void 0 : _a[1]}`;
+    if (/android/i.test(userAgent))
+        return `Android ${(_b = userAgent.match(/Android\s(.*?)\;/)) === null || _b === void 0 ? void 0 : _b[1]}`;
+    if (/windows/i.test(userAgent))
+        return `Windows ${(_c = userAgent.match(/Windows\s(.*?)\;/)) === null || _c === void 0 ? void 0 : _c[1]}`;
+    if (/mac/i.test(userAgent))
+        return `Mac OS`;
+    return 'Unknown';
+}
+function getDevice() {
+    let userAgent = self.navigator.userAgent;
+    if (!userAgent)
+        return 'Unknown';
+    if (/iphone/i.test(userAgent))
+        return `iPhone`;
+    if (/android/i.test(userAgent)) {
+        var index1 = userAgent.indexOf('(');
+        var index2 = userAgent.indexOf(')');
+        if (index1 !== -1 && index2 !== -1) {
+            var value = userAgent.substring(index1 + 1, index2);
+            return `${value}`;
+        }
+    }
+    if (/windows/i.test(userAgent))
+        return `Windows`;
+    if (/mac/i.test(userAgent))
+        return `Mac`;
+    return 'Unknown';
+}
+function getCookie(val) {
+    const cookies = document.cookie;
+    const cookieArray = cookies.split(';');
+    let value = null;
+    cookieArray.forEach((cookie) => {
+        const [cookieName, cookieValue] = cookie.trim().split('=');
+        if (cookieName === val) {
+            value = cookieValue;
+        }
+    });
+    return value !== null && value !== void 0 ? value : '';
+}
+export { uuid, getIndexByblockType, getBrowserInfo, getDevice, getSystem, getCookie };

package/es/materials/sxp/HashTag/settingRender.d.ts

@@ -1,4 +1,11 @@
 declare const _default: ({
+    title: string;
+    child: {
+        type: string;
+        label: string;
+        name: string[];
+    }[];
+} | {
     title: string;
     child: ({
         type: string;
@@ -119,12 +126,6 @@ declare const _default: ({
         })[];
         name?: undefined;
         initialValue?: undefined;
-    } | {
-        label: string;
-        type: string;
-        name: string[];
-        initialValue?: undefined;
-        child?: undefined;
     })[];
 })[];
 export default _default;

package/es/materials/sxp/HashTag/settingRender.js

@@ -99,10 +99,6 @@ export default [
                     {
                         label: '标题对齐',
                         type: 'TextAlign'
-                    },
-                    {
-                        label: '间距',
-                        type: 'TextSpace'
                     }
                 ]
             }
@@ -188,11 +184,6 @@ export default [
             {
                 type: 'TextAlign',
                 name: ['props', 'buttonStyle']
-            },
-            {
-                label: '间距',
-                type: 'TextSpace',
-                name: ['props', 'buttonStyle']
             }
         ]
     },

package/es/materials/sxp/cta/AniLink/settingRender.d.ts

@@ -68,11 +68,6 @@ declare const _default: ({
         type: string;
         name: string[];
         child?: undefined;
-    } | {
-        type: string;
-        name: string[];
-        label?: undefined;
-        child?: undefined;
     })[];
 })[];
 export default _default;

package/es/materials/sxp/cta/AniLink/settingRender.js

@@ -97,10 +97,6 @@ export default [
                 label: '对齐',
                 type: 'TextAlign',
                 name: ['props', 'ctaTempStyles', 'ctaTitle']
-            },
-            {
-                type: 'TextSpace',
-                name: ['props', 'ctaTempStyles', 'ctaTitle']
             }
         ]
     }

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

@@ -64,16 +64,13 @@ declare const _default: ({
         })[];
         name?: undefined;
         options?: undefined;
-    })[];
-    type?: undefined;
-    label?: undefined;
-    name?: undefined;
-} | {
-    title: string;
-    child: {
+    } | {
         type: string;
         name: string[];
-    }[];
+        label?: undefined;
+        child?: undefined;
+        options?: undefined;
+    })[];
     type?: undefined;
     label?: undefined;
     name?: undefined;

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

@@ -1,4 +1,19 @@
 export default [
+    {
+        title: '弹窗背景',
+        child: [
+            {
+                type: 'Number',
+                label: '左右边距',
+                name: ['props', 'popupBg', 'horizontalMargin']
+            },
+            {
+                type: 'Number',
+                label: '下边距',
+                name: ['props', 'popupBg', 'bottomMargin']
+            }
+        ]
+    },
     {
         type: 'Text',
         label: '组件名称',
@@ -53,11 +68,6 @@ export default [
                 type: 'TextAlign',
                 name: ['textStyle']
             },
-            {
-                label: '标题间距',
-                type: 'TextSpace',
-                name: ['textStyle']
-            },
             {
                 label: '表单布局',
                 type: 'Radius',
@@ -116,12 +126,10 @@ export default [
                 ]
             },
             {
-                label: '提交按钮文本样式',
                 type: 'TextStyle',
                 name: ['props', 'submitButtonStyle']
             },
             {
-                label: '提交按钮对齐',
                 type: 'TextAlign',
                 name: ['props', 'submitButtonStyle']
             },
@@ -129,11 +137,6 @@ export default [
                 label: '提交按钮颜色',
                 type: 'Color',
                 name: ['props', 'submitBgColor']
-            },
-            {
-                label: '提交按钮间距',
-                type: 'TextSpace',
-                name: ['props', 'submitButtonStyle']
             }
         ]
     },

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

@@ -18,7 +18,7 @@ export interface ICommodityDetailProps {
     viewTime?: any;
     rec?: RecItemType;
     swiper: {
-        dotsAlign: 'left' | 'center';
+        dotsAlign: 'left' | 'center' | 'right';
         delay: number;
         translateY?: number;
     };
@@ -36,6 +36,15 @@ export interface ICommodityDetailProps {
         translateY?: number;
         style?: CSSProperties;
     };
+    popupBg?: {
+        horizontalMargin?: number;
+        bottomMargin?: number;
+    };
+    iframeIcon?: string;
+    commodityImgRatio?: {
+        w: number;
+        h: number;
+    };
 }
 declare const _default: React.NamedExoticComponent<ICommodityDetailProps>;
 export default _default;

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

@@ -12,8 +12,8 @@ import FormatImage from '../../../../core/components/SxpPageRender/FormatImage';
 import { setFontForText } from '../../../../core/utils/tool';
 import CommodityGroup from '../../template/components/CommodityGroup';
 const CommodityDetail = (_a) => {
-    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
-    var { content, style, bgImg, onClick, schema, isDefault, bottom_image, tipText, isPost, viewTime, rec, swiper, commodityStyles, buttonStyle, index, commodityGroup } = _a, props = __rest(_a, ["content", "style", "bgImg", "onClick", "schema", "isDefault", "bottom_image", "tipText", "isPost", "viewTime", "rec", "swiper", "commodityStyles", "buttonStyle", "index", "commodityGroup"]);
+    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4;
+    var { content, style, bgImg, onClick, schema, isDefault, bottom_image, tipText, isPost, viewTime, rec, swiper, commodityStyles, buttonStyle, index, commodityGroup, popupBg, iframeIcon, commodityImgRatio } = _a, props = __rest(_a, ["content", "style", "bgImg", "onClick", "schema", "isDefault", "bottom_image", "tipText", "isPost", "viewTime", "rec", "swiper", "commodityStyles", "buttonStyle", "index", "commodityGroup", "popupBg", "iframeIcon", "commodityImgRatio"]);
     const { sxpParameter, popupDetailData, isPreview, bffFbReport, popupCurTimeRef, checkCommodityIndexRef } = useSxpDataSource();
     const { jumpToWeb, productView } = useEventReport();
     const curTimeRef = useRef(null);
@@ -69,7 +69,8 @@ const CommodityDetail = (_a) => {
             return '$7,000';
         }
     }, [product === null || product === void 0 ? void 0 : product.price, product === null || product === void 0 ? void 0 : product.currency]);
-    const width = isPreview ? 375 : (_t = style === null || style === void 0 ? void 0 : style.width) !== null && _t !== void 0 ? _t : window.innerWidth;
+    const width = (isPreview ? 375 : (_t = style === null || style === void 0 ? void 0 : style.width) !== null && _t !== void 0 ? _t : window.innerWidth) - ((_u = popupBg === null || popupBg === void 0 ? void 0 : popupBg.horizontalMargin) !== null && _u !== void 0 ? _u : 0) * 2;
+    const height = commodityImgRatio ? width * (commodityImgRatio.h / commodityImgRatio.w) : width;
     const renderContent = ({ isPost }) => {
         var _a, _b, _c, _d;
         return (React.createElement("div", null,
@@ -116,25 +117,32 @@ const CommodityDetail = (_a) => {
             return;
         return (React.createElement(CommodityGroup, { products: (_a = data === null || data === void 0 ? void 0 : data.video) === null || _a === void 0 ? void 0 : _a.bindProducts, data: commodityGroup, defImg: (_c = (_b = sxpParameter === null || sxpParameter === void 0 ? void 0 : sxpParameter.bottom_image) !== null && _b !== void 0 ? _b : bottom_image) !== null && _c !== void 0 ? _c : '', style: { padding: '0 19px' }, onCLick: handleClick, popupDetailData: popupDetailData, check: checkCommodityIndex }));
     }, [checkCommodityIndex]);
+    const getDotsAlign = useMemo(() => {
+        const dotsAlignClass = {
+            left: 'commondityDetail-swiper-clickable-left',
+            center: 'commondityDetail-swiper-clickable-center',
+            right: 'commondityDetail-swiper-clickable-right'
+        };
+        return dotsAlignClass === null || dotsAlignClass === void 0 ? void 0 : dotsAlignClass[swiper === null || swiper === void 0 ? void 0 : swiper.dotsAlign];
+    }, [swiper === null || swiper === void 0 ? void 0 : swiper.dotsAlign]);
+    const iframeUrl = ((_w = (_v = data === null || data === void 0 ? void 0 : data.video) === null || _v === void 0 ? void 0 : _v.bindProduct) === null || _w === void 0 ? void 0 : _w.remark) || ((_z = (_y = (_x = data === null || data === void 0 ? void 0 : data.video) === null || _x === void 0 ? void 0 : _x.bindProducts) === null || _y === void 0 ? void 0 : _y[0]) === null || _z === void 0 ? void 0 : _z.remark) || ((_0 = data === null || data === void 0 ? void 0 : data.product) === null || _0 === void 0 ? void 0 : _0.remark);
     return (React.createElement(React.Fragment, null,
         React.createElement("div", Object.assign({ className: css(Object.assign({}, style)) }, props),
-            product && ((_u = product === null || product === void 0 ? void 0 : product.homePage) === null || _u === void 0 ? void 0 : _u.length) > 0 && (React.createElement("div", { style: { position: 'relative' } },
-                React.createElement(Swiper, { height: width, modules: [Pagination, Autoplay], pagination: {
+            React.createElement("div", { style: { position: 'relative' } },
+                product && ((_1 = product === null || product === void 0 ? void 0 : product.homePage) === null || _1 === void 0 ? void 0 : _1.length) > 0 && (React.createElement(Swiper, { height: height, 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'
+                        clickableClass: getDotsAlign
                     }, loop: true, autoplay: {
                         delay: (swiper === null || swiper === void 0 ? void 0 : swiper.delay) * 1000
                     } },
-                    React.createElement(React.Fragment, null, (_v = product === null || product === void 0 ? void 0 : product.homePage) === null || _v === void 0 ? void 0 : _v.map((src) => {
+                    React.createElement(React.Fragment, null, (_2 = product === null || product === void 0 ? void 0 : product.homePage) === null || _2 === void 0 ? void 0 : _2.map((src) => {
                         var _a;
                         return (React.createElement(SwiperSlide, { key: src },
                             React.createElement("div", { style: {
                                     overflow: 'hidden',
                                     width,
-                                    height: width
+                                    height
                                 } },
                                 React.createElement(FormatImage, { style: {
                                         height: '100%',
@@ -143,21 +151,30 @@ const CommodityDetail = (_a) => {
                                         display: 'block',
                                         objectPosition: `50% ${(swiper === null || swiper === void 0 ? void 0 : swiper.translateY) ? (swiper === null || swiper === void 0 ? void 0 : swiper.translateY) + 50 : 50}%`
                                     }, src: (_a = src !== null && src !== void 0 ? src : sxpParameter === null || sxpParameter === void 0 ? void 0 : sxpParameter.bottom_image) !== null && _a !== void 0 ? _a : bottom_image }))));
-                    }))))),
-            !((_w = product === null || product === void 0 ? void 0 : product.homePage) === null || _w === void 0 ? void 0 : _w.length) && (React.createElement("div", { className: css({
-                    position: 'relative',
-                    height: 0,
-                    width: '100%',
-                    paddingBottom: '100%',
-                    overflow: 'hidden'
-                }) },
-                React.createElement("img", { className: css({
-                        position: 'absolute',
-                        left: 0,
-                        top: 0,
-                        objectFit: 'cover',
-                        width: '100%'
-                    }), src: (_x = sxpParameter === null || sxpParameter === void 0 ? void 0 : sxpParameter.bottom_image) !== null && _x !== void 0 ? _x : bottom_image, alt: 'pdp image' }))),
+                    })))),
+                !((_3 = product === null || product === void 0 ? void 0 : product.homePage) === null || _3 === void 0 ? void 0 : _3.length) && (React.createElement("div", { className: css({
+                        height,
+                        width
+                    }) },
+                    React.createElement("img", { className: css({
+                            objectFit: 'cover',
+                            width: '100%',
+                            height: '100%'
+                        }), src: (_4 = sxpParameter === null || sxpParameter === void 0 ? void 0 : sxpParameter.bottom_image) !== null && _4 !== void 0 ? _4 : bottom_image, alt: 'pdp image' }))),
+                (iframeUrl && iframeIcon) ||
+                    (!product && iframeIcon && (React.createElement("div", { style: {
+                            padding: '5px 10px',
+                            display: 'flex',
+                            alignItems: 'center',
+                            position: 'absolute',
+                            right: '10px',
+                            bottom: '10px',
+                            zIndex: 1,
+                            background: '#fff',
+                            borderRadius: '3px'
+                        }, onClick: () => setShow3DModal(true) },
+                        React.createElement("img", { src: iframeIcon, alt: '3d', width: '20px', height: '20px', style: { marginRight: '5px' } }),
+                        React.createElement("span", { style: { fontSize: '12px' } }, "Try in 3D"))))),
             renderCommodityGroup(),
             React.createElement("div", { className: 'pb-commondity-content' }, renderContent({ isPost }))),
         renderBtn(),
@@ -165,10 +182,11 @@ const CommodityDetail = (_a) => {
             React.createElement("div", { style: { paddingBottom: '80px' } }, renderContent({ isPost: false })),
             renderBtn()),
         React.createElement(Modal, { visible: show3DModal, padding: 0, isFullScreen: true, onClose: () => setShow3DModal(false) },
-            React.createElement("iframe", { src: 'https://rimowa.threedium.co.uk/product-experience/latest/?sku=92573974&lang=en', style: {
+            React.createElement("iframe", { src: iframeUrl, style: {
                     width: '100%',
-                    height: 'calc(100% - 40px)',
-                    marginTop: '40px'
+                    height: 'calc(100% - 50px)',
+                    marginTop: '40px',
+                    border: 'none'
                 } }))));
 };
 export default memo(CommodityDetail);

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

@@ -51,6 +51,10 @@ const CommodityDetail = createMaterial(CommodityDetailComponent, {
                 fontWeight: 'bold',
                 textAlign: 'center',
                 color: 'rgba(255, 255, 255, 0.9)'
+            },
+            commodityImgRatio: {
+                w: 1,
+                h: 1
             }
         },
         style: {}

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

@@ -1,6 +1,17 @@
 declare const _default: ({
     title: string;
     child: ({
+        type: string;
+        label: string;
+        child: {
+            type: string;
+            name: string[];
+            addonAfter: string;
+        }[];
+        options?: undefined;
+        name?: undefined;
+        addonAfter?: undefined;
+    } | {
         type: string;
         label: string;
         options: {
@@ -8,15 +19,15 @@ declare const _default: ({
             value: string;
         }[];
         name: string[];
-        addonAfter?: undefined;
         child?: undefined;
+        addonAfter?: undefined;
     } | {
         type: string;
         name: string[];
         addonAfter: string;
         label?: undefined;
-        options?: undefined;
         child?: undefined;
+        options?: undefined;
     } | {
         type: string;
         child: {
@@ -194,12 +205,14 @@ declare const _default: ({
         })[];
         name?: undefined;
         initialValue?: undefined;
-    } | {
+    })[];
+} | {
+    title: string;
+    child: {
         label: string;
         type: string;
         name: string[];
-        initialValue?: undefined;
-        child?: undefined;
-    })[];
+        text: string;
+    }[];
 })[];
 export default _default;

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

@@ -1,7 +1,38 @@
 export default [
+    {
+        title: '弹窗背景',
+        child: [
+            {
+                type: 'Number',
+                label: '左右边距',
+                name: ['props', 'popupBg', 'horizontalMargin']
+            },
+            {
+                type: 'Number',
+                label: '下边距',
+                name: ['props', 'popupBg', 'bottomMargin']
+            }
+        ]
+    },
     {
         title: '商品图片',
         child: [
+            {
+                type: 'Group',
+                label: '宽高比',
+                child: [
+                    {
+                        type: 'Number',
+                        name: ['props', 'commodityImgRatio', 'w'],
+                        addonAfter: 'w'
+                    },
+                    {
+                        type: 'Number',
+                        name: ['props', 'commodityImgRatio', 'h'],
+                        addonAfter: 'h'
+                    }
+                ]
+            },
             {
                 type: 'Radius',
                 label: '轮播指示器',
@@ -13,6 +44,10 @@ export default [
                     {
                         label: '居中',
                         value: 'center'
+                    },
+                    {
+                        label: '居右',
+                        value: 'right'
                     }
                 ],
                 name: ['props', 'swiper', 'dotsAlign']
@@ -173,10 +208,6 @@ export default [
                         label: '默认行数',
                         type: 'Number',
                         name: ['lineClamp']
-                    },
-                    {
-                        label: '间距',
-                        type: 'TextSpace'
                     }
                 ]
             }
@@ -262,11 +293,17 @@ export default [
             {
                 type: 'TextAlign',
                 name: ['props', 'buttonStyle']
-            },
+            }
+        ]
+    },
+    {
+        title: 'Iframe商品弹窗',
+        child: [
             {
-                label: '间距',
-                type: 'TextSpace',
-                name: ['props', 'buttonStyle']
+                label: '弹窗按钮',
+                type: 'Upload',
+                name: ['props', 'iframeIcon'],
+                text: '建议尺寸：106 * 41'
             }
         ]
     }

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

@@ -18,7 +18,7 @@ export interface ICommodityDetailDiroNewProps {
         unfoldText?: string;
     };
     swiper: {
-        dotsAlign: 'left' | 'center';
+        dotsAlign: 'left' | 'center' | 'right';
         delay: number;
         translateY?: number;
     };
@@ -36,6 +36,15 @@ export interface ICommodityDetailDiroNewProps {
         translateY?: number;
         style?: CSSProperties;
     };
+    popupBg?: {
+        horizontalMargin?: number;
+        bottomMargin?: number;
+    };
+    iframeIcon?: string;
+    commodityImgRatio?: {
+        w: number;
+        h: number;
+    };
 }
 declare const _default: React.NamedExoticComponent<ICommodityDetailDiroNewProps>;
 export default _default;