pb-sxp-ui 1.7.1 → 1.7.3

package/dist/pb-ui.js

@@ -313,6 +313,16 @@
         });
         return value !== null && value !== void 0 ? value : '';
     }
+    const getResFileSizeFromSrc = (imageSrc) => {
+        if (!imageSrc)
+            return '';
+        return fetch(imageSrc)
+            .then((response) => response.blob())
+            .then((blob) => {
+            const fileSizeInMB = blob.size / (1024 * 1024); // 将文件大小转换为 MB
+            return fileSizeInMB.toFixed(2) + '';
+        });
+    };
 
     function unzip(b64Data) {
         const strData = atob(b64Data);
@@ -812,23 +822,65 @@
                 type: 'beacon'
             });
         }, [bffFetch, curReqInfo, enableReportEvent, globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview]);
-        const bffFbReport = React.useCallback((_a) => {
-            var _b, _c, _d;
-            var { eventName, actionSource = 'website', eventSourceUrl = (_b = window === null || window === void 0 ? void 0 : window.location) === null || _b === void 0 ? void 0 : _b.href, externalId } = _a;
+        const bffFbReport = React.useCallback(({ eventName, product }) => {
+            var _a, _b, _c, _d;
             if (!enableReportEvent || !enabledMetaConversionApi || (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview)) {
                 return;
             }
-            const fakeUserId = storeAndLoadFeUserId();
+            let jsonParams = (_a = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.converApi) === null || _a === void 0 ? void 0 : _a[eventName];
             const urlParams = new URLSearchParams(window.location.search);
-            const fbclid = urlParams.get('fbclid');
+            const fbclid = urlParams === null || urlParams === void 0 ? void 0 : urlParams.get('fbclid');
+            const fix_par = {
+                event_source_url: (_b = window === null || window === void 0 ? void 0 : window.location) === null || _b === void 0 ? void 0 : _b.href,
+                external_id: storeAndLoadFeUserId(),
+                client_user_agent: (_d = (_c = window === null || window === void 0 ? void 0 : window.navigator) === null || _c === void 0 ? void 0 : _c.userAgent) !== null && _d !== void 0 ? _d : '',
+                fbc: fbclid ? `fb.2.${new Date().getTime()}.${fbclid}` : '',
+                fbp: getCookie('_fbp') ? `fb.2.${new Date().getTime()}.${getCookie('_fbp')}` : '',
+                time: new Date().getTime()
+            };
+            const regex = /\{\{(.*?)\}\}/g;
+            const getEventParams = (obj) => {
+                if (!obj)
+                    return;
+                if (obj instanceof Array) {
+                    obj === null || obj === void 0 ? void 0 : obj.map((item) => getEventParams(item));
+                }
+                else {
+                    for (const key in obj) {
+                        if (obj.hasOwnProperty(key)) {
+                            const value = obj === null || obj === void 0 ? void 0 : obj[key];
+                            if (typeof value === 'object') {
+                                getEventParams(value);
+                            }
+                            else if (typeof value === 'string') {
+                                const matches = value === null || value === void 0 ? void 0 : value.match(regex);
+                                if (matches) {
+                                    matches.forEach((match) => {
+                                        const prop = match.substring(2, match.length - 2);
+                                        try {
+                                            const replaceValue = new Function('fix_par', 'product', `return ${prop}`)(fix_par, product);
+                                            if (replaceValue) {
+                                                obj[key] = replaceValue;
+                                            }
+                                            else {
+                                                delete obj[key];
+                                            }
+                                        }
+                                        catch (error) {
+                                            delete obj[key];
+                                            console.error('An error occurred:', error === null || error === void 0 ? void 0 : error.message);
+                                        }
+                                    });
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+            getEventParams(jsonParams);
             return bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/fb/events', {
                 method: 'POST',
-                body: {
-                    eventName,
-                    actionSource,
-                    eventSourceUrl,
-                    userData: Object.assign(Object.assign(Object.assign({ externalId: fakeUserId }, (fbclid && { fbc: `fb.2.${new Date().getTime()}.${fbclid}` })), (getCookie('_fbp') && { fbp: `fb.2.${new Date().getTime()}.${getCookie('_fbp')}` })), { clientUserAgent: (_d = (_c = window === null || window === void 0 ? void 0 : window.navigator) === null || _c === void 0 ? void 0 : _c.userAgent) !== null && _d !== void 0 ? _d : '' })
-                },
+                body: jsonParams,
                 type: 'beacon'
             });
         }, [bffFetch, enableReportEvent, enabledMetaConversionApi, globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview]);
@@ -8927,7 +8979,7 @@
      * @Author: binruan@chatlabs.com
      * @Date: 2023-11-02 18:34:34
      * @LastEditors: binruan@chatlabs.com
-     * @LastEditTime: 2024-10-11 18:18:41
+     * @LastEditTime: 2024-10-23 16:44:34
      * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\Modal\index.tsx
      *
      */
@@ -8944,7 +8996,7 @@
         const [isShow, setIsShow] = React.useState(false);
         const modalEleRef = React.useRef(null);
         const { globalConfig, popupDetailData } = useSxpDataSource();
-        const { schema: _schema } = useEditor();
+        const { schema: _schema, popup: _popup } = useEditor();
         const [scrollTop, setScrollTop] = React.useState(15);
         React.useEffect(() => {
             const parentNode = document.getElementById('sxp-render');
@@ -8982,6 +9034,9 @@
                 }, popup === null || popup === void 0 ? void 0 : popup.duration);
             }
         }, [isOpen, popup]);
+        const child = React.useCallback(() => {
+            return children;
+        }, [_popup]);
         if (!modalEleRef.current)
             return null;
         const handleClose = lodash.debounce(() => {
@@ -9067,7 +9122,7 @@
                             var _a;
                             setScrollTop(15 - ((_a = e === null || e === void 0 ? void 0 : e.target) === null || _a === void 0 ? void 0 : _a.scrollTop));
                         }
-                    })), children)))))), modalEleRef.current);
+                    })), child())))))), modalEleRef.current);
     };
     var Modal$1 = React.memo(Modal);
 
@@ -9238,7 +9293,7 @@
      * @Author: binruan@chatlabs.com
      * @Date: 2024-03-20 14:56:16
      * @LastEditors: binruan@chatlabs.com
-     * @LastEditTime: 2024-09-14 10:07:47
+     * @LastEditTime: 2024-10-24 17:51:19
      * @FilePath: \pb-sxp-ui\src\core\utils\materials.ts
      *
      */
@@ -9265,8 +9320,8 @@
                 return file && file.length > 0 ? (_a = file[0]) === null || _a === void 0 ? void 0 : _a.url : null;
         }
     };
-    const getPriceText = ({ product, enableFormattedPrice, globalConfig, isHiddenDef }) => {
-        var _a, _b, _c, _d, _e;
+    const getPriceText = ({ product, enableFormattedPrice, globalConfig, isHiddenDef, style }) => {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         if ((!(product === null || product === void 0 ? void 0 : product.currency) || !(product === null || product === void 0 ? void 0 : product.price)) && isHiddenDef)
             return null;
         let price = (product === null || product === void 0 ? void 0 : product.currency) && (product === null || product === void 0 ? void 0 : product.price) ? product === null || product === void 0 ? void 0 : product.price : 7000;
@@ -9314,6 +9369,8 @@
                 }
             });
         }
+        currency = `<span style="font-family:${(_h = (_g = (_f = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.priceSymbol) === null || _f === void 0 ? void 0 : _f.fontFamily) !== null && _g !== void 0 ? _g : style === null || style === void 0 ? void 0 : style['fontFamily-en']) !== null && _h !== void 0 ? _h : 'inherit'}">${currency}</span>`;
+        text = setFontForText(text, style);
         if ((priceSymbol === null || priceSymbol === void 0 ? void 0 : priceSymbol.currencyPosition) && (priceSymbol === null || priceSymbol === void 0 ? void 0 : priceSymbol.currencyPosition) !== 'none') {
             text = (priceSymbol === null || priceSymbol === void 0 ? void 0 : priceSymbol.currencyPosition) === 'left' ? currency + text : text + currency;
         }
@@ -9325,7 +9382,7 @@
 
     const CommodityDetail$1 = (_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;
-        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"]);
+        var { content, style, bgImg, onClick, schema, isDefault, bottom_image, tipText, isPost, viewTime, rec, swiper, commodityStyles, buttonStyle, index, commodityGroup, popupBg, iframeIcon, commodityImgRatio, isTel, iframeBgColor, isActive = true } = _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", "isActive"]);
         const { sxpParameter, popupDetailData, isPreview, bffFbReport, popupCurTimeRef, checkCommodityIndexRef, globalConfig } = useSxpDataSource();
         const { jumpToWeb, productView } = useEventReport();
         const curTimeRef = React.useRef(null);
@@ -9355,12 +9412,17 @@
             }
         };
         React.useEffect(() => {
-            if (!isPost) {
-                bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-                    eventName: 'ProductView'
-                });
-            }
-        }, [isPost, bffFbReport]);
+            if (!isActive)
+                return;
+            bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
+                eventName: 'ProductView',
+                product
+            });
+            bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
+                eventName: 'PageView',
+                product
+            });
+        }, [isActive, bffFbReport]);
         React.useEffect(() => {
             const initTime = () => {
                 curTimeRef.current = new Date();
@@ -9374,7 +9436,8 @@
         const priceText = getPriceText({
             product: product,
             enableFormattedPrice: (_t = commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price) === null || _t === void 0 ? void 0 : _t.enableFormattedPrice,
-            globalConfig
+            globalConfig,
+            style: commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price
         });
         const width = (isPreview ? 375 : (_u = style === null || style === void 0 ? void 0 : style.width) !== null && _u !== void 0 ? _u : window.innerWidth) - ((_v = popupBg === null || popupBg === void 0 ? void 0 : popupBg.horizontalMargin) !== null && _v !== void 0 ? _v : 0) * 2;
         const height = commodityImgRatio ? width * (commodityImgRatio.h / commodityImgRatio.w) : width;
@@ -9388,7 +9451,7 @@
                         __html: setFontForText((_b = product === null || product === void 0 ? void 0 : product.title) !== null && _b !== void 0 ? _b : 'Pendant in Yellow Gold with Diamonds, Medium', commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.title)
                     } }),
                 React.createElement("div", { className: 'pb-commondity-content-price', style: getStyle(commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price), hidden: !!product && !(product === null || product === void 0 ? void 0 : product.price), dangerouslySetInnerHTML: {
-                        __html: setFontForText(priceText, commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price)
+                        __html: priceText !== null && priceText !== void 0 ? priceText : ''
                     } }),
                 React.createElement("div", { hidden: !!product && !(product === null || product === void 0 ? void 0 : product.taxInfo), style: getStyle(commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.taxInfo), dangerouslySetInnerHTML: {
                         __html: setFontForText((_c = product === null || product === void 0 ? void 0 : product.taxInfo) !== null && _c !== void 0 ? _c : '税费', commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.taxInfo)
@@ -10202,7 +10265,7 @@
 
     const CommodityDetailDiroNew$1 = (_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, _4;
-        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"]);
+        var { style, isDefault, rec, viewTime, isPost, bottom_image, tipText, swiper, commodityStyles, buttonStyle, index, commodityGroup, popupBg, iframeIcon, commodityImgRatio, isTel, iframeBgColor, isActive = true } = _a, props = __rest(_a, ["style", "isDefault", "rec", "viewTime", "isPost", "bottom_image", "tipText", "swiper", "commodityStyles", "buttonStyle", "index", "commodityGroup", "popupBg", "iframeIcon", "commodityImgRatio", "isTel", "iframeBgColor", "isActive"]);
         React.useState(true);
         const { sxpParameter, popupCurTimeRef, popupDetailData, isPreview, bffFbReport, checkCommodityIndexRef, globalConfig } = useSxpDataSource();
         const { jumpToWeb, productView } = useEventReport();
@@ -10236,14 +10299,21 @@
             }
         };
         React.useEffect(() => {
-            if (!isPost) {
-                bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-                    eventName: 'ProductView'
-                });
-            }
-        }, [isPost, bffFbReport]);
+            if (!isActive)
+                return;
+            bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
+                eventName: 'ProductView',
+                product
+            });
+            bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
+                eventName: 'PageView',
+                product
+            });
+        }, [isActive, bffFbReport]);
         React.useEffect(() => {
             const initTime = () => {
+                if (!isActive)
+                    return;
                 curTimeRef.current = new Date();
             };
             initTime();
@@ -10251,11 +10321,12 @@
             return () => {
                 window.removeEventListener('pageshow', initTime);
             };
-        }, []);
+        }, [isActive]);
         const priceText = getPriceText({
             product,
             enableFormattedPrice: (_t = commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price) === null || _t === void 0 ? void 0 : _t.enableFormattedPrice,
-            globalConfig
+            globalConfig,
+            style: commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price
         });
         const width = (isPreview ? 375 : (_u = style === null || style === void 0 ? void 0 : style.width) !== null && _u !== void 0 ? _u : window.innerWidth) - ((_v = popupBg === null || popupBg === void 0 ? void 0 : popupBg.horizontalMargin) !== null && _v !== void 0 ? _v : 0) * 2;
         const height = commodityImgRatio ? width * (commodityImgRatio.h / commodityImgRatio.w) : width;
@@ -10416,7 +10487,7 @@ Made in Italy` })));
                                 } })),
                         React.createElement("div", { className: 'pb-commondityDiroNew-content-top-right' },
                             React.createElement("div", { className: 'pb-commondityDiroNew-content-top-right-price', hidden: !!product && !(product === null || product === void 0 ? void 0 : product.price), style: getStyle(commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price), dangerouslySetInnerHTML: {
-                                    __html: setFontForText(priceText, commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price)
+                                    __html: priceText !== null && priceText !== void 0 ? priceText : ''
                                 } }),
                             React.createElement("div", { className: 'pb-commondityDiroNew-content-top-right-price', hidden: !!product && !(product === null || product === void 0 ? void 0 : product.taxInfo), style: getStyle(commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.taxInfo), dangerouslySetInnerHTML: {
                                     __html: setFontForText((_2 = product === null || product === void 0 ? void 0 : product.taxInfo) !== null && _2 !== void 0 ? _2 : '税费', commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.taxInfo)
@@ -10863,7 +10934,7 @@ Made in Italy` })));
     const CommodityList$1 = (_a) => {
         var _b, _c, _d;
         var { style, isDefault, rec, viewTime, isPost, bottom_image, commodityStyles, buttonStyle, translateY = 0, commodityPicture, isExternalLink, onClick } = _a, props = __rest(_a, ["style", "isDefault", "rec", "viewTime", "isPost", "bottom_image", "commodityStyles", "buttonStyle", "translateY", "commodityPicture", "isExternalLink", "onClick"]);
-        const { sxpParameter, popupDetailData, setPopupDetailData, ctaEvent, globalConfig } = useSxpDataSource();
+        const { sxpParameter, popupDetailData, setPopupDetailData, ctaEvent, globalConfig, bffFbReport } = useSxpDataSource();
         const { jumpToWeb } = useEventReport();
         const { popup } = useEditor();
         const recData = isPost ? rec : popupDetailData;
@@ -10874,7 +10945,8 @@ Made in Italy` })));
             return getPriceText({
                 product,
                 enableFormattedPrice: (_a = commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price) === null || _a === void 0 ? void 0 : _a.enableFormattedPrice,
-                globalConfig
+                globalConfig,
+                style: commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price
             });
         }, [(_d = commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price) === null || _d === void 0 ? void 0 : _d.enableFormattedPrice, globalConfig]);
         const handleClick = lodash.throttle((item, multiCheckIndex) => {
@@ -10893,8 +10965,13 @@ Made in Italy` })));
                 onClick === null || onClick === void 0 ? void 0 : onClick();
             }
         }, popup === null || popup === void 0 ? void 0 : popup.duration);
+        React.useEffect(() => {
+            bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
+                eventName: 'PageView'
+            });
+        }, []);
         return (React.createElement("div", { className: css.css(Object.assign(Object.assign({}, style), { display: 'flex', flexDirection: 'column', gap: '10px', padding: '0 20px', marginTop: '50px', boxSizing: 'border-box' })) }, product === null || product === void 0 ? void 0 : product.map((item, index) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
             return (React.createElement(React.Fragment, null, recData && !(item === null || item === void 0 ? void 0 : item.bindCta) ? null : (React.createElement("div", Object.assign({ key: index }, props, { className: css.css({
                     display: 'flex'
                 }), onClick: () => handleClick(item, index) }),
@@ -10921,10 +10998,10 @@ Made in Italy` })));
                         }) },
                         React.createElement("div", null,
                             React.createElement("div", { style: commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price, hidden: !!item && !(item === null || item === void 0 ? void 0 : item.price), dangerouslySetInnerHTML: {
-                                    __html: setFontForText(priceText(item), commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price)
+                                    __html: (_j = priceText(item)) !== null && _j !== void 0 ? _j : ''
                                 } })),
                         React.createElement("div", { className: 'one-line-ellipsis', style: Object.assign(Object.assign({}, buttonStyle), { padding: '0 15px' }), dangerouslySetInnerHTML: {
-                                __html: setFontForText((_k = (_j = item === null || item === void 0 ? void 0 : item.bindCta) === null || _j === void 0 ? void 0 : _j.enTitle) !== null && _k !== void 0 ? _k : 'Shop Now', buttonStyle)
+                                __html: setFontForText((_l = (_k = item === null || item === void 0 ? void 0 : item.bindCta) === null || _k === void 0 ? void 0 : _k.enTitle) !== null && _l !== void 0 ? _l : 'Shop Now', buttonStyle)
                             } })))))));
         })));
     };
@@ -11072,7 +11149,7 @@ Made in Italy` })));
      * @Author: binruan@chatlabs.com
      * @Date: 2024-03-26 16:50:25
      * @LastEditors: binruan@chatlabs.com
-     * @LastEditTime: 2024-07-04 17:47:52
+     * @LastEditTime: 2024-10-24 19:04:37
      * @FilePath: \pb-sxp-ui\src\materials\sxp\template\components\settingRender.tsx
      *
      */
@@ -11118,6 +11195,12 @@ Made in Italy` })));
                     label: '背景色',
                     name: ['style', 'backgroundColor']
                 },
+                {
+                    type: 'Number',
+                    label: '背景色毛玻璃',
+                    name: ['style', 'backdropFilter'],
+                    addonAfter: 'px'
+                },
                 {
                     label: '内边距',
                     type: 'Number',
@@ -13901,7 +13984,8 @@ Made in Italy` })));
             product: rec === null || rec === void 0 ? void 0 : rec.product,
             enableFormattedPrice: (_a = textStyles === null || textStyles === void 0 ? void 0 : textStyles.price) === null || _a === void 0 ? void 0 : _a.enableFormattedPrice,
             globalConfig,
-            isHiddenDef: true
+            isHiddenDef: true,
+            style: textStyles === null || textStyles === void 0 ? void 0 : textStyles.price
         });
         React.useEffect(() => {
             if (imgDom.current === null || src === '') {
@@ -13943,7 +14027,7 @@ Made in Italy` })));
                         __html: setFontForText(title, textStyles === null || textStyles === void 0 ? void 0 : textStyles.title)
                     } }),
                 React.createElement("div", { className: 'waterFallList-content-listItem-info-price', hidden: !priceText, style: textStyles.price, dangerouslySetInnerHTML: {
-                        __html: setFontForText(priceText, textStyles === null || textStyles === void 0 ? void 0 : textStyles.price)
+                        __html: priceText !== null && priceText !== void 0 ? priceText : ''
                     } }))));
     };
     function WaterfallList$1(_a) {
@@ -14218,7 +14302,8 @@ Made in Italy` })));
             product: rec === null || rec === void 0 ? void 0 : rec.product,
             enableFormattedPrice: (_a = textStyles === null || textStyles === void 0 ? void 0 : textStyles.price) === null || _a === void 0 ? void 0 : _a.enableFormattedPrice,
             globalConfig,
-            isHiddenDef: true
+            isHiddenDef: true,
+            style: textStyles === null || textStyles === void 0 ? void 0 : textStyles.price
         });
         // useEffect(() => {
         //   if (imgDom.current === null || src === '') {
@@ -14305,7 +14390,7 @@ Made in Italy` })));
                         __html: setFontForText(title, textStyles === null || textStyles === void 0 ? void 0 : textStyles.title)
                     } }),
                 React.createElement("div", { className: 'list-content-listItem-info-price', style: textStyles === null || textStyles === void 0 ? void 0 : textStyles.price, hidden: !priceText, dangerouslySetInnerHTML: {
-                        __html: setFontForText(priceText, textStyles === null || textStyles === void 0 ? void 0 : textStyles.price)
+                        __html: priceText !== null && priceText !== void 0 ? priceText : ''
                     } }))));
     };
     function WaterfallList(_a) {
@@ -14410,13 +14495,13 @@ Made in Italy` })));
      * @Author: binruan@chatlabs.com
      * @Date: 2024-01-10 10:58:24
      * @LastEditors: binruan@chatlabs.com
-     * @LastEditTime: 2024-10-11 13:43:22
+     * @LastEditTime: 2024-10-23 16:58:01
      * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\WaterFall\index.tsx
      *
      */
     const WaterFall = (props) => {
         var _a;
-        const { waterFallData, setOpenHashtag, openHashtag, swiperRef, setWaterFallData, cacheRtcList, setRtcList, cacheActiveIndex, rtcList, setCacheRtcList, setIsFromHashtag, isFromHashtag, bffEventReport, themeTag, selectTag } = useSxpDataSource();
+        const { waterFallData, setOpenHashtag, openHashtag, swiperRef, setWaterFallData, cacheRtcList, setRtcList, cacheActiveIndex, rtcList, setCacheRtcList, setIsFromHashtag, isFromHashtag, bffEventReport, themeTag, selectTag, bffFbReport } = useSxpDataSource();
         const { backMainFeed } = useEventReport();
         React.useRef(null);
         const modalEleRef = React.useRef(null);
@@ -14493,8 +14578,11 @@ Made in Italy` })));
         React.useEffect(() => {
             if (openHashtag) {
                 setViewTime(new Date());
+                bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
+                    eventName: 'PageView'
+                });
             }
-        }, [openHashtag]);
+        }, [openHashtag, bffFbReport]);
         React.useEffect(() => {
             const initTime = () => {
                 setViewTime(new Date());
@@ -14680,7 +14768,7 @@ Made in Italy` })));
      * @Author: binruan@chatlabs.com
      * @Date: 2024-07-02 14:51:32
      * @LastEditors: binruan@chatlabs.com
-     * @LastEditTime: 2024-08-06 14:28:34
+     * @LastEditTime: 2024-10-25 10:39:04
      * @FilePath: \pb-sxp-ui\src\materials\sxp\cta\AniLink\settingRender.tsx
      *
      */
@@ -14726,6 +14814,12 @@ Made in Italy` })));
                     label: '背景色',
                     name: ['style', 'backgroundColor']
                 },
+                {
+                    type: 'Number',
+                    label: '背景色毛玻璃',
+                    name: ['style', 'backdropFilter'],
+                    addonAfter: 'px'
+                },
                 {
                     type: 'TextMargin',
                     name: ['style'],
@@ -15025,6 +15119,12 @@ Made in Italy` })));
                     label: '背景色',
                     name: ['style', 'backgroundColor']
                 },
+                {
+                    type: 'Number',
+                    label: '背景色毛玻璃',
+                    name: ['style', 'backdropFilter'],
+                    addonAfter: 'px'
+                },
                 {
                     label: '外边距',
                     type: 'Number',
@@ -15575,6 +15675,7 @@ Made in Italy` })));
         const videoId = `pb-cache-video-${index}`;
         const videoEleRef = React.useRef(null);
         const hlsRef = React.useRef(null);
+        const initTimeRef = React.useRef();
         const blur = React.useMemo(() => {
             return (videoPostConfig === null || videoPostConfig === void 0 ? void 0 : videoPostConfig.mode) === '2';
         }, [videoPostConfig]);
@@ -15620,8 +15721,8 @@ Made in Italy` })));
             setWaiting(false);
             setIsLoadFinish(true);
         }, []);
-        const handleStartPlay = React.useCallback(() => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+        const handleStartPlay = React.useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
             if (!(videoRef === null || videoRef === void 0 ? void 0 : videoRef.current))
                 return;
             setIsPauseVideo(false);
@@ -15631,24 +15732,27 @@ Made in Italy` })));
                 const videoDuration = ((_d = (_c = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _c === void 0 ? void 0 : _c.duration) !== null && _d !== void 0 ? _d : 0).toFixed(2);
                 const videoCurrentTime = ((_f = (_e = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _e === void 0 ? void 0 : _e.currentTime) !== null && _f !== void 0 ? _f : 0).toFixed(2);
                 const playType = isFirstPlay ? '0' : '1';
+                const contentSize = yield getResFileSizeFromSrc((_g = item === null || item === void 0 ? void 0 : item.video) === null || _g === void 0 ? void 0 : _g.url);
                 bffEventReport === null || bffEventReport === void 0 ? void 0 : bffEventReport({
                     eventInfo: {
                         eventSubject: 'playVideo',
                         eventDescription: 'User played the video',
-                        contentId: (_h = (_g = item === null || item === void 0 ? void 0 : item.video) === null || _g === void 0 ? void 0 : _g.itemId) !== null && _h !== void 0 ? _h : '',
-                        contentName: (_k = (_j = item === null || item === void 0 ? void 0 : item.video) === null || _j === void 0 ? void 0 : _j.title) !== null && _k !== void 0 ? _k : '',
+                        contentId: (_j = (_h = item === null || item === void 0 ? void 0 : item.video) === null || _h === void 0 ? void 0 : _h.itemId) !== null && _j !== void 0 ? _j : '',
+                        contentName: (_l = (_k = item === null || item === void 0 ? void 0 : item.video) === null || _k === void 0 ? void 0 : _k.title) !== null && _l !== void 0 ? _l : '',
                         playType,
                         startTime: videoCurrentTime,
                         videoDuration,
-                        contentTags: JSON.stringify((_m = (_l = item === null || item === void 0 ? void 0 : item.video) === null || _l === void 0 ? void 0 : _l.tags) !== null && _m !== void 0 ? _m : []),
+                        contentTags: JSON.stringify((_o = (_m = item === null || item === void 0 ? void 0 : item.video) === null || _m === void 0 ? void 0 : _m.tags) !== null && _o !== void 0 ? _o : []),
                         position: index + '',
                         contentFormat: 'video',
-                        traceInfo: (_o = item === null || item === void 0 ? void 0 : item.video) === null || _o === void 0 ? void 0 : _o.traceInfo
+                        traceInfo: (_p = item === null || item === void 0 ? void 0 : item.video) === null || _p === void 0 ? void 0 : _p.traceInfo,
+                        contentSize,
+                        loadTime: (new Date() - (initTimeRef === null || initTimeRef === void 0 ? void 0 : initTimeRef.current)).toFixed(2) + ''
                     }
                 });
                 setIsFirstPlay(false);
             }
-        }, [bffEventReport, data, index, isFirstPlay, videoRef === null || videoRef === void 0 ? void 0 : videoRef.current]);
+        }), [bffEventReport, data, index, isFirstPlay, videoRef === null || videoRef === void 0 ? void 0 : videoRef.current]);
         const handLoadeddata = React.useCallback(() => {
             var _a;
             if (!(videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) || firstFrameSrc || !blur)
@@ -15752,6 +15856,7 @@ Made in Italy` })));
             videoRef.current = mountVideoPlayerAtNode === null || mountVideoPlayerAtNode === void 0 ? void 0 : mountVideoPlayerAtNode(videoPlayerWrapperNode);
             if (!(videoRef === null || videoRef === void 0 ? void 0 : videoRef.current))
                 return;
+            initTimeRef.current = new Date();
             const Hls = window === null || window === void 0 ? void 0 : window.Hls;
             let hls = hlsRef === null || hlsRef === void 0 ? void 0 : hlsRef.current;
             if (videoSrc.includes('.m3u8') && Hls && Hls.isSupported()) {
@@ -15795,17 +15900,18 @@ Made in Italy` })));
             };
         }, [isActive]);
         React.useEffect(() => {
-            var _a, _b;
+            var _a, _b, _c, _d;
             if (!(videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) || !isLoadFinish)
                 return;
             if (isActive) {
                 bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-                    eventName: 'ViewContent'
+                    eventName: 'ViewContent',
+                    product: (_b = (_a = data === null || data === void 0 ? void 0 : data[index]) === null || _a === void 0 ? void 0 : _a.video) === null || _b === void 0 ? void 0 : _b.bindProduct
                 });
-                (_a = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _a === void 0 ? void 0 : _a.play();
+                (_c = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _c === void 0 ? void 0 : _c.play();
             }
             else {
-                (_b = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _b === void 0 ? void 0 : _b.pause();
+                (_d = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _d === void 0 ? void 0 : _d.pause();
             }
         }, [isActive, isLoadFinish, videoRef === null || videoRef === void 0 ? void 0 : videoRef.current]);
         /*
@@ -15827,9 +15933,11 @@ Made in Italy` })));
             if (!isActive)
                 return;
             const onShow = () => {
+                var _a, _b;
                 handleClickVideo('start')();
                 bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-                    eventName: 'ViewContent'
+                    eventName: 'ViewContent',
+                    product: (_b = (_a = data === null || data === void 0 ? void 0 : data[index]) === null || _a === void 0 ? void 0 : _a.video) === null || _b === void 0 ? void 0 : _b.bindProduct
                 });
             };
             const onHide = handleClickVideo('pause');
@@ -16001,19 +16109,14 @@ Made in Italy` })));
                 }, onLoad: onShowFirstImage }))));
     };
 
-    /*
-     * @Author: lewinlu@chatlabs.com
-     * @Date: 2024-01-03 14:39:09
-     * @LastEditors: binruan@chatlabs.com
-     * @LastEditTime: 2024-10-10 17:53:30
-     * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\PictureGroup\index.tsx
-     */
     const PictureGroup$2 = ({ imgUrls, width, height, rec, index, onReportViewImageEnd, onViewImageStartEvent, imgUrlsPostConfig }) => {
         var _a, _b;
         const ref = React.useRef();
         const { isActive } = useSwiperSlide();
         const { sxpParameter, openHashtag } = useSxpDataSource();
         const [isLoad, setIsLoad] = React.useState(false);
+        const [imgInfo, setImgInfo] = React.useState();
+        const initTime = new Date();
         React.useEffect(() => {
             if (isLoad && isActive) {
                 (ref === null || ref === void 0 ? void 0 : ref.current) && ref.current.swiper.autoplay.start();
@@ -16021,21 +16124,36 @@ Made in Italy` })));
                     onReportViewImageEnd(rec);
                 }
                 else {
-                    onViewImageStartEvent(index);
+                    onViewImageStartEvent(index, imgInfo);
                 }
             }
             else {
                 (ref === null || ref === void 0 ? void 0 : ref.current) && ref.current.swiper.autoplay.stop();
             }
-        }, [rec, isActive, onReportViewImageEnd, openHashtag, index, onViewImageStartEvent, isLoad]);
-        const showFirstImageFn = React.useCallback(() => {
+        }, [rec, isActive, onReportViewImageEnd, openHashtag, index, onViewImageStartEvent, isLoad, imgInfo]);
+        const showFirstImageFn = React.useCallback((e) => __awaiter(void 0, void 0, void 0, function* () {
             if (!isLoad) {
+                const contentSize = yield getResFileSizeFromSrc(e.src);
+                setImgInfo({
+                    contentSize,
+                    loadTime: (new Date() - initTime).toFixed(2) + ''
+                });
                 setIsLoad(true);
             }
-        }, [isLoad]);
+        }), [isLoad]);
         // if (!isActive) {
         //   return <img src={sxpParameter?.placeholder_image} style={{ width, height, objectFit: 'cover' }} />;
         // }
+        React.useEffect(() => {
+            const onShow = () => onViewImageStartEvent(index, imgInfo);
+            const onHide = () => onReportViewImageEnd(rec);
+            SXP_EVENT_BUS.on(SXP_EVENT_TYPE.PAGE_DID_SHOW, onShow);
+            SXP_EVENT_BUS.on(SXP_EVENT_TYPE.PAGE_DID_HIDE, onHide);
+            return () => {
+                SXP_EVENT_BUS.off(SXP_EVENT_TYPE.PAGE_DID_SHOW, onShow);
+                SXP_EVENT_BUS.off(SXP_EVENT_TYPE.PAGE_DID_HIDE, onHide);
+            };
+        }, [imgInfo]);
         return (React.createElement(Swiper, { ref: ref, defaultValue: 0, direction: 'horizontal', modules: [Pagination, Autoplay], pagination: {
                 clickable: true,
                 bulletActiveClass: 'swipe-item-active-bullet',
@@ -16174,7 +16292,7 @@ Made in Italy` })));
      * @Author: binruan@chatlabs.com
      * @Date: 2023-12-26 16:11:34
      * @LastEditors: binruan@chatlabs.com
-     * @LastEditTime: 2024-10-12 16:22:10
+     * @LastEditTime: 2024-10-25 10:36:59
      * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\RenderCard.tsx
      *
      */
@@ -16223,7 +16341,12 @@ Made in Italy` })));
                 const Component = withBindDataSource(t);
                 const defaulSetting = (_z = t === null || t === void 0 ? void 0 : t.extend) === null || _z === void 0 ? void 0 : _z.defaulSetting;
                 const isExternalLink = ((_2 = (_1 = (_0 = value === null || value === void 0 ? void 0 : value.item) === null || _0 === void 0 ? void 0 : _0.event) === null || _1 === void 0 ? void 0 : _1.onClick) === null || _2 === void 0 ? void 0 : _2.linkType) === 'externalLink';
-                return (React.createElement(Component, Object.assign({ style: Object.assign(Object.assign(Object.assign({}, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.style), (_3 = value === null || value === void 0 ? void 0 : value.item) === null || _3 === void 0 ? void 0 : _3.style), { zIndex: 50, marginLeft: '20px', boxSizing: 'border-box', transform: 'translate3d(0px, 0px, 0px)' }), textStyle: Object.assign(Object.assign({}, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.textStyle), (_4 = value === null || value === void 0 ? void 0 : value.item) === null || _4 === void 0 ? void 0 : _4.textStyle), bindDatas: (_6 = (_5 = value === null || value === void 0 ? void 0 : value.item) === null || _5 === void 0 ? void 0 : _5.bindDatas) !== null && _6 !== void 0 ? _6 : [] }, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.props, (_7 = value === null || value === void 0 ? void 0 : value.item) === null || _7 === void 0 ? void 0 : _7.props, { event: ((_8 = value === null || value === void 0 ? void 0 : value.item) === null || _8 === void 0 ? void 0 : _8.event) || {}, schema: schema, id: value === null || value === void 0 ? void 0 : value.id, key: value === null || value === void 0 ? void 0 : value.id, recData: rec, isExternalLink: isExternalLink, index: index, isActive: isActive })));
+                let style = (_3 = value === null || value === void 0 ? void 0 : value.item) === null || _3 === void 0 ? void 0 : _3.style;
+                if (style.hasOwnProperty('backdropFilter')) {
+                    let sbf = style['backdropFilter'];
+                    style['backdropFilter'] = `blur(${sbf !== null && sbf !== void 0 ? sbf : 0}px)`;
+                }
+                return (React.createElement(Component, Object.assign({ style: Object.assign(Object.assign(Object.assign({}, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.style), style), { zIndex: 50, marginLeft: '20px', boxSizing: 'border-box', transform: 'translate3d(0px, 0px, 0px)' }), textStyle: Object.assign(Object.assign({}, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.textStyle), (_4 = value === null || value === void 0 ? void 0 : value.item) === null || _4 === void 0 ? void 0 : _4.textStyle), bindDatas: (_6 = (_5 = value === null || value === void 0 ? void 0 : value.item) === null || _5 === void 0 ? void 0 : _5.bindDatas) !== null && _6 !== void 0 ? _6 : [] }, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.props, (_7 = value === null || value === void 0 ? void 0 : value.item) === null || _7 === void 0 ? void 0 : _7.props, { event: ((_8 = value === null || value === void 0 ? void 0 : value.item) === null || _8 === void 0 ? void 0 : _8.event) || {}, schema: schema, id: value === null || value === void 0 ? void 0 : value.id, key: value === null || value === void 0 ? void 0 : value.id, recData: rec, isExternalLink: isExternalLink, index: index, isActive: isActive })));
             }
             else {
                 return null;
@@ -16316,7 +16439,7 @@ Made in Italy` })));
      * @Author: binruan@chatlabs.com
      * @Date: 2024-01-15 19:03:09
      * @LastEditors: binruan@chatlabs.com
-     * @LastEditTime: 2024-10-17 17:16:42
+     * @LastEditTime: 2024-10-25 15:41:58
      * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\index.tsx
      *
      */
@@ -16346,9 +16469,6 @@ Made in Italy` })));
             if ((data === null || data === void 0 ? void 0 : data.length) > 0) {
                 const now = new Date();
                 viewTime.current = now;
-                bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-                    eventName: 'PageView'
-                });
             }
         }, [data === null || data === void 0 ? void 0 : data.length]);
         const handleH5EnterLink = React.useCallback(() => {
@@ -16357,11 +16477,8 @@ Made in Italy` })));
             if (data.length > 0) {
                 const now = new Date();
                 viewTime.current = now;
-                bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-                    eventName: 'PageView'
-                });
             }
-        }, [data.length, bffFbReport, h5EnterLink]);
+        }, [data.length, h5EnterLink]);
         React.useEffect(() => {
             var _a;
             if (!ctaType || (ctaType === null || ctaType === void 0 ? void 0 : ctaType.length) < 1)
@@ -16392,7 +16509,7 @@ Made in Italy` })));
                     // 移动端h5直接杀掉浏览器或宿主app时不会触发，pc端直接杀掉标签页时能触发
                     if (repCond) {
                         SXP_EVENT_BUS.emit(SXP_EVENT_TYPE.PAGE_DID_HIDE, item);
-                        handleReportViewImageEnd(item);
+                        // handleReportViewImageEnd(item);
                         handleReportProductView(item);
                     }
                     let fromKName = '';
@@ -16437,7 +16554,7 @@ Made in Italy` })));
                     // 页面可见时触发，注意页面初始化时不会触发
                     handleH5EnterLink();
                     if (repCond) {
-                        handleViewImageStartEvent(activeIndex);
+                        // handleViewImageStartEvent(activeIndex);
                         SXP_EVENT_BUS.emit(SXP_EVENT_TYPE.PAGE_DID_SHOW, item);
                         backMainFeed('external', selectTag);
                     }
@@ -16530,7 +16647,7 @@ Made in Italy` })));
                     const t = resolver[(_a = value === null || value === void 0 ? void 0 : value.item) === null || _a === void 0 ? void 0 : _a.type];
                     const Component = withBindDataSource(t);
                     const defaulSetting = (_b = t === null || t === void 0 ? void 0 : t.extend) === null || _b === void 0 ? void 0 : _b.defaulSetting;
-                    return (React.createElement(Component, Object.assign({ key: `${index}${idx}`, textStyle: Object.assign(Object.assign({}, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.textStyle), (_c = value === null || value === void 0 ? void 0 : value.item) === null || _c === void 0 ? void 0 : _c.textStyle), bindDatas: (_e = (_d = value === null || value === void 0 ? void 0 : value.item) === null || _d === void 0 ? void 0 : _d.bindDatas) !== null && _e !== void 0 ? _e : [] }, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.props, (_f = value === null || value === void 0 ? void 0 : value.item) === null || _f === void 0 ? void 0 : _f.props, { event: ((_g = value === null || value === void 0 ? void 0 : value.item) === null || _g === void 0 ? void 0 : _g.event) || {}, schema: schema, id: value === null || value === void 0 ? void 0 : value.id, viewTime: viewTime.current, rec: rec, isPost: true, tipText: tipText, style: Object.assign(Object.assign(Object.assign({}, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.style), (_h = value === null || value === void 0 ? void 0 : value.item) === null || _h === void 0 ? void 0 : _h.style), { height: '100%', overflow: 'auto' }), index: index })));
+                    return (React.createElement(Component, Object.assign({ key: `${index}${idx}`, textStyle: Object.assign(Object.assign({}, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.textStyle), (_c = value === null || value === void 0 ? void 0 : value.item) === null || _c === void 0 ? void 0 : _c.textStyle), bindDatas: (_e = (_d = value === null || value === void 0 ? void 0 : value.item) === null || _d === void 0 ? void 0 : _d.bindDatas) !== null && _e !== void 0 ? _e : [] }, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.props, (_f = value === null || value === void 0 ? void 0 : value.item) === null || _f === void 0 ? void 0 : _f.props, { event: ((_g = value === null || value === void 0 ? void 0 : value.item) === null || _g === void 0 ? void 0 : _g.event) || {}, schema: schema, id: value === null || value === void 0 ? void 0 : value.id, viewTime: viewTime.current, rec: rec, isPost: true, tipText: tipText, style: Object.assign(Object.assign(Object.assign({}, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.style), (_h = value === null || value === void 0 ? void 0 : value.item) === null || _h === void 0 ? void 0 : _h.style), { height: '100%', overflow: 'auto' }), index: index, isActive: activeIndex === index })));
                 });
             }
             return null;
@@ -16686,7 +16803,8 @@ Made in Italy` })));
                         productId: (_g = (_f = item === null || item === void 0 ? void 0 : item.product) === null || _f === void 0 ? void 0 : _f.itemId) !== null && _g !== void 0 ? _g : '',
                         requestId: null,
                         traceInfo: (_j = (_h = item === null || item === void 0 ? void 0 : item.video) === null || _h === void 0 ? void 0 : _h.traceInfo) !== null && _j !== void 0 ? _j : '',
-                        contentFormat
+                        contentFormat,
+                        position: ((_k = swiper.previousIndex) !== null && _k !== void 0 ? _k : 0) + ''
                     }
                 });
                 //  如果上一个商品是图片集，需上报 浏览图片集结结束 事件
@@ -16698,11 +16816,12 @@ Made in Italy` })));
                     eventInfo: {
                         eventSubject: 'scrollUp',
                         eventDescription: 'User scroll up',
-                        contentId: (_l = (_k = item === null || item === void 0 ? void 0 : item.video) === null || _k === void 0 ? void 0 : _k.itemId) !== null && _l !== void 0 ? _l : '',
-                        productId: (_o = (_m = item.product) === null || _m === void 0 ? void 0 : _m.itemId) !== null && _o !== void 0 ? _o : '',
+                        contentId: (_m = (_l = item === null || item === void 0 ? void 0 : item.video) === null || _l === void 0 ? void 0 : _l.itemId) !== null && _m !== void 0 ? _m : '',
+                        productId: (_p = (_o = item.product) === null || _o === void 0 ? void 0 : _o.itemId) !== null && _p !== void 0 ? _p : '',
                         requestId: null,
-                        traceInfo: (_q = (_p = item === null || item === void 0 ? void 0 : item.video) === null || _p === void 0 ? void 0 : _p.traceInfo) !== null && _q !== void 0 ? _q : '',
-                        contentFormat
+                        traceInfo: (_r = (_q = item === null || item === void 0 ? void 0 : item.video) === null || _q === void 0 ? void 0 : _q.traceInfo) !== null && _r !== void 0 ? _r : '',
+                        contentFormat,
+                        position: ((_s = swiper.previousIndex) !== null && _s !== void 0 ? _s : 0) + ''
                     }
                 });
                 //  如果上一个商品是图片集，需上报 浏览图片集结结束 事件
@@ -16710,12 +16829,6 @@ Made in Italy` })));
             }
             // 商品浏览事件
             handleReportProductView(item);
-            const curItem = data[swiper.activeIndex];
-            if (!((_r = curItem === null || curItem === void 0 ? void 0 : curItem.video) === null || _r === void 0 ? void 0 : _r.url) && !((_s = curItem === null || curItem === void 0 ? void 0 : curItem.video) === null || _s === void 0 ? void 0 : _s.imgUrls) && (curItem === null || curItem === void 0 ? void 0 : curItem.product)) {
-                bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-                    eventName: 'ProductView'
-                });
-            }
             viewTime.current = new Date();
         };
         const handleReportProductView = (item) => {
@@ -16733,8 +16846,8 @@ Made in Italy` })));
                 viewTime.current = new Date();
             }
         }, [openHashtag, data, activeIndex]);
-        const handleViewImageStartEvent = (activeIndex) => {
-            var _a, _b, _c, _d, _e, _f;
+        const handleViewImageStartEvent = (activeIndex, imgInfo) => {
+            var _a, _b, _c, _d, _e, _f, _g, _h;
             const item = data[activeIndex];
             // 如果是图片集则上报事件
             if (!((_a = item === null || item === void 0 ? void 0 : item.video) === null || _a === void 0 ? void 0 : _a.url) && ((_b = item === null || item === void 0 ? void 0 : item.video) === null || _b === void 0 ? void 0 : _b.imgUrls)) {
@@ -16750,11 +16863,18 @@ Made in Italy` })));
                         contentTags: JSON.stringify((_f = item === null || item === void 0 ? void 0 : item.video.tags) !== null && _f !== void 0 ? _f : []),
                         position: activeIndex + '',
                         contentFormat: 'image',
-                        traceInfo: item === null || item === void 0 ? void 0 : item.video.traceInfo
+                        traceInfo: item === null || item === void 0 ? void 0 : item.video.traceInfo,
+                        contentSize: imgInfo === null || imgInfo === void 0 ? void 0 : imgInfo.contentSize,
+                        loadTime: imgInfo === null || imgInfo === void 0 ? void 0 : imgInfo.loadTime
                     }
                 });
                 bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-                    eventName: 'ViewContent'
+                    eventName: 'ViewContent',
+                    product: (_g = item === null || item === void 0 ? void 0 : item.video) === null || _g === void 0 ? void 0 : _g.bindProduct
+                });
+                bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
+                    eventName: 'PageView',
+                    product: (_h = item === null || item === void 0 ? void 0 : item.video) === null || _h === void 0 ? void 0 : _h.bindProduct
                 });
             }
         };
@@ -17228,7 +17348,7 @@ Made in Italy` })));
      * @Author: binruan@chatlabs.com
      * @Date: 2023-10-31 10:56:01
      * @LastEditors: binruan@chatlabs.com
-     * @LastEditTime: 2024-08-23 10:28:15
+     * @LastEditTime: 2024-10-23 15:07:29
      * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\Popup\index.tsx
      *
      */