pb-sxp-ui 1.10.11 → 1.11.0

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';
@@ -666,6 +666,7 @@
         const themeTag = React.useRef();
         const curTime = React.useRef();
         const multiPostTimeRef = React.useRef();
+        const sessionTimeRef = React.useRef();
         const [selectTag, setSelectTag] = React.useState(DEFAULT_TAG);
         const checkCommodityIndexRef = React.useRef(-1);
         const popupCurTimeRef = React.useRef(null);
@@ -847,6 +848,20 @@
             setCacheRtcList(cacheRtcList.concat(getFilterRecList(data)));
             return data;
         }), [getRecommendVideos, rtcList, waterFallData, cacheRtcList]);
+        const refreshFeSession = React.useCallback(() => {
+            var _a, _b, _c, _d, _e, _f;
+            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) {
+                if (Math.floor((new Date() - ((_d = sessionTimeRef.current) !== null && _d !== void 0 ? _d : new Date())) / (1000 * 60)) >=
+                    ((_f = (_e = defaultGlobalConfig === null || defaultGlobalConfig === void 0 ? void 0 : defaultGlobalConfig.session) === null || _e === void 0 ? void 0 : _e.expires) !== null && _f !== void 0 ? _f : 30)) {
+                    refreshFeSessionId();
+                }
+            }
+            else {
+                refreshFeSessionId();
+            }
+            sessionTimeRef.current = new Date();
+        }, [data, sessionTimeRef]);
         const bffEventReport = React.useCallback(({ userInfo, eventInfo, reportLayId = true }) => {
             // 关闭 BFF 事件上报
             if (!enableReportEvent || (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview)) {
@@ -859,6 +874,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 +890,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 ||
@@ -1173,7 +1198,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,
@@ -9778,7 +9804,7 @@
      * @Author: binruan@chatlabs.com
      * @Date: 2023-11-02 18:34:34
      * @LastEditors: binruan@chatlabs.com
-     * @LastEditTime: 2024-11-20 18:37:10
+     * @LastEditTime: 2024-12-12 16:35:54
      * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\Modal\index.tsx
      *
      */
@@ -9836,7 +9862,7 @@
         }, [isOpen, popup]);
         const child = React.useCallback(() => {
             return children;
-        }, [_popup, openState, globalConfig]);
+        }, [_popup, openState, globalConfig, schema]);
         React.useEffect(() => {
             const trapFocus = (element) => {
                 var focusableEls = element === null || element === void 0 ? void 0 : element.querySelectorAll('[role="button"],a, a[href]:not([disabled]), button:not([disabled]), textarea:not([disabled]), input[type="text"]:not([disabled]), input[type="radio"]:not([disabled]), input[type="checkbox"]:not([disabled]), select:not([disabled])');
@@ -16602,13 +16628,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('');
@@ -16639,7 +16665,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() {
@@ -17963,6 +17990,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-13 17:20:22
+     * @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');
@@ -17978,13 +18013,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();
         }, []);
         React.useEffect(() => {
             if ((data === null || data === void 0 ? void 0 : data.length) > 0) {
@@ -17993,7 +18028,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();