pb-sxp-ui 1.0.7 → 1.0.9

package/dist/pb-ui.js

@@ -546,7 +546,7 @@
             const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/customform', { method: 'POST', body }));
             return res === null || res === void 0 ? void 0 : res.success;
         }), [bffFetch]);
-        const ctaEvent = React.useCallback((eventInfo, rec, product) => {
+        const ctaEvent = React.useCallback((eventInfo, rec, product, position) => {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
             const cta = product === null || product === void 0 ? void 0 : product.bindCta;
             const isProd = ((_a = rec === null || rec === void 0 ? void 0 : rec.video) === null || _a === void 0 ? void 0 : _a.bindProduct) || (((_b = rec === null || rec === void 0 ? void 0 : rec.video) === null || _b === void 0 ? void 0 : _b.bindProducts) && ((_d = (_c = rec === null || rec === void 0 ? void 0 : rec.video) === null || _c === void 0 ? void 0 : _c.bindProducts) === null || _d === void 0 ? void 0 : _d.length) > 0);
@@ -561,7 +561,7 @@
                 fromKName = 'imagePage';
             }
             bffEventReport === null || bffEventReport === void 0 ? void 0 : bffEventReport({
-                eventInfo: Object.assign(Object.assign({}, eventInfo), { ctaId: (_h = cta === null || cta === void 0 ? void 0 : cta.itemId) !== null && _h !== void 0 ? _h : '', ctaName: (_j = cta === null || cta === void 0 ? void 0 : cta.title) !== null && _j !== void 0 ? _j : '', contentTags: JSON.stringify(cta === null || cta === void 0 ? void 0 : cta.tags), position: rec === null || rec === void 0 ? void 0 : rec.position, relatedContentId: (_l = (_k = rec === null || rec === void 0 ? void 0 : rec.video) === null || _k === void 0 ? void 0 : _k.itemId) !== null && _l !== void 0 ? _l : '', relatedProductId: isProd ? product === null || product === void 0 ? void 0 : product.itemId : '', traceInfo: (_m = cta === null || cta === void 0 ? void 0 : cta.traceInfo) !== null && _m !== void 0 ? _m : '', fromKName })
+                eventInfo: Object.assign(Object.assign({}, eventInfo), { ctaId: (_h = cta === null || cta === void 0 ? void 0 : cta.itemId) !== null && _h !== void 0 ? _h : '', ctaName: (_j = cta === null || cta === void 0 ? void 0 : cta.title) !== null && _j !== void 0 ? _j : '', contentTags: JSON.stringify(cta === null || cta === void 0 ? void 0 : cta.tags), position: position + '', relatedContentId: (_l = (_k = rec === null || rec === void 0 ? void 0 : rec.video) === null || _k === void 0 ? void 0 : _k.itemId) !== null && _l !== void 0 ? _l : '', relatedProductId: isProd ? product === null || product === void 0 ? void 0 : product.itemId : '', traceInfo: (_m = cta === null || cta === void 0 ? void 0 : cta.traceInfo) !== null && _m !== void 0 ? _m : '', fromKName })
             });
         }, [bffEventReport, isFromHashtag]);
         React.useEffect(() => {
@@ -8098,13 +8098,13 @@
      * @Author: binruan@chatlabs.com
      * @Date: 2024-03-12 10:59:06
      * @LastEditors: binruan@chatlabs.com
-     * @LastEditTime: 2024-04-12 15:10:39
+     * @LastEditTime: 2024-04-15 09:47:08
      * @FilePath: \pb-sxp-ui\src\core\hooks\useEventReport.ts
      *
      */
     function useEventReport() {
         const { bffEventReport, popupDetailData, waterFallData, isFromHashtag } = useSxpDataSource();
-        const jumpToWeb = React.useCallback((data, product, cta) => {
+        const jumpToWeb = React.useCallback((data, product, cta, position) => {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
             let fromKName = '';
             if (popupDetailData && (((_b = (_a = data === null || data === void 0 ? void 0 : data.video) === null || _a === void 0 ? void 0 : _a.bindProducts) === null || _b === void 0 ? void 0 : _b.length) || ((_c = data === null || data === void 0 ? void 0 : data.video) === null || _c === void 0 ? void 0 : _c.bindProduct))) {
@@ -8133,14 +8133,14 @@
                     fromKName,
                     fromKPage: location === null || location === void 0 ? void 0 : location.href,
                     contentTags: (product === null || product === void 0 ? void 0 : product.tags) ? JSON.stringify(product === null || product === void 0 ? void 0 : product.tags) : '',
-                    position: (data === null || data === void 0 ? void 0 : data.position) + '',
+                    position: position + '',
                     relatedContentId: (_m = (_l = data === null || data === void 0 ? void 0 : data.video) === null || _l === void 0 ? void 0 : _l.itemId) !== null && _m !== void 0 ? _m : '',
                     relatedCtatId: (_o = cta === null || cta === void 0 ? void 0 : cta.itemId) !== null && _o !== void 0 ? _o : '',
                     traceInfo: (_p = product === null || product === void 0 ? void 0 : product.traceInfo) !== null && _p !== void 0 ? _p : ''
                 }
             });
         }, [bffEventReport, popupDetailData, isFromHashtag]);
-        const productView = React.useCallback((data, product, cta, viewTime) => {
+        const productView = React.useCallback((data, product, cta, viewTime, position) => {
             var _a, _b, _c, _d;
             let fromKName = '';
             if (popupDetailData && (((_b = (_a = data === null || data === void 0 ? void 0 : data.video) === null || _a === void 0 ? void 0 : _a.bindProducts) === null || _b === void 0 ? void 0 : _b.length) || ((_c = data === null || data === void 0 ? void 0 : data.video) === null || _c === void 0 ? void 0 : _c.bindProduct))) {
@@ -8158,7 +8158,7 @@
                     fromKName,
                     fromKPage: location === null || location === void 0 ? void 0 : location.href,
                     contentTags: JSON.stringify(product === null || product === void 0 ? void 0 : product.tags),
-                    position: (data === null || data === void 0 ? void 0 : data.position) + '',
+                    position: position + '',
                     relatedContentId: (_d = data === null || data === void 0 ? void 0 : data.video) === null || _d === void 0 ? void 0 : _d.itemId,
                     relatedCtatId: cta === null || cta === void 0 ? void 0 : cta.itemId,
                     traceInfo: product === null || product === void 0 ? void 0 : product.traceInfo,
@@ -8301,7 +8301,7 @@
 
     const CommodityDetail$1 = (_a) => {
         var _b, _c, _d, _e, _f, _g, _h, _j;
-        var { content, style, bgImg, onClick, schema, isDefault, bottom_image, tipText, isPost, viewTime, rec, swiper, commodityStyles, buttonStyle } = _a, props = __rest(_a, ["content", "style", "bgImg", "onClick", "schema", "isDefault", "bottom_image", "tipText", "isPost", "viewTime", "rec", "swiper", "commodityStyles", "buttonStyle"]);
+        var { content, style, bgImg, onClick, schema, isDefault, bottom_image, tipText, isPost, viewTime, rec, swiper, commodityStyles, buttonStyle, index } = _a, props = __rest(_a, ["content", "style", "bgImg", "onClick", "schema", "isDefault", "bottom_image", "tipText", "isPost", "viewTime", "rec", "swiper", "commodityStyles", "buttonStyle", "index"]);
         const { sxpParameter } = useSxpDataSource();
         const { popupDetailData, bffEventReport, isPreview, waterFallData } = useSxpDataSource();
         const { jumpToWeb, productView } = useEventReport();
@@ -8310,11 +8310,12 @@
         const data = isPost ? rec : popupDetailData;
         const product = isPost ? data === null || data === void 0 ? void 0 : data.product : (_b = data === null || data === void 0 ? void 0 : data.video) === null || _b === void 0 ? void 0 : _b.bindProduct;
         const cta = isPost ? (_c = data === null || data === void 0 ? void 0 : data.product) === null || _c === void 0 ? void 0 : _c.bindCta : (_e = (_d = data === null || data === void 0 ? void 0 : data.video) === null || _d === void 0 ? void 0 : _d.bindProduct) === null || _e === void 0 ? void 0 : _e.bindCta;
+        const position = isPost ? index : popupDetailData === null || popupDetailData === void 0 ? void 0 : popupDetailData.index;
         const handleLink = () => {
             if (product === null || product === void 0 ? void 0 : product.link) {
-                jumpToWeb(popupDetailData, product, cta);
+                jumpToWeb(popupDetailData, product, cta, position);
                 if (!isPost) {
-                    productView(data, product, cta, viewTime || curTimeRef.current);
+                    productView(data, product, cta, viewTime || curTimeRef.current, position);
                 }
                 window.location.href = window.getJointUtmLink(product.link);
             }
@@ -8751,7 +8752,7 @@
 
     const CommodityDetailDiroNew$1 = (_a) => {
         var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-        var { style, isDefault, rec, viewTime, isPost, bottom_image, tipText, swiper, commodityStyles, buttonStyle } = _a, props = __rest(_a, ["style", "isDefault", "rec", "viewTime", "isPost", "bottom_image", "tipText", "swiper", "commodityStyles", "buttonStyle"]);
+        var { style, isDefault, rec, viewTime, isPost, bottom_image, tipText, swiper, commodityStyles, buttonStyle, index } = _a, props = __rest(_a, ["style", "isDefault", "rec", "viewTime", "isPost", "bottom_image", "tipText", "swiper", "commodityStyles", "buttonStyle", "index"]);
         React.useState(true);
         const { sxpParameter } = useSxpDataSource();
         const { popupDetailData, bffEventReport, isPreview, swiperRef, waterFallData } = useSxpDataSource();
@@ -8767,11 +8768,12 @@
         const data = isPost ? rec : popupDetailData;
         const product = isPost ? data === null || data === void 0 ? void 0 : data.product : (_b = data === null || data === void 0 ? void 0 : data.video) === null || _b === void 0 ? void 0 : _b.bindProduct;
         const cta = isPost ? (_c = data === null || data === void 0 ? void 0 : data.product) === null || _c === void 0 ? void 0 : _c.bindCta : (_e = (_d = data === null || data === void 0 ? void 0 : data.video) === null || _d === void 0 ? void 0 : _d.bindProduct) === null || _e === void 0 ? void 0 : _e.bindCta;
+        const position = isPost ? index : popupDetailData === null || popupDetailData === void 0 ? void 0 : popupDetailData.index;
         const handleLink = () => {
             if (product === null || product === void 0 ? void 0 : product.link) {
-                jumpToWeb(data, product, cta);
+                jumpToWeb(data, product, cta, position);
                 if (!isPost) {
-                    productView(data, product, cta, viewTime || curTimeRef.current);
+                    productView(data, product, cta, viewTime || curTimeRef.current, position);
                 }
                 window.location.href = window.getJointUtmLink(product.link);
             }
@@ -9184,7 +9186,7 @@ Made in Italy` })));
     }
 
     const EventProvider = (_a) => {
-        var { rec, children, className, onClick, style, isExternalLink = false } = _a; __rest(_a, ["rec", "children", "className", "onClick", "style", "isExternalLink"]);
+        var { rec, children, className, onClick, style, isExternalLink = false, index } = _a; __rest(_a, ["rec", "children", "className", "onClick", "style", "isExternalLink", "index"]);
         const ref = React.useRef(null);
         const isOnScreen = useOnScreen(ref);
         const { popup } = useEditor();
@@ -9197,23 +9199,24 @@ Made in Italy` })));
                 ctaEvent === null || ctaEvent === void 0 ? void 0 : ctaEvent({
                     eventSubject: 'ctaExposure',
                     eventDescription: 'The cta was shown to the user'
-                }, rec, item);
+                }, rec, item, index);
             }
-        }, [isOnScreen, ref, rec, ctaEvent]);
+        }, [isOnScreen, ref, rec, ctaEvent, index]);
         const handleClick = lodash.throttle(() => {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
             const item = (_b = (_a = rec === null || rec === void 0 ? void 0 : rec.video) === null || _a === void 0 ? void 0 : _a.bindProduct) !== null && _b !== void 0 ? _b : rec === null || rec === void 0 ? void 0 : rec.video;
             ctaEvent === null || ctaEvent === void 0 ? void 0 : ctaEvent({
                 eventSubject: 'clickCta',
                 eventDescription: 'User clicked the CTA'
-            }, rec, item);
-            setPopupDetailData === null || setPopupDetailData === void 0 ? void 0 : setPopupDetailData(rec);
+            }, rec, item, index);
+            setPopupDetailData === null || setPopupDetailData === void 0 ? void 0 : setPopupDetailData(Object.assign(Object.assign({}, rec), { index }));
             if (isExternalLink) {
                 if ((_d = (_c = rec === null || rec === void 0 ? void 0 : rec.video) === null || _c === void 0 ? void 0 : _c.bindProduct) === null || _d === void 0 ? void 0 : _d.link) {
                     const cta = (_e = rec === null || rec === void 0 ? void 0 : rec.video) === null || _e === void 0 ? void 0 : _e.bindCta;
                     const product = (_f = rec === null || rec === void 0 ? void 0 : rec.video) === null || _f === void 0 ? void 0 : _f.bindProduct;
-                    jumpToWeb(rec, product, cta);
+                    jumpToWeb(rec, product, cta, index);
                     window.location.href = (_h = (_g = rec === null || rec === void 0 ? void 0 : rec.video) === null || _g === void 0 ? void 0 : _g.bindProduct) === null || _h === void 0 ? void 0 : _h.link;
+                    window.location.href = window.getJointUtmLink((_k = (_j = rec === null || rec === void 0 ? void 0 : rec.video) === null || _j === void 0 ? void 0 : _j.bindProduct) === null || _k === void 0 ? void 0 : _k.link);
                 }
             }
             else {
@@ -9382,18 +9385,18 @@ Made in Italy` })));
 
     const Link$1 = (_a) => {
         var _b, _c, _d, _e, _f;
-        var { content, style, bgImg, recData, bottom_image, ctaTempStyles } = _a, props = __rest(_a, ["content", "style", "bgImg", "recData", "bottom_image", "ctaTempStyles"]);
+        var { content, style, bgImg, recData, bottom_image, ctaTempStyles, index } = _a, props = __rest(_a, ["content", "style", "bgImg", "recData", "bottom_image", "ctaTempStyles", "index"]);
         const { sxpParameter, bffEventReport } = useSxpDataSource();
         const { jumpToWeb } = useEventReport();
         const cta = (_b = recData === null || recData === void 0 ? void 0 : recData.video) === null || _b === void 0 ? void 0 : _b.bindCta;
         const product = (_c = recData === null || recData === void 0 ? void 0 : recData.video) === null || _c === void 0 ? void 0 : _c.bindProduct;
         const handleTo = () => {
             if (cta === null || cta === void 0 ? void 0 : cta.link) {
-                jumpToWeb(recData, product, cta);
+                jumpToWeb(recData, product, cta, index);
                 window.location.href = window.getJointUtmLink(cta.link);
             }
         };
-        return (React.createElement(EventProvider$1, Object.assign({ rec: recData, className: css.css(Object.assign({ alignItems: 'center' }, style)), style: { display: 'flex' } }, props, { onClick: handleTo }),
+        return (React.createElement(EventProvider$1, Object.assign({ index: index, rec: recData, className: css.css(Object.assign({ alignItems: 'center' }, style)), style: { display: 'flex' } }, props, { onClick: handleTo }),
             React.createElement("div", { className: css.css(Object.assign({ backgroundColor: '#f2f2f2', overflow: 'hidden', flexShrink: 0 }, ctaTempStyles === null || ctaTempStyles === void 0 ? void 0 : ctaTempStyles.img)) },
                 React.createElement("img", { className: css.css({ width: '100%', objectFit: 'cover', height: '100%' }), src: (_e = (_d = cta === null || cta === void 0 ? void 0 : cta.icon) !== null && _d !== void 0 ? _d : sxpParameter === null || sxpParameter === void 0 ? void 0 : sxpParameter.bottom_image) !== null && _e !== void 0 ? _e : bottom_image, alt: '' })),
             React.createElement("div", { className: css.css({
@@ -9661,11 +9664,11 @@ Made in Italy` })));
      * @Author: binruan@chatlabs.com
      * @Date: 2024-01-16 14:50:13
      * @LastEditors: binruan@chatlabs.com
-     * @LastEditTime: 2024-03-11 15:46:24
+     * @LastEditTime: 2024-04-11 18:24:15
      * @FilePath: \pb-sxp-ui\src\materials\sxp\template\components\Img.tsx
      *
      */
-    const Img = ({ src, rec, item }) => {
+    const Img = ({ src, rec, item, index }) => {
         const ref = React.useRef(null);
         const isOnScreen = useOnScreen(ref);
         const { ctaEvent } = useSxpDataSource();
@@ -9674,9 +9677,9 @@ Made in Italy` })));
                 ctaEvent === null || ctaEvent === void 0 ? void 0 : ctaEvent({
                     eventSubject: 'ctaExposure',
                     eventDescription: 'The cta was shown to the user'
-                }, rec, item);
+                }, rec, item, index);
             }
-        }, [isOnScreen, src, ref, rec, ctaEvent, item]);
+        }, [isOnScreen, src, ref, rec, ctaEvent, item, index]);
         return (React.createElement("img", { ref: ref, hidden: !src, className: css.css({ width: '100%', objectFit: 'cover', height: '100%' }), src: src, alt: '' }));
     };
     var Img$1 = React.memo(Img);
@@ -9685,7 +9688,7 @@ Made in Italy` })));
 
     const MultiCommodityDiro$1 = (_a) => {
         var _b, _c;
-        var { content, style, bgImg, recData, onClick, bottom_image, ctaTempStyles, isExternalLink } = _a, props = __rest(_a, ["content", "style", "bgImg", "recData", "onClick", "bottom_image", "ctaTempStyles", "isExternalLink"]);
+        var { content, style, bgImg, recData, onClick, bottom_image, ctaTempStyles, isExternalLink, index } = _a, props = __rest(_a, ["content", "style", "bgImg", "recData", "onClick", "bottom_image", "ctaTempStyles", "isExternalLink", "index"]);
         const { ctaEvent, setPopupDetailData, sxpParameter } = useSxpDataSource();
         const { popup } = useEditor();
         const { jumpToWeb } = useEventReport();
@@ -9694,12 +9697,12 @@ Made in Italy` })));
             ctaEvent === null || ctaEvent === void 0 ? void 0 : ctaEvent({
                 eventSubject: 'clickCta',
                 eventDescription: 'User clicked the CTA'
-            }, recData, item);
-            setPopupDetailData === null || setPopupDetailData === void 0 ? void 0 : setPopupDetailData(Object.assign(Object.assign({}, recData), { video: Object.assign(Object.assign({}, recData === null || recData === void 0 ? void 0 : recData.video), { bindProduct: item }) }));
+            }, recData, item, index);
+            setPopupDetailData === null || setPopupDetailData === void 0 ? void 0 : setPopupDetailData(Object.assign(Object.assign({}, recData), { video: Object.assign(Object.assign({}, recData === null || recData === void 0 ? void 0 : recData.video), { bindProduct: item }), index }));
             if (isExternalLink) {
                 if (item === null || item === void 0 ? void 0 : item.link) {
-                    jumpToWeb(recData, item, item.bindCta);
-                    window.location.href = item.link;
+                    jumpToWeb(recData, item, item.bindCta, index);
+                    window.location.href = window.getJointUtmLink(item.link);
                 }
             }
             else {
@@ -9710,7 +9713,7 @@ Made in Italy` })));
             var _a, _b, _c, _d, _e, _f;
             return (React.createElement(SwiperSlide, Object.assign({ hidden: recData && !(item === null || item === void 0 ? void 0 : item.bindCta), key: item === null || item === void 0 ? void 0 : item.itemId, className: css.css(Object.assign(Object.assign({}, style), { display: 'flex', flexShrink: 0, marginLeft: 0, marginRight: '8px' })) }, props, { onClick: () => handleClick(item) }),
                 React.createElement("div", { className: css.css(Object.assign({ overflow: 'hidden', flexShrink: 0, backgroundColor: '#f2f2f2' }, ctaTempStyles === null || ctaTempStyles === void 0 ? void 0 : ctaTempStyles.img)) },
-                    React.createElement(Img$1, { src: (_c = (_b = (_a = item === null || item === void 0 ? void 0 : item.homePage) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : sxpParameter === null || sxpParameter === void 0 ? void 0 : sxpParameter.bottom_image) !== null && _c !== void 0 ? _c : bottom_image, rec: recData, item: item })),
+                    React.createElement(Img$1, { src: (_c = (_b = (_a = item === null || item === void 0 ? void 0 : item.homePage) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : sxpParameter === null || sxpParameter === void 0 ? void 0 : sxpParameter.bottom_image) !== null && _c !== void 0 ? _c : bottom_image, rec: recData, item: item, index: index })),
                 React.createElement("div", { className: css.css({
                         color: '#000',
                         display: 'flex',
@@ -9797,7 +9800,7 @@ Made in Italy` })));
 
     const MultiCommodity$1 = (_a) => {
         var _b, _c;
-        var { content, style, bgImg, recData, onClick, bottom_image, ctaTempStyles, isExternalLink } = _a, props = __rest(_a, ["content", "style", "bgImg", "recData", "onClick", "bottom_image", "ctaTempStyles", "isExternalLink"]);
+        var { content, style, bgImg, recData, onClick, bottom_image, ctaTempStyles, isExternalLink, index } = _a, props = __rest(_a, ["content", "style", "bgImg", "recData", "onClick", "bottom_image", "ctaTempStyles", "isExternalLink", "index"]);
         const { sxpParameter } = useSxpDataSource();
         const { ctaEvent, setPopupDetailData } = useSxpDataSource();
         const { popup } = useEditor();
@@ -9807,12 +9810,12 @@ Made in Italy` })));
             ctaEvent === null || ctaEvent === void 0 ? void 0 : ctaEvent({
                 eventSubject: 'clickCta',
                 eventDescription: 'User clicked the CTA'
-            }, recData, item);
-            setPopupDetailData === null || setPopupDetailData === void 0 ? void 0 : setPopupDetailData(Object.assign(Object.assign({}, recData), { video: Object.assign(Object.assign({}, recData === null || recData === void 0 ? void 0 : recData.video), { bindProduct: item }) }));
+            }, recData, item, index);
+            setPopupDetailData === null || setPopupDetailData === void 0 ? void 0 : setPopupDetailData(Object.assign(Object.assign({}, recData), { video: Object.assign(Object.assign({}, recData === null || recData === void 0 ? void 0 : recData.video), { bindProduct: item }), index }));
             if (isExternalLink) {
                 if (item === null || item === void 0 ? void 0 : item.link) {
-                    jumpToWeb(recData, item, item.bindCta);
-                    window.location.href = item.link;
+                    jumpToWeb(recData, item, item.bindCta, index);
+                    window.location.href = window.getJointUtmLink(item.link);
                 }
             }
             else {
@@ -9823,7 +9826,7 @@ Made in Italy` })));
             var _a, _b, _c, _d, _e, _f;
             return (React.createElement(SwiperSlide, Object.assign({ hidden: recData && !(item === null || item === void 0 ? void 0 : item.bindCta), key: item.itemId, className: css.css(Object.assign(Object.assign({}, style), { display: 'flex', flexShrink: 0, marginLeft: 0, marginRight: '8px' })) }, props, { onClick: () => handleClick(item) }),
                 React.createElement("div", { className: css.css(Object.assign({ overflow: 'hidden', flexShrink: 0, backgroundColor: '#f2f2f2' }, ctaTempStyles === null || ctaTempStyles === void 0 ? void 0 : ctaTempStyles.img)) },
-                    React.createElement(Img$1, { src: (_c = (_b = (_a = item === null || item === void 0 ? void 0 : item.homePage) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : sxpParameter === null || sxpParameter === void 0 ? void 0 : sxpParameter.bottom_image) !== null && _c !== void 0 ? _c : bottom_image, rec: recData, item: item })),
+                    React.createElement(Img$1, { src: (_c = (_b = (_a = item === null || item === void 0 ? void 0 : item.homePage) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : sxpParameter === null || sxpParameter === void 0 ? void 0 : sxpParameter.bottom_image) !== null && _c !== void 0 ? _c : bottom_image, rec: recData, item: item, index: index })),
                 React.createElement("div", { className: css.css({
                         color: '#fff',
                         display: 'flex',
@@ -9910,7 +9913,7 @@ Made in Italy` })));
 
     const MultiCommodityDiroNew$1 = (_a) => {
         var _b, _c;
-        var { content, style, bgImg, recData, onClick, bottom_image, ctaTempStyles, isExternalLink } = _a, props = __rest(_a, ["content", "style", "bgImg", "recData", "onClick", "bottom_image", "ctaTempStyles", "isExternalLink"]);
+        var { content, style, bgImg, recData, onClick, bottom_image, ctaTempStyles, isExternalLink, index } = _a, props = __rest(_a, ["content", "style", "bgImg", "recData", "onClick", "bottom_image", "ctaTempStyles", "isExternalLink", "index"]);
         const { ctaEvent, setPopupDetailData, sxpParameter } = useSxpDataSource();
         const { popup } = useEditor();
         const { jumpToWeb } = useEventReport();
@@ -9919,12 +9922,12 @@ Made in Italy` })));
             ctaEvent === null || ctaEvent === void 0 ? void 0 : ctaEvent({
                 eventSubject: 'clickCta',
                 eventDescription: 'User clicked the CTA'
-            }, recData, item);
-            setPopupDetailData === null || setPopupDetailData === void 0 ? void 0 : setPopupDetailData(Object.assign(Object.assign({}, recData), { video: Object.assign(Object.assign({}, recData === null || recData === void 0 ? void 0 : recData.video), { bindProduct: item }) }));
+            }, recData, item, index);
+            setPopupDetailData === null || setPopupDetailData === void 0 ? void 0 : setPopupDetailData(Object.assign(Object.assign({}, recData), { video: Object.assign(Object.assign({}, recData === null || recData === void 0 ? void 0 : recData.video), { bindProduct: item }), index }));
             if (isExternalLink) {
                 if (item === null || item === void 0 ? void 0 : item.link) {
-                    jumpToWeb(recData, item, item.bindCta);
-                    window.location.href = item.link;
+                    jumpToWeb(recData, item, item.bindCta, index);
+                    window.location.href = window.getJointUtmLink(item.link);
                 }
             }
             else {
@@ -9935,7 +9938,7 @@ Made in Italy` })));
             var _a, _b, _c, _d, _e, _f;
             return (React.createElement(SwiperSlide, Object.assign({ hidden: recData && !(item === null || item === void 0 ? void 0 : item.bindCta), key: item === null || item === void 0 ? void 0 : item.itemId, className: css.css(Object.assign(Object.assign({}, style), { display: 'flex', flexShrink: 0, marginLeft: 0, marginRight: '8px' })) }, props, { onClick: () => handleClick(item) }),
                 React.createElement("div", { className: css.css(Object.assign({ overflow: 'hidden', flexShrink: 0, backgroundColor: '#f2f2f2' }, ctaTempStyles === null || ctaTempStyles === void 0 ? void 0 : ctaTempStyles.img)) },
-                    React.createElement(Img$1, { src: (_c = (_b = (_a = item === null || item === void 0 ? void 0 : item.homePage) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : sxpParameter === null || sxpParameter === void 0 ? void 0 : sxpParameter.bottom_image) !== null && _c !== void 0 ? _c : bottom_image, rec: recData, item: item })),
+                    React.createElement(Img$1, { src: (_c = (_b = (_a = item === null || item === void 0 ? void 0 : item.homePage) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : sxpParameter === null || sxpParameter === void 0 ? void 0 : sxpParameter.bottom_image) !== null && _c !== void 0 ? _c : bottom_image, rec: recData, item: item, index: index })),
                 React.createElement("div", { className: css.css({
                         color: '#fff',
                         display: 'flex',
@@ -11581,7 +11584,7 @@ Made in Italy` })));
             };
         }, [src, showVideo]);
         const handleClickToDetail = () => {
-            reportTagsView();
+            reportTagsView(index);
             setRtcList === null || setRtcList === void 0 ? void 0 : setRtcList(list);
             setTimeout(() => {
                 var _a;
@@ -11689,7 +11692,7 @@ Made in Italy` })));
      * @Author: binruan@chatlabs.com
      * @Date: 2024-01-10 10:58:24
      * @LastEditors: binruan@chatlabs.com
-     * @LastEditTime: 2024-04-12 11:29:01
+     * @LastEditTime: 2024-04-15 09:58:50
      * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\WaterFall\index.tsx
      *
      */
@@ -11716,7 +11719,7 @@ Made in Italy` })));
             if (!isEq && cacheRtcList && (cacheRtcList === null || cacheRtcList === void 0 ? void 0 : cacheRtcList.length)) {
                 setRtcList === null || setRtcList === void 0 ? void 0 : setRtcList(cacheRtcList);
             }
-            reportTagsView();
+            reportTagsView(0);
             setWaterFallData === null || setWaterFallData === void 0 ? void 0 : setWaterFallData(undefined);
             setIsFromHashtag === null || setIsFromHashtag === void 0 ? void 0 : setIsFromHashtag(false);
             setTimeout(() => {
@@ -11733,7 +11736,7 @@ Made in Italy` })));
                 setRecData(waterFallData);
             }
         }, [waterFallData]);
-        const reportTagsView = React.useCallback(() => {
+        const reportTagsView = React.useCallback((index) => {
             var _a, _b, _c, _d, _e, _f;
             const rec = recData === null || recData === void 0 ? void 0 : recData.rec;
             if (!rec)
@@ -11751,7 +11754,7 @@ Made in Italy` })));
             bffEventReport === null || bffEventReport === void 0 ? void 0 : bffEventReport({
                 eventInfo: {
                     relatedContentId: (_d = rec === null || rec === void 0 ? void 0 : rec.video) === null || _d === void 0 ? void 0 : _d.itemId,
-                    position: rec === null || rec === void 0 ? void 0 : rec.position,
+                    position: index + '',
                     contentTags: JSON.stringify((_e = rec === null || rec === void 0 ? void 0 : rec.video) === null || _e === void 0 ? void 0 : _e.tags),
                     traceInfo: (_f = rec === null || rec === void 0 ? void 0 : rec.video) === null || _f === void 0 ? void 0 : _f.traceInfo,
                     hashTags: JSON.stringify([recData === null || recData === void 0 ? void 0 : recData.hashTag]),
@@ -11886,7 +11889,7 @@ Made in Italy` })));
     const defaultUnLikeIconPath = '/pb_static/f71266d2c64446c5ae6a5a7f5489cc0a.png';
     const defaultLikeIconPath = '/pb_static/f07900fe3f0f4ae188ea1611d4801a44.png';
     const LikeButton = (_a) => {
-        var { active, activeIcon, unActicveIcon, recData } = _a, props = __rest(_a, ["active", "activeIcon", "unActicveIcon", "recData"]);
+        var { active, activeIcon, unActicveIcon, recData, position } = _a, props = __rest(_a, ["active", "activeIcon", "unActicveIcon", "recData", "position"]);
         const { mutateLike, mutateUnlike, bffEventReport } = useSxpDataSource();
         const [state, setState] = React.useState(active);
         const likeIcon = useIconLink(defaultLikeIconPath);
@@ -11904,7 +11907,7 @@ Made in Italy` })));
                         contentId: (_f = (_e = recData.video) === null || _e === void 0 ? void 0 : _e.itemId) !== null && _f !== void 0 ? _f : '',
                         contentName: (_h = (_g = recData.video) === null || _g === void 0 ? void 0 : _g.title) !== null && _h !== void 0 ? _h : '',
                         contentTags: JSON.stringify((_k = (_j = recData.video) === null || _j === void 0 ? void 0 : _j.tags) !== null && _k !== void 0 ? _k : []),
-                        position: recData.position,
+                        position: position + '',
                         contentFormat: ((_l = recData.video) === null || _l === void 0 ? void 0 : _l.url) ? 'video' : 'image',
                         traceInfo: (_m = recData.video) === null || _m === void 0 ? void 0 : _m.traceInfo
                     }
@@ -11924,7 +11927,7 @@ Made in Italy` })));
                         contentId: (_q = (_p = recData.video) === null || _p === void 0 ? void 0 : _p.itemId) !== null && _q !== void 0 ? _q : '',
                         contentName: (_s = (_r = recData.video) === null || _r === void 0 ? void 0 : _r.title) !== null && _s !== void 0 ? _s : '',
                         contentTags: JSON.stringify((_u = (_t = recData.video) === null || _t === void 0 ? void 0 : _t.tags) !== null && _u !== void 0 ? _u : []),
-                        position: recData.position,
+                        position: position + '',
                         contentFormat: ((_v = recData.video) === null || _v === void 0 ? void 0 : _v.url) ? 'video' : 'image',
                         traceInfo: (_w = recData.video) === null || _w === void 0 ? void 0 : _w.traceInfo
                     }
@@ -11982,7 +11985,7 @@ Made in Italy` })));
                         startTime: videoCurrentTime,
                         videoDuration,
                         contentTags: JSON.stringify((_m = (_l = item.video) === null || _l === void 0 ? void 0 : _l.tags) !== null && _m !== void 0 ? _m : []),
-                        position: item.position,
+                        position: index + '',
                         contentFormat: 'video',
                         traceInfo: (_o = item.video) === null || _o === void 0 ? void 0 : _o.traceInfo
                     }
@@ -12010,7 +12013,7 @@ Made in Italy` })));
                         startTime: videoCurrentTime,
                         videoDuration,
                         contentTags: JSON.stringify((_m = (_l = item.video) === null || _l === void 0 ? void 0 : _l.tags) !== null && _m !== void 0 ? _m : []),
-                        position: item.position,
+                        position: index + '',
                         contentFormat: 'video',
                         traceInfo: (_o = item.video) === null || _o === void 0 ? void 0 : _o.traceInfo
                     }
@@ -12070,7 +12073,7 @@ Made in Italy` })));
                         videoDuration,
                         playDuration,
                         contentTags: JSON.stringify((_m = (_l = item.video) === null || _l === void 0 ? void 0 : _l.tags) !== null && _m !== void 0 ? _m : []),
-                        position: item.position,
+                        position: index + '',
                         contentFormat: 'video',
                         traceInfo: (_o = item.video) === null || _o === void 0 ? void 0 : _o.traceInfo
                     }
@@ -12418,7 +12421,7 @@ Made in Italy` })));
      * @Author: binruan@chatlabs.com
      * @Date: 2023-12-26 16:11:34
      * @LastEditors: binruan@chatlabs.com
-     * @LastEditTime: 2024-04-10 16:49:34
+     * @LastEditTime: 2024-04-11 18:14:05
      * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\RenderCard.tsx
      *
      */
@@ -12452,7 +12455,7 @@ Made in Italy` })));
                 const Component = withBindDataSource(t);
                 const defaulSetting = (_x = t === null || t === void 0 ? void 0 : t.extend) === null || _x === void 0 ? void 0 : _x.defaulSetting;
                 const isExternalLink = ((_0 = (_z = (_y = value === null || value === void 0 ? void 0 : value.item) === null || _y === void 0 ? void 0 : _y.event) === null || _z === void 0 ? void 0 : _z.onClick) === null || _0 === void 0 ? void 0 : _0.linkType) === 'externalLink';
-                return (React.createElement(Component, Object.assign({ style: Object.assign(Object.assign(Object.assign({}, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.style), (_1 = value === null || value === void 0 ? void 0 : value.item) === null || _1 === void 0 ? void 0 : _1.style), { zIndex: 50, marginLeft: '20px', boxSizing: 'border-box' }), textStyle: Object.assign(Object.assign({}, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.textStyle), (_2 = value === null || value === void 0 ? void 0 : value.item) === null || _2 === void 0 ? void 0 : _2.textStyle), bindDatas: (_4 = (_3 = value === null || value === void 0 ? void 0 : value.item) === null || _3 === void 0 ? void 0 : _3.bindDatas) !== null && _4 !== void 0 ? _4 : [] }, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.props, (_5 = value === null || value === void 0 ? void 0 : value.item) === null || _5 === void 0 ? void 0 : _5.props, { event: ((_6 = value === null || value === void 0 ? void 0 : value.item) === null || _6 === void 0 ? void 0 : _6.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 })));
+                return (React.createElement(Component, Object.assign({ style: Object.assign(Object.assign(Object.assign({}, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.style), (_1 = value === null || value === void 0 ? void 0 : value.item) === null || _1 === void 0 ? void 0 : _1.style), { zIndex: 50, marginLeft: '20px', boxSizing: 'border-box' }), textStyle: Object.assign(Object.assign({}, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.textStyle), (_2 = value === null || value === void 0 ? void 0 : value.item) === null || _2 === void 0 ? void 0 : _2.textStyle), bindDatas: (_4 = (_3 = value === null || value === void 0 ? void 0 : value.item) === null || _3 === void 0 ? void 0 : _3.bindDatas) !== null && _4 !== void 0 ? _4 : [] }, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.props, (_5 = value === null || value === void 0 ? void 0 : value.item) === null || _5 === void 0 ? void 0 : _5.props, { event: ((_6 = value === null || value === void 0 ? void 0 : value.item) === null || _6 === void 0 ? void 0 : _6.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 })));
             }
             else {
                 return null;
@@ -12478,7 +12481,7 @@ Made in Italy` })));
      * @Author: binruan@chatlabs.com
      * @Date: 2024-01-15 19:03:09
      * @LastEditors: binruan@chatlabs.com
-     * @LastEditTime: 2024-04-10 10:13:48
+     * @LastEditTime: 2024-04-11 18:45:44
      * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\index.tsx
      *
      */
@@ -12606,7 +12609,7 @@ Made in Italy` })));
                             eventDescription: 'Session completed',
                             relatedContentId: (_l = item === null || item === void 0 ? void 0 : item.video) === null || _l === void 0 ? void 0 : _l.itemId,
                             relatedProductId: (_m = item === null || item === void 0 ? void 0 : item.product) === null || _m === void 0 ? void 0 : _m.itemId,
-                            position: item === null || item === void 0 ? void 0 : item.position,
+                            position: activeIndex,
                             fromKName,
                             fromKPage: location === null || location === void 0 ? void 0 : location.href,
                             relatedCtatId: (_q = (_p = (_o = item.video) === null || _o === void 0 ? void 0 : _o.bindCta) === null || _p === void 0 ? void 0 : _p.itemId) !== null && _q !== void 0 ? _q : ''
@@ -12649,7 +12652,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, 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' }) })));
+                    return (React.createElement(Component, Object.assign({ key: index, 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 null;
@@ -12668,7 +12671,7 @@ Made in Italy` })));
             }
             return null;
         }, [descStyle, activeIndex, tempMap, resolver, tipText, nudge, hashTagStyle]);
-        const renderLikeButton = React.useCallback((rec) => {
+        const renderLikeButton = React.useCallback((rec, index) => {
             var _a, _b;
             if (!(globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.isShowLike))
                 return;
@@ -12680,7 +12683,7 @@ Made in Italy` })));
                 return (React.createElement(LikeButton$1, { key: rec.position, activeIcon: globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.likeIcon, unActicveIcon: globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.unlikeIcon, active: rec.isCollected, recData: rec, className: 'clc-sxp-like-button', style: {
                         top,
                         right: (_b = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.likeIconX) !== null && _b !== void 0 ? _b : 0
-                    } }));
+                    }, position: index }));
             }
             return null;
         }, [globalConfig, waterFallData]);
@@ -12698,7 +12701,7 @@ Made in Italy` })));
                         imageEndTime: `${endTime}`,
                         playDuration: `${duration}`,
                         contentTags: JSON.stringify((_f = item.video.tags) !== null && _f !== void 0 ? _f : []),
-                        position: item.position,
+                        position: activeIndex,
                         contentFormat: 'image',
                         traceInfo: item.video.traceInfo
                     }
@@ -12743,7 +12746,7 @@ Made in Italy` })));
         const handleReportProductView = (item) => {
             var _a, _b, _c;
             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) && (item === null || item === void 0 ? void 0 : item.product)) {
-                productView(item, item.product, (_c = item === null || item === void 0 ? void 0 : item.product) === null || _c === void 0 ? void 0 : _c.bindCta, viewTime.current);
+                productView(item, item.product, (_c = item === null || item === void 0 ? void 0 : item.product) === null || _c === void 0 ? void 0 : _c.bindCta, viewTime.current, activeIndex);
             }
         };
         React.useEffect(() => {
@@ -12766,7 +12769,7 @@ Made in Italy` })));
                         contentName: (_e = item.video.title) !== null && _e !== void 0 ? _e : '',
                         imageStartTime: `${startTime}`,
                         contentTags: JSON.stringify((_f = item.video.tags) !== null && _f !== void 0 ? _f : []),
-                        position: item.position,
+                        position: activeIndex,
                         contentFormat: 'image',
                         traceInfo: item.video.traceInfo
                     }
@@ -12800,7 +12803,7 @@ Made in Italy` })));
                     React.createElement("img", { width: 64, height: 64, src: loadingImage, alt: 'loading...', style: { objectFit: 'contain' } }))) : (React.createElement(React.Fragment, null,
                     renderContent(rec, index),
                     renderBottom(rec, index),
-                    renderLikeButton(rec)))))));
+                    renderLikeButton(rec, index)))))));
             });
         }, [containerWidth, data, height, loading, renderBottom, renderContent, visList, loadingImage]);
         const mutedIcon = useIconLink('/pb_static/5beaaa5ce7f3477b99db3838619cc471.png');
@@ -12857,7 +12860,7 @@ Made in Italy` })));
      * @Author: binruan@chatlabs.com
      * @Date: 2023-10-31 10:56:01
      * @LastEditors: binruan@chatlabs.com
-     * @LastEditTime: 2024-04-12 09:50:58
+     * @LastEditTime: 2024-04-15 09:39:17
      * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\Popup\index.tsx
      *
      */
@@ -12893,7 +12896,7 @@ Made in Italy` })));
             const product = (_b = data === null || data === void 0 ? void 0 : data.video) === null || _b === void 0 ? void 0 : _b.bindProduct;
             const cta = (_d = (_c = data === null || data === void 0 ? void 0 : data.video) === null || _c === void 0 ? void 0 : _c.bindProduct) === null || _d === void 0 ? void 0 : _d.bindCta;
             if (product && cta) {
-                productView(data, product, cta, curTimeRef.current);
+                productView(data, product, cta, curTimeRef.current, popupDetailData === null || popupDetailData === void 0 ? void 0 : popupDetailData.index);
             }
             setTimeout(() => {
                 window === null || window === void 0 ? void 0 : window.sxpPopup('');