pb-sxp-ui 1.3.0 → 1.3.2

package/es/core/context/SxpDataSourceProvider.js

@@ -93,8 +93,8 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             .catch((err) => Promise.reject(err));
     }, [bffDataSource]);
     const getRecommendVideos = useCallback((query) => __awaiter(void 0, void 0, void 0, function* () {
-        var _d, _e, _f, _g, _h;
-        query = Object.assign(Object.assign({ maxSize: (_d = query === null || query === void 0 ? void 0 : query.maxSize) !== null && _d !== void 0 ? _d : maxSize, defaultSize: (_e = query === null || query === void 0 ? void 0 : query.defaultSize) !== null && _e !== void 0 ? _e : 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 }, ((query === null || query === void 0 ? void 0 : query.contentFilter) && { contentFilter: `[${query === null || query === void 0 ? void 0 : query.contentFilter}]` })), ((query === null || query === void 0 ? void 0 : query.productFilter) && { productFilter: `[${query === null || query === void 0 ? void 0 : query.productFilter}]` }));
+        var _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+        query = Object.assign(Object.assign(Object.assign({ maxSize: (_d = query === null || query === void 0 ? void 0 : query.maxSize) !== null && _d !== void 0 ? _d : maxSize, defaultSize: (_e = query === null || query === void 0 ? void 0 : query.defaultSize) !== null && _e !== void 0 ? _e : 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 }, ((query === null || query === void 0 ? void 0 : query.contentFilter) && { contentFilter: `[${query === null || query === void 0 ? void 0 : query.contentFilter}]` })), ((query === null || query === void 0 ? void 0 : query.productFilter) && { productFilter: `[${query === null || query === void 0 ? void 0 : query.productFilter}]` })), { pageNum: query === null || query === void 0 ? void 0 : query.pageNum });
         if (utmVal) {
             const val = (_h = (_g = (_f = utmVal === null || utmVal === void 0 ? void 0 : utmVal.split('&')) === null || _f === void 0 ? void 0 : _f.filter((val) => {
                 var _a, _b;
@@ -103,8 +103,35 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             })) === null || _g === void 0 ? void 0 : _g.join('&')) !== null && _h !== void 0 ? _h : '';
             query = Object.assign(Object.assign({}, query), { channel: decodeURIComponent(val) });
         }
-        if ((globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview) || isEditor) {
-            query = Object.assign(Object.assign(Object.assign({}, query), { directPage: true, level: 1, pageNum: 1 }), (!utmVal && channelQueryList && (channelQueryList === null || channelQueryList === void 0 ? void 0 : channelQueryList.length) > 0 && { channel: channelQueryList === null || channelQueryList === void 0 ? void 0 : channelQueryList.join('&') }));
+        if (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview) {
+            query = Object.assign(Object.assign({}, query), { directPage: true, level: 1, pageNum: (_j = query === null || query === void 0 ? void 0 : query.pageNum) !== null && _j !== void 0 ? _j : 1 });
+        }
+        if (isEditor) {
+            let pageNum = 1;
+            query = Object.assign(Object.assign({}, query), (!utmVal && channelQueryList && (channelQueryList === null || channelQueryList === void 0 ? void 0 : channelQueryList.length) > 0 && { channel: channelQueryList === null || channelQueryList === void 0 ? void 0 : channelQueryList[0] }));
+            if (!(query === null || query === void 0 ? void 0 : query.channel) || isInit.current)
+                return;
+            isInit.current = true;
+            let list = [];
+            let result = null;
+            const recurveRecList = (query) => __awaiter(void 0, void 0, void 0, function* () {
+                var _r, _s, _t, _u, _v, _w;
+                query.pageNum = pageNum;
+                result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/recommend/list', { method: 'GET', query }));
+                if (!(result === null || result === void 0 ? void 0 : result.success)) {
+                    return undefined;
+                }
+                const isNotNullList = (_s = (_r = result === null || result === void 0 ? void 0 : result.data) === null || _r === void 0 ? void 0 : _r.recList) === null || _s === void 0 ? void 0 : _s.every((item) => (item === null || item === void 0 ? void 0 : item.product) || (item === null || item === void 0 ? void 0 : item.video));
+                list = list.concat((_w = (_v = (_u = (_t = result === null || result === void 0 ? void 0 : result.data) === null || _t === void 0 ? void 0 : _t.recList) === null || _u === void 0 ? void 0 : _u.filter) === null || _v === void 0 ? void 0 : _v.call(_u, (item) => (item === null || item === void 0 ? void 0 : item.product) || (item === null || item === void 0 ? void 0 : item.video))) !== null && _w !== void 0 ? _w : []);
+                if (isNotNullList) {
+                    pageNum = pageNum + 1;
+                    yield recurveRecList(query);
+                }
+            });
+            yield recurveRecList(query);
+            if (!(query === null || query === void 0 ? void 0 : query.hashTag) && result)
+                setCurReqInfo({ rtc: (_k = result === null || result === void 0 ? void 0 : result.data) === null || _k === void 0 ? void 0 : _k.rtc, requestId: (_l = result === null || result === void 0 ? void 0 : result.data) === null || _l === void 0 ? void 0 : _l.requestId });
+            return Object.assign(Object.assign({}, result.data), { recList: list });
         }
         const result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/recommend/list', { method: 'GET', query }));
         if (!(result === null || result === void 0 ? void 0 : result.success)) {
@@ -112,15 +139,20 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         }
         if (!(query === null || query === void 0 ? void 0 : query.hashTag))
             setCurReqInfo({ rtc: result.data.rtc, requestId: result.data.requestId });
+        if ((globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview) && !isEditor) {
+            let list = [];
+            list = list.concat((_q = (_p = (_o = (_m = result === null || result === void 0 ? void 0 : result.data) === null || _m === void 0 ? void 0 : _m.recList) === null || _o === void 0 ? void 0 : _o.filter) === null || _p === void 0 ? void 0 : _p.call(_o, (item) => (item === null || item === void 0 ? void 0 : item.product) || (item === null || item === void 0 ? void 0 : item.video))) !== null && _q !== void 0 ? _q : []);
+            return Object.assign(Object.assign({}, result.data), { recList: list });
+        }
         return result === null || result === void 0 ? void 0 : result.data;
-    }), [bffFetch, utmVal, maxSize, defaultSize, globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview, channelQueryList, isEditor]);
-    const loadVideos = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        var _j, _k, _l, _m;
+    }), [bffFetch, utmVal, maxSize, defaultSize, channelQueryList]);
+    const loadVideos = useCallback((pageNum) => __awaiter(void 0, void 0, void 0, function* () {
+        var _x, _y, _z, _0;
         if (rtcList.length <= 0) {
             return;
         }
         const lastItem = rtcList === null || rtcList === void 0 ? void 0 : rtcList[(rtcList === null || rtcList === void 0 ? void 0 : rtcList.length) - 1];
-        const data = yield getRecommendVideos(Object.assign(Object.assign(Object.assign({ hashTag: waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.hashTag }, (((_j = lastItem === null || lastItem === void 0 ? void 0 : lastItem.product) === null || _j === void 0 ? void 0 : _j.itemId) && { productFilter: (_k = lastItem === null || lastItem === void 0 ? void 0 : lastItem.product) === null || _k === void 0 ? void 0 : _k.itemId })), (((_l = lastItem === null || lastItem === void 0 ? void 0 : lastItem.video) === null || _l === void 0 ? void 0 : _l.itemId) && { contentFilter: (_m = lastItem === null || lastItem === void 0 ? void 0 : lastItem.video) === null || _m === void 0 ? void 0 : _m.itemId })), { themeTag: themeTag.current }));
+        const data = yield getRecommendVideos(Object.assign(Object.assign(Object.assign(Object.assign({ hashTag: waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.hashTag }, (((_x = lastItem === null || lastItem === void 0 ? void 0 : lastItem.product) === null || _x === void 0 ? void 0 : _x.itemId) && { productFilter: (_y = lastItem === null || lastItem === void 0 ? void 0 : lastItem.product) === null || _y === void 0 ? void 0 : _y.itemId })), (((_z = lastItem === null || lastItem === void 0 ? void 0 : lastItem.video) === null || _z === void 0 ? void 0 : _z.itemId) && { contentFilter: (_0 = lastItem === null || lastItem === void 0 ? void 0 : lastItem.video) === null || _0 === void 0 ? void 0 : _0.itemId })), { themeTag: themeTag.current }), ((globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview) && !isEditor && { pageNum })));
         setRtcList(rtcList.concat(getFilterRecList(data)));
         setCacheRtcList(cacheRtcList.concat(getFilterRecList(data)));
     }), [getRecommendVideos, rtcList, waterFallData, cacheRtcList]);
@@ -132,7 +164,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             userInfo = {};
         }
         const sessionID = storeAndLoadFeSessionId();
-        const ef = Object.assign(Object.assign({ sessionID, rtc: curReqInfo.rtc, requestId: curReqInfo.requestId }, eventInfo), { sxpDevice: getDevice(), sxpSystem: getSystem(), sxpBrowser: getBrowserInfo() });
+        const ef = Object.assign(Object.assign(Object.assign(Object.assign({ sessionID, rtc: curReqInfo.rtc, requestId: curReqInfo.requestId }, eventInfo), (getDevice() && { sxpDevice: getDevice() })), (getSystem() && { sxpSystem: getSystem() })), (getBrowserInfo() && { sxpBrowser: getBrowserInfo() }));
         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 })
@@ -148,24 +180,21 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         });
     }, [bffFetch, curReqInfo, enableReportEvent, globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview]);
     const bffFbReport = useCallback((_a) => {
-        var _b, _c;
+        var _b, _c, _d;
         var { eventName, actionSource = 'website', eventSourceUrl = (_b = window === null || window === void 0 ? void 0 : window.location) === null || _b === void 0 ? void 0 : _b.href, externalId } = _a;
         if (!enableReportEvent || !enabledMetaConversionApi || (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview)) {
             return;
         }
         const fakeUserId = storeAndLoadFeUserId();
+        const urlParams = new URLSearchParams(window.location.search);
+        const fbclid = urlParams.get('fbclid');
         return bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/fb/events', {
             method: 'POST',
             body: {
                 eventName,
                 actionSource,
                 eventSourceUrl,
-                userData: {
-                    externalId: fakeUserId,
-                    fbc: `fb.2.${new Date().getTime()}.${getCookie('_fbc')}`,
-                    fbp: `fb.2.${new Date().getTime()}.${getCookie('_fbp')}`,
-                    client_user_agent: (_c = window === null || window === void 0 ? void 0 : window.navigator) === null || _c === void 0 ? void 0 : _c.userAgent
-                }
+                userData: Object.assign(Object.assign(Object.assign({ externalId: fakeUserId }, (fbclid && { fbc: `fb.2.${new Date().getTime()}.${fbclid}` })), (getCookie('_fbp') && { fbp: `fb.2.${new Date().getTime()}.${getCookie('_fbp')}` })), { client_user_agent: (_d = (_c = window === null || window === void 0 ? void 0 : window.navigator) === null || _c === void 0 ? void 0 : _c.userAgent) !== null && _d !== void 0 ? _d : '' })
             },
             type: 'beacon'
         });
@@ -183,17 +212,17 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         return res === null || res === void 0 ? void 0 : res.success;
     }), [bffFetch]);
     const bffGetTagList = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        var _o, _p, _q, _r, _s;
+        var _1, _2, _3, _4, _5;
         if (!utmVal || !isShowTag)
             return;
         try {
-            const val = (_q = (_p = (_o = utmVal === null || utmVal === void 0 ? void 0 : utmVal.split('&')) === null || _o === void 0 ? void 0 : _o.filter((val) => {
+            const val = (_3 = (_2 = (_1 = utmVal === null || utmVal === void 0 ? void 0 : utmVal.split('&')) === null || _1 === void 0 ? void 0 : _1.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 || _p === void 0 ? void 0 : _p.join('&')) !== null && _q !== void 0 ? _q : '';
+            })) === null || _2 === void 0 ? void 0 : _2.join('&')) !== null && _3 !== void 0 ? _3 : '';
             const result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/tag/list', { method: 'GET', query: { channel: decodeURIComponent(val) } }));
-            setTagList((_s = (_r = result === null || result === void 0 ? void 0 : result.data) === null || _r === void 0 ? void 0 : _r.tags) !== null && _s !== void 0 ? _s : []);
+            setTagList((_5 = (_4 = result === null || result === void 0 ? void 0 : result.data) === null || _4 === void 0 ? void 0 : _4.tags) !== null && _5 !== void 0 ? _5 : []);
         }
         catch (e) {
             console.log('e', e);
@@ -266,11 +295,10 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
                 }
             });
             setLoading(false);
-            isInit.current = true;
         });
     }, [isShowConsent]);
     useEffect(() => {
-        if (!isInit.current)
+        if (!isPreview)
             return;
         setLoading(true);
         bffGetTagList();
@@ -280,6 +308,12 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             setCacheRtcList(getFilterRecList(data));
         })
             .finally(() => {
+            bffEventReport({
+                eventInfo: {
+                    eventSubject: 'apiRequest',
+                    eventDescription: 'api request succeed'
+                }
+            });
             setLoading(false);
         });
     }, [getRecommendVideos, bffGetTagList]);
@@ -330,7 +364,8 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             setSelectTag,
             globalConfig,
             popupCurTimeRef,
-            checkCommodityIndexRef
+            checkCommodityIndexRef,
+            isEditor
         } }, isShowConsent ? (React.createElement(Consent, Object.assign({}, (_c = (_b = (_a = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.consent) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.item) === null || _c === void 0 ? void 0 : _c.props))) : (render({
         rtcList,
         mutateLike: bffMutateLike,

package/es/core/hooks/useEventReport.d.ts

@@ -1,6 +1,6 @@
 import { RecItemType } from '../components/SxpPageRender/typing';
 export declare function useEventReport(): {
-    jumpToWeb: (data?: RecItemType, product?: RecItemType['product'], cta?: RecItemType['cta'], position?: number) => void;
+    jumpToWeb: (data?: RecItemType, product?: RecItemType['product'], cta?: RecItemType['cta'], position?: number, traceInfo?: string) => void;
     productView: (data?: RecItemType, product?: RecItemType['product'], cta?: RecItemType['cta'], viewTime?: any, position?: number) => void;
     backMainFeed: (lastFeed: 'theme' | 'branch' | 'external', selectTag?: string, themeTag?: string, hashTag?: string) => void;
 };

package/es/core/hooks/useEventReport.js

@@ -3,7 +3,7 @@ import { useSxpDataSource } from './useSxpDataSource';
 import { DEFAULT_TAG } from '../context/SxpDataSourceProvider';
 export function useEventReport() {
     const { bffEventReport, popupDetailData, waterFallData, isFromHashtag } = useSxpDataSource();
-    const jumpToWeb = useCallback((data, product, cta, position) => {
+    const jumpToWeb = useCallback((data, product, cta, position, traceInfo) => {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9;
         let fromKName = '';
         if (popupDetailData && (((_b = (_a = data === null || data === void 0 ? void 0 : data.video) === null || _a === void 0 ? void 0 : _a.bindProducts) === null || _b === void 0 ? void 0 : _b.length) || ((_c = data === null || data === void 0 ? void 0 : data.video) === null || _c === void 0 ? void 0 : _c.bindProduct))) {
@@ -36,7 +36,7 @@ export function useEventReport() {
                 position: position + '',
                 contentId: (_v = (_u = data === null || data === void 0 ? void 0 : data.video) === null || _u === void 0 ? void 0 : _u.itemId) !== null && _v !== void 0 ? _v : '',
                 ctatId: (_w = cta === null || cta === void 0 ? void 0 : cta.itemId) !== null && _w !== void 0 ? _w : '',
-                traceInfo: (_9 = (_6 = (_4 = (_0 = (_x = product === null || product === void 0 ? void 0 : product.traceInfo) !== null && _x !== void 0 ? _x : (_z = (_y = data === null || data === void 0 ? void 0 : data.video) === null || _y === void 0 ? void 0 : _y.bindProduct) === null || _z === void 0 ? void 0 : _z.traceInfo) !== null && _0 !== void 0 ? _0 : (_3 = (_2 = (_1 = data === null || data === void 0 ? void 0 : data.video) === null || _1 === void 0 ? void 0 : _1.bindProducts) === null || _2 === void 0 ? void 0 : _2[0]) === null || _3 === void 0 ? void 0 : _3.traceInfo) !== null && _4 !== void 0 ? _4 : (_5 = data === null || data === void 0 ? void 0 : data.product) === null || _5 === void 0 ? void 0 : _5.traceInfo) !== null && _6 !== void 0 ? _6 : (_8 = (_7 = data === null || data === void 0 ? void 0 : data.video) === null || _7 === void 0 ? void 0 : _7.bindCta) === null || _8 === void 0 ? void 0 : _8.traceInfo) !== null && _9 !== void 0 ? _9 : ''
+                traceInfo: (_9 = (_6 = (_4 = (_0 = (_x = traceInfo !== null && traceInfo !== void 0 ? traceInfo : product === null || product === void 0 ? void 0 : product.traceInfo) !== null && _x !== void 0 ? _x : (_z = (_y = data === null || data === void 0 ? void 0 : data.video) === null || _y === void 0 ? void 0 : _y.bindProduct) === null || _z === void 0 ? void 0 : _z.traceInfo) !== null && _0 !== void 0 ? _0 : (_3 = (_2 = (_1 = data === null || data === void 0 ? void 0 : data.video) === null || _1 === void 0 ? void 0 : _1.bindProducts) === null || _2 === void 0 ? void 0 : _2[0]) === null || _3 === void 0 ? void 0 : _3.traceInfo) !== null && _4 !== void 0 ? _4 : (_5 = data === null || data === void 0 ? void 0 : data.product) === null || _5 === void 0 ? void 0 : _5.traceInfo) !== null && _6 !== void 0 ? _6 : (_8 = (_7 = data === null || data === void 0 ? void 0 : data.video) === null || _7 === void 0 ? void 0 : _7.bindCta) === null || _8 === void 0 ? void 0 : _8.traceInfo) !== null && _9 !== void 0 ? _9 : ''
             }
         });
     }, [bffEventReport, popupDetailData, isFromHashtag]);

package/es/core/utils/tool.d.ts

@@ -7,8 +7,8 @@ interface IfontType {
     'fontFamily-en': string;
 }
 export declare const setFontForText: (textContent?: string | null, style?: IfontType | any) => string;
-declare function getBrowserInfo(): string;
-declare function getSystem(): string;
-declare function getDevice(): string;
+declare function getBrowserInfo(): string | null;
+declare function getSystem(): string | null;
+declare function getDevice(): string | null;
 declare function getCookie(val: string): string;
 export { uuid, getIndexByblockType, getBrowserInfo, getDevice, getSystem, getCookie };

package/es/core/utils/tool.js

@@ -92,7 +92,7 @@ function getBrowserInfo() {
     var _a, _b, _c, _d, _e, _f, _g;
     let userAgent = self.navigator.userAgent;
     if (!userAgent)
-        return 'Unknown';
+        return null;
     if (/edge\/([\d\.]+)/i.exec(userAgent))
         return `Edge ${(_a = /edge\/([\d\.]+)/i.exec(userAgent)) === null || _a === void 0 ? void 0 : _a[1]}`;
     if (/edg\/([\d\.]+)/i.exec(userAgent))
@@ -107,13 +107,13 @@ function getBrowserInfo() {
         return `Firefox ${(_f = /firefox\/([\d\.]+)/i.exec(userAgent)) === null || _f === void 0 ? void 0 : _f[1]}`;
     if (/safari/i.test(userAgent))
         return `Safari ${(_g = /version\/([\d\.]+)/i.exec(userAgent)) === null || _g === void 0 ? void 0 : _g[1]}`;
-    return 'Unknown';
+    return null;
 }
 function getSystem() {
     var _a, _b, _c;
     let userAgent = self.navigator.userAgent;
     if (!userAgent)
-        return 'Unknown';
+        return null;
     if (/iphone/i.test(userAgent))
         return `IOS ${(_a = userAgent.match(/OS\s(.*?)\slike/)) === null || _a === void 0 ? void 0 : _a[1]}`;
     if (/android/i.test(userAgent))
@@ -122,12 +122,12 @@ function getSystem() {
         return `Windows ${(_c = userAgent.match(/Windows\s(.*?)\;/)) === null || _c === void 0 ? void 0 : _c[1]}`;
     if (/mac/i.test(userAgent))
         return `Mac OS`;
-    return 'Unknown';
+    return null;
 }
 function getDevice() {
     let userAgent = self.navigator.userAgent;
     if (!userAgent)
-        return 'Unknown';
+        return null;
     if (/iphone/i.test(userAgent))
         return `iPhone`;
     if (/android/i.test(userAgent)) {
@@ -142,7 +142,7 @@ function getDevice() {
         return `Windows`;
     if (/mac/i.test(userAgent))
         return `Mac`;
-    return 'Unknown';
+    return null;
 }
 function getCookie(val) {
     const cookies = document.cookie;

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

@@ -8,7 +8,9 @@ export interface IHashTagProps {
         hashTagDesc: CSSProperties;
         hashTagLink: CSSProperties;
         title: CSSProperties;
-        price: CSSProperties;
+        price: CSSProperties & {
+            enableFormattedPrice?: boolean;
+        };
     };
     buttonBgStyle: CSSProperties;
     showBanner?: boolean;

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

@@ -1,11 +1,4 @@
 declare const _default: ({
-    title: string;
-    child: {
-        type: string;
-        label: string;
-        name: string[];
-    }[];
-} | {
     title: string;
     child: ({
         type: string;
@@ -68,6 +61,13 @@ declare const _default: ({
             name?: undefined;
             initialValue?: undefined;
             child?: undefined;
+        } | {
+            label: string;
+            type: string;
+            name: string[];
+            initialValue: boolean;
+            options?: undefined;
+            child?: undefined;
         })[];
     }[];
 } | {
@@ -126,6 +126,12 @@ declare const _default: ({
         })[];
         name?: undefined;
         initialValue?: undefined;
+    } | {
+        label: string;
+        type: string;
+        name: string[];
+        initialValue?: undefined;
+        child?: undefined;
     })[];
 })[];
 export default _default;

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

@@ -99,6 +99,16 @@ export default [
                     {
                         label: '标题对齐',
                         type: 'TextAlign'
+                    },
+                    {
+                        label: '间距',
+                        type: 'TextSpace'
+                    },
+                    {
+                        label: '价格千分符展示',
+                        type: 'Switch',
+                        name: ['enableFormattedPrice'],
+                        initialValue: true
                     }
                 ]
             }
@@ -184,6 +194,11 @@ export default [
             {
                 type: 'TextAlign',
                 name: ['props', 'buttonStyle']
+            },
+            {
+                label: '间距',
+                type: 'TextSpace',
+                name: ['props', 'buttonStyle']
             }
         ]
     },

package/es/materials/sxp/cta/AniLink/settingRender.d.ts

@@ -68,6 +68,11 @@ declare const _default: ({
         type: string;
         name: string[];
         child?: undefined;
+    } | {
+        type: string;
+        name: string[];
+        label?: undefined;
+        child?: undefined;
     })[];
 })[];
 export default _default;

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

@@ -97,6 +97,10 @@ export default [
                 label: '对齐',
                 type: 'TextAlign',
                 name: ['props', 'ctaTempStyles', 'ctaTitle']
+            },
+            {
+                type: 'TextSpace',
+                name: ['props', 'ctaTempStyles', 'ctaTitle']
             }
         ]
     }

package/es/materials/sxp/popup/AppointForm/settingRender.d.ts

@@ -64,13 +64,16 @@ declare const _default: ({
         })[];
         name?: undefined;
         options?: undefined;
-    } | {
+    })[];
+    type?: undefined;
+    label?: undefined;
+    name?: undefined;
+} | {
+    title: string;
+    child: {
         type: string;
         name: string[];
-        label?: undefined;
-        child?: undefined;
-        options?: undefined;
-    })[];
+    }[];
     type?: undefined;
     label?: undefined;
     name?: undefined;

package/es/materials/sxp/popup/AppointForm/settingRender.js

@@ -68,6 +68,11 @@ export default [
                 type: 'TextAlign',
                 name: ['textStyle']
             },
+            {
+                label: '标题间距',
+                type: 'TextSpace',
+                name: ['textStyle']
+            },
             {
                 label: '表单布局',
                 type: 'Radius',
@@ -126,10 +131,12 @@ export default [
                 ]
             },
             {
+                label: '提交按钮文本样式',
                 type: 'TextStyle',
                 name: ['props', 'submitButtonStyle']
             },
             {
+                label: '提交按钮对齐',
                 type: 'TextAlign',
                 name: ['props', 'submitButtonStyle']
             },
@@ -137,6 +144,11 @@ export default [
                 label: '提交按钮颜色',
                 type: 'Color',
                 name: ['props', 'submitBgColor']
+            },
+            {
+                label: '提交按钮间距',
+                type: 'TextSpace',
+                name: ['props', 'submitButtonStyle']
             }
         ]
     },

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

@@ -25,7 +25,9 @@ export interface ICommodityDetailProps {
     commodityStyles?: {
         title: CSSProperties;
         collection: CSSProperties;
-        price: CSSProperties;
+        price: CSSProperties & {
+            enableFormattedPrice?: boolean;
+        };
         info: CSSProperties;
         taxInfo: CSSProperties;
     };

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

@@ -12,7 +12,7 @@ import FormatImage from '../../../../core/components/SxpPageRender/FormatImage';
 import { setFontForText } from '../../../../core/utils/tool';
 import CommodityGroup from '../../template/components/CommodityGroup';
 const CommodityDetail = (_a) => {
-    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4;
+    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5;
     var { content, style, bgImg, onClick, schema, isDefault, bottom_image, tipText, isPost, viewTime, rec, swiper, commodityStyles, buttonStyle, index, commodityGroup, popupBg, iframeIcon, commodityImgRatio } = _a, props = __rest(_a, ["content", "style", "bgImg", "onClick", "schema", "isDefault", "bottom_image", "tipText", "isPost", "viewTime", "rec", "swiper", "commodityStyles", "buttonStyle", "index", "commodityGroup", "popupBg", "iframeIcon", "commodityImgRatio"]);
     const { sxpParameter, popupDetailData, isPreview, bffFbReport, popupCurTimeRef, checkCommodityIndexRef } = useSxpDataSource();
     const { jumpToWeb, productView } = useEventReport();
@@ -20,6 +20,7 @@ const CommodityDetail = (_a) => {
     const [showModal, setShowModal] = useState(false);
     const [show3DModal, setShow3DModal] = useState(false);
     const [checkCommodityIndex, setCheckCommodityIndex] = useState((_b = popupDetailData === null || popupDetailData === void 0 ? void 0 : popupDetailData.multiCheckIndex) !== null && _b !== void 0 ? _b : 0);
+    const ref = useRef();
     const data = isPost ? rec : popupDetailData;
     let product = isPost ? data === null || data === void 0 ? void 0 : data.product : (_d = (_c = data === null || data === void 0 ? void 0 : data.video) === null || _c === void 0 ? void 0 : _c.bindProduct) !== null && _d !== void 0 ? _d : (_f = (_e = data === null || data === void 0 ? void 0 : data.video) === null || _e === void 0 ? void 0 : _e.bindProducts) === null || _f === void 0 ? void 0 : _f[0];
     let cta = isPost
@@ -59,17 +60,20 @@ const CommodityDetail = (_a) => {
         };
     }, []);
     const priceText = useMemo(() => {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g;
+        const isToLocStr = ((_a = commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price) === null || _a === void 0 ? void 0 : _a.enableFormattedPrice) === undefined || ((_b = commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price) === null || _b === void 0 ? void 0 : _b.enableFormattedPrice);
         if ((product === null || product === void 0 ? void 0 : product.currency) && (product === null || product === void 0 ? void 0 : product.price)) {
-            return `${(_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 : ''}${(_e = (_d = product === null || product === void 0 ? void 0 : product.price) === null || _d === void 0 ? void 0 : _d.toLocaleString('zh', {
-                minimumFractionDigits: 0
-            })) !== null && _e !== void 0 ? _e : ''}`;
+            return `${(_e = (_d = (_c = product === null || product === void 0 ? void 0 : product.currency) === null || _c === void 0 ? void 0 : _c.split('-')[1]) === null || _d === void 0 ? void 0 : _d.toUpperCase()) !== null && _e !== void 0 ? _e : ''}${isToLocStr
+                ? (_g = (_f = product === null || product === void 0 ? void 0 : product.price) === null || _f === void 0 ? void 0 : _f.toLocaleString('zh', {
+                    minimumFractionDigits: 0
+                })) !== null && _g !== void 0 ? _g : ''
+                : product === null || product === void 0 ? void 0 : product.price}`;
         }
         else {
             return '$7,000';
         }
-    }, [product === null || product === void 0 ? void 0 : product.price, product === null || product === void 0 ? void 0 : product.currency]);
-    const width = (isPreview ? 375 : (_t = style === null || style === void 0 ? void 0 : style.width) !== null && _t !== void 0 ? _t : window.innerWidth) - ((_u = popupBg === null || popupBg === void 0 ? void 0 : popupBg.horizontalMargin) !== null && _u !== void 0 ? _u : 0) * 2;
+    }, [product === null || product === void 0 ? void 0 : product.price, product === null || product === void 0 ? void 0 : product.currency, (_t = commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price) === null || _t === void 0 ? void 0 : _t.enableFormattedPrice]);
+    const width = (isPreview ? 375 : (_u = style === null || style === void 0 ? void 0 : style.width) !== null && _u !== void 0 ? _u : window.innerWidth) - ((_v = popupBg === null || popupBg === void 0 ? void 0 : popupBg.horizontalMargin) !== null && _v !== void 0 ? _v : 0) * 2;
     const height = commodityImgRatio ? width * (commodityImgRatio.h / commodityImgRatio.w) : width;
     const renderContent = ({ isPost }) => {
         var _a, _b, _c, _d;
@@ -110,6 +114,10 @@ const CommodityDetail = (_a) => {
         popupCurTimeRef.current = new Date();
         setCheckCommodityIndex(index);
         checkCommodityIndexRef.current = index;
+        if (ref === null || ref === void 0 ? void 0 : ref.current) {
+            ref.current.swiper.slideTo(0);
+            ref.current.swiper.autoplay.start();
+        }
     }, []);
     const renderCommodityGroup = useCallback(() => {
         var _a, _b, _c;
@@ -125,18 +133,18 @@ const CommodityDetail = (_a) => {
         };
         return dotsAlignClass === null || dotsAlignClass === void 0 ? void 0 : dotsAlignClass[swiper === null || swiper === void 0 ? void 0 : swiper.dotsAlign];
     }, [swiper === null || swiper === void 0 ? void 0 : swiper.dotsAlign]);
-    const iframeUrl = ((_w = (_v = data === null || data === void 0 ? void 0 : data.video) === null || _v === void 0 ? void 0 : _v.bindProduct) === null || _w === void 0 ? void 0 : _w.remark) || ((_z = (_y = (_x = data === null || data === void 0 ? void 0 : data.video) === null || _x === void 0 ? void 0 : _x.bindProducts) === null || _y === void 0 ? void 0 : _y[0]) === null || _z === void 0 ? void 0 : _z.remark) || ((_0 = data === null || data === void 0 ? void 0 : data.product) === null || _0 === void 0 ? void 0 : _0.remark);
+    const iframeUrl = ((_x = (_w = data === null || data === void 0 ? void 0 : data.video) === null || _w === void 0 ? void 0 : _w.bindProduct) === null || _x === void 0 ? void 0 : _x.remark) || ((_0 = (_z = (_y = data === null || data === void 0 ? void 0 : data.video) === null || _y === void 0 ? void 0 : _y.bindProducts) === null || _z === void 0 ? void 0 : _z[0]) === null || _0 === void 0 ? void 0 : _0.remark) || ((_1 = data === null || data === void 0 ? void 0 : data.product) === null || _1 === void 0 ? void 0 : _1.remark);
     return (React.createElement(React.Fragment, null,
         React.createElement("div", Object.assign({ className: css(Object.assign({}, style)) }, props),
             React.createElement("div", { style: { position: 'relative' } },
-                product && ((_1 = product === null || product === void 0 ? void 0 : product.homePage) === null || _1 === void 0 ? void 0 : _1.length) > 0 && (React.createElement(Swiper, { height: height, modules: [Pagination, Autoplay], pagination: {
+                product && ((_2 = product === null || product === void 0 ? void 0 : product.homePage) === null || _2 === void 0 ? void 0 : _2.length) > 0 && (React.createElement(Swiper, { height: height, modules: [Pagination, Autoplay], pagination: {
                         clickable: true,
                         bulletActiveClass: 'swipe-item-active-bullet',
                         clickableClass: getDotsAlign
                     }, loop: true, autoplay: {
                         delay: (swiper === null || swiper === void 0 ? void 0 : swiper.delay) * 1000
-                    } },
-                    React.createElement(React.Fragment, null, (_2 = product === null || product === void 0 ? void 0 : product.homePage) === null || _2 === void 0 ? void 0 : _2.map((src) => {
+                    }, ref: ref },
+                    React.createElement(React.Fragment, null, (_3 = product === null || product === void 0 ? void 0 : product.homePage) === null || _3 === void 0 ? void 0 : _3.map((src) => {
                         var _a;
                         return (React.createElement(SwiperSlide, { key: src },
                             React.createElement("div", { style: {
@@ -152,7 +160,7 @@ const CommodityDetail = (_a) => {
                                         objectPosition: `50% ${(swiper === null || swiper === void 0 ? void 0 : swiper.translateY) ? (swiper === null || swiper === void 0 ? void 0 : swiper.translateY) + 50 : 50}%`
                                     }, src: (_a = src !== null && src !== void 0 ? src : sxpParameter === null || sxpParameter === void 0 ? void 0 : sxpParameter.bottom_image) !== null && _a !== void 0 ? _a : bottom_image }))));
                     })))),
-                !((_3 = product === null || product === void 0 ? void 0 : product.homePage) === null || _3 === void 0 ? void 0 : _3.length) && (React.createElement("div", { className: css({
+                !((_4 = product === null || product === void 0 ? void 0 : product.homePage) === null || _4 === void 0 ? void 0 : _4.length) && (React.createElement("div", { className: css({
                         height,
                         width
                     }) },
@@ -160,21 +168,20 @@ const CommodityDetail = (_a) => {
                             objectFit: 'cover',
                             width: '100%',
                             height: '100%'
-                        }), src: (_4 = sxpParameter === null || sxpParameter === void 0 ? void 0 : sxpParameter.bottom_image) !== null && _4 !== void 0 ? _4 : bottom_image, alt: 'pdp image' }))),
-                (iframeUrl && iframeIcon) ||
-                    (!product && iframeIcon && (React.createElement("div", { style: {
-                            padding: '5px 10px',
-                            display: 'flex',
-                            alignItems: 'center',
-                            position: 'absolute',
-                            right: '10px',
-                            bottom: '10px',
-                            zIndex: 1,
-                            background: '#fff',
-                            borderRadius: '3px'
-                        }, onClick: () => setShow3DModal(true) },
-                        React.createElement("img", { src: iframeIcon, alt: '3d', width: '20px', height: '20px', style: { marginRight: '5px' } }),
-                        React.createElement("span", { style: { fontSize: '12px' } }, "Try in 3D"))))),
+                        }), src: (_5 = sxpParameter === null || sxpParameter === void 0 ? void 0 : sxpParameter.bottom_image) !== null && _5 !== void 0 ? _5 : bottom_image, alt: 'pdp image' }))),
+                (iframeUrl || !product) && iframeIcon && (React.createElement("div", { style: {
+                        padding: '5px 10px',
+                        display: 'flex',
+                        alignItems: 'center',
+                        position: 'absolute',
+                        right: '10px',
+                        bottom: '10px',
+                        zIndex: 1,
+                        background: '#fff',
+                        borderRadius: '3px'
+                    }, onClick: () => setShow3DModal(true) },
+                    React.createElement("img", { src: iframeIcon, alt: '3d', width: '20px', height: '20px', style: { marginRight: '5px' } }),
+                    React.createElement("span", { style: { fontSize: '12px' } }, "Try in 3D")))),
             renderCommodityGroup(),
             React.createElement("div", { className: 'pb-commondity-content' }, renderContent({ isPost }))),
         renderBtn(),

package/es/materials/sxp/popup/CommodityDetail/settingRender.d.ts

@@ -147,6 +147,13 @@ declare const _default: ({
             options?: undefined;
             initialValue?: undefined;
             child?: undefined;
+        } | {
+            label: string;
+            type: string;
+            name: string[];
+            initialValue: boolean;
+            options?: undefined;
+            child?: undefined;
         })[];
     }[];
 } | {
@@ -205,6 +212,12 @@ declare const _default: ({
         })[];
         name?: undefined;
         initialValue?: undefined;
+    } | {
+        label: string;
+        type: string;
+        name: string[];
+        initialValue?: undefined;
+        child?: undefined;
     })[];
 } | {
     title: string;

package/es/materials/sxp/popup/CommodityDetail/settingRender.js

@@ -208,6 +208,16 @@ export default [
                         label: '默认行数',
                         type: 'Number',
                         name: ['lineClamp']
+                    },
+                    {
+                        label: '间距',
+                        type: 'TextSpace'
+                    },
+                    {
+                        label: '价格千分符展示',
+                        type: 'Switch',
+                        name: ['enableFormattedPrice'],
+                        initialValue: true
                     }
                 ]
             }
@@ -293,6 +303,11 @@ export default [
             {
                 type: 'TextAlign',
                 name: ['props', 'buttonStyle']
+            },
+            {
+                label: '间距',
+                type: 'TextSpace',
+                name: ['props', 'buttonStyle']
             }
         ]
     },