pb-sxp-ui 1.3.6 → 1.3.8

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

@@ -1,7 +1,6 @@
 import React, { memo, useCallback, useEffect, useRef, useState } from 'react';
 import * as ReactDOM from 'react-dom';
 import './index.less';
-import { isEqual } from 'lodash';
 import Navbar from '../Navbar';
 import WaterfallList from './WaterfallList';
 import left from './left.png';
@@ -28,21 +27,13 @@ const WaterFall = (props) => {
         }
     }, []);
     const handleClose = () => {
-        const isEq = isEqual(rtcList, cacheRtcList);
-        if (!isEq && cacheRtcList && (cacheRtcList === null || cacheRtcList === void 0 ? void 0 : cacheRtcList.length)) {
-            setRtcList === null || setRtcList === void 0 ? void 0 : setRtcList(cacheRtcList);
-        }
+        var _a, _b;
         backMainFeed('branch', selectTag, undefined, waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.hashTag);
         reportTagsView();
         setWaterFallData === null || setWaterFallData === void 0 ? void 0 : setWaterFallData(undefined);
         setIsFromHashtag === null || setIsFromHashtag === void 0 ? void 0 : setIsFromHashtag(false);
-        setTimeout(() => {
-            var _a, _b;
-            if (!isEq) {
-                (_b = (_a = swiperRef === null || swiperRef === void 0 ? void 0 : swiperRef.current) === null || _a === void 0 ? void 0 : _a.swiper) === null || _b === void 0 ? void 0 : _b.slideTo(cacheActiveIndex, 0, false);
-            }
-            setOpenHashtag === null || setOpenHashtag === void 0 ? void 0 : setOpenHashtag(false);
-        }, 0);
+        (_b = (_a = swiperRef === null || swiperRef === void 0 ? void 0 : swiperRef.current) === null || _a === void 0 ? void 0 : _a.swiper) === null || _b === void 0 ? void 0 : _b.slideTo(cacheActiveIndex, 0, false);
+        setOpenHashtag === null || setOpenHashtag === void 0 ? void 0 : setOpenHashtag(false);
     };
     const [recData, setRecData] = useState();
     useEffect(() => {

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

@@ -21,6 +21,7 @@ import { useEventReport } from '../../../core/hooks/useEventReport';
 import withBindDataSource from '../../../core/hoc/withBindDataSource';
 import Tagbar from './Tagbar';
 import { getFeUserId, getSlideSkipState } from '../../../core/utils/localStore';
+import { isEqual } from 'lodash';
 const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.innerHeight, containerWidth = window.innerWidth, tempMap, resolver, data = [], ctaType, tipText, nudge, _schema, hashTagStyle, tagList = [], licenseUrl }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const mutedIcon = useIconLink('/pb_static/5beaaa5ce7f3477b99db3838619cc471.png');
@@ -34,7 +35,7 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
     const [isShowMore, setIsShowMore] = useState(false);
     const [isReload, setIsReload] = useState(new Date().getTime());
     const skipLinkRef = useRef(false);
-    const { loadVideos, bffEventReport, loading, setPopupDetailData, ctaEvent, swiperRef, waterFallData, setOpenHashtag, appDomain, openHashtag, loadingImage, isFromHashtag, popupDetailData, bffFbReport, curTime, h5EnterLink, isShowConsent, selectTag, isPreview, isEditor } = useSxpDataSource();
+    const { loadVideos, bffEventReport, loading, setPopupDetailData, ctaEvent, swiperRef, waterFallData, setOpenHashtag, appDomain, openHashtag, loadingImage, isFromHashtag, popupDetailData, bffFbReport, curTime, h5EnterLink, isShowConsent, selectTag, isPreview, isEditor, cacheRtcList, setRtcList, cacheActiveIndex, rtcList } = useSxpDataSource();
     const { backMainFeed, productView, jumpToWeb } = useEventReport();
     const isShowFingerTip = useMemo(() => {
         return data.length > 0 && !loading && (getFeUserId() || (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enableSwiperTip));
@@ -478,6 +479,10 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
     ]);
     return (React.createElement("div", { id: 'sxp-render', className: 'clc-sxp-container' },
         waterFallData && (React.createElement(Navbar, { icon: left, styles: { background: 'rgba(0,0,0,.3)', color: '#fff' }, textStyle: Object.assign(Object.assign({}, (_e = (_d = (_c = (_b = (_a = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.hashTag) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.item) === null || _c === void 0 ? void 0 : _c.props) === null || _d === void 0 ? void 0 : _d.textStyles) === null || _e === void 0 ? void 0 : _e.hashTagTitle), { color: '#fff' }), onClose: () => {
+                const isEq = isEqual(rtcList, cacheRtcList);
+                if (!isEq && cacheRtcList && (cacheRtcList === null || cacheRtcList === void 0 ? void 0 : cacheRtcList.length)) {
+                    setRtcList === null || setRtcList === void 0 ? void 0 : setRtcList(cacheRtcList);
+                }
                 setOpenHashtag === null || setOpenHashtag === void 0 ? void 0 : setOpenHashtag(true);
             } })),
         renderLogo,

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

@@ -48,6 +48,7 @@ export interface ICommodityDetailProps {
         h: number;
     };
     isTel?: boolean;
+    iframeBgColor?: string;
 }
 declare const _default: React.NamedExoticComponent<ICommodityDetailProps>;
 export default _default;

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

@@ -13,7 +13,7 @@ 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, _y, _z;
-    var { content, style, bgImg, onClick, schema, isDefault, bottom_image, tipText, isPost, viewTime, rec, swiper, commodityStyles, buttonStyle, index, commodityGroup, popupBg, iframeIcon, commodityImgRatio, isTel } = _a, props = __rest(_a, ["content", "style", "bgImg", "onClick", "schema", "isDefault", "bottom_image", "tipText", "isPost", "viewTime", "rec", "swiper", "commodityStyles", "buttonStyle", "index", "commodityGroup", "popupBg", "iframeIcon", "commodityImgRatio", "isTel"]);
+    var { content, style, bgImg, onClick, schema, isDefault, bottom_image, tipText, isPost, viewTime, rec, swiper, commodityStyles, buttonStyle, index, commodityGroup, popupBg, iframeIcon, commodityImgRatio, isTel, iframeBgColor } = _a, props = __rest(_a, ["content", "style", "bgImg", "onClick", "schema", "isDefault", "bottom_image", "tipText", "isPost", "viewTime", "rec", "swiper", "commodityStyles", "buttonStyle", "index", "commodityGroup", "popupBg", "iframeIcon", "commodityImgRatio", "isTel", "iframeBgColor"]);
     const { sxpParameter, popupDetailData, isPreview, bffFbReport, popupCurTimeRef, checkCommodityIndexRef } = useSxpDataSource();
     const { jumpToWeb, productView } = useEventReport();
     const curTimeRef = useRef(null);
@@ -91,10 +91,10 @@ const CommodityDetail = (_a) => {
                     __html: setFontForText((_c = product === null || product === void 0 ? void 0 : product.taxInfo) !== null && _c !== void 0 ? _c : '税费', commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.taxInfo)
                 } }),
             React.createElement("div", { hidden: !!product && (!(product === null || product === void 0 ? void 0 : product.info) || (product === null || product === void 0 ? void 0 : product.info) === '') },
-                React.createElement(ExpandableText, { foldText: tipText === null || tipText === void 0 ? void 0 : tipText.foldText, unfoldText: tipText === null || tipText === void 0 ? void 0 : tipText.unfoldText, onClick: () => setShowModal(true), isPost: isPost, text: (_d = product === null || product === void 0 ? void 0 : product.info) !== null && _d !== void 0 ? _d : `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
+                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: (_d = product === null || product === void 0 ? void 0 : product.info) !== null && _d !== void 0 ? _d : `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 = () => {
@@ -187,10 +187,10 @@ 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("div", { style: { height: window.innerHeight } },
+            React.createElement("div", { style: { backgroundColor: iframeBgColor, height: '100%' } },
                 React.createElement("iframe", { src: iframeUrl, style: {
                         width: '100%',
-                        height: isTel ? `${664 - 50}px` : `${window.innerHeight - 50}px`,
+                        height: 'calc(100% - 50px)',
                         marginTop: '50px',
                         border: 'none'
                     } })))));

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

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

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

@@ -318,7 +318,12 @@ export default [
                 label: '弹窗按钮',
                 type: 'Upload',
                 name: ['props', 'iframeIcon'],
-                text: '建议尺寸：72 * 41'
+                text: '建议尺寸：72 * 30'
+            },
+            {
+                label: '背景色',
+                type: 'Color',
+                name: ['props', 'iframeBgColor']
             }
         ]
     }

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

@@ -48,6 +48,7 @@ export interface ICommodityDetailDiroNewProps {
         h: number;
     };
     isTel?: boolean;
+    iframeBgColor?: string;
 }
 declare const _default: React.NamedExoticComponent<ICommodityDetailDiroNewProps>;
 export default _default;

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

@@ -13,7 +13,7 @@ import { setFontForText } from '../../../../core/utils/tool';
 import CommodityGroup from '../../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, _2, _3;
-    var { style, isDefault, rec, viewTime, isPost, bottom_image, tipText, swiper, commodityStyles, buttonStyle, index, commodityGroup, popupBg, iframeIcon, commodityImgRatio, isTel } = _a, props = __rest(_a, ["style", "isDefault", "rec", "viewTime", "isPost", "bottom_image", "tipText", "swiper", "commodityStyles", "buttonStyle", "index", "commodityGroup", "popupBg", "iframeIcon", "commodityImgRatio", "isTel"]);
+    var { style, isDefault, rec, viewTime, isPost, bottom_image, tipText, swiper, commodityStyles, buttonStyle, index, commodityGroup, popupBg, iframeIcon, commodityImgRatio, isTel, iframeBgColor } = _a, props = __rest(_a, ["style", "isDefault", "rec", "viewTime", "isPost", "bottom_image", "tipText", "swiper", "commodityStyles", "buttonStyle", "index", "commodityGroup", "popupBg", "iframeIcon", "commodityImgRatio", "isTel", "iframeBgColor"]);
     const [spread, setSpread] = useState(true);
     const { sxpParameter, popupCurTimeRef, popupDetailData, isPreview, bffFbReport, checkCommodityIndexRef } = useSxpDataSource();
     const { jumpToWeb, productView } = useEventReport();
@@ -85,7 +85,7 @@ const CommodityDetailDiroNew = (_a) => {
     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
+                    `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
 Made in Italy` })));
     };
     const getStyle = useCallback((style) => {
@@ -187,10 +187,10 @@ Made in Italy` })));
                 productInfoText({ isPost }))),
         React.createElement(Modal, { visible: showModal, onClose: () => setShowModal(false) }, productInfoText({ isPost: false })),
         React.createElement(Modal, { visible: show3DModal, padding: 0, isFullScreen: true, onClose: () => setShow3DModal(false) },
-            React.createElement("div", { style: { height: window.innerHeight } },
+            React.createElement("div", { style: { backgroundColor: iframeBgColor, height: '100%' } },
                 React.createElement("iframe", { src: iframeUrl, style: {
                         width: '100%',
-                        height: isTel ? `${664 - 50}px` : `${window.innerHeight - 50}px`,
+                        height: 'calc(100% - 50px)',
                         marginTop: '50px',
                         border: 'none'
                     } })))));

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

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

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

@@ -301,7 +301,12 @@ export default [
                 label: '弹窗按钮',
                 type: 'Upload',
                 name: ['props', 'iframeIcon'],
-                text: '建议尺寸：72 * 41'
+                text: '建议尺寸：72 * 30'
+            },
+            {
+                label: '背景色',
+                type: 'Color',
+                name: ['props', 'iframeBgColor']
             }
         ]
     }

package/lib/core/components/SxpPageRender/WaterFall/index.js

@@ -4,7 +4,6 @@ const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importStar(require("react"));
 const ReactDOM = tslib_1.__importStar(require("react-dom"));
 require("./index.less");
-const lodash_1 = require("lodash");
 const Navbar_1 = tslib_1.__importDefault(require("../Navbar"));
 const WaterfallList_1 = tslib_1.__importDefault(require("./WaterfallList"));
 const left_png_1 = tslib_1.__importDefault(require("./left.png"));
@@ -31,21 +30,13 @@ const WaterFall = (props) => {
         }
     }, []);
     const handleClose = () => {
-        const isEq = (0, lodash_1.isEqual)(rtcList, cacheRtcList);
-        if (!isEq && cacheRtcList && (cacheRtcList === null || cacheRtcList === void 0 ? void 0 : cacheRtcList.length)) {
-            setRtcList === null || setRtcList === void 0 ? void 0 : setRtcList(cacheRtcList);
-        }
+        var _a, _b;
         backMainFeed('branch', selectTag, undefined, waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.hashTag);
         reportTagsView();
         setWaterFallData === null || setWaterFallData === void 0 ? void 0 : setWaterFallData(undefined);
         setIsFromHashtag === null || setIsFromHashtag === void 0 ? void 0 : setIsFromHashtag(false);
-        setTimeout(() => {
-            var _a, _b;
-            if (!isEq) {
-                (_b = (_a = swiperRef === null || swiperRef === void 0 ? void 0 : swiperRef.current) === null || _a === void 0 ? void 0 : _a.swiper) === null || _b === void 0 ? void 0 : _b.slideTo(cacheActiveIndex, 0, false);
-            }
-            setOpenHashtag === null || setOpenHashtag === void 0 ? void 0 : setOpenHashtag(false);
-        }, 0);
+        (_b = (_a = swiperRef === null || swiperRef === void 0 ? void 0 : swiperRef.current) === null || _a === void 0 ? void 0 : _a.swiper) === null || _b === void 0 ? void 0 : _b.slideTo(cacheActiveIndex, 0, false);
+        setOpenHashtag === null || setOpenHashtag === void 0 ? void 0 : setOpenHashtag(false);
     };
     const [recData, setRecData] = (0, react_1.useState)();
     (0, react_1.useEffect)(() => {

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

@@ -24,6 +24,7 @@ const useEventReport_1 = require("../../../core/hooks/useEventReport");
 const withBindDataSource_1 = tslib_1.__importDefault(require("../../../core/hoc/withBindDataSource"));
 const Tagbar_1 = tslib_1.__importDefault(require("./Tagbar"));
 const localStore_1 = require("../../../core/utils/localStore");
+const lodash_1 = require("lodash");
 const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.innerHeight, containerWidth = window.innerWidth, tempMap, resolver, data = [], ctaType, tipText, nudge, _schema, hashTagStyle, tagList = [], licenseUrl }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const mutedIcon = (0, useIconLink_1.useIconLink)('/pb_static/5beaaa5ce7f3477b99db3838619cc471.png');
@@ -37,7 +38,7 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
     const [isShowMore, setIsShowMore] = (0, react_1.useState)(false);
     const [isReload, setIsReload] = (0, react_1.useState)(new Date().getTime());
     const skipLinkRef = (0, react_1.useRef)(false);
-    const { loadVideos, bffEventReport, loading, setPopupDetailData, ctaEvent, swiperRef, waterFallData, setOpenHashtag, appDomain, openHashtag, loadingImage, isFromHashtag, popupDetailData, bffFbReport, curTime, h5EnterLink, isShowConsent, selectTag, isPreview, isEditor } = (0, hooks_1.useSxpDataSource)();
+    const { loadVideos, bffEventReport, loading, setPopupDetailData, ctaEvent, swiperRef, waterFallData, setOpenHashtag, appDomain, openHashtag, loadingImage, isFromHashtag, popupDetailData, bffFbReport, curTime, h5EnterLink, isShowConsent, selectTag, isPreview, isEditor, cacheRtcList, setRtcList, cacheActiveIndex, rtcList } = (0, hooks_1.useSxpDataSource)();
     const { backMainFeed, productView, jumpToWeb } = (0, useEventReport_1.useEventReport)();
     const isShowFingerTip = (0, react_1.useMemo)(() => {
         return data.length > 0 && !loading && ((0, localStore_1.getFeUserId)() || (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enableSwiperTip));
@@ -481,6 +482,10 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
     ]);
     return (react_1.default.createElement("div", { id: 'sxp-render', className: 'clc-sxp-container' },
         waterFallData && (react_1.default.createElement(Navbar_1.default, { icon: left_png_1.default, styles: { background: 'rgba(0,0,0,.3)', color: '#fff' }, textStyle: Object.assign(Object.assign({}, (_e = (_d = (_c = (_b = (_a = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.hashTag) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.item) === null || _c === void 0 ? void 0 : _c.props) === null || _d === void 0 ? void 0 : _d.textStyles) === null || _e === void 0 ? void 0 : _e.hashTagTitle), { color: '#fff' }), onClose: () => {
+                const isEq = (0, lodash_1.isEqual)(rtcList, cacheRtcList);
+                if (!isEq && cacheRtcList && (cacheRtcList === null || cacheRtcList === void 0 ? void 0 : cacheRtcList.length)) {
+                    setRtcList === null || setRtcList === void 0 ? void 0 : setRtcList(cacheRtcList);
+                }
                 setOpenHashtag === null || setOpenHashtag === void 0 ? void 0 : setOpenHashtag(true);
             } })),
         renderLogo,

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

@@ -48,6 +48,7 @@ export interface ICommodityDetailProps {
         h: number;
     };
     isTel?: boolean;
+    iframeBgColor?: string;
 }
 declare const _default: React.NamedExoticComponent<ICommodityDetailProps>;
 export default _default;

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

@@ -15,7 +15,7 @@ const tool_1 = require("../../../../core/utils/tool");
 const CommodityGroup_1 = tslib_1.__importDefault(require("../../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, _y, _z;
-    var { content, style, bgImg, onClick, schema, isDefault, bottom_image, tipText, isPost, viewTime, rec, swiper, commodityStyles, buttonStyle, index, commodityGroup, popupBg, iframeIcon, commodityImgRatio, isTel } = _a, props = tslib_1.__rest(_a, ["content", "style", "bgImg", "onClick", "schema", "isDefault", "bottom_image", "tipText", "isPost", "viewTime", "rec", "swiper", "commodityStyles", "buttonStyle", "index", "commodityGroup", "popupBg", "iframeIcon", "commodityImgRatio", "isTel"]);
+    var { content, style, bgImg, onClick, schema, isDefault, bottom_image, tipText, isPost, viewTime, rec, swiper, commodityStyles, buttonStyle, index, commodityGroup, popupBg, iframeIcon, commodityImgRatio, isTel, iframeBgColor } = _a, props = tslib_1.__rest(_a, ["content", "style", "bgImg", "onClick", "schema", "isDefault", "bottom_image", "tipText", "isPost", "viewTime", "rec", "swiper", "commodityStyles", "buttonStyle", "index", "commodityGroup", "popupBg", "iframeIcon", "commodityImgRatio", "isTel", "iframeBgColor"]);
     const { sxpParameter, popupDetailData, isPreview, bffFbReport, popupCurTimeRef, checkCommodityIndexRef } = (0, hooks_1.useSxpDataSource)();
     const { jumpToWeb, productView } = (0, useEventReport_1.useEventReport)();
     const curTimeRef = (0, react_1.useRef)(null);
@@ -93,10 +93,10 @@ const CommodityDetail = (_a) => {
                     __html: (0, tool_1.setFontForText)((_c = product === null || product === void 0 ? void 0 : product.taxInfo) !== null && _c !== void 0 ? _c : '税费', commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.taxInfo)
                 } }),
             react_1.default.createElement("div", { hidden: !!product && (!(product === null || product === void 0 ? void 0 : product.info) || (product === null || product === void 0 ? void 0 : product.info) === '') },
-                react_1.default.createElement(ExpandableText_1.default, { 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: (_d = product === null || product === void 0 ? void 0 : product.info) !== null && _d !== void 0 ? _d : `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
+                react_1.default.createElement(ExpandableText_1.default, { 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: (_d = product === null || product === void 0 ? void 0 : product.info) !== null && _d !== void 0 ? _d : `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 = () => {
@@ -189,10 +189,10 @@ const CommodityDetail = (_a) => {
             react_1.default.createElement("div", { style: { paddingBottom: '80px' } }, renderContent({ isPost: false })),
             renderBtn()),
         react_1.default.createElement(Modal_1.default, { visible: show3DModal, padding: 0, isFullScreen: true, onClose: () => setShow3DModal(false) },
-            react_1.default.createElement("div", { style: { height: window.innerHeight } },
+            react_1.default.createElement("div", { style: { backgroundColor: iframeBgColor, height: '100%' } },
                 react_1.default.createElement("iframe", { src: iframeUrl, style: {
                         width: '100%',
-                        height: isTel ? `${664 - 50}px` : `${window.innerHeight - 50}px`,
+                        height: 'calc(100% - 50px)',
                         marginTop: '50px',
                         border: 'none'
                     } })))));

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

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

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

@@ -320,7 +320,12 @@ exports.default = [
                 label: '弹窗按钮',
                 type: 'Upload',
                 name: ['props', 'iframeIcon'],
-                text: '建议尺寸：72 * 41'
+                text: '建议尺寸：72 * 30'
+            },
+            {
+                label: '背景色',
+                type: 'Color',
+                name: ['props', 'iframeBgColor']
             }
         ]
     }

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

@@ -48,6 +48,7 @@ export interface ICommodityDetailDiroNewProps {
         h: number;
     };
     isTel?: boolean;
+    iframeBgColor?: string;
 }
 declare const _default: React.NamedExoticComponent<ICommodityDetailDiroNewProps>;
 export default _default;

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

@@ -15,7 +15,7 @@ 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, _2, _3;
-    var { style, isDefault, rec, viewTime, isPost, bottom_image, tipText, swiper, commodityStyles, buttonStyle, index, commodityGroup, popupBg, iframeIcon, commodityImgRatio, isTel } = _a, props = tslib_1.__rest(_a, ["style", "isDefault", "rec", "viewTime", "isPost", "bottom_image", "tipText", "swiper", "commodityStyles", "buttonStyle", "index", "commodityGroup", "popupBg", "iframeIcon", "commodityImgRatio", "isTel"]);
+    var { style, isDefault, rec, viewTime, isPost, bottom_image, tipText, swiper, commodityStyles, buttonStyle, index, commodityGroup, popupBg, iframeIcon, commodityImgRatio, isTel, iframeBgColor } = _a, props = tslib_1.__rest(_a, ["style", "isDefault", "rec", "viewTime", "isPost", "bottom_image", "tipText", "swiper", "commodityStyles", "buttonStyle", "index", "commodityGroup", "popupBg", "iframeIcon", "commodityImgRatio", "isTel", "iframeBgColor"]);
     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)();
@@ -87,7 +87,7 @@ const CommodityDetailDiroNew = (_a) => {
     const productInfoText = ({ isPost }) => {
         return (react_1.default.createElement("div", { hidden: !!product && (!(product === null || product === void 0 ? void 0 : product.info) || (product === null || product === void 0 ? void 0 : product.info) === '') },
             react_1.default.createElement(ExpandableText_1.default, { 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
+                    `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
 Made in Italy` })));
     };
     const getStyle = (0, react_1.useCallback)((style) => {
@@ -189,10 +189,10 @@ Made in Italy` })));
                 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: show3DModal, padding: 0, isFullScreen: true, onClose: () => setShow3DModal(false) },
-            react_1.default.createElement("div", { style: { height: window.innerHeight } },
+            react_1.default.createElement("div", { style: { backgroundColor: iframeBgColor, height: '100%' } },
                 react_1.default.createElement("iframe", { src: iframeUrl, style: {
                         width: '100%',
-                        height: isTel ? `${664 - 50}px` : `${window.innerHeight - 50}px`,
+                        height: 'calc(100% - 50px)',
                         marginTop: '50px',
                         border: 'none'
                     } })))));

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

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

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

@@ -303,7 +303,12 @@ exports.default = [
                 label: '弹窗按钮',
                 type: 'Upload',
                 name: ['props', 'iframeIcon'],
-                text: '建议尺寸：72 * 41'
+                text: '建议尺寸：72 * 30'
+            },
+            {
+                label: '背景色',
+                type: 'Color',
+                name: ['props', 'iframeBgColor']
             }
         ]
     }