pb-sxp-ui 1.0.84 → 1.0.86

package/dist/pb-ui.js

@@ -434,7 +434,7 @@
      * @Author: binruan@chatlabs.com
      * @Date: 2024-06-13 15:16:53
      * @LastEditors: binruan@chatlabs.com
-     * @LastEditTime: 2024-06-17 14:25:01
+     * @LastEditTime: 2024-06-18 16:06:16
      * @FilePath: \pb-sxp-ui\src\core\components\Consent\index.tsx
      *
      */
@@ -474,7 +474,7 @@
                     eventSubject: 'userConsent',
                     eventDescription: '用户授权【操作结果】',
                     consentResult: '0',
-                    consentTags: '[]',
+                    consentTags: '["系统运营"]',
                     rtc: null,
                     requestId: null,
                     sessionID: null
@@ -503,8 +503,8 @@
         DataSourceType[DataSourceType["BFF"] = 5] = "BFF";
     })(DataSourceType || (DataSourceType = {}));
     const UTM_KEYS = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_id', 'utm_content', 'cl_source'];
-    const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent = true, maxSize, defaultSize, isPreview = false, sxpParameter, appDomain, hashTagSize, loadingImage, isOpenHashTag = false, enabledMetaConversionApi = false, consentHeight, consentWidth, isShowTag = true, isOpenConsent = false, globalConfig }) => {
-        var _a, _b, _c, _d, _e, _f, _g;
+    const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent = true, maxSize, defaultSize, isPreview = false, sxpParameter, appDomain, hashTagSize, loadingImage, isOpenHashTag = false, enabledMetaConversionApi = false, consentHeight, consentWidth, isShowTag = true, isOpenConsent = false, globalConfig, isEditor = false }) => {
+        var _a, _b, _c;
         const [rtcList, setRtcList] = React.useState([]);
         const [tagList, setTagList] = React.useState([]);
         const [loading, setLoading] = React.useState(false);
@@ -522,6 +522,10 @@
         const [videoRef, setVideoRef] = React.useState(null);
         const themeTag = React.useRef();
         const curTime = React.useRef();
+        const isShowConsent = React.useMemo(() => {
+            var _a, _b, _c, _d;
+            return (((_d = (_c = (_b = (_a = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.consent) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.item) === null || _c === void 0 ? void 0 : _c.props) === null || _d === void 0 ? void 0 : _d.privacy_necessity) && !isAgreePolicy && !isEditor) || isOpenConsent;
+        }, [isAgreePolicy, globalConfig, isOpenConsent, isEditor]);
         React.useEffect(() => {
             const handleChangeThemeTag = (tag) => {
                 themeTag.current = tag;
@@ -566,10 +570,10 @@
         }, [bffDataSource]);
         // 获取推荐视频数据
         const getRecommendVideos = React.useCallback((query) => __awaiter(void 0, void 0, void 0, function* () {
-            var _h, _j, _k, _l, _m;
+            var _d, _e, _f, _g, _h;
             query = {
-                maxSize: (_h = query === null || query === void 0 ? void 0 : query.maxSize) !== null && _h !== void 0 ? _h : maxSize,
-                defaultSize: (_j = query === null || query === void 0 ? void 0 : query.defaultSize) !== null && _j !== void 0 ? _j : defaultSize,
+                maxSize: (_d = query === null || query === void 0 ? void 0 : query.maxSize) !== null && _d !== void 0 ? _d : maxSize,
+                defaultSize: (_e = query === null || query === void 0 ? void 0 : query.defaultSize) !== null && _e !== void 0 ? _e : defaultSize,
                 'itemFilter.itemId': query === null || query === void 0 ? void 0 : query['itemFilter.itemId'],
                 'itemFilter.itemType': query === null || query === void 0 ? void 0 : query['itemFilter.itemType'],
                 hashTag: query === null || query === void 0 ? void 0 : query.hashTag,
@@ -577,10 +581,10 @@
                 themeTag: query === null || query === void 0 ? void 0 : query.themeTag
             };
             if (utmVal) {
-                const val = (_m = (_l = (_k = utmVal === null || utmVal === void 0 ? void 0 : utmVal.split('&')) === null || _k === void 0 ? void 0 : _k.filter((val) => {
+                const val = (_h = (_g = (_f = utmVal === null || utmVal === void 0 ? void 0 : utmVal.split('&')) === null || _f === void 0 ? void 0 : _f.filter((val) => {
                     const key = val.split('=')[0];
                     return UTM_KEYS.includes(key);
-                })) === null || _l === void 0 ? void 0 : _l.join('&')) !== null && _m !== void 0 ? _m : '';
+                })) === null || _g === void 0 ? void 0 : _g.join('&')) !== null && _h !== void 0 ? _h : '';
                 query = Object.assign(Object.assign({}, query), { channel: decodeURIComponent(val) });
             }
             const result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/recommend/list', { method: 'GET', query }));
@@ -592,7 +596,7 @@
             return result === null || result === void 0 ? void 0 : result.data;
         }), [bffFetch, utmVal, maxSize, defaultSize]);
         const loadVideos = React.useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-            var _o, _p;
+            var _j, _k;
             if (rtcList.length <= 0) {
                 return;
             }
@@ -602,8 +606,8 @@
                 'itemFilter.itemType': waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.itemType,
                 themeTag: themeTag.current
             });
-            setRtcList(rtcList.concat((_o = data === null || data === void 0 ? void 0 : data.recList) !== null && _o !== void 0 ? _o : []));
-            setCacheRtcList(cacheRtcList.concat((_p = data === null || data === void 0 ? void 0 : data.recList) !== null && _p !== void 0 ? _p : []));
+            setRtcList(rtcList.concat((_j = data === null || data === void 0 ? void 0 : data.recList) !== null && _j !== void 0 ? _j : []));
+            setCacheRtcList(cacheRtcList.concat((_k = data === null || data === void 0 ? void 0 : data.recList) !== null && _k !== void 0 ? _k : []));
         }), [getRecommendVideos, rtcList, waterFallData, cacheRtcList]);
         const bffEventReport = React.useCallback(({ userInfo, eventInfo }) => {
             // 关闭 BFF 事件上报
@@ -667,16 +671,16 @@
         }), [bffFetch]);
         // 获取 Tag
         const bffGetTagList = React.useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-            var _q, _r, _s, _t, _u;
+            var _l, _m, _o, _p, _q;
             if (!utmVal || !isShowTag)
                 return;
             try {
-                const val = (_s = (_r = (_q = utmVal === null || utmVal === void 0 ? void 0 : utmVal.split('&')) === null || _q === void 0 ? void 0 : _q.filter((val) => {
+                const val = (_o = (_m = (_l = utmVal === null || utmVal === void 0 ? void 0 : utmVal.split('&')) === null || _l === void 0 ? void 0 : _l.filter((val) => {
                     const key = val.split('=')[0];
                     return UTM_KEYS.includes(key);
-                })) === null || _r === void 0 ? void 0 : _r.join('&')) !== null && _s !== void 0 ? _s : '';
+                })) === null || _m === void 0 ? void 0 : _m.join('&')) !== null && _o !== void 0 ? _o : '';
                 const result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/tag/list', { method: 'GET', query: { channel: decodeURIComponent(val) } }));
-                setTagList((_u = (_t = result === null || result === void 0 ? void 0 : result.data) === null || _t === void 0 ? void 0 : _t.tags) !== null && _u !== void 0 ? _u : []);
+                setTagList((_q = (_p = result === null || result === void 0 ? void 0 : result.data) === null || _p === void 0 ? void 0 : _p.tags) !== null && _q !== void 0 ? _q : []);
             }
             catch (e) {
                 console.log('e', e);
@@ -730,7 +734,7 @@
             h5EnterLink();
         }, []);
         React.useEffect(() => {
-            if (!isAgreePolicy)
+            if (isShowConsent)
                 return;
             setLoading(true);
             bffGetTagList();
@@ -750,7 +754,7 @@
                 setLoading(false);
                 isInit.current = true;
             });
-        }, [isAgreePolicy]);
+        }, [isShowConsent]);
         React.useEffect(() => {
             if (!isInit.current)
                 return;
@@ -808,7 +812,7 @@
                 curTime,
                 h5EnterLink,
                 themeTag
-            } }, (((_d = (_c = (_b = (_a = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.consent) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.item) === null || _c === void 0 ? void 0 : _c.props) === null || _d === void 0 ? void 0 : _d.privacy_necessity) && !isAgreePolicy) || isOpenConsent ? (React.createElement(Consent$3, Object.assign({}, (_g = (_f = (_e = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.consent) === null || _e === void 0 ? void 0 : _e[0]) === null || _f === void 0 ? void 0 : _f.item) === null || _g === void 0 ? void 0 : _g.props))) : (render({
+            } }, isShowConsent ? (React.createElement(Consent$3, Object.assign({}, (_c = (_b = (_a = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.consent) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.item) === null || _c === void 0 ? void 0 : _c.props))) : (render({
             rtcList,
             mutateLike: bffMutateLike,
             mutateUnlike: bffMutateUnlike,
@@ -12074,8 +12078,8 @@ Made in Italy` })));
             // 通过宽度比例获取图片高度
             const height = imgInfo.height * (unitWidth / imgInfo.width);
             if (isLoading) {
-                // 加40是因为下方文字部分高度为40，可以自己设置
-                sizeChange(height + 76 + space, index);
+                // 加56是因为下方文字部分高度为56，可以自己设置
+                sizeChange(height + 56 + space, index);
             }
         }, [imgInfo, index, unitWidth, isLoading, space]); /* 增加sizeChange依赖项会导致在admin预览编辑时无限刷新 */
         const calculateHeightForWidth = (videoWidth, videoHeight, targetWidth) => {
@@ -13597,7 +13601,7 @@ Made in Italy` })));
      * @Author: binruan@chatlabs.com
      * @Date: 2024-01-15 19:03:09
      * @LastEditors: binruan@chatlabs.com
-     * @LastEditTime: 2024-06-13 18:09:16
+     * @LastEditTime: 2024-06-18 11:50:31
      * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\index.tsx
      *
      */
@@ -13688,9 +13692,11 @@ Made in Italy` })));
                 if (document.visibilityState === 'hidden') {
                     // 当用户导航到新页面、切换标签页、关闭标签页、最小化或关闭浏览器、刷新原页面（即离开原页面时），或者在移动设备上从浏览器切换到不同的应用程序时
                     // 移动端h5直接杀掉浏览器或宿主app时不会触发，pc端直接杀掉标签页时能触发
-                    SXP_EVENT_BUS.emit(SXP_EVENT_TYPE.PAGE_DID_HIDE, item);
-                    handleReportViewImageEnd(item);
-                    handleReportProductView(item);
+                    if (!openHashtag) {
+                        SXP_EVENT_BUS.emit(SXP_EVENT_TYPE.PAGE_DID_HIDE, item);
+                        handleReportViewImageEnd(item);
+                        handleReportProductView(item);
+                    }
                     let fromKName = '';
                     if (popupDetailData && (((_b = (_a = item === null || item === void 0 ? void 0 : item.video) === null || _a === void 0 ? void 0 : _a.bindProducts) === null || _b === void 0 ? void 0 : _b.length) || ((_c = item === null || item === void 0 ? void 0 : item.video) === null || _c === void 0 ? void 0 : _c.bindProduct))) {
                         fromKName = 'pdpPage';
@@ -13727,8 +13733,10 @@ Made in Italy` })));
                 else if (document.visibilityState === 'visible') {
                     // 页面可见时触发，注意页面初始化时不会触发
                     handleH5EnterLink();
-                    handleViewImageStartEvent(activeIndex);
-                    SXP_EVENT_BUS.emit(SXP_EVENT_TYPE.PAGE_DID_SHOW, item);
+                    if (!openHashtag) {
+                        handleViewImageStartEvent(activeIndex);
+                        SXP_EVENT_BUS.emit(SXP_EVENT_TYPE.PAGE_DID_SHOW, item);
+                    }
                     backMainFeed('external');
                 }
             };
@@ -13745,7 +13753,8 @@ Made in Italy` })));
             isFromHashtag,
             tempMap,
             curTime,
-            backMainFeed
+            backMainFeed,
+            openHashtag
         ]);
         React.useEffect(() => {
             const initTime = () => {