pb-sxp-ui 1.15.2 → 1.15.4

package/es/core/components/Consent/index.js

@@ -29,7 +29,6 @@ const Consent = ({ width = window.innerWidth, height = window.innerHeight, priva
                 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,

package/es/core/components/SxpPageRender/ConsentPopup.js

@@ -1,15 +1,15 @@
-import React, { memo, useMemo } from 'react';
+import React, { memo } from 'react';
 import './index.less';
 import withBindDataSource from '../../../core/hoc/withBindDataSource';
-import { getContsentState } from '../../../core/utils/localStore';
+import { useEditorDataProvider } from '../../../core/context/EditorDataProvider';
 const Consent = ({ resolver, globalConfig }) => {
-    var _a, _b;
-    const contsentState = useMemo(() => {
-        return getContsentState();
-    }, []);
-    const t = resolver === null || resolver === void 0 ? void 0 : resolver['Display'];
-    const Component = withBindDataSource(t);
+    var _a, _b, _c;
+    const { consentPopupCate } = useEditorDataProvider();
     const value = (_b = (_a = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.consentPopup) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.item;
-    return React.createElement(Component, Object.assign({}, value === null || value === void 0 ? void 0 : value.props, { style: value === null || value === void 0 ? void 0 : value.style, event: (value === null || value === void 0 ? void 0 : value.event) || {}, contsentState: contsentState }));
+    if (!value || (!consentPopupCate && !((_c = value === null || value === void 0 ? void 0 : value.props) === null || _c === void 0 ? void 0 : _c.open)))
+        return null;
+    const t = resolver === null || resolver === void 0 ? void 0 : resolver[value === null || value === void 0 ? void 0 : value.type];
+    const Component = withBindDataSource(t);
+    return (React.createElement(Component, Object.assign({}, value === null || value === void 0 ? void 0 : value.props, { style: value === null || value === void 0 ? void 0 : value.style, event: (value === null || value === void 0 ? void 0 : value.event) || {}, consentPopupCate: consentPopupCate })));
 };
 export default memo(Consent);

package/es/core/components/SxpPageRender/Navbar.js

@@ -8,7 +8,7 @@ const Navbar = ({ icon, styles, textStyle, onClose }) => {
         React.createElement("button", { className: 'clc-sxp-nav-left', role: 'button', "aria-label": 'back button', onClick: onClose },
             React.createElement("img", { src: icon, alt: 'back button' })),
         React.createElement("div", { className: 'clc-sxp-nav-title', style: Object.assign(Object.assign({}, textStyle), { paddingLeft: (textStyle === null || textStyle === void 0 ? void 0 : textStyle.textAlign) === 'left' ? '35px' : 0 }), dangerouslySetInnerHTML: {
-                __html: setFontForText(`#${(_a = waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.hashTag) !== null && _a !== void 0 ? _a : '标题'}`, textStyle)
+                __html: setFontForText(`#${(_a = waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.hashTag) !== null && _a !== void 0 ? _a : 'title'}`, textStyle)
             } })));
 };
 export default memo(Navbar);

package/es/core/components/SxpPageRender/index.js

@@ -117,7 +117,7 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
                 contentId: (_m = item === null || item === void 0 ? void 0 : item.video) === null || _m === void 0 ? void 0 : _m.itemId,
                 productId: (_o = item === null || item === void 0 ? void 0 : item.product) === null || _o === void 0 ? void 0 : _o.itemId,
                 position: activeIndex + '',
-                fromKName: fk ? fk : fromKName,
+                fromKName: fk || fromKName,
                 fromKPage: location === null || location === void 0 ? void 0 : location.href,
                 ctatId: (_r = (_q = (_p = item === null || item === void 0 ? void 0 : item.video) === null || _p === void 0 ? void 0 : _p.bindCta) === null || _q === void 0 ? void 0 : _q.itemId) !== null && _r !== void 0 ? _r : '',
                 traceInfo: (_v = (_t = (_s = item === null || item === void 0 ? void 0 : item.video) === null || _s === void 0 ? void 0 : _s.traceInfo) !== null && _t !== void 0 ? _t : (_u = item === null || item === void 0 ? void 0 : item.product) === null || _u === void 0 ? void 0 : _u.traceInfo) !== null && _v !== void 0 ? _v : ''
@@ -144,9 +144,12 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
                     setIsReload(new Date().getTime());
                     skipLinkRef.current = false;
                 }
+                refreshFeSession === null || refreshFeSession === void 0 ? void 0 : refreshFeSession(false);
                 handleH5EnterLink();
                 if (repCond) {
-                    SXP_EVENT_BUS.emit(SXP_EVENT_TYPE.PAGE_DID_SHOW, item);
+                    setTimeout(() => {
+                        SXP_EVENT_BUS.emit(SXP_EVENT_TYPE.PAGE_DID_SHOW, item);
+                    });
                     backMainFeed('external', selectTag);
                 }
             }
@@ -408,7 +411,7 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
         }
     };
     const handleScrollEvent = (swiper) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
         const item = data[swiper.previousIndex];
         if (!item)
             return;
@@ -427,9 +430,9 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
                     contentId: (_e = (_d = item === null || item === void 0 ? void 0 : item.video) === null || _d === void 0 ? void 0 : _d.itemId) !== null && _e !== void 0 ? _e : '',
                     productId: (_g = (_f = item === null || item === void 0 ? void 0 : item.product) === null || _f === void 0 ? void 0 : _f.itemId) !== null && _g !== void 0 ? _g : '',
                     requestId: null,
-                    traceInfo: (_j = (_h = item === null || item === void 0 ? void 0 : item.video) === null || _h === void 0 ? void 0 : _h.traceInfo) !== null && _j !== void 0 ? _j : '',
+                    traceInfo: (_l = (_j = (_h = item === null || item === void 0 ? void 0 : item.video) === null || _h === void 0 ? void 0 : _h.traceInfo) !== null && _j !== void 0 ? _j : (_k = item === null || item === void 0 ? void 0 : item.product) === null || _k === void 0 ? void 0 : _k.traceInfo) !== null && _l !== void 0 ? _l : '',
                     contentFormat,
-                    position: ((_k = swiper.previousIndex) !== null && _k !== void 0 ? _k : 0) + ''
+                    position: ((_m = swiper.previousIndex) !== null && _m !== void 0 ? _m : 0) + ''
                 }
             });
             handleViewImageStartEnd(item);
@@ -440,12 +443,12 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
                 eventInfo: {
                     eventSubject: 'scrollUp',
                     eventDescription: 'User scroll up',
-                    contentId: (_m = (_l = item === null || item === void 0 ? void 0 : item.video) === null || _l === void 0 ? void 0 : _l.itemId) !== null && _m !== void 0 ? _m : '',
-                    productId: (_p = (_o = item.product) === null || _o === void 0 ? void 0 : _o.itemId) !== null && _p !== void 0 ? _p : '',
+                    contentId: (_p = (_o = item === null || item === void 0 ? void 0 : item.video) === null || _o === void 0 ? void 0 : _o.itemId) !== null && _p !== void 0 ? _p : '',
+                    productId: (_r = (_q = item.product) === null || _q === void 0 ? void 0 : _q.itemId) !== null && _r !== void 0 ? _r : '',
                     requestId: null,
-                    traceInfo: (_r = (_q = item === null || item === void 0 ? void 0 : item.video) === null || _q === void 0 ? void 0 : _q.traceInfo) !== null && _r !== void 0 ? _r : '',
+                    traceInfo: (_v = (_t = (_s = item === null || item === void 0 ? void 0 : item.video) === null || _s === void 0 ? void 0 : _s.traceInfo) !== null && _t !== void 0 ? _t : (_u = item === null || item === void 0 ? void 0 : item.product) === null || _u === void 0 ? void 0 : _u.traceInfo) !== null && _v !== void 0 ? _v : '',
                     contentFormat,
-                    position: ((_s = swiper.previousIndex) !== null && _s !== void 0 ? _s : 0) + ''
+                    position: ((_w = swiper.previousIndex) !== null && _w !== void 0 ? _w : 0) + ''
                 }
             });
             handleViewImageStartEnd(item);

package/es/core/context/SxpDataSourceProvider.d.ts

@@ -90,6 +90,8 @@ export interface ISxpDataSourceContext {
     setEventTimeList?: React.Dispatch<React.SetStateAction<Array<IEventTimeType>>>;
     multiPostTimeRef?: any;
     refreshFeSession?: (enableReSid?: boolean, event?: (fk: string) => void) => void;
+    getAccount?: () => Promise<any>;
+    accountSonsent?: (v: boolean) => Promise<boolean>;
 }
 export declare const SxpDataSourceContext: React.Context<ISxpDataSourceContext>;
 export interface SxpDataSourceProviderProps {

package/es/core/context/SxpDataSourceProvider.js

@@ -47,6 +47,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
     const [channel, setChannel] = useState();
     const [eventTimeList, setEventTimeList] = useState([]);
     const [playbookType, setPlaybookType] = useState();
+    const [chatlabsId, setChatlabsId] = useState();
     const finalPageData = useMemo(() => pageData !== null && pageData !== void 0 ? pageData : data, [pageData, data]);
     const isShowConsent = useMemo(() => {
         var _a, _b, _c, _d;
@@ -99,41 +100,35 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
     const bffDataSource = useMemo(() => {
         return dataSources === null || dataSources === void 0 ? void 0 : dataSources.find((d) => d.type === DataSourceType.BFF);
     }, [dataSources]);
+    const fakeUserId = useMemo(() => {
+        var _a;
+        return ((_a = bffDataSource === null || bffDataSource === void 0 ? void 0 : bffDataSource.headers) === null || _a === void 0 ? void 0 : _a['x-app-id']) + storeAndLoadFeUserId();
+    }, [bffDataSource]);
     const bffFetch = useCallback((path, options) => {
         if (!bffDataSource)
             return;
         const url = bffDataSource.url;
-        const fakeUserId = storeAndLoadFeUserId();
         if (options === null || options === void 0 ? void 0 : options.query) {
             const queryString = qs.stringify(options.query);
             path = `${path}?${queryString}`;
         }
         if (options.type === 'beacon' && navigator.sendBeacon) {
-            return navigator.sendBeacon(`${url}/api/v1${path}`, new Blob([
+            return navigator.sendBeacon(`${url}/api/${path}`, new Blob([
                 JSON.stringify(Object.assign(Object.assign(Object.assign({}, options.body), bffDataSource.headers), { 'x-user-id': fakeUserId }))
             ], { type: 'application/json;charset=UTF-8' }));
         }
         return window
-            .fetch(`${url}/api/v1${path}`, {
+            .fetch(`${url}/api/${path}`, {
             headers: Object.assign({ 'Content-Type': 'application/json', 'x-user-id': fakeUserId }, bffDataSource.headers),
             method: options.method,
             body: JSON.stringify(options.body)
         })
             .then((res) => res.json())
             .catch((err) => Promise.reject(err));
-    }, [bffDataSource]);
+    }, [bffDataSource, fakeUserId]);
     const getRecommendVideos = useCallback((query) => __awaiter(void 0, void 0, void 0, function* () {
         var _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
-        query = {
-            maxSize: (_f = query === null || query === void 0 ? void 0 : query.maxSize) !== null && _f !== void 0 ? _f : maxSize,
-            defaultSize: (_g = query === null || query === void 0 ? void 0 : query.defaultSize) !== null && _g !== void 0 ? _g : defaultSize,
-            hashTag: query === null || query === void 0 ? void 0 : query.hashTag,
-            traceInfo: query === null || query === void 0 ? void 0 : query.traceInfo,
-            themeTag: query === null || query === void 0 ? void 0 : query.themeTag,
-            pageNum: query === null || query === void 0 ? void 0 : query.pageNum,
-            contentFilter: query === null || query === void 0 ? void 0 : query.contentFilter,
-            productFilter: query === null || query === void 0 ? void 0 : query.productFilter
-        };
+        query = Object.assign({ maxSize: (_f = query === null || query === void 0 ? void 0 : query.maxSize) !== null && _f !== void 0 ? _f : maxSize, defaultSize: (_g = query === null || query === void 0 ? void 0 : query.defaultSize) !== null && _g !== void 0 ? _g : defaultSize, hashTag: query === null || query === void 0 ? void 0 : query.hashTag, traceInfo: query === null || query === void 0 ? void 0 : query.traceInfo, themeTag: query === null || query === void 0 ? void 0 : query.themeTag, pageNum: query === null || query === void 0 ? void 0 : query.pageNum, contentFilter: query === null || query === void 0 ? void 0 : query.contentFilter, productFilter: query === null || query === void 0 ? void 0 : query.productFilter }, (chatlabsId && { chatlabsId }));
         if (channel) {
             query = Object.assign(Object.assign({}, query), { channel: decodeURIComponent(channel) });
         }
@@ -158,14 +153,16 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             const recurveRecList = (query) => __awaiter(void 0, void 0, void 0, function* () {
                 var _v, _w, _x, _y, _z, _0;
                 query.pageNum = pageNum;
-                result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/recommend/list', { method: 'POST', body: query }));
+                result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('v1/recommend/list', { method: 'POST', body: query }));
                 if (!(result === null || result === void 0 ? void 0 : result.success)) {
                     return undefined;
                 }
                 setLoading(false);
                 list = list.concat((_y = (_x = (_w = (_v = result === null || result === void 0 ? void 0 : result.data) === null || _v === void 0 ? void 0 : _v.recList) === null || _w === void 0 ? void 0 : _w.filter) === null || _x === void 0 ? void 0 : _x.call(_w, (item) => (item === null || item === void 0 ? void 0 : item.product) || (item === null || item === void 0 ? void 0 : item.video))) !== null && _y !== void 0 ? _y : []);
-                setRtcList(getFilterRecList(Object.assign(Object.assign({}, result.data), { recList: list })));
-                setCacheRtcList(getFilterRecList(Object.assign(Object.assign({}, result.data), { recList: list })));
+                if ((rtcList === null || rtcList === void 0 ? void 0 : rtcList.length) === 0) {
+                    setRtcList(getFilterRecList(Object.assign(Object.assign({}, result === null || result === void 0 ? void 0 : result.data), { recList: list })));
+                    setCacheRtcList(getFilterRecList(Object.assign(Object.assign({}, result === null || result === void 0 ? void 0 : result.data), { recList: list })));
+                }
                 const isNotNullList = (_0 = (_z = result === null || result === void 0 ? void 0 : result.data) === null || _z === void 0 ? void 0 : _z.recList) === null || _0 === void 0 ? void 0 : _0.some((item) => (item === null || item === void 0 ? void 0 : item.product) || (item === null || item === void 0 ? void 0 : item.video));
                 if (isNotNullList) {
                     pageNum = pageNum + 1;
@@ -175,12 +172,12 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             yield recurveRecList(query);
             if (!(query === null || query === void 0 ? void 0 : query.hashTag) && result)
                 setCurReqInfo({ rtc: (_l = result === null || result === void 0 ? void 0 : result.data) === null || _l === void 0 ? void 0 : _l.rtc, requestId: (_m = result === null || result === void 0 ? void 0 : result.data) === null || _m === void 0 ? void 0 : _m.requestId });
-            return Object.assign(Object.assign({}, result.data), { recList: list });
+            return Object.assign(Object.assign({}, result === null || result === void 0 ? void 0 : result.data), { recList: list });
         }
         if (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview) {
             query = Object.assign(Object.assign({}, query), { directPage: true, level: 1, pageNum: (_o = query === null || query === void 0 ? void 0 : query.pageNum) !== null && _o !== void 0 ? _o : 1 });
         }
-        const result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/recommend/list', { method: 'POST', body: query }));
+        const result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('v1/recommend/list', { method: 'POST', body: query }));
         if (!(result === null || result === void 0 ? void 0 : result.success)) {
             return undefined;
         }
@@ -196,7 +193,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             return Object.assign(Object.assign({}, result.data), { recList: list });
         }
         return result === null || result === void 0 ? void 0 : result.data;
-    }), [bffFetch, utmVal, maxSize, defaultSize, channelQueryList, channel]);
+    }), [bffFetch, utmVal, maxSize, defaultSize, channelQueryList, channel, chatlabsId]);
     const loadVideos = useCallback((pageNum) => __awaiter(void 0, void 0, void 0, function* () {
         var _1, _2, _3, _4;
         if (rtcList.length <= 0) {
@@ -230,6 +227,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         return expire;
     }, [data]);
     const bffEventReport = useCallback(({ userInfo, eventInfo, reportLayId = true }) => {
+        var _a, _b;
         if (!enableReportEvent || (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview)) {
             return;
         }
@@ -237,7 +235,15 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             userInfo = {};
         }
         const sessionID = storeAndLoadFeSessionId();
-        const ef = Object.assign(Object.assign(Object.assign(Object.assign({ sessionID, rtc: curReqInfo.rtc, requestId: curReqInfo.requestId }, { playbookType }), (layoutVariantId && reportLayId && { layoutVariantId })), eventInfo), ((eventInfo === null || eventInfo === void 0 ? void 0 : eventInfo.position) && channel && { position: Number(eventInfo === null || eventInfo === void 0 ? void 0 : eventInfo.position) + 1 + '' }));
+        const params = {};
+        const queryString = location.search.slice(1);
+        (_a = splitUrlParams(queryString)) === null || _a === void 0 ? void 0 : _a.map((val) => {
+            const key = val.split('=')[0];
+            const value = val.split('=')[1];
+            params[key] = value;
+        });
+        const cl_source = params === null || params === void 0 ? void 0 : params.cl_source;
+        const ef = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ sessionID, rtc: curReqInfo.rtc, requestId: curReqInfo.requestId }, { playbookType }), (layoutVariantId && reportLayId && { layoutVariantId })), eventInfo), ((eventInfo === null || eventInfo === void 0 ? void 0 : eventInfo.position) && channel && { position: Number(eventInfo === null || eventInfo === void 0 ? void 0 : eventInfo.position) + 1 + '' })), (cl_source && { clSource: cl_source }));
         const realUserInfo = Object.entries(userInfo).map(([k, v]) => ({ name: k, value: v }));
         const realEventInfo = Object.entries(ef)
             .map(([k, v]) => v && { name: k, value: v })
@@ -246,14 +252,23 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         console.log('userInfo:', userInfo);
         console.log('eventInfo:', ef);
         console.log('========= 结束 =========');
-        return bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/event/report', {
+        return bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch(`v2/event/report/CLD/${(_b = bffDataSource === null || bffDataSource === void 0 ? void 0 : bffDataSource.headers) === null || _b === void 0 ? void 0 : _b['x-app-id']}/${eventInfo === null || eventInfo === void 0 ? void 0 : eventInfo.eventSubject}`, {
             method: 'POST',
             body: { userInfo: realUserInfo, eventInfo: realEventInfo },
             type: 'beacon'
         });
-    }, [bffFetch, curReqInfo, enableReportEvent, globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview, layoutVariantId, globalConfig, playbookType]);
+    }, [
+        bffFetch,
+        curReqInfo,
+        enableReportEvent,
+        globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview,
+        layoutVariantId,
+        globalConfig,
+        playbookType,
+        bffDataSource
+    ]);
     const bffFbReport = useCallback(({ eventName, product }) => {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         if (!enableReportEvent ||
             !enabledMetaConversionApi ||
             (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview) ||
@@ -265,7 +280,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         const fbclid = urlParams === null || urlParams === void 0 ? void 0 : urlParams.get('fbclid');
         const fix_par = {
             event_source_url: (_c = window === null || window === void 0 ? void 0 : window.location) === null || _c === void 0 ? void 0 : _c.href,
-            external_id: storeAndLoadFeUserId(),
+            external_id: fakeUserId,
             client_user_agent: (_e = (_d = window === null || window === void 0 ? void 0 : window.navigator) === null || _d === void 0 ? void 0 : _d.userAgent) !== null && _e !== void 0 ? _e : '',
             fbc: fbclid ? `fb.2.${new Date().getTime()}.${fbclid}` : '',
             fbp: getCookie('_fbp') ? `fb.2.${new Date().getTime()}.${getCookie('_fbp')}` : '',
@@ -317,22 +332,30 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             }
         };
         getEventParams(jsonParams);
-        return bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/fb/events', {
+        return bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch(`v2/event/report/FB/${(_f = bffDataSource === null || bffDataSource === void 0 ? void 0 : bffDataSource.headers) === null || _f === void 0 ? void 0 : _f['x-app-id']}/${eventName}`, {
             method: 'POST',
             body: jsonParams,
             type: 'beacon'
         });
-    }, [bffFetch, enableReportEvent, enabledMetaConversionApi, globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview, globalConfig]);
+    }, [
+        bffFetch,
+        enableReportEvent,
+        enabledMetaConversionApi,
+        globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview,
+        globalConfig,
+        fakeUserId,
+        bffDataSource
+    ]);
     const bffMutateLike = useCallback((body) => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/recommend/like', { method: 'POST', body }));
+        const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('v1/recommend/like', { method: 'POST', body }));
         return res === null || res === void 0 ? void 0 : res.success;
     }), [bffFetch]);
     const bffMutateUnlike = useCallback((body) => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/recommend/unlike', { method: 'POST', body }));
+        const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('v1/recommend/unlike', { method: 'POST', body }));
         return res === null || res === void 0 ? void 0 : res.success;
     }), [bffFetch]);
     const bffSubmitForm = useCallback((body) => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/customform', { method: 'POST', body }));
+        const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('v1/customform', { method: 'POST', body }));
         return res === null || res === void 0 ? void 0 : res.success;
     }), [bffFetch]);
     const bffGetTagList = useCallback((data) => __awaiter(void 0, void 0, void 0, function* () {
@@ -346,7 +369,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
                 const key = val.split('=')[0];
                 return (_b = ((_a = utmParameter === null || utmParameter === void 0 ? void 0 : utmParameter.channels) !== null && _a !== void 0 ? _a : [])) === null || _b === void 0 ? void 0 : _b.includes(key);
             })) === null || _9 === void 0 ? void 0 : _9.join('&')) !== null && _10 !== void 0 ? _10 : '';
-            const result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/tag/list', { method: 'GET', query: { channel: decodeURIComponent(val) } }));
+            const result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('v1/tag/list', { method: 'GET', query: { channel: decodeURIComponent(val) } }));
             setTagList((_12 = (_11 = result === null || result === void 0 ? void 0 : result.data) === null || _11 === void 0 ? void 0 : _11.tags) !== null && _12 !== void 0 ? _12 : []);
         }
         catch (e) {
@@ -401,12 +424,26 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
                 utmContent: getVal('utm_content'),
                 enterTime: Math.floor(time / 1000) + '',
                 requestId: null,
-                enterUrl: (_c = (_b = window === null || window === void 0 ? void 0 : window.location) === null || _b === void 0 ? void 0 : _b.href) !== null && _c !== void 0 ? _c : '',
-                clSource: getVal('cl_source')
+                enterUrl: (_c = (_b = window === null || window === void 0 ? void 0 : window.location) === null || _b === void 0 ? void 0 : _b.href) !== null && _c !== void 0 ? _c : ''
             },
             reportLayId: false
         });
     }, [bffEventReport]);
+    const getAccount = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
+        var _13, _14;
+        const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('v1/account', { method: 'GET' }));
+        setChatlabsId((_13 = res === null || res === void 0 ? void 0 : res.data) === null || _13 === void 0 ? void 0 : _13.chatLabsId);
+        return ((_14 = res === null || res === void 0 ? void 0 : res.data) === null || _14 === void 0 ? void 0 : _14.consentResult) === 'true';
+    }), [bffFetch]);
+    const accountSonsent = useCallback((consentResult) => __awaiter(void 0, void 0, void 0, function* () {
+        const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('v1/account/consent', {
+            method: 'POST',
+            body: {
+                consentResult
+            }
+        }));
+        return res === null || res === void 0 ? void 0 : res.success;
+    }), [bffFetch]);
     useEffect(() => {
         if (!isShowConsent)
             h5EnterLink();
@@ -425,10 +462,10 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
                 let curData;
                 let gldata;
                 if (data === null || data === void 0 ? void 0 : data.layoutVariantId) {
+                    layId = data === null || data === void 0 ? void 0 : data.layoutVariantId;
+                    setLayoutVariantId(data === null || data === void 0 ? void 0 : data.layoutVariantId);
                     const id = (_b = (_a = data === null || data === void 0 ? void 0 : data.layoutVariantId) === null || _a === void 0 ? void 0 : _a.split('-')) === null || _b === void 0 ? void 0 : _b[1];
                     if (id) {
-                        layId = id;
-                        setLayoutVariantId(id);
                         curData = dataList === null || dataList === void 0 ? void 0 : dataList.find((item) => (item === null || item === void 0 ? void 0 : item.id) === id);
                         if (curData) {
                             setPageData(curData);
@@ -554,7 +591,9 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             eventTimeList,
             setEventTimeList,
             multiPostTimeRef,
-            refreshFeSession
+            refreshFeSession,
+            getAccount,
+            accountSonsent
         } }, isShowConsent ? (React.createElement(Consent, Object.assign({}, (_e = (_d = (_c = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.consent) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.item) === null || _e === void 0 ? void 0 : _e.props))) : (render({
         rtcList,
         mutateLike: bffMutateLike,

package/es/core/utils/materials.js

@@ -32,14 +32,16 @@ export const getBgStyleByImg = (data) => {
 };
 export const getPriceText = ({ product, enableFormattedPrice, globalConfig, isHiddenDef, style }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h;
+    let text = '';
     if ((!(product === null || product === void 0 ? void 0 : product.currency) || !(product === null || product === void 0 ? void 0 : product.price)) && isHiddenDef)
         return null;
-    let price = (product === null || product === void 0 ? void 0 : product.currency) && (product === null || product === void 0 ? void 0 : product.price) ? product === null || product === void 0 ? void 0 : product.price : 7000;
-    let text = '';
+    let price = Number((product === null || product === void 0 ? void 0 : product.currency) && (product === null || product === void 0 ? void 0 : product.price) ? product === null || product === void 0 ? void 0 : product.price : 7000);
+    if (typeof price !== 'number')
+        return text;
     let priceSymbol = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.priceSymbol;
     let currency = (product === null || product === void 0 ? void 0 : product.currency) ? (_c = (_b = (_a = product === null || product === void 0 ? void 0 : product.currency) === null || _a === void 0 ? void 0 : _a.split('-')[1]) === null || _b === void 0 ? void 0 : _b.toUpperCase()) !== null && _c !== void 0 ? _c : '' : '$';
     const isToLocStr = enableFormattedPrice === undefined || enableFormattedPrice;
-    let decPic = price.toString();
+    let decPic = price === null || price === void 0 ? void 0 : price.toString();
     if (priceSymbol === null || priceSymbol === void 0 ? void 0 : priceSymbol.showTwoDecimalPoint) {
         decPic = price === null || price === void 0 ? void 0 : price.toFixed(2);
     }

package/es/materials/sxp/consentPopup/Click/index.d.ts

@@ -0,0 +1,19 @@
+import React, { CSSProperties } from 'react';
+import './index.less';
+export interface IClickProps {
+    open?: boolean;
+    content?: string;
+    style?: Record<string, any>;
+    isTel?: boolean;
+    acceptButton?: {
+        text?: string;
+        style?: CSSProperties;
+    };
+    rejectButton?: {
+        text?: string;
+        style?: CSSProperties;
+    };
+    consentPopupCate?: string;
+}
+declare const _default: React.NamedExoticComponent<IClickProps>;
+export default _default;

package/es/materials/sxp/consentPopup/Click/index.js

@@ -0,0 +1,37 @@
+import { __awaiter, __rest } from "tslib";
+import React, { memo, useEffect, useMemo, useState } from 'react';
+import './index.less';
+import ConsentDetail from '../../popup/ConsentDetail';
+import tel from './tel.png';
+import { setFontForText } from '../../../../core/utils/tool';
+import { useSxpDataSource } from '../../../../core/hooks';
+const Click = (_a) => {
+    var { isTel, open, content, style, consentPopupCate, acceptButton, rejectButton } = _a, props = __rest(_a, ["isTel", "open", "content", "style", "consentPopupCate", "acceptButton", "rejectButton"]);
+    const { getAccount, accountSonsent } = useSxpDataSource();
+    const [consentResult, setConsentResult] = useState(false);
+    const handleGetAccount = () => __awaiter(void 0, void 0, void 0, function* () {
+        const res = yield (getAccount === null || getAccount === void 0 ? void 0 : getAccount());
+        setConsentResult(res);
+    });
+    useEffect(() => {
+        handleGetAccount();
+    }, []);
+    const visivle = useMemo(() => {
+        return consentPopupCate || (open && style && !consentResult);
+    }, [consentPopupCate, open, style, consentResult]);
+    const handleClick = (v) => {
+        accountSonsent === null || accountSonsent === void 0 ? void 0 : accountSonsent(v);
+        setConsentResult(true);
+    };
+    return (React.createElement(React.Fragment, null, isTel ? (React.createElement("img", { src: tel, style: { objectFit: 'cover', width: '100%', height: '100%' } })) : (React.createElement(React.Fragment, null, visivle && (React.createElement("div", { className: 'consentPopupClick' },
+        React.createElement("div", { className: 'consentPopupClick-container', style: style },
+            React.createElement("div", { className: 'consentPopupClick-container-content' },
+                React.createElement(ConsentDetail, { content: content, style: { padding: 0 } })),
+            React.createElement("button", { style: acceptButton === null || acceptButton === void 0 ? void 0 : acceptButton.style, onClick: () => handleClick(true), dangerouslySetInnerHTML: {
+                    __html: setFontForText(acceptButton === null || acceptButton === void 0 ? void 0 : acceptButton.text, acceptButton === null || acceptButton === void 0 ? void 0 : acceptButton.style)
+                } }),
+            React.createElement("button", { style: rejectButton === null || rejectButton === void 0 ? void 0 : rejectButton.style, onClick: () => handleClick(false), dangerouslySetInnerHTML: {
+                    __html: setFontForText(rejectButton === null || rejectButton === void 0 ? void 0 : rejectButton.text, rejectButton === null || rejectButton === void 0 ? void 0 : rejectButton.style)
+                } }))))))));
+};
+export default memo(Click);

package/es/materials/sxp/consentPopup/Click/material.d.ts

@@ -0,0 +1,2 @@
+declare const Click: import("../../../../core/create").MaterialComponet<import(".").IClickProps>;
+export { Click };

package/es/materials/sxp/consentPopup/Click/material.js

@@ -0,0 +1,48 @@
+import settingRender from './settingRender';
+import ClickComponent from '.';
+import { createMaterial } from '../../../../core/create';
+const Click = createMaterial(ClickComponent, {
+    displayName: 'Click Consent',
+    icon: '',
+    category: 'consentPopup',
+    type: 'Click',
+    related: {
+        settingRender,
+        bindableProps: []
+    },
+    defaulSetting: {
+        props: {
+            content: '<p><strong><span style="font-size:14px"><span style="line-height:3">Your Cookie Preferences</span></span></strong></p><p>We use cookie, including third-party cookies, to ensure the proper functioning and security of this site, to analyse its use, and to show you personalised content. You can authorise the use of all cookies by clicking on &quot;Accept all cookies&quot;. If you click on &quot;Reject all cookies&quot;, we will only use cookies necessary for the proper functioning and security of this site. To personalise on adjust your preferences at any time, click on &quot;Cookies Settings&quot; below or at the bottom of any Fendi.com webpage. For more information, read our Cookie Policy.</p><p></p>',
+            acceptButton: {
+                text: 'Accept all cookies',
+                style: {
+                    backgroundColor: '#000',
+                    height: 45,
+                    color: '#fff',
+                    fontSize: 12,
+                    textAlign: 'center',
+                    marginTop: 5,
+                    marginBottom: 5
+                }
+            },
+            rejectButton: {
+                text: 'Reject all cookies',
+                style: {
+                    backgroundColor: '#000',
+                    height: 45,
+                    color: '#fff',
+                    fontSize: 12,
+                    textAlign: 'center',
+                    marginTop: 5,
+                    marginBottom: 5
+                }
+            }
+        },
+        style: {
+            backgroundColor: '#fff',
+            padding: 18
+        }
+    },
+    sort: 2
+});
+export { Click };

package/es/materials/sxp/consentPopup/Click/settingRender.d.ts

@@ -0,0 +1,63 @@
+declare const _default: ({
+    title: string;
+    child: {
+        type: string;
+        name: string[];
+    }[];
+} | {
+    title: string;
+    child: ({
+        type: string;
+        label: string;
+        name: string[];
+        addonAfter?: undefined;
+        child?: undefined;
+    } | {
+        type: string;
+        label: string;
+        name: string[];
+        addonAfter: string;
+        child?: undefined;
+    } | {
+        type: string;
+        label: string;
+        child: ({
+            type: string;
+            name: string[];
+            max: number;
+            addonAfter?: undefined;
+        } | {
+            type: string;
+            name: string[];
+            addonAfter: string;
+            max: number;
+        })[];
+        name?: undefined;
+        addonAfter?: undefined;
+    } | {
+        type: string;
+        label: string;
+        child: {
+            type: string;
+            name: string[];
+            bottomText: string;
+        }[];
+        name?: undefined;
+        addonAfter?: undefined;
+    } | {
+        type: string;
+        label: string;
+        child: ({
+            type: string;
+            name: string[];
+            addonAfter?: undefined;
+        } | {
+            type: string;
+            name: string[];
+            addonAfter: string;
+        })[];
+        name?: undefined;
+        addonAfter?: undefined;
+    })[];
+})[];
+export default _default;