pb-sxp-ui 1.0.79 → 1.0.81

package/dist/index.cjs

@@ -393,6 +393,7 @@ const getFeSessionId = () => {
 
 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)) {
@@ -437,6 +438,70 @@ var SXP_EVENT_TYPE;
     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: []
@@ -446,13 +511,15 @@ var DataSourceType;
     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();
@@ -462,6 +529,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
     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;
@@ -506,10 +574,10 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
     }, [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,
@@ -517,10 +585,10 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             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 }));
@@ -532,7 +600,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         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;
         }
@@ -542,8 +610,8 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             '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 事件上报
@@ -607,16 +675,16 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
     }), [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);
@@ -640,7 +708,38 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             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()
@@ -659,7 +758,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             setLoading(false);
             isInit.current = true;
         });
-    }, []);
+    }, [isAgreePolicy]);
     React.useEffect(() => {
         if (!isInit.current)
             return;
@@ -711,14 +810,19 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             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);
 
@@ -984,7 +1088,7 @@ var defaultSetting = {
  *
  */
 var _a$5, _b$5, _c;
-var settingRender$5 = [
+var settingRender$6 = [
     {
         type: 'Text',
         label: '组件名称',
@@ -1122,7 +1226,7 @@ var settingRender$5 = [
  * @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
  *
  */
@@ -1192,9 +1296,21 @@ function useEventReport() {
             }
         });
     }, [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
     };
 }
 
@@ -1299,7 +1415,7 @@ const AppointForm = createMaterial(AppointFormComponent, {
     category: 'popup',
     type: 'AppointForm',
     related: {
-        settingRender: settingRender$5,
+        settingRender: settingRender$6,
         bindableProps: [],
         interactionRender: interactionRender$8
     },
@@ -1325,7 +1441,7 @@ const AppointForm = createMaterial(AppointFormComponent, {
 });
 
 var _a$4, _b$4;
-var settingRender$4 = [
+var settingRender$5 = [
     {
         title: '商品图片',
         child: [
@@ -8639,7 +8755,7 @@ const CommodityDetail = createMaterial(CommodityDetailComponent, {
     category: 'popup',
     type: 'CommodityDetail',
     related: {
-        settingRender: settingRender$4
+        settingRender: settingRender$5
     },
     defaulSetting: {
         props: {
@@ -8705,7 +8821,7 @@ var interactionRender$7 = [
  *
  */
 var _a$3, _b$3;
-var settingRender$3 = [
+var settingRender$4 = [
     {
         title: '',
         child: [
@@ -8832,7 +8948,7 @@ const Prompt = createMaterial(PromptComponent, {
     category: 'popup',
     type: 'Prompt',
     related: {
-        settingRender: settingRender$3,
+        settingRender: settingRender$4,
         bindableProps: [],
         interactionRender: interactionRender$7
     },
@@ -8858,7 +8974,7 @@ var _a$2, _b$2;
  * @FilePath: \pb-sxp-ui\src\materials\sxp\popup\CommodityDetailDiroNew\settingRender.tsx
  *
  */
-var settingRender$2 = [
+var settingRender$3 = [
     {
         title: '商品图片',
         child: [
@@ -9181,7 +9297,7 @@ const CommodityDetailDiroNew = createMaterial(CommodityDetailDiroNewComponent, {
     category: 'popup',
     type: 'CommodityDetailDiroNew',
     related: {
-        settingRender: settingRender$2
+        settingRender: settingRender$3
     },
     defaulSetting: {
         props: {
@@ -9242,7 +9358,7 @@ var _a$1, _b$1;
  * @FilePath: \pb-sxp-ui\src\materials\sxp\template\components\settingRender.tsx
  *
  */
-var settingRender$1 = [
+var settingRender$2 = [
     {
         title: '主题样式',
         child: [
@@ -9594,7 +9710,7 @@ const Commodity = createMaterial(CommodityComponent, {
     related: {
         interactionRender: interactionRender$6,
         bindableProps: [],
-        settingRender: settingRender$1
+        settingRender: settingRender$2
     },
     defaulSetting: {
         props: {
@@ -9673,7 +9789,7 @@ const Appoint = createMaterial(AppointComponent, {
     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: {
@@ -9750,7 +9866,7 @@ const Link = createMaterial(LinkComponent, {
     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: {
@@ -9842,7 +9958,7 @@ const CommodityDiro = createMaterial(CommodityDiroComponent, {
     type: 'CommodityDiro',
     related: {
         interactionRender: interactionRender$4,
-        settingRender: settingRender$1,
+        settingRender: settingRender$2,
         bindableProps: []
     },
     defaulSetting: {
@@ -9941,7 +10057,7 @@ const CommodityDiroNew = createMaterial(CommodityDiroNewComponent, {
     related: {
         interactionRender: interactionRender$3,
         bindableProps: [],
-        settingRender: settingRender$1
+        settingRender: settingRender$2
     },
     defaulSetting: {
         props: {
@@ -10086,7 +10202,7 @@ const MultiCommodityDiro = createMaterial(MultiCommodityDiroComponent, {
     related: {
         interactionRender: interactionRender$2,
         bindableProps: [],
-        settingRender: settingRender$1
+        settingRender: settingRender$2
     },
     defaulSetting: {
         props: {
@@ -10200,7 +10316,7 @@ const MultiCommodity = createMaterial(MultiCommodityComponent, {
     type: 'MultiCommodity',
     related: {
         interactionRender: interactionRender$1,
-        settingRender: settingRender$1,
+        settingRender: settingRender$2,
         bindableProps: []
     },
     defaulSetting: {
@@ -10316,7 +10432,7 @@ const MultiCommodityDiroNew = createMaterial(MultiCommodityDiroNewComponent, {
     related: {
         interactionRender,
         bindableProps: [],
-        settingRender: settingRender$1
+        settingRender: settingRender$2
     },
     defaulSetting: {
         props: {
@@ -10362,11 +10478,11 @@ var _a, _b;
  * @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: [
@@ -10389,7 +10505,8 @@ var settingRender = [
             {
                 type: 'Switch',
                 label: '固定宽高',
-                name: ['props', 'isWaterfallFlow']
+                name: ['props', 'openFixedSize'],
+                initialValue: true
             }
         ]
     },
@@ -11998,8 +12115,8 @@ const WaterfallFlowItem$1 = (props) => {
             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);
@@ -12203,25 +12320,30 @@ function WaterfallList$1(_a) {
     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";
@@ -12350,8 +12472,8 @@ const WaterfallFlowItem = (props) => {
             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();
@@ -12422,31 +12544,37 @@ function WaterfallList(_a) {
     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();
@@ -12467,6 +12595,9 @@ const WaterFall = (props) => {
         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);
@@ -12534,7 +12665,7 @@ const WaterFall = (props) => {
             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);
 
@@ -12565,7 +12696,7 @@ const HashTag = createMaterial(HashTagComponent, {
     category: 'base',
     type: 'HashTag',
     related: {
-        settingRender,
+        settingRender: settingRender$1,
         bindableProps: []
     },
     defaulSetting: {
@@ -12622,6 +12753,84 @@ const HashTag = createMaterial(HashTagComponent, {
     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
@@ -12640,6 +12849,7 @@ var _materials_ = /*#__PURE__*/Object.freeze({
     CommodityDetailDiroNew: CommodityDetailDiroNew,
     CommodityDiro: CommodityDiro,
     CommodityDiroNew: CommodityDiroNew,
+    Consent: Consent,
     HashTag: HashTag,
     Link: Link,
     MultiCommodity: MultiCommodity,
@@ -13312,16 +13522,37 @@ const Nudge = ({ nudge }) => {
         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;
@@ -13353,7 +13584,7 @@ var Tagbar$1 = React.memo(Tagbar);
  * @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
  *
  */
@@ -13364,11 +13595,11 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
     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();
@@ -13376,44 +13607,20 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
         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;
@@ -13509,13 +13716,33 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
                 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) {
@@ -14257,7 +14484,7 @@ const Popup = () => {
  * @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
  *
  */
@@ -14274,14 +14501,14 @@ Object.values(_materials_).forEach((v) => {
     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 })),
@@ -14300,8 +14527,9 @@ var index = React.memo(SxpPageCore);
  */
 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,
@@ -14309,11 +14537,20 @@ const EditorDataProvider = ({ children, data }) => {
                 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() {