pb-sxp-ui 1.10.12 → 1.11.1

package/dist/index.js

@@ -482,17 +482,17 @@ const storeAndLoadFeSessionId = () => {
     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';
@@ -832,6 +832,23 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         setCacheRtcList(cacheRtcList.concat(getFilterRecList(data)));
         return data;
     }), [getRecommendVideos, rtcList, waterFallData, cacheRtcList]);
+    const refreshFeSession = 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 = useCallback(({ userInfo, eventInfo, reportLayId = true }) => {
         // 关闭 BFF 事件上报
         if (!enableReportEvent || (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview)) {
@@ -844,6 +861,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             // 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 }));
@@ -859,7 +877,16 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             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 = useCallback(({ eventName, product }) => {
         var _a, _b, _c, _d, _e;
         if (!enableReportEvent ||
@@ -985,7 +1012,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         });
     }, [bffEventReport, isFromHashtag]);
     const h5EnterLink = 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) {
@@ -993,7 +1020,10 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         }
         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',
@@ -1005,16 +1035,16 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
                 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]);
     useEffect(() => {
         if (!isShowConsent)
             h5EnterLink();
-    }, [isShowConsent]);
+    }, [isShowConsent, h5EnterLink]);
     useEffect(() => {
         if (isShowConsent || isPreview)
             return;
@@ -1158,7 +1188,8 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             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,
@@ -11981,7 +12012,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
  *
  */
@@ -11995,32 +12026,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(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(Object.assign({}, style))}` }, props),
+        React.createElement("iframe", { src: iframeUrl, style: {
                 width: '100%',
                 height: 'calc(100% - 50px)',
                 marginTop: '50px',
@@ -16603,13 +16618,13 @@ var settingRender$1 = [
  * @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 = 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] = useState(false);
     const [openConsent, setOpenConsent] = useState(false);
     const [consentPopupCate, setConsentPopupCate] = useState('');
@@ -16640,7 +16655,8 @@ const EditorDataProvider = ({ children, data }) => {
             consentPopupCate,
             setConsentPopupCate,
             openMultiPosts,
-            setOpenMultiPosts
+            setOpenMultiPosts,
+            pageTypeList: (_p = data === null || data === void 0 ? void 0 : data.pageTypeList) !== null && _p !== void 0 ? _p : []
         } }, children));
 };
 function useEditorDataProvider() {
@@ -17964,6 +17980,14 @@ const NavBack = ({ data, minusHeight, tagHeight, onClick }) => {
 };
 var NavBack$1 = 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');
@@ -17979,13 +18003,13 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
     const [isReload, setIsReload] = useState(new Date().getTime());
     const skipLinkRef = useRef(false);
     const [pageNum, setPageNum] = 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 = 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]);
     useEffect(() => {
-        refreshFeSessionId();
+        refreshFeSession === null || refreshFeSession === void 0 ? void 0 : refreshFeSession(true);
     }, []);
     useEffect(() => {
         if ((data === null || data === void 0 ? void 0 : data.length) > 0) {
@@ -17994,7 +18018,6 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
         }
     }, [data === null || data === void 0 ? void 0 : data.length]);
     const handleH5EnterLink = useCallback(() => {
-        refreshFeSessionId();
         h5EnterLink === null || h5EnterLink === void 0 ? void 0 : h5EnterLink();
         if (data.length > 0) {
             const now = new Date();
@@ -18901,7 +18924,7 @@ var index$1 = 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
  *
  */