pb-sxp-ui 1.11.0 → 1.11.1

package/dist/pb-ui.js

@@ -666,7 +666,6 @@
         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);
@@ -848,20 +847,23 @@
             setCacheRtcList(cacheRtcList.concat(getFilterRecList(data)));
             return data;
         }), [getRecommendVideos, rtcList, waterFallData, cacheRtcList]);
-        const refreshFeSession = React.useCallback(() => {
-            var _a, _b, _c, _d, _e, _f;
+        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) {
-                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)) {
+                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 {
+            else if (enableReSid) {
                 refreshFeSessionId();
             }
-            sessionTimeRef.current = new Date();
-        }, [data, sessionTimeRef]);
+        }, [data]);
         const bffEventReport = React.useCallback(({ userInfo, eventInfo, reportLayId = true }) => {
             // 关闭 BFF 事件上报
             if (!enableReportEvent || (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview)) {
@@ -1025,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) {
@@ -1033,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',
@@ -1045,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;
@@ -17994,7 +17999,7 @@ Made in Italy` })));
      * @Author: binruan@chatlabs.com
      * @Date: 2024-03-20 10:27:31
      * @LastEditors: binruan@chatlabs.com
-     * @LastEditTime: 2024-12-13 17:20:22
+     * @LastEditTime: 2024-12-16 15:03:38
      * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\index.tsx
      *
      */
@@ -18019,7 +18024,7 @@ Made in Italy` })));
             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(() => {
-            refreshFeSession === null || refreshFeSession === void 0 ? void 0 : refreshFeSession();
+            refreshFeSession === null || refreshFeSession === void 0 ? void 0 : refreshFeSession(true);
         }, []);
         React.useEffect(() => {
             if ((data === null || data === void 0 ? void 0 : data.length) > 0) {