pb-sxp-ui 1.0.79 → 1.0.81

package/dist/pb-ui.js

@@ -385,6 +385,7 @@
 
     const FAKE_USER_KEY = 'SXP_FAKE_USER_ID';
     const FAKE_USER_STATE = 'FAKE_USER_STATE';
+    const AGREE_POLICY = 'AGREE_POLICY';
     const storeAndLoadFeUserId = () => {
         let fakeUserId = window.localStorage.getItem(FAKE_USER_KEY);
         if (lodash.isEmpty(fakeUserId)) {
@@ -429,6 +430,70 @@
         SXP_EVENT_TYPE["CHANGE_THEME_TAG"] = "changeThemeTag";
     })(SXP_EVENT_TYPE || (SXP_EVENT_TYPE = {}));
 
+    /*
+     * @Author: binruan@chatlabs.com
+     * @Date: 2024-06-13 15:16:53
+     * @LastEditors: binruan@chatlabs.com
+     * @LastEditTime: 2024-06-13 18:22:53
+     * @FilePath: \pb-sxp-ui\src\core\components\Consent\index.tsx
+     *
+     */
+    const Consent$2 = ({ width = window.innerWidth, height = window.innerHeight, privacy_title, privacy_context, privacy_policy_url, privacy_policy_title }) => {
+        const { setIsAgreePolicy, bffEventReport } = useSxpDataSource();
+        const channelObj = React.useMemo(() => {
+            const queryString = location.search.slice(1);
+            const params = qs.parse(queryString.replace(/\+/g, '%2B'));
+            for (const key in params) {
+                params[key] = params[key].replace(/%2B/g, '+');
+            }
+            return params;
+        }, []);
+        const getUtmValue = (key) => { var _a; return (_a = channelObj[key]) !== null && _a !== void 0 ? _a : null; };
+        React.useEffect(() => {
+            bffEventReport === null || bffEventReport === void 0 ? void 0 : bffEventReport({
+                eventInfo: {
+                    eventSubject: 'privacyEnter',
+                    eventDescription: 'User enter privacy page',
+                    utmSource: getUtmValue('utm_source'),
+                    utmMedium: getUtmValue('utm_medium'),
+                    utmCampaign: getUtmValue('utm_campaign'),
+                    utmId: getUtmValue('utm_id'),
+                    utmContent: getUtmValue('utm_content'),
+                    clSource: getUtmValue('cl_source'),
+                    enterTime: `${Date.now()}`,
+                    enterUrl: window.location.href,
+                    rtc: null,
+                    requestId: null,
+                    sessionID: null
+                }
+            });
+        }, []);
+        const handleAgree = () => {
+            bffEventReport === null || bffEventReport === void 0 ? void 0 : bffEventReport({
+                eventInfo: {
+                    eventSubject: 'userConsent',
+                    eventDescription: '用户授权【操作结果】',
+                    consentResult: '0',
+                    consentTags: '[]',
+                    rtc: null,
+                    requestId: null,
+                    sessionID: null
+                }
+            });
+            setIsAgreePolicy === null || setIsAgreePolicy === void 0 ? void 0 : setIsAgreePolicy(true);
+            window.localStorage.setItem(AGREE_POLICY, 'yes');
+        };
+        return (React.createElement("div", { className: 'consent-bg' },
+            React.createElement("div", { className: 'consent' },
+                React.createElement("div", { className: 'consent-col' },
+                    React.createElement("div", { className: 'consent-title' }, privacy_title !== null && privacy_title !== void 0 ? privacy_title : 'Privacy Policy'),
+                    React.createElement("div", { className: 'consent-content' }, privacy_context !== null && privacy_context !== void 0 ? privacy_context : 'This site uses cookies to improve your online experience. By continuing to use the site please agree the policy first.')),
+                React.createElement("div", { className: 'consent-col' },
+                    React.createElement("button", { className: 'consent-btn', onClick: handleAgree }, "Agree"),
+                    React.createElement("a", { className: 'consent-policy', target: '_blank', href: privacy_policy_url }, privacy_policy_title !== null && privacy_policy_title !== void 0 ? privacy_policy_title : 'More information')))));
+    };
+    var Consent$3 = React.memo(Consent$2);
+
     const SxpDataSourceContext = React.createContext({
         rtcList: [],
         tagList: []
@@ -438,13 +503,15 @@
         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, isShowTag = true }) => {
+    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 [rtcList, setRtcList] = React.useState([]);
         const [tagList, setTagList] = React.useState([]);
         const [loading, setLoading] = React.useState(false);
         const [curReqInfo, setCurReqInfo] = React.useState({ rtc: '', requestId: '' });
         const swiperRef = React.useRef(null);
         const isInit = React.useRef(false);
+        const [isAgreePolicy, setIsAgreePolicy] = React.useState(() => !!window.localStorage.getItem(AGREE_POLICY));
         // 弹窗数据
         const [popupDetailData, setPopupDetailData] = React.useState();
         const [waterFallData, setWaterFallData] = React.useState();
@@ -454,6 +521,7 @@
         const [isFromHashtag, setIsFromHashtag] = React.useState(false);
         const [videoRef, setVideoRef] = React.useState(null);
         const themeTag = React.useRef();
+        const curTime = React.useRef();
         React.useEffect(() => {
             const handleChangeThemeTag = (tag) => {
                 themeTag.current = tag;
@@ -498,10 +566,10 @@
         }, [bffDataSource]);
         // 获取推荐视频数据
         const getRecommendVideos = React.useCallback((query) => __awaiter(void 0, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e;
+            var _h, _j, _k, _l, _m;
             query = {
-                maxSize: (_a = query === null || query === void 0 ? void 0 : query.maxSize) !== null && _a !== void 0 ? _a : maxSize,
-                defaultSize: (_b = query === null || query === void 0 ? void 0 : query.defaultSize) !== null && _b !== void 0 ? _b : defaultSize,
+                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,
                 '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,
@@ -509,10 +577,10 @@
                 themeTag: query === null || query === void 0 ? void 0 : query.themeTag
             };
             if (utmVal) {
-                const val = (_e = (_d = (_c = utmVal === null || utmVal === void 0 ? void 0 : utmVal.split('&')) === null || _c === void 0 ? void 0 : _c.filter((val) => {
+                const val = (_m = (_l = (_k = utmVal === null || utmVal === void 0 ? void 0 : utmVal.split('&')) === null || _k === void 0 ? void 0 : _k.filter((val) => {
                     const key = val.split('=')[0];
                     return UTM_KEYS.includes(key);
-                })) === null || _d === void 0 ? void 0 : _d.join('&')) !== null && _e !== void 0 ? _e : '';
+                })) === null || _l === void 0 ? void 0 : _l.join('&')) !== null && _m !== void 0 ? _m : '';
                 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 }));
@@ -524,7 +592,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 _f, _g;
+            var _o, _p;
             if (rtcList.length <= 0) {
                 return;
             }
@@ -534,8 +602,8 @@
                 'itemFilter.itemType': waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.itemType,
                 themeTag: themeTag.current
             });
-            setRtcList(rtcList.concat((_f = data === null || data === void 0 ? void 0 : data.recList) !== null && _f !== void 0 ? _f : []));
-            setCacheRtcList(cacheRtcList.concat((_g = data === null || data === void 0 ? void 0 : data.recList) !== null && _g !== void 0 ? _g : []));
+            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 : []));
         }), [getRecommendVideos, rtcList, waterFallData, cacheRtcList]);
         const bffEventReport = React.useCallback(({ userInfo, eventInfo }) => {
             // 关闭 BFF 事件上报
@@ -599,16 +667,16 @@
         }), [bffFetch]);
         // 获取 Tag
         const bffGetTagList = React.useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-            var _h, _j, _k, _l, _m;
+            var _q, _r, _s, _t, _u;
             if (!utmVal || !isShowTag)
                 return;
             try {
-                const val = (_k = (_j = (_h = utmVal === null || utmVal === void 0 ? void 0 : utmVal.split('&')) === null || _h === void 0 ? void 0 : _h.filter((val) => {
+                const val = (_s = (_r = (_q = utmVal === null || utmVal === void 0 ? void 0 : utmVal.split('&')) === null || _q === void 0 ? void 0 : _q.filter((val) => {
                     const key = val.split('=')[0];
                     return UTM_KEYS.includes(key);
-                })) === null || _j === void 0 ? void 0 : _j.join('&')) !== null && _k !== void 0 ? _k : '';
+                })) === null || _r === void 0 ? void 0 : _r.join('&')) !== null && _s !== void 0 ? _s : '';
                 const result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/tag/list', { method: 'GET', query: { channel: decodeURIComponent(val) } }));
-                setTagList((_m = (_l = result === null || result === void 0 ? void 0 : result.data) === null || _l === void 0 ? void 0 : _l.tags) !== null && _m !== void 0 ? _m : []);
+                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 : []);
             }
             catch (e) {
                 console.log('e', e);
@@ -632,7 +700,38 @@
                 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 + '', contentId: (_l = (_k = rec === null || rec === void 0 ? void 0 : rec.video) === null || _k === void 0 ? void 0 : _k.itemId) !== null && _l !== void 0 ? _l : '', productId: 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]);
+        const h5EnterLink = React.useCallback(() => {
+            var _a, _b;
+            const queryString = location.search.slice(1);
+            const params = qs.parse(queryString.replace(/\+/g, '%2B'));
+            for (const key in params) {
+                params[key] = params[key].replace(/%2B/g, '+');
+            }
+            const getVal = (key) => { var _a; return (_a = params[key]) !== null && _a !== void 0 ? _a : ''; };
+            const time = new Date();
+            curTime.current = time;
+            bffEventReport === null || bffEventReport === void 0 ? void 0 : bffEventReport({
+                eventInfo: {
+                    eventSubject: 'h5LinkEnterFeed',
+                    eventDescription: 'User enter h5 link',
+                    utmSource: getVal('utm_source'),
+                    utmMedium: getVal('utm_medium'),
+                    utmCampaign: getVal('utm_campaign'),
+                    utmId: getVal('utm_id'),
+                    utmContent: getVal('utm_content'),
+                    enterTime: Math.floor(time / 1000) + '',
+                    requestId: null,
+                    enterUrl: (_b = (_a = window === null || window === void 0 ? void 0 : window.location) === null || _a === void 0 ? void 0 : _a.href) !== null && _b !== void 0 ? _b : '',
+                    clSource: getVal('cl_source')
+                }
+            });
+        }, [bffEventReport]);
+        React.useEffect(() => {
+            h5EnterLink();
+        }, []);
         React.useEffect(() => {
+            if (!isAgreePolicy)
+                return;
             setLoading(true);
             bffGetTagList();
             getRecommendVideos()
@@ -651,7 +750,7 @@
                 setLoading(false);
                 isInit.current = true;
             });
-        }, []);
+        }, [isAgreePolicy]);
         React.useEffect(() => {
             if (!isInit.current)
                 return;
@@ -703,14 +802,19 @@
                 setLoading,
                 videoRef,
                 setVideoRef,
-                bffFbReport
-            } }, render({
+                bffFbReport,
+                isAgreePolicy,
+                setIsAgreePolicy,
+                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({
             rtcList,
             mutateLike: bffMutateLike,
             mutateUnlike: bffMutateUnlike,
             submitForm: bffSubmitForm,
             tagList
-        })));
+        }))));
     };
     var SxpDataSourceProvider$1 = React.memo(SxpDataSourceProvider);
 
@@ -976,7 +1080,7 @@
      *
      */
     var _a$5, _b$5, _c;
-    var settingRender$5 = [
+    var settingRender$6 = [
         {
             type: 'Text',
             label: '组件名称',
@@ -1114,7 +1218,7 @@
      * @Author: binruan@chatlabs.com
      * @Date: 2024-03-12 10:59:06
      * @LastEditors: binruan@chatlabs.com
-     * @LastEditTime: 2024-04-15 09:47:08
+     * @LastEditTime: 2024-06-12 10:53:57
      * @FilePath: \pb-sxp-ui\src\core\hooks\useEventReport.ts
      *
      */
@@ -1184,9 +1288,21 @@
                 }
             });
         }, [bffEventReport, popupDetailData]);
+        const backMainFeed = React.useCallback((lastFeed, themeTag, hashTag) => {
+            bffEventReport === null || bffEventReport === void 0 ? void 0 : bffEventReport({
+                eventInfo: {
+                    lastFeed,
+                    themeTags: themeTag ? `[${themeTag}]` : '',
+                    hashTags: hashTag ? `[${hashTag}]` : '',
+                    eventSubject: 'backMainFeed',
+                    eventDescription: 'back Main Feed'
+                }
+            });
+        }, [bffEventReport]);
         return {
             jumpToWeb,
-            productView
+            productView,
+            backMainFeed
         };
     }
 
@@ -1291,7 +1407,7 @@
         category: 'popup',
         type: 'AppointForm',
         related: {
-            settingRender: settingRender$5,
+            settingRender: settingRender$6,
             bindableProps: [],
             interactionRender: interactionRender$8
         },
@@ -1317,7 +1433,7 @@
     });
 
     var _a$4, _b$4;
-    var settingRender$4 = [
+    var settingRender$5 = [
         {
             title: '商品图片',
             child: [
@@ -8631,7 +8747,7 @@
         category: 'popup',
         type: 'CommodityDetail',
         related: {
-            settingRender: settingRender$4
+            settingRender: settingRender$5
         },
         defaulSetting: {
             props: {
@@ -8697,7 +8813,7 @@
      *
      */
     var _a$3, _b$3;
-    var settingRender$3 = [
+    var settingRender$4 = [
         {
             title: '',
             child: [
@@ -8824,7 +8940,7 @@
         category: 'popup',
         type: 'Prompt',
         related: {
-            settingRender: settingRender$3,
+            settingRender: settingRender$4,
             bindableProps: [],
             interactionRender: interactionRender$7
         },
@@ -8850,7 +8966,7 @@
      * @FilePath: \pb-sxp-ui\src\materials\sxp\popup\CommodityDetailDiroNew\settingRender.tsx
      *
      */
-    var settingRender$2 = [
+    var settingRender$3 = [
         {
             title: '商品图片',
             child: [
@@ -9173,7 +9289,7 @@ Made in Italy` })));
         category: 'popup',
         type: 'CommodityDetailDiroNew',
         related: {
-            settingRender: settingRender$2
+            settingRender: settingRender$3
         },
         defaulSetting: {
             props: {
@@ -9234,7 +9350,7 @@ Made in Italy` })));
      * @FilePath: \pb-sxp-ui\src\materials\sxp\template\components\settingRender.tsx
      *
      */
-    var settingRender$1 = [
+    var settingRender$2 = [
         {
             title: '主题样式',
             child: [
@@ -9586,7 +9702,7 @@ Made in Italy` })));
         related: {
             interactionRender: interactionRender$6,
             bindableProps: [],
-            settingRender: settingRender$1
+            settingRender: settingRender$2
         },
         defaulSetting: {
             props: {
@@ -9665,7 +9781,7 @@ Made in Italy` })));
         type: 'Appoint',
         related: {
             interactionRender: interactionRender$5,
-            settingRender: settingRender$1 === null || settingRender$1 === void 0 ? void 0 : settingRender$1.filter((i) => i.type !== 'commodityTitle'),
+            settingRender: settingRender$2 === null || settingRender$2 === void 0 ? void 0 : settingRender$2.filter((i) => i.type !== 'commodityTitle'),
             bindableProps: []
         },
         defaulSetting: {
@@ -9742,7 +9858,7 @@ Made in Italy` })));
         category: 'template',
         type: 'Link',
         related: {
-            settingRender: settingRender$1 === null || settingRender$1 === void 0 ? void 0 : settingRender$1.filter((i) => i.type !== 'commodityTitle'),
+            settingRender: settingRender$2 === null || settingRender$2 === void 0 ? void 0 : settingRender$2.filter((i) => i.type !== 'commodityTitle'),
             bindableProps: []
         },
         defaulSetting: {
@@ -9834,7 +9950,7 @@ Made in Italy` })));
         type: 'CommodityDiro',
         related: {
             interactionRender: interactionRender$4,
-            settingRender: settingRender$1,
+            settingRender: settingRender$2,
             bindableProps: []
         },
         defaulSetting: {
@@ -9933,7 +10049,7 @@ Made in Italy` })));
         related: {
             interactionRender: interactionRender$3,
             bindableProps: [],
-            settingRender: settingRender$1
+            settingRender: settingRender$2
         },
         defaulSetting: {
             props: {
@@ -10078,7 +10194,7 @@ Made in Italy` })));
         related: {
             interactionRender: interactionRender$2,
             bindableProps: [],
-            settingRender: settingRender$1
+            settingRender: settingRender$2
         },
         defaulSetting: {
             props: {
@@ -10192,7 +10308,7 @@ Made in Italy` })));
         type: 'MultiCommodity',
         related: {
             interactionRender: interactionRender$1,
-            settingRender: settingRender$1,
+            settingRender: settingRender$2,
             bindableProps: []
         },
         defaulSetting: {
@@ -10308,7 +10424,7 @@ Made in Italy` })));
         related: {
             interactionRender,
             bindableProps: [],
-            settingRender: settingRender$1
+            settingRender: settingRender$2
         },
         defaulSetting: {
             props: {
@@ -10354,11 +10470,11 @@ Made in Italy` })));
      * @Author: binruan@chatlabs.com
      * @Date: 2024-04-07 14:07:12
      * @LastEditors: binruan@chatlabs.com
-     * @LastEditTime: 2024-05-23 11:03:15
+     * @LastEditTime: 2024-06-11 11:04:55
      * @FilePath: \pb-sxp-ui\src\materials\sxp\HashTag\settingRender.tsx
      *
      */
-    var settingRender = [
+    var settingRender$1 = [
         {
             title: 'Banner',
             child: [
@@ -10381,7 +10497,8 @@ Made in Italy` })));
                 {
                     type: 'Switch',
                     label: '固定宽高',
-                    name: ['props', 'isWaterfallFlow']
+                    name: ['props', 'openFixedSize'],
+                    initialValue: true
                 }
             ]
         },
@@ -11990,8 +12107,8 @@ Made in Italy` })));
                 React.createElement("div", { className: 'waterFallList-content-listItem-info-price', hidden: !priceText, style: textStyles.price }, priceText))));
     };
     function WaterfallList$1(_a) {
-        var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
-        var { reportTagsView } = _a, props = __rest(_a, ["reportTagsView"]);
+        var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+        var { reportTagsView, showBanner } = _a, props = __rest(_a, ["reportTagsView", "showBanner"]);
         const { waterFallData, getRecommendVideos, hashTagSize, loadingImage, isOpenHashTag } = useSxpDataSource();
         /** 滚动的父元素 */
         const scrollParent = React.useRef(null);
@@ -12195,25 +12312,30 @@ Made in Italy` })));
         return (React.createElement(React.Fragment, null, isLoadingData ? (React.createElement("div", { style: { height: '100%', width: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center' } },
             React.createElement("img", { width: 64, height: 64, src: loadingImage, alt: 'loading...', style: { objectFit: 'contain' } }))) : (React.createElement("div", { className: 'waterFallList', ref: waterfallFlowDom },
             React.createElement("div", { className: 'waterFallList-scroll', ref: scrollParent },
-                React.createElement("div", { className: 'waterFallList-info', style: (_b = props === null || props === void 0 ? void 0 : props.textStyles) === null || _b === void 0 ? void 0 : _b.hashTagDesc }, (_c = data === null || data === void 0 ? void 0 : data.tag) === null || _c === void 0 ? void 0 : _c.info),
-                React.createElement("div", { hidden: !((_d = data === null || data === void 0 ? void 0 : data.tag) === null || _d === void 0 ? void 0 : _d.link), className: 'waterFallList-collection', style: Object.assign({}, (_e = props === null || props === void 0 ? void 0 : props.textStyles) === null || _e === void 0 ? void 0 : _e.hashTagLink), onClick: handleClickLink }, ((_f = data === null || data === void 0 ? void 0 : data.tag) === null || _f === void 0 ? void 0 : _f.linkTitle) || 'Shop the collection'),
+                showBanner && ((_b = data === null || data === void 0 ? void 0 : data.tag) === null || _b === void 0 ? void 0 : _b.picture) && (React.createElement(FormatImage$1, { className: css.css({
+                        width: '100%',
+                        objectFit: 'cover',
+                        marginBottom: '20px'
+                    }), src: (_c = data === null || data === void 0 ? void 0 : data.tag) === null || _c === void 0 ? void 0 : _c.picture })),
+                React.createElement("div", { className: 'waterFallList-info', style: (_d = props === null || props === void 0 ? void 0 : props.textStyles) === null || _d === void 0 ? void 0 : _d.hashTagDesc }, (_e = data === null || data === void 0 ? void 0 : data.tag) === null || _e === void 0 ? void 0 : _e.info),
+                React.createElement("div", { hidden: !((_f = data === null || data === void 0 ? void 0 : data.tag) === null || _f === void 0 ? void 0 : _f.link), className: 'waterFallList-collection', style: Object.assign({}, (_g = props === null || props === void 0 ? void 0 : props.textStyles) === null || _g === void 0 ? void 0 : _g.hashTagLink), onClick: handleClickLink }, ((_h = data === null || data === void 0 ? void 0 : data.tag) === null || _h === void 0 ? void 0 : _h.linkTitle) || 'Shop the collection'),
                 React.createElement("div", { className: 'waterFallList-content' }, list === null || list === void 0 ? void 0 :
                     list.map((item, ind) => {
                         var _a;
                         return (React.createElement(WaterfallFlowItem$1, Object.assign({ key: ind, index: ind, rec: item, list: list, showBorder: scrollTop + ((_a = scrollParent === null || scrollParent === void 0 ? void 0 : scrollParent.current) === null || _a === void 0 ? void 0 : _a.clientHeight), style: styleList[ind], sizeChange: onSizeChange, unitWidth: unitWidth, reportTagsView: reportTagsView }, props)));
                     }),
-                    React.createElement("div", { hidden: !((_g = data === null || data === void 0 ? void 0 : data.tag) === null || _g === void 0 ? void 0 : _g.link), style: {
+                    React.createElement("div", { hidden: !((_j = data === null || data === void 0 ? void 0 : data.tag) === null || _j === void 0 ? void 0 : _j.link), style: {
                             position: 'absolute',
                             width: '100%',
-                            transform: `translate(0px,${(_m = ((_j = waterfallFlowListInfo === null || waterfallFlowListInfo === void 0 ? void 0 : waterfallFlowListInfo.current[((_h = waterfallFlowListInfo === null || waterfallFlowListInfo === void 0 ? void 0 : waterfallFlowListInfo.current) === null || _h === void 0 ? void 0 : _h.length) - 1]) === null || _j === void 0 ? void 0 : _j.top) +
-                            ((_l = waterfallFlowListInfo === null || waterfallFlowListInfo === void 0 ? void 0 : waterfallFlowListInfo.current[((_k = waterfallFlowListInfo === null || waterfallFlowListInfo === void 0 ? void 0 : waterfallFlowListInfo.current) === null || _k === void 0 ? void 0 : _k.length) - 1]) === null || _l === void 0 ? void 0 : _l.height)) !== null && _m !== void 0 ? _m : 0}px)`,
-                            height: ((_o = data === null || data === void 0 ? void 0 : data.tag) === null || _o === void 0 ? void 0 : _o.link)
-                                ? ((_p = buttonRef === null || buttonRef === void 0 ? void 0 : buttonRef.current) === null || _p === void 0 ? void 0 : _p.offsetHeight) || ((_q = props === null || props === void 0 ? void 0 : props.buttonBgStyle) === null || _q === void 0 ? void 0 : _q.height) || '100px'
+                            transform: `translate(0px,${(_p = ((_l = waterfallFlowListInfo === null || waterfallFlowListInfo === void 0 ? void 0 : waterfallFlowListInfo.current[((_k = waterfallFlowListInfo === null || waterfallFlowListInfo === void 0 ? void 0 : waterfallFlowListInfo.current) === null || _k === void 0 ? void 0 : _k.length) - 1]) === null || _l === void 0 ? void 0 : _l.top) +
+                            ((_o = waterfallFlowListInfo === null || waterfallFlowListInfo === void 0 ? void 0 : waterfallFlowListInfo.current[((_m = waterfallFlowListInfo === null || waterfallFlowListInfo === void 0 ? void 0 : waterfallFlowListInfo.current) === null || _m === void 0 ? void 0 : _m.length) - 1]) === null || _o === void 0 ? void 0 : _o.height)) !== null && _p !== void 0 ? _p : 0}px)`,
+                            height: ((_q = data === null || data === void 0 ? void 0 : data.tag) === null || _q === void 0 ? void 0 : _q.link)
+                                ? ((_r = buttonRef === null || buttonRef === void 0 ? void 0 : buttonRef.current) === null || _r === void 0 ? void 0 : _r.offsetHeight) || ((_s = props === null || props === void 0 ? void 0 : props.buttonBgStyle) === null || _s === void 0 ? void 0 : _s.height) || '100px'
                                 : 0
                         } }))),
-            React.createElement("div", { className: 'waterFallList-bottom', hidden: !((_r = data === null || data === void 0 ? void 0 : data.tag) === null || _r === void 0 ? void 0 : _r.link), style: props === null || props === void 0 ? void 0 : props.buttonBgStyle }),
-            React.createElement("div", { ref: buttonRef, hidden: !((_s = data === null || data === void 0 ? void 0 : data.tag) === null || _s === void 0 ? void 0 : _s.link), className: 'waterFallList-btn-wrap', style: Object.assign(Object.assign({}, props === null || props === void 0 ? void 0 : props.buttonBgStyle), { height: 'auto', backgroundColor: 'transparent' }) },
-                React.createElement("button", { className: 'waterFallList-btn', style: props === null || props === void 0 ? void 0 : props.buttonStyle, onClick: handleClickLink }, ((_t = data === null || data === void 0 ? void 0 : data.tag) === null || _t === void 0 ? void 0 : _t.linkTitle) || 'Shop the collection'))))));
+            React.createElement("div", { className: 'waterFallList-bottom', hidden: !((_t = data === null || data === void 0 ? void 0 : data.tag) === null || _t === void 0 ? void 0 : _t.link), style: props === null || props === void 0 ? void 0 : props.buttonBgStyle }),
+            React.createElement("div", { ref: buttonRef, hidden: !((_u = data === null || data === void 0 ? void 0 : data.tag) === null || _u === void 0 ? void 0 : _u.link), className: 'waterFallList-btn-wrap', style: Object.assign(Object.assign({}, props === null || props === void 0 ? void 0 : props.buttonBgStyle), { height: 'auto', backgroundColor: 'transparent' }) },
+                React.createElement("button", { className: 'waterFallList-btn', style: props === null || props === void 0 ? void 0 : props.buttonStyle, onClick: handleClickLink }, ((_v = data === null || data === void 0 ? void 0 : data.tag) === null || _v === void 0 ? void 0 : _v.linkTitle) || 'Shop the collection'))))));
     }
 
     var img$1 = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAaZJREFUeF7t2jFKBEEQRuG3mSJeQTARURDMTL2EqXfwAnoKD6FHMDEzNVIw2tzQC2gFggyDrExX1V92T7wz9PumFnqbXdH5teq8nwEwJqBzgfEVKDYAW8Ae8NZq3ZUm4Aa4AnaBR+C8BUIVAIu/ngSfAs9LESoAWLgB/LzWwP7SeLtfHWAu3tZ9Adz/dwD3eOUJCIlXBQiLVwQIjVcDCI9XAkiJVwFIi1cASI3PBpjb3jbd5GyyUcraCUrEZ02ATHwGgFR8NIBcfCSAZHwUgGx8BIB0vDeAfLwnQIl4L4Ay8R4ApeJbA2wD78DOZA/e7ABzk739Xz/T8rfAIfA6WYCd3BqA7NUSwCKfgLNKCK0BjoC7rzP74yoIrQGsuxSCB0ApBC+AMgieACUQvAHkESIApBGiAGQRIgEkEaIB5BAyAKQQsgBkEDIBJBCyAdIRFABSEVQA0hCUAFIQ1ADCERQBQhFUAcIQlAFCENQBfkOwg9eXpeftFQDmEOzv8ifARy8A3wiXwAHwANwujbf7q0xAi9bZZwwAN9oiDx4TUORFuS2z+wn4BAiAaEHnKChjAAAAAElFTkSuQmCC";
@@ -12342,8 +12464,8 @@ Made in Italy` })));
                 React.createElement("div", { className: 'list-content-listItem-info-price', style: textStyles === null || textStyles === void 0 ? void 0 : textStyles.price, hidden: !priceText }, priceText))));
     };
     function WaterfallList(_a) {
-        var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
-        var { reportTagsView } = _a, props = __rest(_a, ["reportTagsView"]);
+        var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+        var { reportTagsView, showBanner } = _a, props = __rest(_a, ["reportTagsView", "showBanner"]);
         const { waterFallData, getRecommendVideos, hashTagSize, loadingImage, isOpenHashTag } = useSxpDataSource();
         const [list, setList] = React.useState();
         const [data, setData] = React.useState();
@@ -12414,31 +12536,37 @@ Made in Italy` })));
         return (React.createElement(React.Fragment, null, isLoadingData ? (React.createElement("div", { style: { height: '100%', width: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center' } },
             React.createElement("img", { width: 64, height: 64, src: loadingImage, alt: 'loading...', style: { objectFit: 'contain' } }))) : (React.createElement("div", { className: 'list' },
             React.createElement("div", { className: 'list-scroll', ref: containerRef },
-                React.createElement("div", { className: 'list-info', style: (_b = props === null || props === void 0 ? void 0 : props.textStyles) === null || _b === void 0 ? void 0 : _b.hashTagDesc }, (_c = data === null || data === void 0 ? void 0 : data.tag) === null || _c === void 0 ? void 0 : _c.info),
-                React.createElement("div", { hidden: !((_d = data === null || data === void 0 ? void 0 : data.tag) === null || _d === void 0 ? void 0 : _d.link), className: 'list-collection', onClick: handleClickLink, style: Object.assign(Object.assign({}, (_e = props === null || props === void 0 ? void 0 : props.textStyles) === null || _e === void 0 ? void 0 : _e.hashTagLink), { marginBottom: props === null || props === void 0 ? void 0 : props.space }) }, ((_f = data === null || data === void 0 ? void 0 : data.tag) === null || _f === void 0 ? void 0 : _f.linkTitle) || 'Shop the collection'),
+                showBanner && ((_b = data === null || data === void 0 ? void 0 : data.tag) === null || _b === void 0 ? void 0 : _b.picture) && (React.createElement(FormatImage$1, { className: css.css({
+                        width: '100%',
+                        objectFit: 'cover',
+                        marginBottom: '20px'
+                    }), src: (_c = data === null || data === void 0 ? void 0 : data.tag) === null || _c === void 0 ? void 0 : _c.picture })),
+                React.createElement("div", { className: 'list-info', style: (_d = props === null || props === void 0 ? void 0 : props.textStyles) === null || _d === void 0 ? void 0 : _d.hashTagDesc }, (_e = data === null || data === void 0 ? void 0 : data.tag) === null || _e === void 0 ? void 0 : _e.info),
+                React.createElement("div", { hidden: !((_f = data === null || data === void 0 ? void 0 : data.tag) === null || _f === void 0 ? void 0 : _f.link), className: 'list-collection', onClick: handleClickLink, style: Object.assign(Object.assign({}, (_g = props === null || props === void 0 ? void 0 : props.textStyles) === null || _g === void 0 ? void 0 : _g.hashTagLink), { marginBottom: props === null || props === void 0 ? void 0 : props.space }) }, ((_h = data === null || data === void 0 ? void 0 : data.tag) === null || _h === void 0 ? void 0 : _h.linkTitle) || 'Shop the collection'),
                 React.createElement("div", { className: 'list-content' }, list === null || list === void 0 ? void 0 : list.map((item, ind) => {
                     return (React.createElement(WaterfallFlowItem, Object.assign({ key: ind, index: ind, rec: item, list: list, reportTagsView: reportTagsView }, props)));
                 })),
                 React.createElement("div", { hidden: !isLoadMore, style: { textAlign: 'center' } }, "loading..."),
-                React.createElement("div", { hidden: !((_g = data === null || data === void 0 ? void 0 : data.tag) === null || _g === void 0 ? void 0 : _g.link), style: {
-                        height: ((_h = data === null || data === void 0 ? void 0 : data.tag) === null || _h === void 0 ? void 0 : _h.link) ? ((_j = props === null || props === void 0 ? void 0 : props.buttonBgStyle) === null || _j === void 0 ? void 0 : _j.height) || ((_k = props === null || props === void 0 ? void 0 : props.buttonStyle) === null || _k === void 0 ? void 0 : _k.height) || '100px' : 0
+                React.createElement("div", { hidden: !((_j = data === null || data === void 0 ? void 0 : data.tag) === null || _j === void 0 ? void 0 : _j.link), style: {
+                        height: ((_k = data === null || data === void 0 ? void 0 : data.tag) === null || _k === void 0 ? void 0 : _k.link) ? ((_l = props === null || props === void 0 ? void 0 : props.buttonBgStyle) === null || _l === void 0 ? void 0 : _l.height) || ((_m = props === null || props === void 0 ? void 0 : props.buttonStyle) === null || _m === void 0 ? void 0 : _m.height) || '100px' : 0
                     } })),
-            React.createElement("div", { className: 'list-bottom', hidden: !((_l = data === null || data === void 0 ? void 0 : data.tag) === null || _l === void 0 ? void 0 : _l.link), style: props === null || props === void 0 ? void 0 : props.buttonBgStyle }),
-            React.createElement("div", { hidden: !((_m = data === null || data === void 0 ? void 0 : data.tag) === null || _m === void 0 ? void 0 : _m.link), className: 'list-btn-wrap', style: Object.assign(Object.assign({}, props === null || props === void 0 ? void 0 : props.buttonBgStyle), { height: 'auto', backgroundColor: 'transparent' }) },
-                React.createElement("button", { className: 'list-btn', style: props === null || props === void 0 ? void 0 : props.buttonStyle, onClick: handleClickLink }, ((_o = data === null || data === void 0 ? void 0 : data.tag) === null || _o === void 0 ? void 0 : _o.linkTitle) || 'Shop the collection'))))));
+            React.createElement("div", { className: 'list-bottom', hidden: !((_o = data === null || data === void 0 ? void 0 : data.tag) === null || _o === void 0 ? void 0 : _o.link), style: props === null || props === void 0 ? void 0 : props.buttonBgStyle }),
+            React.createElement("div", { hidden: !((_p = data === null || data === void 0 ? void 0 : data.tag) === null || _p === void 0 ? void 0 : _p.link), className: 'list-btn-wrap', style: Object.assign(Object.assign({}, props === null || props === void 0 ? void 0 : props.buttonBgStyle), { height: 'auto', backgroundColor: 'transparent' }) },
+                React.createElement("button", { className: 'list-btn', style: props === null || props === void 0 ? void 0 : props.buttonStyle, onClick: handleClickLink }, ((_q = data === null || data === void 0 ? void 0 : data.tag) === null || _q === void 0 ? void 0 : _q.linkTitle) || 'Shop the collection'))))));
     }
 
     /*
      * @Author: binruan@chatlabs.com
      * @Date: 2024-01-10 10:58:24
      * @LastEditors: binruan@chatlabs.com
-     * @LastEditTime: 2024-06-07 10:35:35
+     * @LastEditTime: 2024-06-12 14:18:56
      * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\WaterFall\index.tsx
      *
      */
     const WaterFall = (props) => {
         var _a;
-        const { waterFallData, setOpenHashtag, openHashtag, swiperRef, setWaterFallData, cacheRtcList, setRtcList, cacheActiveIndex, rtcList, setCacheRtcList, setIsFromHashtag, isFromHashtag, bffEventReport } = useSxpDataSource();
+        const { waterFallData, setOpenHashtag, openHashtag, swiperRef, setWaterFallData, cacheRtcList, setRtcList, cacheActiveIndex, rtcList, setCacheRtcList, setIsFromHashtag, isFromHashtag, bffEventReport, themeTag } = useSxpDataSource();
+        const { backMainFeed } = useEventReport();
         React.useRef(null);
         const modalEleRef = React.useRef(null);
         const [viewTime, setViewTime] = React.useState();
@@ -12459,6 +12587,9 @@ Made in Italy` })));
             if (!isEq && cacheRtcList && (cacheRtcList === null || cacheRtcList === void 0 ? void 0 : cacheRtcList.length)) {
                 setRtcList === null || setRtcList === void 0 ? void 0 : setRtcList(cacheRtcList);
             }
+            if (!(themeTag === null || themeTag === void 0 ? void 0 : themeTag.current)) {
+                backMainFeed('branch', themeTag === null || themeTag === void 0 ? void 0 : themeTag.current, waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.hashTag);
+            }
             reportTagsView();
             setWaterFallData === null || setWaterFallData === void 0 ? void 0 : setWaterFallData(undefined);
             setIsFromHashtag === null || setIsFromHashtag === void 0 ? void 0 : setIsFromHashtag(false);
@@ -12526,7 +12657,7 @@ Made in Italy` })));
                 display: openHashtag ? 'block' : 'none'
             } },
             React.createElement(Navbar$1, { icon: img$1, styles: { top: '32px' }, textStyle: (_a = props === null || props === void 0 ? void 0 : props.textStyles) === null || _a === void 0 ? void 0 : _a.hashTagTitle, onClose: handleClose }),
-            (props === null || props === void 0 ? void 0 : props.isWaterfallFlow) ? (React.createElement(WaterfallList$1, Object.assign({ reportTagsView: reportTagsView }, props))) : (React.createElement(WaterfallList, Object.assign({ reportTagsView: reportTagsView }, props)))), modalEleRef.current);
+            (props === null || props === void 0 ? void 0 : props.openFixedSize) === true || (props === null || props === void 0 ? void 0 : props.openFixedSize) === undefined ? (React.createElement(WaterfallList, Object.assign({ reportTagsView: reportTagsView }, props))) : (React.createElement(WaterfallList$1, Object.assign({ reportTagsView: reportTagsView }, props)))), modalEleRef.current);
     };
     var WaterFall$1 = React.memo(WaterFall);
 
@@ -12557,7 +12688,7 @@ Made in Italy` })));
         category: 'base',
         type: 'HashTag',
         related: {
-            settingRender,
+            settingRender: settingRender$1,
             bindableProps: []
         },
         defaulSetting: {
@@ -12614,6 +12745,84 @@ Made in Italy` })));
         sort: 2
     });
 
+    /*
+     * @Author: binruan@chatlabs.com
+     * @Date: 2024-06-13 10:08:32
+     * @LastEditors: binruan@chatlabs.com
+     * @LastEditTime: 2024-06-13 17:42:50
+     * @FilePath: \pb-sxp-ui\src\materials\sxp\Consent\settingRender.tsx
+     *
+     */
+    var settingRender = [
+        {
+            title: '协议详情',
+            child: [
+                {
+                    type: 'Switch',
+                    label: '必须同意用户协议',
+                    name: ['props', 'privacy_necessity'],
+                    extra: '当新用户进入页面时，会出现用户协议弹窗，用户需要先同意协议后才能访问内容。'
+                },
+                {
+                    type: 'Text',
+                    label: '弹窗标题',
+                    name: ['props', 'privacy_title']
+                },
+                {
+                    type: 'TextArea',
+                    label: '用户协议弹窗内容',
+                    name: ['props', 'privacy_context']
+                },
+                {
+                    type: 'Group',
+                    label: '隐私政策',
+                    child: [
+                        {
+                            type: 'Text',
+                            name: ['props', 'privacy_policy_title']
+                        },
+                        {
+                            type: 'Text',
+                            name: ['props', 'privacy_policy_url'],
+                            addonBefore: 'https://'
+                        }
+                    ],
+                    extra: '当用户点击更多信息按钮时，将会跳转至设置的链接查看政策内容'
+                }
+            ]
+        }
+    ];
+
+    const Consent$1 = (props) => {
+        return React.createElement(Consent$1, Object.assign({}, props));
+    };
+    var ConsentComponent = React.memo(Consent$1);
+
+    /*
+     * @Author: binruan@chatlabs.com
+     * @Date: 2023-07-28 18:29:57
+     * @LastEditors: binruan@chatlabs.com
+     * @LastEditTime: 2024-06-13 17:32:17
+     * @FilePath: \pb-sxp-ui\src\materials\sxp\Consent\material.tsx
+     *
+     */
+    const Consent = createMaterial(ConsentComponent, {
+        displayName: 'Consent',
+        icon: '',
+        category: 'base',
+        type: 'Consent',
+        related: {
+            settingRender
+        },
+        defaulSetting: {
+            props: {},
+            style: {}
+        },
+        w: 100,
+        h: 40,
+        sort: 1
+    });
+
     /*
      * @Author: binruan@chatlabs.com
      * @Date: 2023-07-25 14:56:49
@@ -12632,6 +12841,7 @@ Made in Italy` })));
         CommodityDetailDiroNew: CommodityDetailDiroNew,
         CommodityDiro: CommodityDiro,
         CommodityDiroNew: CommodityDiroNew,
+        Consent: Consent,
         HashTag: HashTag,
         Link: Link,
         MultiCommodity: MultiCommodity,
@@ -13304,16 +13514,37 @@ Made in Italy` })));
             React.createElement("p", { style: Object.assign(Object.assign({}, nudge === null || nudge === void 0 ? void 0 : nudge.textStyle), { textWrap: 'nowrap', textOverflow: 'ellipsis', overflow: 'hidden', whiteSpace: 'nowrap', flex: 1, marginBottom: 0 }) }, (_g = nudge === null || nudge === void 0 ? void 0 : nudge.content) !== null && _g !== void 0 ? _g : '')))));
     };
 
+    /*
+     * @Author: binruan@chatlabs.com
+     * @Date: 2024-04-29 16:32:21
+     * @LastEditors: binruan@chatlabs.com
+     * @LastEditTime: 2024-06-12 11:01:48
+     * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\Tagbar.tsx
+     *
+     */
     const DEFAULT_TAG = 'FOR U';
     const Tagbar = ({ tagList = [], setActiveIndex }) => {
         const [selectTag, setSelectTag] = React.useState(DEFAULT_TAG);
-        const { getRecommendVideos, setRtcList, setCacheRtcList, setCacheActiveIndex, setLoading, swiperRef, waterFallData } = useSxpDataSource();
+        const { getRecommendVideos, setRtcList, setCacheRtcList, setCacheActiveIndex, setLoading, swiperRef, waterFallData, bffEventReport } = useSxpDataSource();
+        const { backMainFeed } = useEventReport();
         const realTagList = React.useMemo(() => {
             return [DEFAULT_TAG, ...tagList];
         }, [tagList]);
         const handleSelectTag = (tag) => () => {
             if (tag === selectTag)
                 return;
+            if (tag !== 'FOR U') {
+                bffEventReport === null || bffEventReport === void 0 ? void 0 : bffEventReport({
+                    eventInfo: {
+                        eventSubject: 'clickThemeTagsViewContents',
+                        eventDescription: 'click Theme Tags View Contents',
+                        themeTags: `[${tag}]`
+                    }
+                });
+            }
+            else {
+                backMainFeed('theme', selectTag);
+            }
             let themeTag;
             if (tag !== DEFAULT_TAG) {
                 themeTag = tag;
@@ -13345,7 +13576,7 @@ Made in Italy` })));
      * @Author: binruan@chatlabs.com
      * @Date: 2024-01-15 19:03:09
      * @LastEditors: binruan@chatlabs.com
-     * @LastEditTime: 2024-06-07 11:10:42
+     * @LastEditTime: 2024-06-13 18:09:16
      * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\index.tsx
      *
      */
@@ -13356,11 +13587,11 @@ Made in Italy` })));
         const viewImageStartTime = React.useRef(0);
         const [isInit, setIsInit] = React.useState(false);
         const [isMuted, setIsMuted] = React.useState(true);
-        const curTime = React.useRef();
         const viewTime = React.useRef();
         const [isLoadMore, setIsLoadMore] = React.useState(false);
         const [isShowMore, setIsShowMore] = React.useState(false);
-        const { loadVideos, bffEventReport, loading, setPopupDetailData, ctaEvent, swiperRef, waterFallData, setOpenHashtag, appDomain, openHashtag, loadingImage, isFromHashtag, popupDetailData, bffFbReport } = useSxpDataSource();
+        const { loadVideos, bffEventReport, loading, setPopupDetailData, ctaEvent, swiperRef, waterFallData, setOpenHashtag, appDomain, openHashtag, loadingImage, isFromHashtag, popupDetailData, bffFbReport, curTime, h5EnterLink } = useSxpDataSource();
+        const { backMainFeed } = useEventReport();
         const [videoRef, setVideoRef] = React.useState(null);
         const playerRef = React.useRef();
         const { productView } = useEventReport();
@@ -13368,44 +13599,20 @@ Made in Italy` })));
             return data.length > 0 && !loading && getFeUserId();
         }, [data, loading]);
         const handleH5EnterLink = React.useCallback(() => {
-            var _a, _b;
             if (data.length <= 0) {
                 return;
             }
-            initTime();
-            // 刷新 sessionId
-            // refreshFeSessionId();
-            const queryString = location.search.slice(1);
-            const params = qs.parse(queryString.replace(/\+/g, '%2B'));
-            for (const key in params) {
-                params[key] = params[key].replace(/%2B/g, '+');
+            refreshFeSessionId();
+            const now = new Date();
+            viewTime.current = now;
+            if (isInit) {
+                h5EnterLink === null || h5EnterLink === void 0 ? void 0 : h5EnterLink();
             }
-            const getVal = (key) => { var _a; return (_a = params[key]) !== null && _a !== void 0 ? _a : ''; };
-            bffEventReport === null || bffEventReport === void 0 ? void 0 : bffEventReport({
-                eventInfo: {
-                    eventSubject: 'h5LinkEnterFeed',
-                    eventDescription: 'User enter h5 link',
-                    utmSource: getVal('utm_source'),
-                    utmMedium: getVal('utm_medium'),
-                    utmCampaign: getVal('utm_campaign'),
-                    utmId: getVal('utm_id'),
-                    utmContent: getVal('utm_content'),
-                    enterTime: `${Date.now()}`,
-                    requestId: null,
-                    enterUrl: (_b = (_a = window === null || window === void 0 ? void 0 : window.location) === null || _a === void 0 ? void 0 : _a.href) !== null && _b !== void 0 ? _b : '',
-                    clSource: getVal('cl_sourc')
-                }
-            });
             bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
                 eventName: 'PageView'
             });
             setIsInit(true);
-        }, [bffEventReport, data.length, bffFbReport]);
-        const initTime = () => {
-            curTime.current = new Date();
-            viewTime.current = new Date();
-            refreshFeSessionId();
-        };
+        }, [data.length, bffFbReport, h5EnterLink, isInit]);
         const firstRef = React.useRef();
         React.useEffect(() => {
             var _a, _b, _c, _d;
@@ -13501,13 +13708,33 @@ Made in Italy` })));
                     handleH5EnterLink();
                     handleViewImageStartEvent(activeIndex);
                     SXP_EVENT_BUS.emit(SXP_EVENT_TYPE.PAGE_DID_SHOW, item);
+                    backMainFeed('external');
                 }
             };
             document.addEventListener('visibilitychange', visibleChange);
             return () => {
                 document.removeEventListener('visibilitychange', visibleChange);
             };
-        }, [activeIndex, bffEventReport, curTime, data, handleH5EnterLink, popupDetailData, isFromHashtag, tempMap]);
+        }, [
+            activeIndex,
+            bffEventReport,
+            data,
+            handleH5EnterLink,
+            popupDetailData,
+            isFromHashtag,
+            tempMap,
+            curTime,
+            backMainFeed
+        ]);
+        React.useEffect(() => {
+            const initTime = () => {
+                backMainFeed('external');
+            };
+            window.addEventListener('pageshow', initTime);
+            return () => {
+                window.removeEventListener('pageshow', initTime);
+            };
+        }, []);
         const tagHeight = React.useMemo(() => {
             let h = 0;
             if (tagList.length > 0) {
@@ -14249,7 +14476,7 @@ Made in Italy` })));
      * @Author: binruan@chatlabs.com
      * @Date: 2024-01-15 19:03:09
      * @LastEditors: binruan@chatlabs.com
-     * @LastEditTime: 2024-05-17 18:41:05
+     * @LastEditTime: 2024-06-13 14:54:12
      * @FilePath: \pb-sxp-ui\src\core\components\SxpPageCore\index.tsx
      *
      */
@@ -14266,14 +14493,14 @@ Made in Italy` })));
         RESOLVER[v.extend.type] = v;
     });
     const SxpPageCore = ({ data, maxSize = 10, defaultSize = 10, hashTagSize = 20, loadingImage, appDomain, licenseUrl, enabledMetaConversionApi }) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         const utmVal = React.useMemo(() => {
             var _a;
             const searchParams = (location === null || location === void 0 ? void 0 : location.search) ? (_a = location === null || location === void 0 ? void 0 : location.search) === null || _a === void 0 ? void 0 : _a.replace('?', '') : '';
             return searchParams;
         }, []);
         return (React.createElement(EditorCore, { resolver: RESOLVER, enableDataSource: false, schema: data === null || data === void 0 ? void 0 : data.data, utmVal: utmVal },
-            React.createElement(SxpDataSourceProvider$1, { utmVal: utmVal, dataSources: data === null || data === void 0 ? void 0 : data.data_sources, sxpParameter: data === null || data === void 0 ? void 0 : data.sxp_parameter, maxSize: (_b = (_a = data === null || data === void 0 ? void 0 : data.sxp_parameter) === null || _a === void 0 ? void 0 : _a.personalized_recommend) !== null && _b !== void 0 ? _b : maxSize, defaultSize: (_d = (_c = data === null || data === void 0 ? void 0 : data.sxp_parameter) === null || _c === void 0 ? void 0 : _c.default_recommend) !== null && _d !== void 0 ? _d : defaultSize, hashTagSize: (_f = (_e = data === null || data === void 0 ? void 0 : data.sxp_parameter) === null || _e === void 0 ? void 0 : _e.hash_tag_size) !== null && _f !== void 0 ? _f : hashTagSize, loadingImage: loadingImage, appDomain: appDomain, enabledMetaConversionApi: enabledMetaConversionApi, isShowTag: (_j = (_h = (_g = data === null || data === void 0 ? void 0 : data.data) === null || _g === void 0 ? void 0 : _g.sxpPageConf) === null || _h === void 0 ? void 0 : _h.globalConfig) === null || _j === void 0 ? void 0 : _j.isShowTag, render: ({ rtcList, tagList }) => {
+            React.createElement(SxpDataSourceProvider$1, { utmVal: utmVal, dataSources: data === null || data === void 0 ? void 0 : data.data_sources, sxpParameter: data === null || data === void 0 ? void 0 : data.sxp_parameter, maxSize: (_b = (_a = data === null || data === void 0 ? void 0 : data.sxp_parameter) === null || _a === void 0 ? void 0 : _a.personalized_recommend) !== null && _b !== void 0 ? _b : maxSize, defaultSize: (_d = (_c = data === null || data === void 0 ? void 0 : data.sxp_parameter) === null || _c === void 0 ? void 0 : _c.default_recommend) !== null && _d !== void 0 ? _d : defaultSize, hashTagSize: (_f = (_e = data === null || data === void 0 ? void 0 : data.sxp_parameter) === null || _e === void 0 ? void 0 : _e.hash_tag_size) !== null && _f !== void 0 ? _f : hashTagSize, loadingImage: loadingImage, appDomain: appDomain, enabledMetaConversionApi: enabledMetaConversionApi, isShowTag: (_j = (_h = (_g = data === null || data === void 0 ? void 0 : data.data) === null || _g === void 0 ? void 0 : _g.sxpPageConf) === null || _h === void 0 ? void 0 : _h.globalConfig) === null || _j === void 0 ? void 0 : _j.isShowTag, globalConfig: (_l = (_k = data === null || data === void 0 ? void 0 : data.data) === null || _k === void 0 ? void 0 : _k.sxpPageConf) === null || _l === void 0 ? void 0 : _l.globalConfig, render: ({ rtcList, tagList }) => {
                     var _a;
                     return (React.createElement(React.Fragment, null,
                         React.createElement(SxpPageRender, Object.assign({}, (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.sxpPageConf, { tagList: tagList, data: rtcList, resolver: RESOLVER, licenseUrl: licenseUrl })),
@@ -14292,8 +14519,9 @@ Made in Italy` })));
      */
     const EditorDataContext = React.createContext({});
     const EditorDataProvider = ({ children, data }) => {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         const [openHashtag, setOpenHashtag] = React.useState(false);
+        const [openConsent, setOpenConsent] = React.useState(false);
         return (React.createElement(EditorDataContext.Provider, { value: {
                 sxpPrameter: {
                     bottomImage: (_a = data === null || data === void 0 ? void 0 : data.sxp_parameter) === null || _a === void 0 ? void 0 : _a.bottom_image,
@@ -14301,11 +14529,20 @@ Made in Italy` })));
                     personalizedRecommend: (_c = data === null || data === void 0 ? void 0 : data.sxp_parameter) === null || _c === void 0 ? void 0 : _c.personalized_recommend,
                     placeholderImage: (_d = data === null || data === void 0 ? void 0 : data.sxp_parameter) === null || _d === void 0 ? void 0 : _d.placeholder_image,
                     hashTagSize: (_e = data === null || data === void 0 ? void 0 : data.sxp_parameter) === null || _e === void 0 ? void 0 : _e.hash_tag_size,
-                    loadingImage: (_f = data === null || data === void 0 ? void 0 : data.sxp_parameter) === null || _f === void 0 ? void 0 : _f.loading_image
+                    loadingImage: (_f = data === null || data === void 0 ? void 0 : data.sxp_parameter) === null || _f === void 0 ? void 0 : _f.loading_image,
+                    privacyContent: (_g = data === null || data === void 0 ? void 0 : data.sxp_parameter) === null || _g === void 0 ? void 0 : _g.privacy_context,
+                    privacyNecessity: (_h = data === null || data === void 0 ? void 0 : data.sxp_parameter) === null || _h === void 0 ? void 0 : _h.privacy_necessity,
+                    privacyPolicyTitle: (_j = data === null || data === void 0 ? void 0 : data.sxp_parameter) === null || _j === void 0 ? void 0 : _j.privacy_policy_title,
+                    privacyPolicyUrl: (_k = data === null || data === void 0 ? void 0 : data.sxp_parameter) === null || _k === void 0 ? void 0 : _k.privacy_policy_url,
+                    privacyTitle: (_l = data === null || data === void 0 ? void 0 : data.sxp_parameter) === null || _l === void 0 ? void 0 : _l.privacy_title,
+                    template: (_m = data === null || data === void 0 ? void 0 : data.sxp_parameter) === null || _m === void 0 ? void 0 : _m.template,
+                    industry: (_o = data === null || data === void 0 ? void 0 : data.sxp_parameter) === null || _o === void 0 ? void 0 : _o.industry
                 },
                 appDomain: data === null || data === void 0 ? void 0 : data.appDomain,
                 openHashtag,
-                setOpenHashtag
+                setOpenHashtag,
+                openConsent,
+                setOpenConsent
             } }, children));
     };
     function useEditorDataProvider() {