pb-sxp-ui 1.14.0 → 1.15.0

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 localStore_1 = require("../../../core/utils/localStore");
+const EditorDataProvider_1 = require("../../../core/context/EditorDataProvider");
 const Consent = ({ resolver, globalConfig }) => {
     var _a, _b;
-    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);
+    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;
-    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 }));
+    if (!value)
+        return null;
+    const t = resolver === null || resolver === void 0 ? void 0 : resolver[value === null || value === void 0 ? void 0 : value.type];
+    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 })));
 };
 exports.default = (0, react_1.memo)(Consent);

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

package/lib/core/context/SxpDataSourceProvider.js

@@ -4,13 +4,13 @@ exports.DEFAULT_TAG = exports.SxpDataSourceContext = void 0;
 const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importStar(require("react"));
 const qs_1 = tslib_1.__importDefault(require("qs"));
+const lodash_1 = require("lodash");
 const sessionStore_1 = require("../utils/sessionStore");
 const localStore_1 = require("../utils/localStore");
 const useIconLink_1 = require("../components/SxpPageRender/useIconLink");
 const event_1 = tslib_1.__importStar(require("../utils/event"));
 const Consent_1 = tslib_1.__importDefault(require("../components/Consent"));
 const tool_1 = require("../utils/tool");
-const lodash_1 = require("lodash");
 exports.SxpDataSourceContext = (0, react_1.createContext)({
     rtcList: [],
     tagList: []
@@ -102,29 +102,32 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
     const bffDataSource = (0, react_1.useMemo)(() => {
         return dataSources === null || dataSources === void 0 ? void 0 : dataSources.find((d) => d.type === DataSourceType.BFF);
     }, [dataSources]);
+    const fakeUserId = (0, react_1.useMemo)(() => {
+        var _a;
+        return ((_a = bffDataSource === null || bffDataSource === void 0 ? void 0 : bffDataSource.headers) === null || _a === void 0 ? void 0 : _a['x-app-id']) + (0, localStore_1.storeAndLoadFeUserId)();
+    }, [bffDataSource]);
     const bffFetch = (0, react_1.useCallback)((path, options) => {
         if (!bffDataSource)
             return;
         const url = bffDataSource.url;
-        const fakeUserId = (0, localStore_1.storeAndLoadFeUserId)();
         if (options === null || options === void 0 ? void 0 : options.query) {
             const queryString = qs_1.default.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 = (0, react_1.useCallback)((query) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
         var _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
         query = {
@@ -141,7 +144,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             query = Object.assign(Object.assign({}, query), { channel: decodeURIComponent(channel) });
         }
         else if (utmVal) {
-            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 = (_k = (_j = (_h = (0, tool_1.splitUrlParams)(utmVal)) === null || _h === void 0 ? void 0 : _h.filter((val) => {
                 var _a, _b;
                 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);
@@ -161,14 +164,16 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             const recurveRecList = (query) => tslib_1.__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;
@@ -178,12 +183,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;
         }
@@ -233,6 +238,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         return expire;
     }, [data]);
     const bffEventReport = (0, react_1.useCallback)(({ userInfo, eventInfo, reportLayId = true }) => {
+        var _a, _b;
         if (!enableReportEvent || (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview)) {
             return;
         }
@@ -240,7 +246,16 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             userInfo = {};
         }
         const sessionID = (0, sessionStore_1.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 = (0, tool_1.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 realUserInfo = Object.entries(userInfo).map(([k, v]) => ({ name: k, value: v }));
         const realEventInfo = Object.entries(ef)
             .map(([k, v]) => v && { name: k, value: v })
@@ -249,26 +264,35 @@ 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 = (0, react_1.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) ||
             !((_a = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.converApi) === null || _a === void 0 ? void 0 : _a[eventName])) {
             return;
         }
-        let jsonParams = (0, lodash_1.cloneDeep)((_b = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.converApi) === null || _b === void 0 ? void 0 : _b[eventName]);
+        const jsonParams = (0, lodash_1.cloneDeep)((_b = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.converApi) === null || _b === void 0 ? void 0 : _b[eventName]);
         const urlParams = new URLSearchParams(window.location.search);
         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: (0, localStore_1.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: (0, tool_1.getCookie)('_fbp') ? `fb.2.${new Date().getTime()}.${(0, tool_1.getCookie)('_fbp')}` : '',
@@ -320,22 +344,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 = (0, react_1.useCallback)((body) => tslib_1.__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 = (0, react_1.useCallback)((body) => tslib_1.__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 = (0, react_1.useCallback)((body) => tslib_1.__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 = (0, react_1.useCallback)((data) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
@@ -344,12 +376,12 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         if (!utmVal || !isShowTag)
             return;
         try {
-            const val = (_10 = (_9 = (_8 = utmVal === null || utmVal === void 0 ? void 0 : utmVal.split('&')) === null || _8 === void 0 ? void 0 : _8.filter((val) => {
+            const val = (_10 = (_9 = (_8 = (0, tool_1.splitUrlParams)(utmVal)) === null || _8 === void 0 ? void 0 : _8.filter((val) => {
                 var _a, _b;
                 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) {
@@ -379,9 +411,14 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         });
     }, [bffEventReport, isFromHashtag]);
     const h5EnterLink = (0, react_1.useCallback)(() => {
-        var _a, _b;
+        var _a, _b, _c;
         const queryString = location.search.slice(1);
-        const params = qs_1.default.parse(queryString.replace(/\+/g, '%2B'));
+        const params = {};
+        (_a = (0, tool_1.splitUrlParams)(queryString.replace(/\+/g, '%2B'))) === null || _a === void 0 ? void 0 : _a.map((val) => {
+            const key = val.split('=')[0];
+            const value = val.split('=')[1];
+            params[key] = value;
+        });
         for (const key in params) {
             params[key] = params[key].replace(/%2B/g, '+');
         }
@@ -399,7 +436,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
                 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 : '',
+                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')
             },
             reportLayId: false
@@ -423,10 +460,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/lib/core/utils/materials.js

@@ -38,14 +38,16 @@ const getBgStyleByImg = (data) => {
 exports.getBgStyleByImg = getBgStyleByImg;
 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/lib/core/utils/tool.d.ts

@@ -12,4 +12,5 @@ declare function getSystem(): string | null;
 declare function getDevice(): string | null;
 declare function getCookie(val: string): string;
 declare function getScreenReader(): boolean;
-export { uuid, getIndexByblockType, getBrowserInfo, getDevice, getSystem, getCookie, getScreenReader };
+declare function splitUrlParams(urlParams: string): string[] | undefined;
+export { uuid, getIndexByblockType, getBrowserInfo, getDevice, getSystem, getCookie, getScreenReader, splitUrlParams };

package/lib/core/utils/tool.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getScreenReader = exports.getCookie = exports.getSystem = exports.getDevice = exports.getBrowserInfo = exports.getIndexByblockType = exports.uuid = exports.setFontForText = exports.getUid = exports.generateRandomString = void 0;
+exports.splitUrlParams = exports.getScreenReader = exports.getCookie = exports.getSystem = exports.getDevice = exports.getBrowserInfo = exports.getIndexByblockType = exports.uuid = exports.setFontForText = exports.getUid = exports.generateRandomString = void 0;
 const uuid_1 = require("uuid");
 function uuid(len, radix) {
     const chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
@@ -67,8 +67,8 @@ const setFontForText = (textContent, style) => {
     const cnStyle = `font-family:${cn !== null && cn !== void 0 ? cn : 'inherit'}`;
     const enStyle = `font-family:${en !== null && en !== void 0 ? en : 'inherit'}`;
     const fn = (str) => {
-        let chineseStartIndex = str.search(chineseRegex);
-        let englishStartIndex = str.search(englishRegex);
+        const chineseStartIndex = str.search(chineseRegex);
+        const englishStartIndex = str.search(englishRegex);
         if (chineseStartIndex !== -1 && englishStartIndex !== -1 && chineseStartIndex < englishStartIndex) {
             content += `<span style="${cnStyle}">${str.substring(chineseStartIndex, englishStartIndex)}</span>`;
             text = str.substring(englishStartIndex, str === null || str === void 0 ? void 0 : str.length);
@@ -98,7 +98,7 @@ const setFontForText = (textContent, style) => {
 exports.setFontForText = setFontForText;
 function getBrowserInfo() {
     var _a, _b, _c, _d, _e, _f, _g;
-    let userAgent = self.navigator.userAgent;
+    const userAgent = self.navigator.userAgent;
     if (!userAgent)
         return null;
     if (/edge\/([\d\.]+)/i.exec(userAgent))
@@ -120,7 +120,7 @@ function getBrowserInfo() {
 exports.getBrowserInfo = getBrowserInfo;
 function getSystem() {
     var _a, _b, _c;
-    let userAgent = self.navigator.userAgent;
+    const userAgent = self.navigator.userAgent;
     if (!userAgent)
         return null;
     if (/iphone/i.test(userAgent))
@@ -130,28 +130,28 @@ function getSystem() {
     if (/windows/i.test(userAgent))
         return `Windows ${(_c = userAgent.match(/Windows\s(.*?)\;/)) === null || _c === void 0 ? void 0 : _c[1]}`;
     if (/mac/i.test(userAgent))
-        return `Mac OS`;
+        return 'Mac OS';
     return null;
 }
 exports.getSystem = getSystem;
 function getDevice() {
-    let userAgent = self.navigator.userAgent;
+    const userAgent = self.navigator.userAgent;
     if (!userAgent)
         return null;
     if (/iphone/i.test(userAgent))
-        return `iPhone`;
+        return 'iPhone';
     if (/android/i.test(userAgent)) {
-        var index1 = userAgent.indexOf('(');
-        var index2 = userAgent.indexOf(')');
+        const index1 = userAgent.indexOf('(');
+        const index2 = userAgent.indexOf(')');
         if (index1 !== -1 && index2 !== -1) {
-            var value = userAgent.substring(index1 + 1, index2);
+            const value = userAgent.substring(index1 + 1, index2);
             return `${value}`;
         }
     }
     if (/windows/i.test(userAgent))
-        return `Windows`;
+        return 'Windows';
     if (/mac/i.test(userAgent))
-        return `Mac`;
+        return 'Mac';
     return null;
 }
 exports.getDevice = getDevice;
@@ -169,7 +169,7 @@ function getCookie(val) {
 }
 exports.getCookie = getCookie;
 function getScreenReader() {
-    let userAgent = self.navigator.userAgent;
+    const userAgent = self.navigator.userAgent;
     if (!userAgent)
         return false;
     return (/TalkBack/i.test(userAgent) ||
@@ -180,3 +180,28 @@ function getScreenReader() {
         /ChromeVox/i.test(userAgent));
 }
 exports.getScreenReader = getScreenReader;
+function splitUrlParams(urlParams) {
+    if (!urlParams)
+        return;
+    const indList = [];
+    for (let i = 0; i < urlParams.length; i++) {
+        const item = urlParams[i];
+        const curStr = urlParams.substring(i + 1, urlParams.length);
+        if (item === '&' &&
+            (curStr === null || curStr === void 0 ? void 0 : curStr.indexOf('=')) !== -1 &&
+            ((curStr === null || curStr === void 0 ? void 0 : curStr.indexOf('=')) < (curStr === null || curStr === void 0 ? void 0 : curStr.indexOf('&')) || (curStr === null || curStr === void 0 ? void 0 : curStr.indexOf('&')) === -1)) {
+            indList.push(i);
+        }
+    }
+    const splitList = indList.length > 0 ? [] : [urlParams];
+    let lastIndex = 0;
+    indList === null || indList === void 0 ? void 0 : indList.map((i) => {
+        splitList === null || splitList === void 0 ? void 0 : splitList.push(urlParams.substring(lastIndex, i));
+        lastIndex = i + 1;
+        if (i === indList[indList.length - 1] && i < urlParams.length) {
+            splitList === null || splitList === void 0 ? void 0 : splitList.push(urlParams.substring(lastIndex, urlParams.length));
+        }
+    });
+    return splitList !== null && splitList !== void 0 ? splitList : [];
+}
+exports.splitUrlParams = splitUrlParams;

package/lib/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/lib/materials/sxp/HashTag/material.js

@@ -60,7 +60,8 @@ const HashTag = (0, create_1.createMaterial)(_1.default, {
                 paddingLeft: 20,
                 paddingRight: 20,
                 paddingBottom: 20
-            }
+            },
+            openFixedSize: { open: true, ratio: '1' }
         }
     },
     w: 100,

package/lib/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/lib/materials/sxp/HashTag/settingRender.js

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

package/lib/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/lib/materials/sxp/consentPopup/Click/index.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const react_1 = tslib_1.__importStar(require("react"));
+require("./index.less");
+const tel_png_1 = tslib_1.__importDefault(require("./tel.png"));
+const ConsentDetail_1 = tslib_1.__importDefault(require("../../popup/ConsentDetail"));
+const Click = (_a) => {
+    var { isTel, open, content, style, consentPopupCate, acceptButton, rejectButton } = _a, props = tslib_1.__rest(_a, ["isTel", "open", "content", "style", "consentPopupCate", "acceptButton", "rejectButton"]);
+    const visivle = (0, react_1.useMemo)(() => {
+        return consentPopupCate || (open && style);
+    }, [consentPopupCate, open]);
+    const handleClickAccept = () => { };
+    const handleClickReject = () => { };
+    return (react_1.default.createElement(react_1.default.Fragment, null, isTel ? (react_1.default.createElement("img", { src: tel_png_1.default, style: { objectFit: 'cover', width: '100%', height: '100%' } })) : (react_1.default.createElement(react_1.default.Fragment, null, visivle && (react_1.default.createElement("div", { className: 'consentPopupClick' },
+        react_1.default.createElement("div", { className: 'consentPopupClick-container', style: style },
+            react_1.default.createElement(ConsentDetail_1.default, { content: content, style: { padding: 0 } }),
+            react_1.default.createElement("button", { style: acceptButton === null || acceptButton === void 0 ? void 0 : acceptButton.style, onClick: handleClickAccept }, acceptButton === null || acceptButton === void 0 ? void 0 : acceptButton.text),
+            react_1.default.createElement("button", { style: rejectButton === null || rejectButton === void 0 ? void 0 : rejectButton.style, onClick: handleClickReject }, rejectButton === null || rejectButton === void 0 ? void 0 : rejectButton.text))))))));
+};
+exports.default = (0, react_1.memo)(Click);

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

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