pb-sxp-ui 1.13.1 → 1.13.3

package/dist/pb-ui.js

@@ -670,15 +670,12 @@
         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}`;
@@ -686,19 +683,19 @@
             // 事件上报优化
             // Beacon API 用于发送异步和非阻塞请求到服务器。这类请求不需要响应。
             if (options.type === 'beacon' && navigator.sendBeacon) {
-                return navigator.sendBeacon(`${url}/api/${path}`, new Blob([
+                return navigator.sendBeacon(`${url}/api/v1${path}`, new Blob([
                     JSON.stringify(Object.assign(Object.assign(Object.assign({}, options.body), bffDataSource.headers), { 'x-user-id': fakeUserId }))
                 ], { type: 'application/json;charset=UTF-8' }));
             }
             return window
-                .fetch(`${url}/api/${path}`, {
+                .fetch(`${url}/api/v1${path}`, {
                 headers: Object.assign({ 'Content-Type': 'application/json', 'x-user-id': fakeUserId }, bffDataSource.headers),
                 method: options.method,
                 body: JSON.stringify(options.body)
             })
                 .then((res) => res.json())
                 .catch((err) => Promise.reject(err));
-        }, [bffDataSource, fakeUserId]);
+        }, [bffDataSource]);
         // 获取推荐视频数据
         const getRecommendVideos = 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;
@@ -736,7 +733,7 @@
                 const recurveRecList = (query) => __awaiter(void 0, void 0, void 0, function* () {
                     var _v, _w, _x, _y, _z, _0;
                     query.pageNum = pageNum;
-                    result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('v1/recommend/list', { method: 'POST', body: query }));
+                    result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/recommend/list', { method: 'POST', body: query }));
                     if (!(result === null || result === void 0 ? void 0 : result.success)) {
                         return undefined;
                     }
@@ -758,7 +755,7 @@
             if (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview) {
                 query = Object.assign(Object.assign({}, query), { directPage: true, level: 1, pageNum: (_o = query === null || query === void 0 ? void 0 : query.pageNum) !== null && _o !== void 0 ? _o : 1 });
             }
-            const result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('v1/recommend/list', { method: 'POST', body: query }));
+            const result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/recommend/list', { method: 'POST', body: query }));
             if (!(result === null || result === void 0 ? void 0 : result.success)) {
                 return undefined;
             }
@@ -808,7 +805,6 @@
             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;
@@ -830,23 +826,14 @@
             console.log('userInfo:', userInfo);
             console.log('eventInfo:', ef);
             console.log('========= 结束 =========');
-            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}`, {
+            return bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/event/report', {
                 method: 'POST',
                 body: { userInfo: realUserInfo, eventInfo: realEventInfo },
                 type: 'beacon'
             });
-        }, [
-            bffFetch,
-            curReqInfo,
-            enableReportEvent,
-            globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview,
-            layoutVariantId,
-            globalConfig,
-            playbookType,
-            bffDataSource
-        ]);
+        }, [bffFetch, curReqInfo, enableReportEvent, globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview, layoutVariantId, globalConfig, playbookType]);
         const bffFbReport = React.useCallback(({ eventName, product }) => {
-            var _a, _b, _c, _d, _e, _f;
+            var _a, _b, _c, _d, _e;
             if (!enableReportEvent ||
                 !enabledMetaConversionApi ||
                 (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview) ||
@@ -858,7 +845,7 @@
             const fbclid = urlParams === null || urlParams === void 0 ? void 0 : urlParams.get('fbclid');
             const fix_par = {
                 event_source_url: (_c = window === null || window === void 0 ? void 0 : window.location) === null || _c === void 0 ? void 0 : _c.href,
-                external_id: fakeUserId,
+                external_id: storeAndLoadFeUserId(),
                 client_user_agent: (_e = (_d = window === null || window === void 0 ? void 0 : window.navigator) === null || _d === void 0 ? void 0 : _d.userAgent) !== null && _e !== void 0 ? _e : '',
                 fbc: fbclid ? `fb.2.${new Date().getTime()}.${fbclid}` : '',
                 fbp: getCookie('_fbp') ? `fb.2.${new Date().getTime()}.${getCookie('_fbp')}` : '',
@@ -910,30 +897,22 @@
                 }
             };
             getEventParams(jsonParams);
-            return bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch(`v2/event/report/FB/${(_f = bffDataSource === null || bffDataSource === void 0 ? void 0 : bffDataSource.headers) === null || _f === void 0 ? void 0 : _f['x-app-id']}/${eventName}`, {
+            return bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/fb/events', {
                 method: 'POST',
                 body: jsonParams,
                 type: 'beacon'
             });
-        }, [
-            bffFetch,
-            enableReportEvent,
-            enabledMetaConversionApi,
-            globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview,
-            globalConfig,
-            fakeUserId,
-            bffDataSource
-        ]);
+        }, [bffFetch, enableReportEvent, enabledMetaConversionApi, globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview, globalConfig]);
         const bffMutateLike = React.useCallback((body) => __awaiter(void 0, void 0, void 0, function* () {
-            const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('v1/recommend/like', { method: 'POST', body }));
+            const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/recommend/like', { method: 'POST', body }));
             return res === null || res === void 0 ? void 0 : res.success;
         }), [bffFetch]);
         const bffMutateUnlike = React.useCallback((body) => __awaiter(void 0, void 0, void 0, function* () {
-            const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('v1/recommend/unlike', { method: 'POST', body }));
+            const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/recommend/unlike', { method: 'POST', body }));
             return res === null || res === void 0 ? void 0 : res.success;
         }), [bffFetch]);
         const bffSubmitForm = React.useCallback((body) => __awaiter(void 0, void 0, void 0, function* () {
-            const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('v1/customform', { method: 'POST', body }));
+            const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/customform', { method: 'POST', body }));
             return res === null || res === void 0 ? void 0 : res.success;
         }), [bffFetch]);
         // 获取 Tag
@@ -948,7 +927,7 @@
                     const key = val.split('=')[0];
                     return (_b = ((_a = utmParameter === null || utmParameter === void 0 ? void 0 : utmParameter.channels) !== null && _a !== void 0 ? _a : [])) === null || _b === void 0 ? void 0 : _b.includes(key);
                 })) === null || _9 === void 0 ? void 0 : _9.join('&')) !== null && _10 !== void 0 ? _10 : '';
-                const result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('v1/tag/list', { method: 'GET', query: { channel: decodeURIComponent(val) } }));
+                const result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/tag/list', { method: 'GET', query: { channel: decodeURIComponent(val) } }));
                 setTagList((_12 = (_11 = result === null || result === void 0 ? void 0 : result.data) === null || _11 === void 0 ? void 0 : _11.tags) !== null && _12 !== void 0 ? _12 : []);
             }
             catch (e) {
@@ -1022,10 +1001,10 @@
                     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);
@@ -10112,7 +10091,7 @@
      * @Author: binruan@chatlabs.com
      * @Date: 2024-03-20 14:56:16
      * @LastEditors: binruan@chatlabs.com
-     * @LastEditTime: 2024-12-20 14:32:26
+     * @LastEditTime: 2024-10-24 17:51:19
      * @FilePath: \pb-sxp-ui\src\core\utils\materials.ts
      *
      */
@@ -10150,16 +10129,14 @@
     };
     const getPriceText = ({ product, enableFormattedPrice, globalConfig, isHiddenDef, style }) => {
         var _a, _b, _c, _d, _e, _f, _g, _h;
-        let text = '';
         if ((!(product === null || product === void 0 ? void 0 : product.currency) || !(product === null || product === void 0 ? void 0 : product.price)) && isHiddenDef)
             return null;
-        let price = Number((product === null || product === void 0 ? void 0 : product.currency) && (product === null || product === void 0 ? void 0 : product.price) ? product === null || product === void 0 ? void 0 : product.price : 7000);
-        if (typeof price !== 'number')
-            return text;
+        let price = (product === null || product === void 0 ? void 0 : product.currency) && (product === null || product === void 0 ? void 0 : product.price) ? product === null || product === void 0 ? void 0 : product.price : 7000;
+        let text = '';
         let priceSymbol = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.priceSymbol;
         let currency = (product === null || product === void 0 ? void 0 : product.currency) ? (_c = (_b = (_a = product === null || product === void 0 ? void 0 : product.currency) === null || _a === void 0 ? void 0 : _a.split('-')[1]) === null || _b === void 0 ? void 0 : _b.toUpperCase()) !== null && _c !== void 0 ? _c : '' : '$';
         const isToLocStr = enableFormattedPrice === undefined || enableFormattedPrice;
-        let decPic = price === null || price === void 0 ? void 0 : price.toString();
+        let decPic = price.toString();
         if (priceSymbol === null || priceSymbol === void 0 ? void 0 : priceSymbol.showTwoDecimalPoint) {
             decPic = price === null || price === void 0 ? void 0 : price.toFixed(2);
         }
@@ -11977,7 +11954,7 @@ Made in Italy` })));
      * @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
      *
      */
@@ -11991,32 +11968,16 @@ Made in Italy` })));
                     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',
@@ -18921,7 +18882,7 @@ Made in Italy` })));
      * @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
      *
      */