pb-sxp-ui 1.2.10 → 1.3.0

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

@@ -14,8 +14,8 @@ const FormatImage_1 = tslib_1.__importDefault(require("../../../../core/componen
 const tool_1 = require("../../../../core/utils/tool");
 const CommodityGroup_1 = tslib_1.__importDefault(require("../../template/components/CommodityGroup"));
 const CommodityDetailDiroNew = (_a) => {
-    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;
-    var { style, isDefault, rec, viewTime, isPost, bottom_image, tipText, swiper, commodityStyles, buttonStyle, index, commodityGroup } = _a, props = tslib_1.__rest(_a, ["style", "isDefault", "rec", "viewTime", "isPost", "bottom_image", "tipText", "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, _5, _6, _7, _8;
+    var { style, isDefault, rec, viewTime, isPost, bottom_image, tipText, swiper, commodityStyles, buttonStyle, index, commodityGroup, popupBg, iframeIcon, commodityImgRatio } = _a, props = tslib_1.__rest(_a, ["style", "isDefault", "rec", "viewTime", "isPost", "bottom_image", "tipText", "swiper", "commodityStyles", "buttonStyle", "index", "commodityGroup", "popupBg", "iframeIcon", "commodityImgRatio"]);
     const [spread, setSpread] = (0, react_1.useState)(true);
     const { sxpParameter, popupCurTimeRef, popupDetailData, isPreview, bffFbReport, checkCommodityIndexRef } = (0, hooks_1.useSxpDataSource)();
     const { jumpToWeb, productView } = (0, useEventReport_1.useEventReport)();
@@ -24,6 +24,7 @@ const CommodityDetailDiroNew = (_a) => {
     const [isTop, setIsTop] = (0, react_1.useState)(true);
     const [showModal, setShowModal] = (0, react_1.useState)(false);
     const curTimeRef = (0, react_1.useRef)(null);
+    const [show3DModal, setShow3DModal] = (0, react_1.useState)(false);
     const [checkCommodityIndex, setCheckCommodityIndex] = (0, react_1.useState)((_b = popupDetailData === null || popupDetailData === void 0 ? void 0 : popupDetailData.multiCheckIndex) !== null && _b !== void 0 ? _b : 0);
     const data = isPost ? rec : popupDetailData;
     let product = isPost ? data === null || data === void 0 ? void 0 : data.product : (_d = (_c = data === null || data === void 0 ? void 0 : data.video) === null || _c === void 0 ? void 0 : _c.bindProduct) !== null && _d !== void 0 ? _d : (_f = (_e = data === null || data === void 0 ? void 0 : data.video) === null || _e === void 0 ? void 0 : _e.bindProducts) === null || _f === void 0 ? void 0 : _f[0];
@@ -74,7 +75,8 @@ const CommodityDetailDiroNew = (_a) => {
             return '£102,300.00';
         }
     }, [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 handleClickCollapse = () => {
         setSpread(!spread);
     };
@@ -101,52 +103,69 @@ Made in Italy` })));
             return;
         return (react_1.default.createElement(CommodityGroup_1.default, { 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 = (0, react_1.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_1.default.createElement("div", { className: 'pb-commondityDiroNew' },
         react_1.default.createElement("div", Object.assign({ className: (0, css_1.css)(Object.assign(Object.assign({}, style), { transform: 'translate3d(0px, 0px, 0px)' })) }, props),
-            product && ((_u = product === null || product === void 0 ? void 0 : product.homePage) === null || _u === void 0 ? void 0 : _u.length) > 0 && (react_1.default.createElement(react_2.Swiper, { height: width, modules: [modules_1.Pagination, modules_1.Autoplay], pagination: {
-                    clickable: true,
-                    bulletActiveClass: 'commondityDiroNew-swipe-item-active-bullet',
-                    clickableClass: (swiper === null || swiper === void 0 ? void 0 : swiper.dotsAlign) === 'left'
-                        ? 'commondityDiroNew-swiper-clickable-left'
-                        : 'commondityDiroNew-swiper-clickable-center'
-                }, loop: true, autoplay: {
-                    delay: (swiper === null || swiper === void 0 ? void 0 : swiper.delay) * 1000
-                } }, (_v = product === null || product === void 0 ? void 0 : product.homePage) === null || _v === void 0 ? void 0 : _v.map((src) => {
-                var _a;
-                return (react_1.default.createElement(react_2.SwiperSlide, { key: src },
-                    react_1.default.createElement("div", { style: {
-                            overflow: 'hidden',
-                            width,
-                            height: width
-                        } },
-                        react_1.default.createElement(FormatImage_1.default, { style: {
-                                height: '100%',
-                                width: '100%',
-                                objectFit: 'cover',
-                                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_1.default.createElement("div", { className: (0, css_1.css)({
-                    position: 'relative',
-                    height: 0,
-                    width: '100%',
-                    paddingBottom: '100%',
-                    overflow: 'hidden'
-                }) },
-                react_1.default.createElement("img", { className: (0, css_1.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' }))),
+            react_1.default.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_1.default.createElement(react_2.Swiper, { height: height, modules: [modules_1.Pagination, modules_1.Autoplay], pagination: {
+                        clickable: true,
+                        bulletActiveClass: 'commondityDiroNew-swipe-item-active-bullet',
+                        clickableClass: getDotsAlign
+                    }, loop: true, autoplay: {
+                        delay: (swiper === null || swiper === void 0 ? void 0 : swiper.delay) * 1000
+                    } }, (_2 = product === null || product === void 0 ? void 0 : product.homePage) === null || _2 === void 0 ? void 0 : _2.map((src) => {
+                    var _a;
+                    return (react_1.default.createElement(react_2.SwiperSlide, { key: src },
+                        react_1.default.createElement("div", { style: {
+                                overflow: 'hidden',
+                                width,
+                                height
+                            } },
+                            react_1.default.createElement(FormatImage_1.default, { style: {
+                                    height: '100%',
+                                    width: '100%',
+                                    objectFit: 'cover',
+                                    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 }))));
+                }))),
+                !((_3 = product === null || product === void 0 ? void 0 : product.homePage) === null || _3 === void 0 ? void 0 : _3.length) && (react_1.default.createElement("div", { className: (0, css_1.css)({
+                        height,
+                        width
+                    }) },
+                    react_1.default.createElement("img", { className: (0, css_1.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_1.default.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_1.default.createElement("img", { src: iframeIcon, alt: '3d', width: '20px', height: '20px', style: { marginRight: '5px' } }),
+                        react_1.default.createElement("span", { style: { fontSize: '12px' } }, "Try in 3D"))))),
             renderCommodityGroup(),
             react_1.default.createElement("div", { className: 'pb-commondityDiroNew-content' },
                 react_1.default.createElement("div", { className: 'pb-commondityDiroNew-content-top' },
                     react_1.default.createElement("div", { className: 'pb-commondityDiroNew-content-top-left' },
                         react_1.default.createElement("div", { className: 'pb-commondityDiroNew-content-top-left-title', style: getStyle(commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.title), dangerouslySetInnerHTML: {
-                                __html: (0, tool_1.setFontForText)((_y = product === null || product === void 0 ? void 0 : product.title) !== null && _y !== void 0 ? _y : 'Large Dior Toujours BagLarge', commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.title)
+                                __html: (0, tool_1.setFontForText)((_5 = product === null || product === void 0 ? void 0 : product.title) !== null && _5 !== void 0 ? _5 : 'Large Dior Toujours BagLarge', commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.title)
                             } }),
                         react_1.default.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: (0, tool_1.setFontForText)((product === null || product === void 0 ? void 0 : product.collection) || 'Black Macrocannage CalfskinLarge', commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.collection)
@@ -156,13 +175,20 @@ Made in Italy` })));
                                 __html: (0, tool_1.setFontForText)(priceText, commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price)
                             } }),
                         react_1.default.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: (0, tool_1.setFontForText)((_z = product === null || product === void 0 ? void 0 : product.taxInfo) !== null && _z !== void 0 ? _z : '税费', commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.taxInfo)
+                                __html: (0, tool_1.setFontForText)((_6 = product === null || product === void 0 ? void 0 : product.taxInfo) !== null && _6 !== void 0 ? _6 : '税费', commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.taxInfo)
                             } }))),
-                (!product || (product === null || product === void 0 ? void 0 : product.link)) && (react_1.default.createElement("button", { "aria-label": (_0 = cta === null || cta === void 0 ? void 0 : cta.enTitle) !== null && _0 !== void 0 ? _0 : 'Shop now', onClick: handleLink, className: 'pb-commondityDiroNew-btn', style: buttonStyle },
+                (!product || (product === null || product === void 0 ? void 0 : product.link)) && (react_1.default.createElement("button", { "aria-label": (_7 = cta === null || cta === void 0 ? void 0 : cta.enTitle) !== null && _7 !== void 0 ? _7 : 'Shop now', onClick: handleLink, className: 'pb-commondityDiroNew-btn', style: buttonStyle },
                     react_1.default.createElement("span", { dangerouslySetInnerHTML: {
-                            __html: (0, tool_1.setFontForText)((_1 = cta === null || cta === void 0 ? void 0 : cta.enTitle) !== null && _1 !== void 0 ? _1 : 'Shop now', buttonStyle)
+                            __html: (0, tool_1.setFontForText)((_8 = cta === null || cta === void 0 ? void 0 : cta.enTitle) !== null && _8 !== void 0 ? _8 : 'Shop now', buttonStyle)
                         } }))),
                 productInfoText({ isPost }))),
-        react_1.default.createElement(Modal_1.default, { visible: showModal, onClose: () => setShowModal(false) }, productInfoText({ isPost: false }))));
+        react_1.default.createElement(Modal_1.default, { visible: showModal, onClose: () => setShowModal(false) }, productInfoText({ isPost: false })),
+        react_1.default.createElement(Modal_1.default, { visible: show3DModal, padding: 0, isFullScreen: true, onClose: () => setShow3DModal(false) },
+            react_1.default.createElement("iframe", { src: iframeUrl, style: {
+                    width: '100%',
+                    height: 'calc(100% - 50px)',
+                    marginTop: '40px',
+                    border: 'none'
+                } }))));
 };
 exports.default = (0, react_1.memo)(CommodityDetailDiroNew);

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

@@ -56,6 +56,10 @@ const CommodityDetailDiroNew = (0, create_1.createMaterial)(_1.default, {
                 borderRadius: 25,
                 marginTop: 16,
                 marginBottom: 16
+            },
+            commodityImgRatio: {
+                w: 1,
+                h: 1
             }
         },
         style: {}

package/lib/materials/sxp/popup/CommodityDetailDiroNew/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: {
@@ -182,12 +193,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/lib/materials/sxp/popup/CommodityDetailDiroNew/settingRender.js

@@ -1,9 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.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: '轮播指示器',
@@ -15,6 +46,10 @@ exports.default = [
                     {
                         label: '居中',
                         value: 'center'
+                    },
+                    {
+                        label: '居右',
+                        value: 'right'
                     }
                 ],
                 name: ['props', 'swiper', 'dotsAlign']
@@ -158,10 +193,6 @@ exports.default = [
                         label: '默认行数',
                         type: 'Number',
                         name: ['lineClamp']
-                    },
-                    {
-                        label: '间距',
-                        type: 'TextSpace'
                     }
                 ]
             }
@@ -247,11 +278,17 @@ exports.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/lib/materials/sxp/popup/CommodityList/settingRender.js

@@ -1,6 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = [
+    {
+        title: '弹窗背景',
+        child: [
+            {
+                type: 'Number',
+                label: '左右边距',
+                name: ['props', 'popupBg', 'horizontalMargin']
+            },
+            {
+                type: 'Number',
+                label: '下边距',
+                name: ['props', 'popupBg', 'bottomMargin']
+            }
+        ]
+    },
     {
         title: '商品图片',
         child: [
@@ -118,10 +133,6 @@ exports.default = [
                     {
                         label: '标题对齐',
                         type: 'TextAlign'
-                    },
-                    {
-                        label: '间距',
-                        type: 'TextSpace'
                     }
                 ]
             }

package/lib/materials/sxp/popup/Iframe/index.d.ts

@@ -0,0 +1,16 @@
+import React, { CSSProperties } from 'react';
+import './index.less';
+export interface IIframeProps {
+    content?: string;
+    btnText?: string;
+    style?: Record<string, any>;
+    icon?: Record<string, any> | string;
+    isExternalLink?: boolean;
+    isPopup?: boolean;
+    onClose?: () => void;
+    onClick?: () => void;
+    submitButtonStyle?: CSSProperties;
+    contentStyle?: CSSProperties;
+}
+declare const _default: React.NamedExoticComponent<IIframeProps>;
+export default _default;

package/lib/materials/sxp/popup/Iframe/index.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const css_1 = require("@emotion/css");
+const react_1 = tslib_1.__importStar(require("react"));
+require("./index.less");
+const hooks_1 = require("../../../../core/hooks");
+const Iframe = (_a) => {
+    var _b, _c;
+    var { content, btnText, style, icon, isPopup, isExternalLink, onClose, onClick, submitButtonStyle, contentStyle } = _a, props = tslib_1.__rest(_a, ["content", "btnText", "style", "icon", "isPopup", "isExternalLink", "onClose", "onClick", "submitButtonStyle", "contentStyle"]);
+    const { popupDetailData } = (0, hooks_1.useSxpDataSource)();
+    const iframeUrl = (_c = (_b = popupDetailData === null || popupDetailData === void 0 ? void 0 : popupDetailData.video) === null || _b === void 0 ? void 0 : _b.bindCta) === null || _c === void 0 ? void 0 : _c.remark;
+    return (react_1.default.createElement("div", Object.assign({ className: `${(0, css_1.css)(Object.assign({}, style))}` }, props), iframeUrl && (react_1.default.createElement("iframe", { src: iframeUrl, style: {
+            width: '100%',
+            height: 'calc(100% - 50px)',
+            marginTop: '40px',
+            border: 'none'
+        } }))));
+};
+exports.default = (0, react_1.memo)(Iframe);

package/lib/materials/sxp/popup/Iframe/material.d.ts

@@ -0,0 +1,2 @@
+declare const Iframe: import("../../../../core/create").MaterialComponet<import(".").IIframeProps>;
+export { Iframe };

package/lib/materials/sxp/popup/Iframe/material.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Iframe = void 0;
+const tslib_1 = require("tslib");
+const settingRender_1 = tslib_1.__importDefault(require("./settingRender"));
+const _1 = tslib_1.__importDefault(require("."));
+const create_1 = require("../../../../core/create");
+const Iframe = (0, create_1.createMaterial)(_1.default, {
+    displayName: 'Iframe弹窗',
+    icon: '',
+    category: 'popup',
+    type: 'Iframe',
+    related: {
+        settingRender: settingRender_1.default,
+        bindableProps: []
+    },
+    defaulSetting: {
+        props: {},
+        style: {}
+    },
+    w: 100,
+    h: 40,
+    sort: 3
+});
+exports.Iframe = Iframe;

package/lib/materials/sxp/popup/Iframe/settingRender.d.ts

@@ -0,0 +1,9 @@
+declare const _default: {
+    title: string;
+    child: {
+        type: string;
+        label: string;
+        name: string[];
+    }[];
+}[];
+export default _default;

package/lib/materials/sxp/popup/Iframe/settingRender.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = [
+    {
+        title: '背景样式',
+        child: [
+            {
+                type: 'Color',
+                label: '背景色',
+                name: ['style', 'backgroundColor']
+            }
+        ]
+    }
+];

package/lib/materials/sxp/popup/Prompt/settingRender.js

@@ -2,7 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = [
     {
-        title: '',
+        title: '弹窗背景',
+        child: [
+            {
+                type: 'Number',
+                label: '左右边距',
+                name: ['props', 'popupBg', 'horizontalMargin']
+            },
+            {
+                type: 'Number',
+                label: '下边距',
+                name: ['props', 'popupBg', 'bottomMargin']
+            }
+        ]
+    },
+    {
+        title: '内容',
         child: [
             {
                 type: 'Media',
@@ -48,11 +63,6 @@ exports.default = [
                     }
                 ]
             },
-            {
-                label: '内容字体间距',
-                type: 'TextSpace',
-                name: ['props', 'contentStyle']
-            },
             {
                 type: 'Group',
                 label: '提交按钮字体',
@@ -86,11 +96,6 @@ exports.default = [
                     }
                 ]
             },
-            {
-                label: '提交按钮间距',
-                type: 'TextSpace',
-                name: ['props', 'submitButtonStyle']
-            },
             {
                 type: 'TextStyle',
                 name: ['props', 'submitButtonStyle']

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

@@ -3,3 +3,4 @@ export * from './CommodityDetail/material';
 export * from './Prompt/material';
 export * from './CommodityDetailDiroNew/material';
 export * from './CommodityList/material';
+export * from './Iframe/material';

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

@@ -6,3 +6,4 @@ tslib_1.__exportStar(require("./CommodityDetail/material"), exports);
 tslib_1.__exportStar(require("./Prompt/material"), exports);
 tslib_1.__exportStar(require("./CommodityDetailDiroNew/material"), exports);
 tslib_1.__exportStar(require("./CommodityList/material"), exports);
+tslib_1.__exportStar(require("./Iframe/material"), exports);

package/lib/materials/sxp/template/Link/index.js

@@ -10,21 +10,15 @@ const Img_1 = tslib_1.__importDefault(require("../components/Img"));
 const tool_1 = require("../../../../core/utils/tool");
 const index_module_less_1 = tslib_1.__importDefault(require("./index.module.less"));
 const Link = (_a) => {
-    var _b, _c, _d, _e, _f, _g, _h, _j;
+    var _b, _c, _d, _e, _f, _g, _h, _j, _k;
     var { content, style, bgImg, recData, bottom_image, ctaTempStyles, index, customTitle } = _a, props = tslib_1.__rest(_a, ["content", "style", "bgImg", "recData", "bottom_image", "ctaTempStyles", "index", "customTitle"]);
     const { sxpParameter, bffEventReport } = (0, hooks_1.useSxpDataSource)();
     const { jumpToWeb } = (0, useEventReport_1.useEventReport)();
     const cta = (_b = recData === null || recData === void 0 ? void 0 : recData.video) === null || _b === void 0 ? void 0 : _b.bindCta;
     const product = (_c = recData === null || recData === void 0 ? void 0 : recData.video) === null || _c === void 0 ? void 0 : _c.bindProduct;
-    const handleTo = () => {
-        if (cta === null || cta === void 0 ? void 0 : cta.link) {
-            jumpToWeb(recData, product, cta, index);
-            window.location.href = window.getJointUtmLink(cta.link);
-        }
-    };
     const src = (_e = (_d = cta === null || cta === void 0 ? void 0 : cta.icon) !== null && _d !== void 0 ? _d : sxpParameter === null || sxpParameter === void 0 ? void 0 : sxpParameter.bottom_image) !== null && _e !== void 0 ? _e : bottom_image;
-    return (react_1.default.createElement(EventProvider_1.default, Object.assign({ index: index, rec: recData, className: (0, css_1.css)(Object.assign({ alignItems: 'center' }, style)), style: { display: 'flex' } }, props, { onClick: handleTo }),
-        react_1.default.createElement(Img_1.default, { src: src, rec: recData, item: (_g = (_f = recData === null || recData === void 0 ? void 0 : recData.video) === null || _f === void 0 ? void 0 : _f.bindProduct) !== null && _g !== void 0 ? _g : recData === null || recData === void 0 ? void 0 : recData.video, index: index, imgStyle: ctaTempStyles === null || ctaTempStyles === void 0 ? void 0 : ctaTempStyles.img }),
+    return (react_1.default.createElement(EventProvider_1.default, Object.assign({ index: index, rec: recData, className: (0, css_1.css)(Object.assign({ alignItems: 'center' }, style)), style: { display: 'flex' } }, props, { jumpLink: (_f = cta === null || cta === void 0 ? void 0 : cta.link) !== null && _f !== void 0 ? _f : '' }),
+        react_1.default.createElement(Img_1.default, { src: src, rec: recData, item: (_h = (_g = recData === null || recData === void 0 ? void 0 : recData.video) === null || _g === void 0 ? void 0 : _g.bindProduct) !== null && _h !== void 0 ? _h : recData === null || recData === void 0 ? void 0 : recData.video, index: index, imgStyle: ctaTempStyles === null || ctaTempStyles === void 0 ? void 0 : ctaTempStyles.img }),
         react_1.default.createElement("div", { className: (0, css_1.css)({
                 display: 'flex',
                 alignItems: 'center',
@@ -33,9 +27,9 @@ const Link = (_a) => {
             }) },
             react_1.default.createElement("div", null,
                 react_1.default.createElement("div", { className: index_module_less_1.default['tow-line-ellipsis'], style: ctaTempStyles === null || ctaTempStyles === void 0 ? void 0 : ctaTempStyles.ctaTitle, dangerouslySetInnerHTML: {
-                        __html: (0, tool_1.setFontForText)((_h = cta === null || cta === void 0 ? void 0 : cta.enTitle) !== null && _h !== void 0 ? _h : 'Product Name', ctaTempStyles === null || ctaTempStyles === void 0 ? void 0 : ctaTempStyles.ctaTitle)
+                        __html: (0, tool_1.setFontForText)((_j = cta === null || cta === void 0 ? void 0 : cta.enTitle) !== null && _j !== void 0 ? _j : 'Product Name', ctaTempStyles === null || ctaTempStyles === void 0 ? void 0 : ctaTempStyles.ctaTitle)
                     } }),
-                (customTitle === null || customTitle === void 0 ? void 0 : customTitle.display) && (react_1.default.createElement("div", { style: Object.assign(Object.assign({}, customTitle === null || customTitle === void 0 ? void 0 : customTitle.style), { lineHeight: ((_j = customTitle === null || customTitle === void 0 ? void 0 : customTitle.style) === null || _j === void 0 ? void 0 : _j.height) + 'px' }), className: index_module_less_1.default['one-line-ellipsis'], dangerouslySetInnerHTML: {
+                (customTitle === null || customTitle === void 0 ? void 0 : customTitle.display) && (react_1.default.createElement("div", { style: Object.assign(Object.assign({}, customTitle === null || customTitle === void 0 ? void 0 : customTitle.style), { lineHeight: ((_k = customTitle === null || customTitle === void 0 ? void 0 : customTitle.style) === null || _k === void 0 ? void 0 : _k.height) + 'px' }), className: index_module_less_1.default['one-line-ellipsis'], dangerouslySetInnerHTML: {
                         __html: (0, tool_1.setFontForText)(customTitle === null || customTitle === void 0 ? void 0 : customTitle.text, customTitle === null || customTitle === void 0 ? void 0 : customTitle.style)
                     } }))))));
 };

package/lib/materials/sxp/template/Link/interactionRender.d.ts

@@ -0,0 +1,8 @@
+declare const _default: {
+    title: string;
+    child: {
+        type: string;
+        name: string;
+    }[];
+}[];
+export default _default;

package/lib/materials/sxp/template/Link/interactionRender.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = [
+    {
+        title: '点击事件',
+        child: [
+            {
+                type: 'link',
+                name: 'onClick'
+            }
+        ]
+    }
+];

package/lib/materials/sxp/template/Link/material.js

@@ -7,6 +7,7 @@ const settingRender_1 = tslib_1.__importDefault(require("../components/settingRe
 const settingRender_2 = tslib_1.__importDefault(require("./settingRender"));
 const _1 = tslib_1.__importDefault(require("."));
 const create_1 = require("../../../../core/create");
+const interactionRender_1 = tslib_1.__importDefault(require("./interactionRender"));
 const Link = (0, create_1.createMaterial)(_1.default, {
     displayName: '跳转指引',
     icon: '',
@@ -14,7 +15,8 @@ const Link = (0, create_1.createMaterial)(_1.default, {
     type: 'Link',
     related: {
         settingRender: (_a = settingRender_1.default === null || settingRender_1.default === void 0 ? void 0 : settingRender_1.default.filter((i) => i.type !== 'commodityTitle')) === null || _a === void 0 ? void 0 : _a.concat(settingRender_2.default),
-        bindableProps: []
+        bindableProps: [],
+        interactionRender: interactionRender_1.default
     },
     defaulSetting: {
         props: {

package/lib/materials/sxp/template/Link/settingRender.js

@@ -93,11 +93,6 @@ exports.default = [
                 type: 'TextAlign',
                 name: ['props', 'customTitle', 'style']
             },
-            {
-                label: '间距',
-                type: 'TextSpace',
-                name: ['props', 'customTitle', 'style']
-            },
             {
                 label: '上边距',
                 type: 'Number',

package/lib/materials/sxp/template/components/EventProvider.d.ts

@@ -1,6 +1,6 @@
 import React, { CSSProperties } from 'react';
 import { RecItemType } from '../../../../core/components/SxpPageRender/typing';
-export interface IImgProps {
+export interface IEventProviderProps {
     rec?: RecItemType;
     children: any;
     className?: any;
@@ -8,6 +8,7 @@ export interface IImgProps {
     style?: CSSProperties;
     isExternalLink?: boolean;
     index?: number;
+    jumpLink?: string;
 }
-declare const _default: React.NamedExoticComponent<IImgProps>;
+declare const _default: React.NamedExoticComponent<IEventProviderProps>;
 export default _default;