pb-sxp-ui 1.13.2 → 1.13.4

package/dist/index.cjs

@@ -677,12 +677,15 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
     const bffDataSource = React.useMemo(() => {
         return dataSources === null || dataSources === void 0 ? void 0 : dataSources.find((d) => d.type === DataSourceType.BFF);
     }, [dataSources]);
+    const fakeUserId = React.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]);
     // bff API 请求方法
     const bffFetch = React.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}`;
@@ -690,19 +693,19 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         // 事件上报优化
         // Beacon API 用于发送异步和非阻塞请求到服务器。这类请求不需要响应。
         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 = React.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;
@@ -740,7 +743,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             const recurveRecList = (query) => __awaiter(void 0, void 0, void 0, function* () {
                 var _v, _w, _x, _y, _z, _0;
                 query.pageNum = pageNum;
-                result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/recommend/list', { method: 'POST', body: query }));
+                result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('v1/recommend/list', { method: 'POST', body: query }));
                 if (!(result === null || result === void 0 ? void 0 : result.success)) {
                     return undefined;
                 }
@@ -762,7 +765,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         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;
         }
@@ -812,6 +815,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         return expire;
     }, [data]);
     const bffEventReport = React.useCallback(({ userInfo, eventInfo, reportLayId = true }) => {
+        var _a;
         // 关闭 BFF 事件上报
         if (!enableReportEvent || (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview)) {
             return;
@@ -833,14 +837,23 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         console.log('userInfo:', userInfo);
         console.log('eventInfo:', ef);
         console.log('========= 结束 =========');
-        return bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/event/report', {
+        return bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch(`v2/event/report/CLD/${(_a = bffDataSource === null || bffDataSource === void 0 ? void 0 : bffDataSource.headers) === null || _a === void 0 ? void 0 : _a['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 = React.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) ||
@@ -852,7 +865,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         const fbclid = urlParams === null || urlParams === void 0 ? void 0 : urlParams.get('fbclid');
         const fix_par = {
             event_source_url: (_c = window === null || window === void 0 ? void 0 : window.location) === null || _c === void 0 ? void 0 : _c.href,
-            external_id: storeAndLoadFeUserId(),
+            external_id: fakeUserId,
             client_user_agent: (_e = (_d = window === null || window === void 0 ? void 0 : window.navigator) === null || _d === void 0 ? void 0 : _d.userAgent) !== null && _e !== void 0 ? _e : '',
             fbc: fbclid ? `fb.2.${new Date().getTime()}.${fbclid}` : '',
             fbp: getCookie('_fbp') ? `fb.2.${new Date().getTime()}.${getCookie('_fbp')}` : '',
@@ -904,22 +917,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 = React.useCallback((body) => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/recommend/like', { method: 'POST', body }));
+        const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('v1/recommend/like', { method: 'POST', body }));
         return res === null || res === void 0 ? void 0 : res.success;
     }), [bffFetch]);
     const bffMutateUnlike = React.useCallback((body) => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/recommend/unlike', { method: 'POST', body }));
+        const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('v1/recommend/unlike', { method: 'POST', body }));
         return res === null || res === void 0 ? void 0 : res.success;
     }), [bffFetch]);
     const bffSubmitForm = React.useCallback((body) => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/customform', { method: 'POST', body }));
+        const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('v1/customform', { method: 'POST', body }));
         return res === null || res === void 0 ? void 0 : res.success;
     }), [bffFetch]);
     // 获取 Tag
@@ -934,7 +955,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
                 const key = val.split('=')[0];
                 return (_b = ((_a = utmParameter === null || utmParameter === void 0 ? void 0 : utmParameter.channels) !== null && _a !== void 0 ? _a : [])) === null || _b === void 0 ? void 0 : _b.includes(key);
             })) === null || _9 === void 0 ? void 0 : _9.join('&')) !== null && _10 !== void 0 ? _10 : '';
-            const result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/tag/list', { method: 'GET', query: { channel: decodeURIComponent(val) } }));
+            const result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('v1/tag/list', { method: 'GET', query: { channel: decodeURIComponent(val) } }));
             setTagList((_12 = (_11 = result === null || result === void 0 ? void 0 : result.data) === null || _11 === void 0 ? void 0 : _11.tags) !== null && _12 !== void 0 ? _12 : []);
         }
         catch (e) {
@@ -1008,10 +1029,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);
@@ -10098,7 +10119,7 @@ var CommodityGroup$1 = React.memo(CommodityGroup);
  * @Author: binruan@chatlabs.com
  * @Date: 2024-03-20 14:56:16
  * @LastEditors: binruan@chatlabs.com
- * @LastEditTime: 2024-10-24 17:51:19
+ * @LastEditTime: 2024-12-20 14:32:26
  * @FilePath: \pb-sxp-ui\src\core\utils\materials.ts
  *
  */
@@ -10136,14 +10157,16 @@ const getBgStyle = (imgSrc) => {
 };
 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);
     }
@@ -11961,7 +11984,7 @@ const CommodityList = createMaterial(CommodityListComponent, {
  * @Author: binruan@chatlabs.com
  * @Date: 2023-10-27 14:06:35
  * @LastEditors: binruan@chatlabs.com
- * @LastEditTime: 2024-12-12 15:12:57
+ * @LastEditTime: 2024-08-08 17:32:11
  * @FilePath: \pb-sxp-ui\src\materials\sxp\popup\Iframe\settingRender.tsx
  *
  */
@@ -11975,32 +11998,16 @@ var settingRender$8 = [
                 name: ['style', 'backgroundColor']
             }
         ]
-    },
-    {
-        title: 'iframe',
-        child: [
-            {
-                type: 'TextArea',
-                label: 'url',
-                name: ['props', 'iframe', 'src']
-            },
-            {
-                type: 'TextArea',
-                label: 'allow',
-                name: ['props', 'iframe', 'allow']
-            }
-        ]
     }
 ];
 
 const Iframe$1 = (_a) => {
     var _b, _c;
-    var { content, btnText, style, icon, isPopup, isExternalLink, onClose, onClick, submitButtonStyle, contentStyle, isTel, iframe } = _a, props = __rest(_a, ["content", "btnText", "style", "icon", "isPopup", "isExternalLink", "onClose", "onClick", "submitButtonStyle", "contentStyle", "isTel", "iframe"]);
+    var { content, btnText, style, icon, isPopup, isExternalLink, onClose, onClick, submitButtonStyle, contentStyle, isTel } = _a, props = __rest(_a, ["content", "btnText", "style", "icon", "isPopup", "isExternalLink", "onClose", "onClick", "submitButtonStyle", "contentStyle", "isTel"]);
     const { popupDetailData } = useSxpDataSource();
-    const { src, allow } = iframe || {};
-    const iframeUrl = src || ((_c = (_b = popupDetailData === null || popupDetailData === void 0 ? void 0 : popupDetailData.video) === null || _b === void 0 ? void 0 : _b.bindCta) === null || _c === void 0 ? void 0 : _c.remark);
-    return (React.createElement("div", Object.assign({ className: `${css.css(Object.assign(Object.assign({}, style), { overflow: 'hidden' }))}` }, props),
-        React.createElement("iframe", { src: iframeUrl, allow: allow, scrolling: 'no', style: {
+    const iframeUrl = (_c = (_b = popupDetailData === null || popupDetailData === void 0 ? void 0 : popupDetailData.video) === null || _b === void 0 ? void 0 : _b.bindCta) === null || _c === void 0 ? void 0 : _c.remark;
+    return (React.createElement("div", Object.assign({ className: `${css.css(Object.assign({}, style))}` }, props),
+        React.createElement("iframe", { src: iframeUrl, style: {
                 width: '100%',
                 height: 'calc(100% - 50px)',
                 marginTop: '50px',
@@ -17938,7 +17945,7 @@ var NavBack$1 = React.memo(NavBack);
  * @Author: binruan@chatlabs.com
  * @Date: 2024-03-20 10:27:31
  * @LastEditors: binruan@chatlabs.com
- * @LastEditTime: 2024-12-18 10:24:20
+ * @LastEditTime: 2024-12-26 17:33:54
  * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\index.tsx
  *
  */
@@ -18063,6 +18070,7 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
                     skipLinkRef.current = false;
                 }
                 // 页面可见时触发，注意页面初始化时不会触发
+                refreshFeSession === null || refreshFeSession === void 0 ? void 0 : refreshFeSession(false, handleSessionCompleted);
                 handleH5EnterLink();
                 if (repCond) {
                     SXP_EVENT_BUS.emit(SXP_EVENT_TYPE.PAGE_DID_SHOW, item);
@@ -18905,7 +18913,7 @@ var index$1 = React.memo(DiyPortalPreview);
  * @Author: binruan@chatlabs.com
  * @Date: 2023-10-31 10:56:01
  * @LastEditors: binruan@chatlabs.com
- * @LastEditTime: 2024-12-12 14:48:31
+ * @LastEditTime: 2024-10-23 15:07:29
  * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\Popup\index.tsx
  *
  */