pb-sxp-ui 1.7.1 → 1.7.2

package/dist/pb-ui.js

@@ -812,23 +812,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 +8969,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 +8986,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 +9024,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 +9112,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);
 
@@ -9325,7 +9370,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 +9400,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();
@@ -10202,7 +10252,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 +10286,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,7 +10308,7 @@
             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,
@@ -10863,7 +10920,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;
@@ -10893,6 +10950,11 @@ 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;
             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({
@@ -14410,13 +14472,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 +14555,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());
@@ -15795,17 +15860,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 +15893,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');
@@ -16316,7 +16384,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-23 18:06:34
      * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\index.tsx
      *
      */
@@ -16346,9 +16414,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 +16422,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)
@@ -16530,7 +16592,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;
@@ -16666,7 +16728,7 @@ Made in Italy` })));
             }
         };
         const handleScrollEvent = (swiper) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
             const item = data[swiper.previousIndex];
             if (!item)
                 return;
@@ -16710,12 +16772,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) => {
@@ -16734,7 +16790,7 @@ Made in Italy` })));
             }
         }, [openHashtag, data, activeIndex]);
         const handleViewImageStartEvent = (activeIndex) => {
-            var _a, _b, _c, _d, _e, _f;
+            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)) {
@@ -16754,7 +16810,12 @@ Made in Italy` })));
                     }
                 });
                 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 +17289,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
      *
      */