pb-sxp-ui 1.7.1 → 1.7.3

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

@@ -12,7 +12,7 @@ const hooks_1 = require("../../../../core/hooks");
 const useEventReport_1 = require("../../../../core/hooks/useEventReport");
 const WaterFall = (props) => {
     var _a;
-    const { waterFallData, setOpenHashtag, openHashtag, swiperRef, setWaterFallData, cacheRtcList, setRtcList, cacheActiveIndex, rtcList, setCacheRtcList, setIsFromHashtag, isFromHashtag, bffEventReport, themeTag, selectTag } = (0, hooks_1.useSxpDataSource)();
+    const { waterFallData, setOpenHashtag, openHashtag, swiperRef, setWaterFallData, cacheRtcList, setRtcList, cacheActiveIndex, rtcList, setCacheRtcList, setIsFromHashtag, isFromHashtag, bffEventReport, themeTag, selectTag, bffFbReport } = (0, hooks_1.useSxpDataSource)();
     const { backMainFeed } = (0, useEventReport_1.useEventReport)();
     const ref = (0, react_1.useRef)(null);
     const modalEleRef = (0, react_1.useRef)(null);
@@ -81,8 +81,11 @@ const WaterFall = (props) => {
     (0, react_1.useEffect)(() => {
         if (openHashtag) {
             setViewTime(new Date());
+            bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
+                eventName: 'PageView'
+            });
         }
-    }, [openHashtag]);
+    }, [openHashtag, bffFbReport]);
     (0, react_1.useEffect)(() => {
         const initTime = () => {
             setViewTime(new Date());

package/lib/core/components/SxpPageRender/index.d.ts

@@ -56,6 +56,7 @@ export interface ISxpPageRenderProps {
             decimalPoint?: string;
             currencyPosition?: string;
             showTwoDecimalPoint?: boolean;
+            fontFamily?: string;
         };
         backButton?: {
             enable: boolean;
@@ -65,6 +66,7 @@ export interface ISxpPageRenderProps {
             yPosit: string;
             y: number;
         };
+        converApi?: any;
     };
     descStyle?: CSSProperties;
     tipText?: {

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

@@ -51,9 +51,6 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
         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 = (0, react_1.useCallback)(() => {
@@ -62,11 +59,8 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
         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]);
     (0, react_1.useEffect)(() => {
         var _a;
         if (!ctaType || (ctaType === null || ctaType === void 0 ? void 0 : ctaType.length) < 1)
@@ -95,7 +89,6 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
             if (document.visibilityState === 'hidden') {
                 if (repCond) {
                     event_1.default.emit(event_1.SXP_EVENT_TYPE.PAGE_DID_HIDE, item);
-                    handleReportViewImageEnd(item);
                     handleReportProductView(item);
                 }
                 let fromKName = '';
@@ -139,7 +132,6 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
                 }
                 handleH5EnterLink();
                 if (repCond) {
-                    handleViewImageStartEvent(activeIndex);
                     event_1.default.emit(event_1.SXP_EVENT_TYPE.PAGE_DID_SHOW, item);
                     backMainFeed('external', selectTag);
                 }
@@ -232,7 +224,7 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
                 const t = resolver[(_a = value === null || value === void 0 ? void 0 : value.item) === null || _a === void 0 ? void 0 : _a.type];
                 const Component = (0, withBindDataSource_1.default)(t);
                 const defaulSetting = (_b = t === null || t === void 0 ? void 0 : t.extend) === null || _b === void 0 ? void 0 : _b.defaulSetting;
-                return (react_1.default.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_1.default.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;
@@ -389,7 +381,8 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
                     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) + ''
                 }
             });
             handleReportViewImageEnd(item);
@@ -400,22 +393,17 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
                 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) + ''
                 }
             });
             handleReportViewImageEnd(item);
         }
         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) => {
@@ -433,8 +421,8 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
             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)) {
             const startTime = Date.now();
@@ -449,11 +437,18 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
                     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
             });
         }
     };

package/lib/core/context/SxpDataSourceProvider.d.ts

@@ -67,10 +67,8 @@ export interface ISxpDataSourceContext {
     videoRef?: any;
     setVideoRef?: React.Dispatch<React.SetStateAction<any>>;
     bffFbReport?: (body: {
-        eventName: string;
-        actionSource?: string;
-        eventSourceUrl?: string;
-        externalId?: string;
+        eventName: 'PageView' | 'ProductView' | 'ViewContent';
+        product?: any;
     }) => Promise<any> | undefined | boolean;
     curTime?: any;
     h5EnterLink?: () => void;

package/lib/core/context/SxpDataSourceProvider.js

@@ -192,23 +192,65 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             type: 'beacon'
         });
     }, [bffFetch, curReqInfo, enableReportEvent, globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview]);
-    const bffFbReport = (0, react_1.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 = (0, react_1.useCallback)(({ eventName, product }) => {
+        var _a, _b, _c, _d;
         if (!enableReportEvent || !enabledMetaConversionApi || (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview)) {
             return;
         }
-        const fakeUserId = (0, localStore_1.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: (0, localStore_1.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: (0, tool_1.getCookie)('_fbp') ? `fb.2.${new Date().getTime()}.${(0, tool_1.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}` })), ((0, tool_1.getCookie)('_fbp') && { fbp: `fb.2.${new Date().getTime()}.${(0, tool_1.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]);

package/lib/core/utils/materials.d.ts

@@ -11,9 +11,15 @@ export declare const getBgStyleByImg: (data: any) => "" | {
     backgroundRepeat: string;
     backgroundSize: string;
 };
-export declare const getPriceText: ({ product, enableFormattedPrice, globalConfig, isHiddenDef }: {
+interface IfontType {
+    'fontFamily-cn': string;
+    'fontFamily-en': string;
+}
+export declare const getPriceText: ({ product, enableFormattedPrice, globalConfig, isHiddenDef, style }: {
     product: ProductInfoType | undefined | null;
     enableFormattedPrice: boolean | undefined;
     globalConfig: ISxpPageRenderProps['globalConfig'];
     isHiddenDef?: boolean;
+    style?: IfontType | any;
 }) => string | null;
+export {};

package/lib/core/utils/materials.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPriceText = exports.getBgStyleByImg = exports.getBgStyle = exports.getMediaValueByMode = void 0;
+const tool_1 = require("./tool");
 const getMediaValueByMode = (obj) => {
     var _a;
     if (!obj || typeof obj !== 'object') {
@@ -35,8 +36,8 @@ const getBgStyleByImg = (data) => {
     return (0, exports.getBgStyle)(imgSrc);
 };
 exports.getBgStyleByImg = getBgStyleByImg;
-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;
@@ -83,6 +84,8 @@ const getPriceText = ({ product, enableFormattedPrice, globalConfig, isHiddenDef
             }
         });
     }
+    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 = (0, tool_1.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;
     }

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

@@ -11,4 +11,5 @@ declare function getBrowserInfo(): string | null;
 declare function getSystem(): string | null;
 declare function getDevice(): string | null;
 declare function getCookie(val: string): string;
-export { uuid, getIndexByblockType, getBrowserInfo, getDevice, getSystem, getCookie };
+declare const getResFileSizeFromSrc: (imageSrc?: string) => "" | Promise<string>;
+export { uuid, getIndexByblockType, getBrowserInfo, getDevice, getSystem, getCookie, getResFileSizeFromSrc };

package/lib/core/utils/tool.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCookie = exports.getSystem = exports.getDevice = exports.getBrowserInfo = exports.getIndexByblockType = exports.uuid = exports.setFontForText = exports.getUid = exports.generateRandomString = void 0;
+exports.getResFileSizeFromSrc = exports.getCookie = exports.getSystem = exports.getDevice = exports.getBrowserInfo = exports.getIndexByblockType = exports.uuid = exports.setFontForText = exports.getUid = exports.generateRandomString = void 0;
 const uuid_1 = require("uuid");
 function uuid(len, radix) {
     const chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
@@ -168,3 +168,14 @@ function getCookie(val) {
     return value !== null && value !== void 0 ? value : '';
 }
 exports.getCookie = getCookie;
+const getResFileSizeFromSrc = (imageSrc) => {
+    if (!imageSrc)
+        return '';
+    return fetch(imageSrc)
+        .then((response) => response.blob())
+        .then((blob) => {
+        const fileSizeInMB = blob.size / (1024 * 1024);
+        return fileSizeInMB.toFixed(2) + '';
+    });
+};
+exports.getResFileSizeFromSrc = getResFileSizeFromSrc;

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

@@ -9,6 +9,7 @@ declare const _default: ({
             addonAfter: string;
         }[];
         name?: undefined;
+        addonAfter?: undefined;
         direction?: undefined;
     } | {
         type: string;
@@ -25,12 +26,21 @@ declare const _default: ({
             max: number;
         })[];
         name?: undefined;
+        addonAfter?: undefined;
         direction?: undefined;
     } | {
         type: string;
         label: string;
         name: string[];
         child?: undefined;
+        addonAfter?: undefined;
+        direction?: undefined;
+    } | {
+        type: string;
+        label: string;
+        name: string[];
+        addonAfter: string;
+        child?: undefined;
         direction?: undefined;
     } | {
         type: string;
@@ -38,6 +48,7 @@ declare const _default: ({
         label: string;
         direction: string;
         child?: undefined;
+        addonAfter?: undefined;
     })[];
 } | {
     title: string;

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

@@ -42,6 +42,12 @@ exports.default = [
                 label: '背景色',
                 name: ['style', 'backgroundColor']
             },
+            {
+                type: 'Number',
+                label: '背景色毛玻璃',
+                name: ['style', 'backdropFilter'],
+                addonAfter: 'px'
+            },
             {
                 type: 'TextMargin',
                 name: ['style'],

package/lib/materials/sxp/cta/AniLinkPopup/settingRender.d.ts

@@ -33,8 +33,8 @@ declare const _default: ({
         child?: undefined;
         addonAfter?: undefined;
     } | {
-        label: string;
         type: string;
+        label: string;
         name: string[];
         addonAfter: string;
         child?: undefined;

package/lib/materials/sxp/cta/AniLinkPopup/settingRender.js

@@ -42,6 +42,12 @@ exports.default = [
                 label: '背景色',
                 name: ['style', 'backgroundColor']
             },
+            {
+                type: 'Number',
+                label: '背景色毛玻璃',
+                name: ['style', 'backdropFilter'],
+                addonAfter: 'px'
+            },
             {
                 label: '外边距',
                 type: 'Number',

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

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

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

@@ -16,7 +16,7 @@ const CommodityGroup_1 = tslib_1.__importDefault(require("../../template/compone
 const materials_1 = require("../../../../core/utils/materials");
 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, _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 = 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"]);
+    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 = 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", "isActive"]);
     const { sxpParameter, popupDetailData, isPreview, bffFbReport, popupCurTimeRef, checkCommodityIndexRef, globalConfig } = (0, hooks_1.useSxpDataSource)();
     const { jumpToWeb, productView } = (0, useEventReport_1.useEventReport)();
     const curTimeRef = (0, react_1.useRef)(null);
@@ -46,12 +46,17 @@ const CommodityDetail = (_a) => {
         }
     };
     (0, react_1.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]);
     (0, react_1.useEffect)(() => {
         const initTime = () => {
             curTimeRef.current = new Date();
@@ -65,7 +70,8 @@ const CommodityDetail = (_a) => {
     const priceText = (0, materials_1.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;
@@ -79,7 +85,7 @@ const CommodityDetail = (_a) => {
                     __html: (0, tool_1.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_1.default.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: (0, tool_1.setFontForText)(priceText, commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price)
+                    __html: priceText !== null && priceText !== void 0 ? priceText : ''
                 } }),
             react_1.default.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: (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)

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

@@ -14,6 +14,7 @@ export interface ICommodityDetailDiroProps {
     isPost?: boolean;
     bottom_image?: string;
     index?: number;
+    isActive?: boolean;
 }
 declare const _default: React.NamedExoticComponent<ICommodityDetailDiroProps>;
 export default _default;

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

@@ -12,7 +12,7 @@ const useEventReport_1 = require("../../../../core/hooks/useEventReport");
 const FormatImage_1 = tslib_1.__importDefault(require("../../../../core/components/SxpPageRender/FormatImage"));
 const CommodityDetailDiro = (_a) => {
     var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-    var { style, isDefault, rec, viewTime, isPost, bottom_image, index } = _a, props = tslib_1.__rest(_a, ["style", "isDefault", "rec", "viewTime", "isPost", "bottom_image", "index"]);
+    var { style, isDefault, rec, viewTime, isPost, bottom_image, index, isActive = true } = _a, props = tslib_1.__rest(_a, ["style", "isDefault", "rec", "viewTime", "isPost", "bottom_image", "index", "isActive"]);
     const [spread, setSpread] = (0, react_1.useState)(true);
     const { sxpParameter } = (0, hooks_1.useSxpDataSource)();
     const { popupDetailData, bffEventReport, isPreview, swiperRef, bffFbReport } = (0, hooks_1.useSxpDataSource)();
@@ -38,14 +38,21 @@ const CommodityDetailDiro = (_a) => {
         }
     };
     (0, react_1.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]);
     (0, react_1.useEffect)(() => {
         const initTime = () => {
+            if (!isActive)
+                return;
             curTimeRef.current = new Date();
         };
         initTime();
@@ -53,7 +60,7 @@ const CommodityDetailDiro = (_a) => {
         return () => {
             window.removeEventListener('pageshow', initTime);
         };
-    }, []);
+    }, [isActive]);
     const priceText = (0, react_1.useMemo)(() => {
         var _a, _b, _c, _d, _e;
         if ((product === null || product === void 0 ? void 0 : product.currency) && (product === null || product === void 0 ? void 0 : product.price)) {

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

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

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

@@ -16,7 +16,7 @@ const CommodityGroup_1 = tslib_1.__importDefault(require("../../template/compone
 const materials_1 = require("../../../../core/utils/materials");
 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, _4;
-    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"]);
+    var { style, isDefault, rec, viewTime, isPost, bottom_image, tipText, swiper, commodityStyles, buttonStyle, index, commodityGroup, popupBg, iframeIcon, commodityImgRatio, isTel, iframeBgColor, isActive = true } = _a, props = tslib_1.__rest(_a, ["style", "isDefault", "rec", "viewTime", "isPost", "bottom_image", "tipText", "swiper", "commodityStyles", "buttonStyle", "index", "commodityGroup", "popupBg", "iframeIcon", "commodityImgRatio", "isTel", "iframeBgColor", "isActive"]);
     const [spread, setSpread] = (0, react_1.useState)(true);
     const { sxpParameter, popupCurTimeRef, popupDetailData, isPreview, bffFbReport, checkCommodityIndexRef, globalConfig } = (0, hooks_1.useSxpDataSource)();
     const { jumpToWeb, productView } = (0, useEventReport_1.useEventReport)();
@@ -50,14 +50,21 @@ const CommodityDetailDiroNew = (_a) => {
         }
     };
     (0, react_1.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]);
     (0, react_1.useEffect)(() => {
         const initTime = () => {
+            if (!isActive)
+                return;
             curTimeRef.current = new Date();
         };
         initTime();
@@ -65,11 +72,12 @@ const CommodityDetailDiroNew = (_a) => {
         return () => {
             window.removeEventListener('pageshow', initTime);
         };
-    }, []);
+    }, [isActive]);
     const priceText = (0, materials_1.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;
@@ -183,7 +191,7 @@ Made in Italy` })));
                             } })),
                     react_1.default.createElement("div", { className: 'pb-commondityDiroNew-content-top-right' },
                         react_1.default.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: (0, tool_1.setFontForText)(priceText, commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price)
+                                __html: priceText !== null && priceText !== void 0 ? priceText : ''
                             } }),
                         react_1.default.createElement("div", { className: 'pb-commondityDiroNew-content-top-right-price', hidden: !!product && !(product === null || product === void 0 ? void 0 : product.taxInfo), style: getStyle(commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.taxInfo), dangerouslySetInnerHTML: {
                                 __html: (0, tool_1.setFontForText)((_2 = product === null || product === void 0 ? void 0 : product.taxInfo) !== null && _2 !== void 0 ? _2 : '税费', commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.taxInfo)