pb-sxp-ui 1.10.12 → 1.11.1

package/dist/pb-ui.js

@@ -497,17 +497,17 @@
         let result = getFeSessionId();
         if (!result) {
             result = generateFeSessionId();
-            window.sessionStorage.setItem(feRealSessionIdKey, result);
+            window.localStorage.setItem(feRealSessionIdKey, result);
         }
         return result;
     };
     const refreshFeSessionId = () => {
         const result = generateFeSessionId();
-        window.sessionStorage.setItem(feRealSessionIdKey, result);
+        window.localStorage.setItem(feRealSessionIdKey, result);
     };
     // 获取 sessionID
     const getFeSessionId = () => {
-        return window.sessionStorage.getItem(feRealSessionIdKey);
+        return window.localStorage.getItem(feRealSessionIdKey);
     };
 
     const FAKE_USER_KEY = 'SXP_FAKE_USER_ID';
@@ -847,6 +847,23 @@
             setCacheRtcList(cacheRtcList.concat(getFilterRecList(data)));
             return data;
         }), [getRecommendVideos, rtcList, waterFallData, cacheRtcList]);
+        const refreshFeSession = React.useCallback((enableReSid) => {
+            var _a, _b, _c, _d, _e;
+            const defaultGlobalConfig = (_b = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.sxpPageConf) === null || _b === void 0 ? void 0 : _b.globalConfig;
+            if ((_c = defaultGlobalConfig === null || defaultGlobalConfig === void 0 ? void 0 : defaultGlobalConfig.session) === null || _c === void 0 ? void 0 : _c.enable) {
+                const sessionStartTime = localStorage.getItem('sessionStartTime');
+                const sst = sessionStartTime ? new Date(sessionStartTime) : new Date();
+                if (Math.floor((new Date() - sst) / (1000 * 60)) >=
+                    ((_e = (_d = defaultGlobalConfig === null || defaultGlobalConfig === void 0 ? void 0 : defaultGlobalConfig.session) === null || _d === void 0 ? void 0 : _d.expires) !== null && _e !== void 0 ? _e : 30)) {
+                    refreshFeSessionId();
+                    curTime.current = new Date();
+                }
+                localStorage.setItem('sessionStartTime', new Date().toISOString());
+            }
+            else if (enableReSid) {
+                refreshFeSessionId();
+            }
+        }, [data]);
         const bffEventReport = React.useCallback(({ userInfo, eventInfo, reportLayId = true }) => {
             // 关闭 BFF 事件上报
             if (!enableReportEvent || (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview)) {
@@ -859,6 +876,7 @@
                 // tpChannelId: 'H5' // 后端处理
                 };
             }
+            refreshFeSession();
             const sessionID = storeAndLoadFeSessionId();
             const ef = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ sessionID, rtc: curReqInfo.rtc, requestId: curReqInfo.requestId }, { playbookType }), (layoutVariantId && reportLayId && { layoutVariantId })), eventInfo), (getDevice$1() && { sxpDevice: getDevice$1() })), (getSystem() && { sxpSystem: getSystem() })), (getBrowserInfo() && { sxpBrowser: getBrowserInfo() })), ((eventInfo === null || eventInfo === void 0 ? void 0 : eventInfo.position) && channel && { position: Number(eventInfo === null || eventInfo === void 0 ? void 0 : eventInfo.position) + 1 + '' }));
             const realUserInfo = Object.entries(userInfo).map(([k, v]) => ({ name: k, value: v }));
@@ -874,7 +892,16 @@
                 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,
+            refreshFeSession
+        ]);
         const bffFbReport = React.useCallback(({ eventName, product }) => {
             var _a, _b, _c, _d, _e;
             if (!enableReportEvent ||
@@ -1000,7 +1027,7 @@
             });
         }, [bffEventReport, isFromHashtag]);
         const h5EnterLink = React.useCallback(() => {
-            var _a, _b;
+            var _a, _b, _c, _d, _e;
             const queryString = location.search.slice(1);
             const params = qs.parse(queryString.replace(/\+/g, '%2B'));
             for (const key in params) {
@@ -1008,7 +1035,10 @@
             }
             const getVal = (key) => { var _a; return (_a = params[key]) !== null && _a !== void 0 ? _a : ''; };
             const time = new Date();
-            curTime.current = time;
+            const defaultGlobalConfig = (_b = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.sxpPageConf) === null || _b === void 0 ? void 0 : _b.globalConfig;
+            if (!((_c = defaultGlobalConfig === null || defaultGlobalConfig === void 0 ? void 0 : defaultGlobalConfig.session) === null || _c === void 0 ? void 0 : _c.enable) || !(curTime === null || curTime === void 0 ? void 0 : curTime.current)) {
+                curTime.current = time;
+            }
             bffEventReport === null || bffEventReport === void 0 ? void 0 : bffEventReport({
                 eventInfo: {
                     eventSubject: 'h5LinkEnterFeed',
@@ -1020,16 +1050,16 @@
                     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: (_e = (_d = window === null || window === void 0 ? void 0 : window.location) === null || _d === void 0 ? void 0 : _d.href) !== null && _e !== void 0 ? _e : '',
                     clSource: getVal('cl_source')
                 },
                 reportLayId: false
             });
-        }, [bffEventReport]);
+        }, [bffEventReport, data, curTime]);
         React.useEffect(() => {
             if (!isShowConsent)
                 h5EnterLink();
-        }, [isShowConsent]);
+        }, [isShowConsent, h5EnterLink]);
         React.useEffect(() => {
             if (isShowConsent || isPreview)
                 return;
@@ -1173,7 +1203,8 @@
                 channel,
                 eventTimeList,
                 setEventTimeList,
-                multiPostTimeRef
+                multiPostTimeRef,
+                refreshFeSession
             } }, isShowConsent ? (React.createElement(Consent$4, Object.assign({}, (_e = (_d = (_c = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.consent) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.item) === null || _e === void 0 ? void 0 : _e.props))) : (render({
             rtcList,
             mutateLike: bffMutateLike,
@@ -11996,7 +12027,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
      *
      */
@@ -12010,32 +12041,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',
@@ -16618,13 +16633,13 @@ Made in Italy` })));
      * @Author: binruan@chatlabs.com
      * @Date: 2023-12-26 10:38:53
      * @LastEditors: binruan@chatlabs.com
-     * @LastEditTime: 2024-10-29 18:04:27
+     * @LastEditTime: 2024-12-11 18:24:31
      * @FilePath: \pb-sxp-ui\src\core\context\EditorDataProvider.tsx
      *
      */
     const EditorDataContext = React.createContext({});
     const EditorDataProvider = ({ children, data }) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
         const [openHashtag, setOpenHashtag] = React.useState(false);
         const [openConsent, setOpenConsent] = React.useState(false);
         const [consentPopupCate, setConsentPopupCate] = React.useState('');
@@ -16655,7 +16670,8 @@ Made in Italy` })));
                 consentPopupCate,
                 setConsentPopupCate,
                 openMultiPosts,
-                setOpenMultiPosts
+                setOpenMultiPosts,
+                pageTypeList: (_p = data === null || data === void 0 ? void 0 : data.pageTypeList) !== null && _p !== void 0 ? _p : []
             } }, children));
     };
     function useEditorDataProvider() {
@@ -17979,6 +17995,14 @@ Made in Italy` })));
     };
     var NavBack$1 = React.memo(NavBack);
 
+    /*
+     * @Author: binruan@chatlabs.com
+     * @Date: 2024-03-20 10:27:31
+     * @LastEditors: binruan@chatlabs.com
+     * @LastEditTime: 2024-12-16 15:03:38
+     * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\index.tsx
+     *
+     */
     const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.innerHeight, containerWidth = window.innerWidth, tempMap, resolver, data = [], ctaType, tipText, nudge, _schema, hashTagStyle, hashTagRightMargin, tagList = [], licenseUrl }) => {
         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;
         const mutedIcon = useIconLink('/pb_static/5beaaa5ce7f3477b99db3838619cc471.png');
@@ -17994,13 +18018,13 @@ Made in Italy` })));
         const [isReload, setIsReload] = React.useState(new Date().getTime());
         const skipLinkRef = React.useRef(false);
         const [pageNum, setPageNum] = React.useState(2);
-        const { loadVideos, bffEventReport, loading, setPopupDetailData, ctaEvent, swiperRef, waterFallData, setOpenHashtag, appDomain, openHashtag, loadingImage, isFromHashtag, popupDetailData, bffFbReport, curTime, h5EnterLink, isShowConsent, selectTag, isPreview, isEditor, cacheRtcList, setRtcList, cacheActiveIndex, rtcList, isNoMoreData, channel } = useSxpDataSource();
+        const { loadVideos, bffEventReport, loading, setPopupDetailData, ctaEvent, swiperRef, waterFallData, setOpenHashtag, appDomain, openHashtag, loadingImage, isFromHashtag, popupDetailData, bffFbReport, curTime, h5EnterLink, isShowConsent, selectTag, isPreview, isEditor, cacheRtcList, setRtcList, cacheActiveIndex, rtcList, isNoMoreData, channel, refreshFeSession } = useSxpDataSource();
         const { backMainFeed, productView, jumpToWeb } = useEventReport();
         const isShowFingerTip = React.useMemo(() => {
             return data.length > 0 && !loading && (getFeUserState() || (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enableSwiperTip));
         }, [data, loading, globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enableSwiperTip]);
         React.useEffect(() => {
-            refreshFeSessionId();
+            refreshFeSession === null || refreshFeSession === void 0 ? void 0 : refreshFeSession(true);
         }, []);
         React.useEffect(() => {
             if ((data === null || data === void 0 ? void 0 : data.length) > 0) {
@@ -18009,7 +18033,6 @@ Made in Italy` })));
             }
         }, [data === null || data === void 0 ? void 0 : data.length]);
         const handleH5EnterLink = React.useCallback(() => {
-            refreshFeSessionId();
             h5EnterLink === null || h5EnterLink === void 0 ? void 0 : h5EnterLink();
             if (data.length > 0) {
                 const now = new Date();
@@ -18916,7 +18939,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
      *
      */