pb-sxp-ui 14.0.7 → 15.0.1

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

@@ -1,15 +1,15 @@
-import React, { memo } from 'react';
+import React, { memo, useMemo } from 'react';
 import './index.less';
 import withBindDataSource from '../../../core/hoc/withBindDataSource';
-import { useEditorDataProvider } from '../../../core/context/EditorDataProvider';
+import { getContsentState } from '../../../core/utils/localStore';
 const Consent = ({ resolver, globalConfig }) => {
     var _a, _b;
-    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;
-    if (!value)
-        return null;
-    const t = resolver === null || resolver === void 0 ? void 0 : resolver[value === null || value === void 0 ? void 0 : value.type];
+    const contsentState = useMemo(() => {
+        return getContsentState();
+    }, []);
+    const t = resolver === null || resolver === void 0 ? void 0 : resolver['Display'];
     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 })));
+    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 }));
 };
 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 : 'title'}`, textStyle)
+                __html: setFontForText(`#${(_a = waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.hashTag) !== null && _a !== void 0 ? _a : '标题'}`, textStyle)
             } })));
 };
 export default memo(Navbar);

package/es/core/components/SxpPageRender/WaterFall/List.js

@@ -10,7 +10,7 @@ import { useEventReport } from '../../../../core/hooks/useEventReport';
 import { getPriceText } from '../../../../core/utils/materials';
 const WaterfallFlowItem = (props) => {
     var _a;
-    const { rec, index, list, reportTagsView, textStyles, space } = props;
+    const { rec, index, list, reportTagsView, textStyles, space, openFixedSize } = props;
     const { swiperRef, setRtcList, setOpenHashtag, sxpParameter, globalConfig } = useSxpDataSource();
     const [showVideo, setShowVideo] = useState(false);
     const imgDom = useRef(null);
@@ -104,11 +104,11 @@ const WaterfallFlowItem = (props) => {
         }, 0);
     };
     return (React.createElement("div", { ref: ref, className: 'list-content-listItem', key: index, onClick: handleClickToDetail, style: { marginBottom: space } },
-        React.createElement("div", { className: 'list-content-listItem-picture' },
+        React.createElement("div", { className: (openFixedSize === null || openFixedSize === void 0 ? void 0 : openFixedSize.ratio) === '1' ? 'list-content-listItem-picture' : 'list-content-listItem-picture1609' },
             showVideo && (React.createElement("div", { style: { display: 'none' } },
                 React.createElement("video", { ref: videoDom, crossOrigin: 'anonymous', className: 'list-content-listItem-picture-img' }),
                 React.createElement("canvas", { ref: canvasRef }))),
-            React.createElement(FormatImage, { loading: 'lazy', className: 'list-content-listItem-picture-img', ref: imgDom })),
+            React.createElement(FormatImage, { loading: 'lazy', className: (openFixedSize === null || openFixedSize === void 0 ? void 0 : openFixedSize.ratio) === '1' ? 'list-content-listItem-picture-img' : 'list-content-listItem-picture1609-img', ref: imgDom })),
         React.createElement("div", { className: 'list-content-listItem-info' },
             React.createElement("div", { className: `${'list-content-listItem-info-title'} ${priceText ? 'list-content-listItem-info-nowrap' : ''}`, style: textStyles === null || textStyles === void 0 ? void 0 : textStyles.title, dangerouslySetInnerHTML: {
                     __html: setFontForText(title, textStyles === null || textStyles === void 0 ? void 0 : textStyles.title)

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

@@ -8,7 +8,7 @@ import List from './List';
 import { useSxpDataSource } from '../../../../core/hooks';
 import { useEventReport } from '../../../../core/hooks/useEventReport';
 const WaterFall = (props) => {
-    var _a;
+    var _a, _b;
     const { waterFallData, setOpenHashtag, openHashtag, swiperRef, setWaterFallData, cacheRtcList, setRtcList, cacheActiveIndex, rtcList, setCacheRtcList, setIsFromHashtag, isFromHashtag, bffEventReport, themeTag, selectTag, bffFbReport } = useSxpDataSource();
     const { backMainFeed } = useEventReport();
     const modalEleRef = useRef(null);
@@ -97,6 +97,6 @@ const WaterFall = (props) => {
             display: openHashtag ? 'block' : 'none'
         } },
         React.createElement(Navbar, { icon: left, 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.openFixedSize) === true || (props === null || props === void 0 ? void 0 : props.openFixedSize) === undefined ? (React.createElement(List, Object.assign({ key: waterFallData, reportTagsView: reportTagsView }, props))) : (React.createElement(WaterfallList, Object.assign({ key: waterFallData, reportTagsView: reportTagsView }, props)))), modalEleRef.current);
+        ((_b = props === null || props === void 0 ? void 0 : props.openFixedSize) === null || _b === void 0 ? void 0 : _b.open) === true || (props === null || props === void 0 ? void 0 : props.openFixedSize) === undefined ? (React.createElement(List, Object.assign({ key: waterFallData, reportTagsView: reportTagsView }, props))) : (React.createElement(WaterfallList, Object.assign({ key: waterFallData, reportTagsView: reportTagsView }, props)))), modalEleRef.current);
 };
 export default memo(WaterFall);

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 || fromKName,
+                fromKName: fk ? 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,12 +144,9 @@ 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) {
-                    setTimeout(() => {
-                        SXP_EVENT_BUS.emit(SXP_EVENT_TYPE.PAGE_DID_SHOW, item);
-                    });
+                    SXP_EVENT_BUS.emit(SXP_EVENT_TYPE.PAGE_DID_SHOW, item);
                     backMainFeed('external', selectTag);
                 }
             }

package/es/core/context/SxpDataSourceProvider.js

@@ -99,32 +99,29 @@ 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/${path}`, new Blob([
+            return navigator.sendBeacon(`${url}/api/v1${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/${path}`, {
+            .fetch(`${url}/api/v1${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, fakeUserId]);
+    }, [bffDataSource]);
     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 = {
@@ -161,16 +158,14 @@ 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('v1/recommend/list', { method: 'POST', body: query }));
+                result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/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 : []);
-                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 })));
-                }
+                setRtcList(getFilterRecList(Object.assign(Object.assign({}, result.data), { recList: list })));
+                setCacheRtcList(getFilterRecList(Object.assign(Object.assign({}, 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;
@@ -180,12 +175,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 === null || result === void 0 ? void 0 : result.data), { recList: list });
+            return Object.assign(Object.assign({}, 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('v1/recommend/list', { method: 'POST', body: query }));
+        const result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/recommend/list', { method: 'POST', body: query }));
         if (!(result === null || result === void 0 ? void 0 : result.success)) {
             return undefined;
         }
@@ -235,7 +230,6 @@ 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;
         }
@@ -243,16 +237,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             userInfo = {};
         }
         const sessionID = storeAndLoadFeSessionId();
-        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;
-        });
-        console.log(params, '111');
-        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 && { cl_source }));
+        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 realUserInfo = Object.entries(userInfo).map(([k, v]) => ({ name: k, value: v }));
         const realEventInfo = Object.entries(ef)
             .map(([k, v]) => v && { name: k, value: v })
@@ -261,23 +246,14 @@ 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(`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}`, {
+        return bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/event/report', {
             method: 'POST',
             body: { userInfo: realUserInfo, eventInfo: realEventInfo },
             type: 'beacon'
         });
-    }, [
-        bffFetch,
-        curReqInfo,
-        enableReportEvent,
-        globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview,
-        layoutVariantId,
-        globalConfig,
-        playbookType,
-        bffDataSource
-    ]);
+    }, [bffFetch, curReqInfo, enableReportEvent, globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview, layoutVariantId, globalConfig, playbookType]);
     const bffFbReport = useCallback(({ eventName, product }) => {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e;
         if (!enableReportEvent ||
             !enabledMetaConversionApi ||
             (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview) ||
@@ -289,7 +265,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: fakeUserId,
+            external_id: storeAndLoadFeUserId(),
             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')}` : '',
@@ -341,30 +317,22 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             }
         };
         getEventParams(jsonParams);
-        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}`, {
+        return bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/fb/events', {
             method: 'POST',
             body: jsonParams,
             type: 'beacon'
         });
-    }, [
-        bffFetch,
-        enableReportEvent,
-        enabledMetaConversionApi,
-        globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview,
-        globalConfig,
-        fakeUserId,
-        bffDataSource
-    ]);
+    }, [bffFetch, enableReportEvent, enabledMetaConversionApi, globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview, globalConfig]);
     const bffMutateLike = useCallback((body) => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('v1/recommend/like', { method: 'POST', body }));
+        const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/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('v1/recommend/unlike', { method: 'POST', body }));
+        const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/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('v1/customform', { method: 'POST', body }));
+        const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/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* () {
@@ -378,7 +346,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('v1/tag/list', { method: 'GET', query: { channel: decodeURIComponent(val) } }));
+            const result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/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) {
@@ -457,10 +425,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);

package/es/core/utils/materials.js

@@ -32,16 +32,14 @@ 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 = 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 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 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 === null || price === void 0 ? void 0 : price.toString();
+    let decPic = 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/HashTag/index.d.ts

@@ -14,7 +14,10 @@ export interface IHashTagProps {
     };
     buttonBgStyle: CSSProperties;
     showBanner?: boolean;
-    openFixedSize?: boolean;
+    openFixedSize?: {
+        open: true;
+        ratio: string;
+    };
 }
 declare const _default: React.NamedExoticComponent<IHashTagProps>;
 export default _default;

package/es/materials/sxp/HashTag/material.js

@@ -56,7 +56,8 @@ const HashTag = createMaterial(HashTagComponent, {
                 paddingLeft: 20,
                 paddingRight: 20,
                 paddingBottom: 20
-            }
+            },
+            openFixedSize: { open: true, ratio: '1' }
         }
     },
     w: 100,

package/es/materials/sxp/HashTag/settingRender.d.ts

@@ -5,12 +5,10 @@ declare const _default: ({
         label: string;
         name: string[];
         addonAfter: string;
-        initialValue?: undefined;
     } | {
         type: string;
         label: string;
         name: string[];
-        initialValue: boolean;
         addonAfter?: undefined;
     })[];
 } | {

package/es/materials/sxp/HashTag/settingRender.js

@@ -19,10 +19,9 @@ export default [
                 addonAfter: 'px'
             },
             {
-                type: 'Switch',
+                type: 'HashTagFixedSize',
                 label: '固定宽高',
-                name: ['props', 'openFixedSize'],
-                initialValue: true
+                name: ['props', 'openFixedSize']
             }
         ]
     },

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

@@ -13,9 +13,9 @@ export interface IDisplayProps {
     };
     style?: Record<string, any>;
     isTel?: boolean;
-    isShowClose?: boolean;
-    consentPopupCate?: string;
     onClick?: () => void;
+    contsentState?: boolean;
+    isShowClose?: boolean;
 }
 declare const _default: React.NamedExoticComponent<IDisplayProps>;
 export default _default;

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

@@ -1,20 +1,18 @@
 import { __rest } from "tslib";
 import React, { memo, useCallback, useMemo, useState } from 'react';
 import './index.less';
+import { useEditorDataProvider } from '../../../../core/context/EditorDataProvider';
 import closeSvg from './close.svg';
 import tel from './tel.png';
 import { setFontForText } from '../../../../core/utils/tool';
-import { getContsentState } from '../../../../core/utils/localStore';
 const Display = (_a) => {
     var _b, _c;
-    var { isTel, isShowOnce, open, content, interaction, style, onClick, isShowClose, consentPopupCate } = _a, props = __rest(_a, ["isTel", "isShowOnce", "open", "content", "interaction", "style", "onClick", "isShowClose", "consentPopupCate"]);
+    var { isTel, isShowOnce, open, content, interaction, style, onClick, contsentState, isShowClose } = _a, props = __rest(_a, ["isTel", "isShowOnce", "open", "content", "interaction", "style", "onClick", "contsentState", "isShowClose"]);
+    const { consentPopupCate } = useEditorDataProvider();
     const [isClose, setIsClose] = useState(false);
-    const contsentState = useMemo(() => {
-        return getContsentState();
-    }, []);
     const visivle = useMemo(() => {
-        return consentPopupCate || (open && (isShowOnce || contsentState) && style && !isClose);
-    }, [consentPopupCate, open, isClose, contsentState]);
+        return consentPopupCate === 'Display' || (open && (isShowOnce || contsentState) && style && !isClose);
+    }, [consentPopupCate, open, isClose]);
     const handleClickClose = useCallback(() => {
         setIsClose(true);
     }, []);

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

@@ -1,3 +1 @@
 export * from './Display/material';
-export * from './Click/material';
-export * from './Swipe/material';

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

@@ -1,3 +1 @@
 export * from './Display/material';
-export * from './Click/material';
-export * from './Swipe/material';

package/es/materials/sxp/cta/AniLink/index.js

@@ -35,7 +35,7 @@ const AniLink = (_a) => {
             onClick === null || onClick === void 0 ? void 0 : onClick();
         }
     };
-    const title = (cta === null || cta === void 0 ? void 0 : cta.enTitle) || 'Show More';
+    const title = (cta === null || cta === void 0 ? void 0 : cta.enTitle) || '查看详情';
     const aniTimStyle = useMemo(() => {
         var _a, _b;
         const ani = event === null || event === void 0 ? void 0 : event.animation;

package/es/materials/sxp/cta/AniLinkPopup/index.js

@@ -35,7 +35,7 @@ const AniLinkPopup = (_a) => {
             onClick === null || onClick === void 0 ? void 0 : onClick();
         }
     };
-    const title = (cta === null || cta === void 0 ? void 0 : cta.enTitle) || 'Show More';
+    const title = (cta === null || cta === void 0 ? void 0 : cta.enTitle) || '查看详情';
     const aniTimStyle = useMemo(() => {
         const ani = event === null || event === void 0 ? void 0 : event.animation;
         if (ani) {

package/es/materials/sxp/popup/ConsentDetail/index.d.ts

@@ -1,9 +1,8 @@
-import React, { CSSProperties } from 'react';
+import React from 'react';
 import './index.less';
 export interface IConsentDetailProps {
     content?: string;
     isTel?: boolean;
-    style?: CSSProperties;
 }
 declare const _default: React.NamedExoticComponent<IConsentDetailProps>;
 export default _default;

package/es/materials/sxp/popup/ConsentDetail/index.js

@@ -2,11 +2,11 @@ import { __rest } from "tslib";
 import React, { memo } from 'react';
 import './index.less';
 const ConsentDetail = (_a) => {
-    var { content, isTel, style } = _a, props = __rest(_a, ["content", "isTel", "style"]);
+    var { content, isTel } = _a, props = __rest(_a, ["content", "isTel"]);
     return (React.createElement("article", { className: 'consentDetail-article', dangerouslySetInnerHTML: {
             __html: typeof content === 'string' ? content : ''
         }, onClick: (e) => {
             e.stopPropagation();
-        }, style: style }));
+        } }));
 };
 export default memo(ConsentDetail);

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

@@ -4,15 +4,15 @@ const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importStar(require("react"));
 require("./index.less");
 const withBindDataSource_1 = tslib_1.__importDefault(require("../../../core/hoc/withBindDataSource"));
-const EditorDataProvider_1 = require("../../../core/context/EditorDataProvider");
+const localStore_1 = require("../../../core/utils/localStore");
 const Consent = ({ resolver, globalConfig }) => {
     var _a, _b;
-    const { consentPopupCate } = (0, EditorDataProvider_1.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;
-    if (!value)
-        return null;
-    const t = resolver === null || resolver === void 0 ? void 0 : resolver[value === null || value === void 0 ? void 0 : value.type];
+    const contsentState = (0, react_1.useMemo)(() => {
+        return (0, localStore_1.getContsentState)();
+    }, []);
+    const t = resolver === null || resolver === void 0 ? void 0 : resolver['Display'];
     const Component = (0, withBindDataSource_1.default)(t);
-    return (react_1.default.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 })));
+    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_1.default.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 }));
 };
 exports.default = (0, react_1.memo)(Consent);

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

@@ -11,7 +11,7 @@ const Navbar = ({ icon, styles, textStyle, onClose }) => {
         react_1.default.createElement("button", { className: 'clc-sxp-nav-left', role: 'button', "aria-label": 'back button', onClick: onClose },
             react_1.default.createElement("img", { src: icon, alt: 'back button' })),
         react_1.default.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: (0, tool_1.setFontForText)(`#${(_a = waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.hashTag) !== null && _a !== void 0 ? _a : 'title'}`, textStyle)
+                __html: (0, tool_1.setFontForText)(`#${(_a = waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.hashTag) !== null && _a !== void 0 ? _a : '标题'}`, textStyle)
             } })));
 };
 exports.default = (0, react_1.memo)(Navbar);

package/lib/core/components/SxpPageRender/WaterFall/List.js

@@ -12,7 +12,7 @@ const useEventReport_1 = require("../../../../core/hooks/useEventReport");
 const materials_1 = require("../../../../core/utils/materials");
 const WaterfallFlowItem = (props) => {
     var _a;
-    const { rec, index, list, reportTagsView, textStyles, space } = props;
+    const { rec, index, list, reportTagsView, textStyles, space, openFixedSize } = props;
     const { swiperRef, setRtcList, setOpenHashtag, sxpParameter, globalConfig } = (0, hooks_1.useSxpDataSource)();
     const [showVideo, setShowVideo] = (0, react_1.useState)(false);
     const imgDom = (0, react_1.useRef)(null);
@@ -106,11 +106,11 @@ const WaterfallFlowItem = (props) => {
         }, 0);
     };
     return (react_1.default.createElement("div", { ref: ref, className: 'list-content-listItem', key: index, onClick: handleClickToDetail, style: { marginBottom: space } },
-        react_1.default.createElement("div", { className: 'list-content-listItem-picture' },
+        react_1.default.createElement("div", { className: (openFixedSize === null || openFixedSize === void 0 ? void 0 : openFixedSize.ratio) === '1' ? 'list-content-listItem-picture' : 'list-content-listItem-picture1609' },
             showVideo && (react_1.default.createElement("div", { style: { display: 'none' } },
                 react_1.default.createElement("video", { ref: videoDom, crossOrigin: 'anonymous', className: 'list-content-listItem-picture-img' }),
                 react_1.default.createElement("canvas", { ref: canvasRef }))),
-            react_1.default.createElement(FormatImage_1.default, { loading: 'lazy', className: 'list-content-listItem-picture-img', ref: imgDom })),
+            react_1.default.createElement(FormatImage_1.default, { loading: 'lazy', className: (openFixedSize === null || openFixedSize === void 0 ? void 0 : openFixedSize.ratio) === '1' ? 'list-content-listItem-picture-img' : 'list-content-listItem-picture1609-img', ref: imgDom })),
         react_1.default.createElement("div", { className: 'list-content-listItem-info' },
             react_1.default.createElement("div", { className: `${'list-content-listItem-info-title'} ${priceText ? 'list-content-listItem-info-nowrap' : ''}`, style: textStyles === null || textStyles === void 0 ? void 0 : textStyles.title, dangerouslySetInnerHTML: {
                     __html: (0, tool_1.setFontForText)(title, textStyles === null || textStyles === void 0 ? void 0 : textStyles.title)

package/lib/core/components/SxpPageRender/WaterFall/index.js

@@ -11,7 +11,7 @@ const List_1 = tslib_1.__importDefault(require("./List"));
 const hooks_1 = require("../../../../core/hooks");
 const useEventReport_1 = require("../../../../core/hooks/useEventReport");
 const WaterFall = (props) => {
-    var _a;
+    var _a, _b;
     const { waterFallData, setOpenHashtag, openHashtag, swiperRef, setWaterFallData, cacheRtcList, setRtcList, cacheActiveIndex, rtcList, setCacheRtcList, setIsFromHashtag, isFromHashtag, bffEventReport, themeTag, selectTag, bffFbReport } = (0, hooks_1.useSxpDataSource)();
     const { backMainFeed } = (0, useEventReport_1.useEventReport)();
     const modalEleRef = (0, react_1.useRef)(null);
@@ -100,6 +100,6 @@ const WaterFall = (props) => {
             display: openHashtag ? 'block' : 'none'
         } },
         react_1.default.createElement(Navbar_1.default, { icon: left_png_1.default, 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.openFixedSize) === true || (props === null || props === void 0 ? void 0 : props.openFixedSize) === undefined ? (react_1.default.createElement(List_1.default, Object.assign({ key: waterFallData, reportTagsView: reportTagsView }, props))) : (react_1.default.createElement(WaterfallList_1.default, Object.assign({ key: waterFallData, reportTagsView: reportTagsView }, props)))), modalEleRef.current);
+        ((_b = props === null || props === void 0 ? void 0 : props.openFixedSize) === null || _b === void 0 ? void 0 : _b.open) === true || (props === null || props === void 0 ? void 0 : props.openFixedSize) === undefined ? (react_1.default.createElement(List_1.default, Object.assign({ key: waterFallData, reportTagsView: reportTagsView }, props))) : (react_1.default.createElement(WaterfallList_1.default, Object.assign({ key: waterFallData, reportTagsView: reportTagsView }, props)))), modalEleRef.current);
 };
 exports.default = (0, react_1.memo)(WaterFall);

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

@@ -120,7 +120,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 || fromKName,
+                fromKName: fk ? 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 : ''
@@ -147,12 +147,9 @@ 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) {
-                    setTimeout(() => {
-                        event_1.default.emit(event_1.SXP_EVENT_TYPE.PAGE_DID_SHOW, item);
-                    });
+                    event_1.default.emit(event_1.SXP_EVENT_TYPE.PAGE_DID_SHOW, item);
                     backMainFeed('external', selectTag);
                 }
             }