pb-sxp-ui 1.7.0 → 1.7.2

package/dist/pb-ui.js

@@ -857,6 +857,7 @@
                                             }
                                         }
                                         catch (error) {
+                                            delete obj[key];
                                             console.error('An error occurred:', error === null || error === void 0 ? void 0 : error.message);
                                         }
                                     });
@@ -8968,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
      *
      */
@@ -8985,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');
@@ -9023,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(() => {
@@ -9108,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);
 
@@ -9366,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);
@@ -9396,17 +9400,17 @@
             }
         };
         React.useEffect(() => {
-            if (!isPost) {
-                bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-                    eventName: 'ProductView',
-                    product
-                });
-            }
+            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
             });
-        }, [isPost, bffFbReport]);
+        }, [isActive, bffFbReport]);
         React.useEffect(() => {
             const initTime = () => {
                 curTimeRef.current = new Date();
@@ -10248,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();
@@ -10282,19 +10286,21 @@
             }
         };
         React.useEffect(() => {
-            if (!isPost) {
-                bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-                    eventName: 'ProductView',
-                    product
-                });
-                bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-                    eventName: 'PageView',
-                    product
-                });
-            }
-        }, [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();
@@ -10302,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,
@@ -14466,7 +14472,7 @@ Made in Italy` })));
      * @Author: binruan@chatlabs.com
      * @Date: 2024-01-10 10:58:24
      * @LastEditors: binruan@chatlabs.com
-     * @LastEditTime: 2024-10-18 18:59:47
+     * @LastEditTime: 2024-10-23 16:58:01
      * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\WaterFall\index.tsx
      *
      */
@@ -14477,11 +14483,6 @@ Made in Italy` })));
         React.useRef(null);
         const modalEleRef = React.useRef(null);
         const [viewTime, setViewTime] = React.useState();
-        React.useEffect(() => {
-            bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-                eventName: 'PageView'
-            });
-        }, []);
         React.useEffect(() => {
             const parentNode = document.getElementById('sxp-render');
             const node = document.getElementById('water-fall');
@@ -14554,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());
@@ -16380,7 +16384,7 @@ Made in Italy` })));
      * @Author: binruan@chatlabs.com
      * @Date: 2024-01-15 19:03:09
      * @LastEditors: binruan@chatlabs.com
-     * @LastEditTime: 2024-10-18 18:54:40
+     * @LastEditTime: 2024-10-23 18:06:34
      * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\index.tsx
      *
      */
@@ -16588,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;
@@ -16724,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, _t;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
             const item = data[swiper.previousIndex];
             if (!item)
                 return;
@@ -16768,13 +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',
-                    product: (_t = curItem === null || curItem === void 0 ? void 0 : curItem.video) === null || _t === void 0 ? void 0 : _t.bindProduct
-                });
-            }
             viewTime.current = new Date();
         };
         const handleReportProductView = (item) => {
@@ -16793,7 +16790,7 @@ Made in Italy` })));
             }
         }, [openHashtag, data, activeIndex]);
         const handleViewImageStartEvent = (activeIndex) => {
-            var _a, _b, _c, _d, _e, _f, _g;
+            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)) {
@@ -16816,6 +16813,10 @@ Made in Italy` })));
                     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
+                });
             }
         };
         const renderToggleButton = React.useCallback((visible) => {
@@ -17288,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
      *
      */