pb-sxp-ui 1.15.6 → 1.15.8

package/es/core/components/SxpPageRender/index.d.ts

@@ -1,4 +1,4 @@
-import { CSSProperties, FC } from 'react';
+import React, { CSSProperties } from 'react';
 import { RecItemType } from './typing';
 import './index.less';
 export type postConfigType = {
@@ -112,5 +112,5 @@ export interface ISxpPageRenderProps {
     hashTagRightMargin: number;
     defaultData?: any;
 }
-declare const SxpPageRender: FC<ISxpPageRenderProps>;
-export default SxpPageRender;
+declare const _default: React.NamedExoticComponent<ISxpPageRenderProps>;
+export default _default;

package/es/core/components/SxpPageRender/index.js

@@ -1,4 +1,4 @@
-import React, { useMemo, useEffect, useState, useRef, useCallback } from 'react';
+import React, { useMemo, useEffect, useState, useRef, useCallback, memo } from 'react';
 import { Swiper, SwiperSlide } from 'swiper/react';
 import ExpandableText from './ExpandableText';
 import LikeButton from './LikeButton';
@@ -554,8 +554,8 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
         isReload,
         renderToggleButton
     ]);
-    return (React.createElement(React.Fragment, null, (data === null || data === void 0 ? void 0 : data.length) < 1 && loading ? (React.createElement("div", { style: { height, width: containerWidth, display: 'flex', justifyContent: 'center', alignItems: 'center' } },
-        React.createElement("img", { width: 64, height: 64, src: loadingImage, alt: 'loading...', style: { objectFit: 'contain' } }))) : (React.createElement("div", { id: 'sxp-render', className: 'clc-sxp-container', style: Object.assign({}, ((globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.textUnderlineOffset) && { textUnderlineOffset: `${globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.textUnderlineOffset}px` })) },
+    return (React.createElement("div", { id: 'sxp-render', className: 'clc-sxp-container' }, (data === null || data === void 0 ? void 0 : data.length) < 1 && loading ? (React.createElement("div", { style: { height, width: containerWidth, display: 'flex', justifyContent: 'center', alignItems: 'center' } },
+        React.createElement("img", { width: 64, height: 64, src: loadingImage, alt: 'loading...', style: { objectFit: 'contain' } }))) : (React.createElement("div", { style: Object.assign({}, ((globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.textUnderlineOffset) && { textUnderlineOffset: `${globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.textUnderlineOffset}px` })) },
         waterFallData && (React.createElement(Navbar, { icon: left, styles: { background: 'rgba(0,0,0,.3)', color: '#fff', top: `${minusHeight}px` }, textStyle: Object.assign(Object.assign({}, (_e = (_d = (_c = (_b = (_a = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.hashTag) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.item) === null || _c === void 0 ? void 0 : _c.props) === null || _d === void 0 ? void 0 : _d.textStyles) === null || _e === void 0 ? void 0 : _e.hashTagTitle), { color: '#fff' }), onClose: () => {
                 const isEq = isEqual(rtcList, cacheRtcList);
                 if (!isEq && cacheRtcList && (cacheRtcList === null || cacheRtcList === void 0 ? void 0 : cacheRtcList.length)) {
@@ -616,4 +616,4 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
         React.createElement(ConsentPopup, { resolver: resolver, globalConfig: globalConfig }),
         openMultiPosts && (React.createElement(MultiPosts, Object.assign({}, (_x = (_w = (_v = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.multiPosts) === null || _v === void 0 ? void 0 : _v[0]) === null || _w === void 0 ? void 0 : _w.item) === null || _x === void 0 ? void 0 : _x.props, (_0 = (_z = (_y = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.multiPosts) === null || _y === void 0 ? void 0 : _y[0]) === null || _z === void 0 ? void 0 : _z.item) === null || _0 === void 0 ? void 0 : _0.event, { style: { position: 'fixed', top: 0, left: 0, right: 0 } })))))));
 };
-export default SxpPageRender;
+export default memo(SxpPageRender);

package/es/core/utils/localStore.d.ts

@@ -3,9 +3,12 @@ export declare const FAKE_USER_STATE = "FAKE_USER_STATE";
 export declare const AGREE_POLICY = "AGREE_POLICY";
 export declare const SLIDE_SKIP_STATE = "SLIDE_SKIP_STATE";
 export declare const CCONTSENT_STATE = "CCONTSENT_STATE";
+export declare const USER_CONSENT_RESULT_KEY = "USER_CONSENT_RESULT";
 export declare const storeAndLoadFeUserId: () => string;
 export declare const removeFeUserId: () => void;
 export declare const getFeUserState: () => boolean;
 export declare const getSlideSkipState: () => boolean;
 export declare const setSlideSkipState: () => void;
 export declare const getContsentState: () => boolean;
+export declare const getUserConsentResult: () => boolean;
+export declare const setUserConsentResult: () => void;

package/es/core/utils/localStore.js

@@ -5,6 +5,7 @@ export const FAKE_USER_STATE = 'FAKE_USER_STATE';
 export const AGREE_POLICY = 'AGREE_POLICY';
 export const SLIDE_SKIP_STATE = 'SLIDE_SKIP_STATE';
 export const CCONTSENT_STATE = 'CCONTSENT_STATE';
+export const USER_CONSENT_RESULT_KEY = 'USER_CONSENT_RESULT';
 export const storeAndLoadFeUserId = () => {
     let fakeUserId = window.localStorage.getItem(FAKE_USER_KEY);
     if (isEmpty(fakeUserId)) {
@@ -37,3 +38,10 @@ export const getContsentState = () => {
     }
     return isEmpty(contsentState);
 };
+export const getUserConsentResult = () => {
+    const contsentState = window.localStorage.getItem(USER_CONSENT_RESULT_KEY);
+    return contsentState === 'true';
+};
+export const setUserConsentResult = () => {
+    window.localStorage.setItem(USER_CONSENT_RESULT_KEY, 'true');
+};

package/es/materials/sxp/consentPopup/Click/index.d.ts

@@ -1,8 +1,12 @@
 import React, { CSSProperties } from 'react';
 import './index.less';
+interface richText {
+    html: any;
+    raw: any;
+}
 export interface IClickProps {
     open?: boolean;
-    content?: string;
+    content?: richText | any;
     style?: Record<string, any>;
     isTel?: boolean;
     acceptButton?: {

package/es/materials/sxp/consentPopup/Click/index.js

@@ -5,6 +5,7 @@ import ConsentDetail from '../../popup/ConsentDetail';
 import tel from './tel.png';
 import { setFontForText } from '../../../../core/utils/tool';
 import { useSxpDataSource } from '../../../../core/hooks';
+import { getUserConsentResult, setUserConsentResult } from '../../../../core/utils/localStore';
 const Click = (_a) => {
     var { isTel, open, content, style, consentPopupCate, acceptButton, rejectButton, showRejectButton } = _a, props = __rest(_a, ["isTel", "open", "content", "style", "consentPopupCate", "acceptButton", "rejectButton", "showRejectButton"]);
     const { getAccount, accountSonsent } = useSxpDataSource();
@@ -17,12 +18,14 @@ const Click = (_a) => {
         return consentPopupCate || (open && style && !consentResult);
     }, [consentPopupCate, open, style, consentResult]);
     useEffect(() => {
-        !consentPopupCate && open && style && handleGetAccount();
+        !consentPopupCate && open && style && !getUserConsentResult() && handleGetAccount();
     }, []);
     const handleClickAccept = () => __awaiter(void 0, void 0, void 0, function* () {
         const res = yield (accountSonsent === null || accountSonsent === void 0 ? void 0 : accountSonsent(true));
-        if (res)
+        if (res) {
             setConsentResult(true);
+            setUserConsentResult();
+        }
     });
     const handleClickReject = () => {
         history === null || history === void 0 ? void 0 : history.back();

package/es/materials/sxp/consentPopup/Swipe/index.d.ts

@@ -1,8 +1,12 @@
 import React from 'react';
 import './index.less';
+interface richText {
+    html: any;
+    raw: any;
+}
 export interface ISwipeProps {
     open?: boolean;
-    content?: string;
+    content?: richText | any;
     style?: Record<string, any>;
     isTel?: boolean;
     consentPopupCate?: string;

package/es/materials/sxp/consentPopup/Swipe/index.js

@@ -4,6 +4,7 @@ import './index.less';
 import ConsentDetail from '../../popup/ConsentDetail';
 import tel from './tel.png';
 import { useSxpDataSource } from '../../../../core/hooks';
+import { getUserConsentResult, setUserConsentResult } from '../../../../core/utils/localStore';
 const Swipe = (_a) => {
     var { isTel, open, content, style, consentPopupCate, swipeIcon } = _a, props = __rest(_a, ["isTel", "open", "content", "style", "consentPopupCate", "swipeIcon"]);
     const touchInfo = useRef();
@@ -18,12 +19,14 @@ const Swipe = (_a) => {
         return consentPopupCate || (open && style && !consentResult);
     }, [consentPopupCate, open, style, consentResult]);
     useEffect(() => {
-        !consentPopupCate && open && style && handleGetAccount();
+        !consentPopupCate && open && style && !getUserConsentResult() && handleGetAccount();
     }, []);
     const handleClickAccept = () => __awaiter(void 0, void 0, void 0, function* () {
         const res = yield (accountSonsent === null || accountSonsent === void 0 ? void 0 : accountSonsent(true));
-        if (res)
+        if (res) {
             setConsentResult(true);
+            setUserConsentResult();
+        }
     });
     const handleTouchStart = (event) => {
         const touch = event.touches[0];

package/es/materials/sxp/popup/ConsentDetail/index.d.ts

@@ -1,7 +1,11 @@
 import React, { CSSProperties } from 'react';
 import './index.less';
+interface richText {
+    html: any;
+    raw: any;
+}
 export interface IConsentDetailProps {
-    content?: string;
+    content?: richText | any;
     isTel?: boolean;
     style?: CSSProperties;
 }

package/es/materials/sxp/popup/ConsentDetail/index.js

@@ -2,9 +2,10 @@ import { __rest } from "tslib";
 import React, { memo } from 'react';
 import './index.less';
 const ConsentDetail = (_a) => {
+    var _b;
     var { content, isTel, style } = _a, props = __rest(_a, ["content", "isTel", "style"]);
     return (React.createElement("article", { className: 'consentDetail-article', dangerouslySetInnerHTML: {
-            __html: typeof content === 'string' ? content : ''
+            __html: (_b = content === null || content === void 0 ? void 0 : content.html) !== null && _b !== void 0 ? _b : content
         }, onClick: (e) => {
             e.stopPropagation();
         }, style: style }));

package/lib/core/components/SxpPageRender/index.d.ts

@@ -1,4 +1,4 @@
-import { CSSProperties, FC } from 'react';
+import React, { CSSProperties } from 'react';
 import { RecItemType } from './typing';
 import './index.less';
 export type postConfigType = {
@@ -112,5 +112,5 @@ export interface ISxpPageRenderProps {
     hashTagRightMargin: number;
     defaultData?: any;
 }
-declare const SxpPageRender: FC<ISxpPageRenderProps>;
-export default SxpPageRender;
+declare const _default: React.NamedExoticComponent<ISxpPageRenderProps>;
+export default _default;

package/lib/core/components/SxpPageRender/index.js

@@ -557,8 +557,8 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
         isReload,
         renderToggleButton
     ]);
-    return (react_1.default.createElement(react_1.default.Fragment, null, (data === null || data === void 0 ? void 0 : data.length) < 1 && loading ? (react_1.default.createElement("div", { style: { height, width: containerWidth, display: 'flex', justifyContent: 'center', alignItems: 'center' } },
-        react_1.default.createElement("img", { width: 64, height: 64, src: loadingImage, alt: 'loading...', style: { objectFit: 'contain' } }))) : (react_1.default.createElement("div", { id: 'sxp-render', className: 'clc-sxp-container', style: Object.assign({}, ((globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.textUnderlineOffset) && { textUnderlineOffset: `${globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.textUnderlineOffset}px` })) },
+    return (react_1.default.createElement("div", { id: 'sxp-render', className: 'clc-sxp-container' }, (data === null || data === void 0 ? void 0 : data.length) < 1 && loading ? (react_1.default.createElement("div", { style: { height, width: containerWidth, display: 'flex', justifyContent: 'center', alignItems: 'center' } },
+        react_1.default.createElement("img", { width: 64, height: 64, src: loadingImage, alt: 'loading...', style: { objectFit: 'contain' } }))) : (react_1.default.createElement("div", { style: Object.assign({}, ((globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.textUnderlineOffset) && { textUnderlineOffset: `${globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.textUnderlineOffset}px` })) },
         waterFallData && (react_1.default.createElement(Navbar_1.default, { icon: left_png_1.default, styles: { background: 'rgba(0,0,0,.3)', color: '#fff', top: `${minusHeight}px` }, textStyle: Object.assign(Object.assign({}, (_e = (_d = (_c = (_b = (_a = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.hashTag) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.item) === null || _c === void 0 ? void 0 : _c.props) === null || _d === void 0 ? void 0 : _d.textStyles) === null || _e === void 0 ? void 0 : _e.hashTagTitle), { color: '#fff' }), onClose: () => {
                 const isEq = (0, lodash_1.isEqual)(rtcList, cacheRtcList);
                 if (!isEq && cacheRtcList && (cacheRtcList === null || cacheRtcList === void 0 ? void 0 : cacheRtcList.length)) {
@@ -619,4 +619,4 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
         react_1.default.createElement(ConsentPopup_1.default, { resolver: resolver, globalConfig: globalConfig }),
         openMultiPosts && (react_1.default.createElement(MultiPosts_1.default, Object.assign({}, (_x = (_w = (_v = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.multiPosts) === null || _v === void 0 ? void 0 : _v[0]) === null || _w === void 0 ? void 0 : _w.item) === null || _x === void 0 ? void 0 : _x.props, (_0 = (_z = (_y = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.multiPosts) === null || _y === void 0 ? void 0 : _y[0]) === null || _z === void 0 ? void 0 : _z.item) === null || _0 === void 0 ? void 0 : _0.event, { style: { position: 'fixed', top: 0, left: 0, right: 0 } })))))));
 };
-exports.default = SxpPageRender;
+exports.default = (0, react_1.memo)(SxpPageRender);

package/lib/core/utils/localStore.d.ts

@@ -3,9 +3,12 @@ export declare const FAKE_USER_STATE = "FAKE_USER_STATE";
 export declare const AGREE_POLICY = "AGREE_POLICY";
 export declare const SLIDE_SKIP_STATE = "SLIDE_SKIP_STATE";
 export declare const CCONTSENT_STATE = "CCONTSENT_STATE";
+export declare const USER_CONSENT_RESULT_KEY = "USER_CONSENT_RESULT";
 export declare const storeAndLoadFeUserId: () => string;
 export declare const removeFeUserId: () => void;
 export declare const getFeUserState: () => boolean;
 export declare const getSlideSkipState: () => boolean;
 export declare const setSlideSkipState: () => void;
 export declare const getContsentState: () => boolean;
+export declare const getUserConsentResult: () => boolean;
+export declare const setUserConsentResult: () => void;

package/lib/core/utils/localStore.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getContsentState = exports.setSlideSkipState = exports.getSlideSkipState = exports.getFeUserState = exports.removeFeUserId = exports.storeAndLoadFeUserId = exports.CCONTSENT_STATE = exports.SLIDE_SKIP_STATE = exports.AGREE_POLICY = exports.FAKE_USER_STATE = exports.FAKE_USER_KEY = void 0;
+exports.setUserConsentResult = exports.getUserConsentResult = exports.getContsentState = exports.setSlideSkipState = exports.getSlideSkipState = exports.getFeUserState = exports.removeFeUserId = exports.storeAndLoadFeUserId = exports.USER_CONSENT_RESULT_KEY = exports.CCONTSENT_STATE = exports.SLIDE_SKIP_STATE = exports.AGREE_POLICY = exports.FAKE_USER_STATE = exports.FAKE_USER_KEY = void 0;
 const lodash_1 = require("lodash");
 const tool_1 = require("./tool");
 exports.FAKE_USER_KEY = 'SXP_FAKE_USER_ID';
@@ -8,6 +8,7 @@ exports.FAKE_USER_STATE = 'FAKE_USER_STATE';
 exports.AGREE_POLICY = 'AGREE_POLICY';
 exports.SLIDE_SKIP_STATE = 'SLIDE_SKIP_STATE';
 exports.CCONTSENT_STATE = 'CCONTSENT_STATE';
+exports.USER_CONSENT_RESULT_KEY = 'USER_CONSENT_RESULT';
 const storeAndLoadFeUserId = () => {
     let fakeUserId = window.localStorage.getItem(exports.FAKE_USER_KEY);
     if ((0, lodash_1.isEmpty)(fakeUserId)) {
@@ -46,3 +47,12 @@ const getContsentState = () => {
     return (0, lodash_1.isEmpty)(contsentState);
 };
 exports.getContsentState = getContsentState;
+const getUserConsentResult = () => {
+    const contsentState = window.localStorage.getItem(exports.USER_CONSENT_RESULT_KEY);
+    return contsentState === 'true';
+};
+exports.getUserConsentResult = getUserConsentResult;
+const setUserConsentResult = () => {
+    window.localStorage.setItem(exports.USER_CONSENT_RESULT_KEY, 'true');
+};
+exports.setUserConsentResult = setUserConsentResult;

package/lib/materials/sxp/consentPopup/Click/index.d.ts

@@ -1,8 +1,12 @@
 import React, { CSSProperties } from 'react';
 import './index.less';
+interface richText {
+    html: any;
+    raw: any;
+}
 export interface IClickProps {
     open?: boolean;
-    content?: string;
+    content?: richText | any;
     style?: Record<string, any>;
     isTel?: boolean;
     acceptButton?: {

package/lib/materials/sxp/consentPopup/Click/index.js

@@ -7,6 +7,7 @@ const ConsentDetail_1 = tslib_1.__importDefault(require("../../popup/ConsentDeta
 const tel_png_1 = tslib_1.__importDefault(require("./tel.png"));
 const tool_1 = require("../../../../core/utils/tool");
 const hooks_1 = require("../../../../core/hooks");
+const localStore_1 = require("../../../../core/utils/localStore");
 const Click = (_a) => {
     var { isTel, open, content, style, consentPopupCate, acceptButton, rejectButton, showRejectButton } = _a, props = tslib_1.__rest(_a, ["isTel", "open", "content", "style", "consentPopupCate", "acceptButton", "rejectButton", "showRejectButton"]);
     const { getAccount, accountSonsent } = (0, hooks_1.useSxpDataSource)();
@@ -19,12 +20,14 @@ const Click = (_a) => {
         return consentPopupCate || (open && style && !consentResult);
     }, [consentPopupCate, open, style, consentResult]);
     (0, react_1.useEffect)(() => {
-        !consentPopupCate && open && style && handleGetAccount();
+        !consentPopupCate && open && style && !(0, localStore_1.getUserConsentResult)() && handleGetAccount();
     }, []);
     const handleClickAccept = () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
         const res = yield (accountSonsent === null || accountSonsent === void 0 ? void 0 : accountSonsent(true));
-        if (res)
+        if (res) {
             setConsentResult(true);
+            (0, localStore_1.setUserConsentResult)();
+        }
     });
     const handleClickReject = () => {
         history === null || history === void 0 ? void 0 : history.back();

package/lib/materials/sxp/consentPopup/Swipe/index.d.ts

@@ -1,8 +1,12 @@
 import React from 'react';
 import './index.less';
+interface richText {
+    html: any;
+    raw: any;
+}
 export interface ISwipeProps {
     open?: boolean;
-    content?: string;
+    content?: richText | any;
     style?: Record<string, any>;
     isTel?: boolean;
     consentPopupCate?: string;

package/lib/materials/sxp/consentPopup/Swipe/index.js

@@ -6,6 +6,7 @@ require("./index.less");
 const ConsentDetail_1 = tslib_1.__importDefault(require("../../popup/ConsentDetail"));
 const tel_png_1 = tslib_1.__importDefault(require("./tel.png"));
 const hooks_1 = require("../../../../core/hooks");
+const localStore_1 = require("../../../../core/utils/localStore");
 const Swipe = (_a) => {
     var { isTel, open, content, style, consentPopupCate, swipeIcon } = _a, props = tslib_1.__rest(_a, ["isTel", "open", "content", "style", "consentPopupCate", "swipeIcon"]);
     const touchInfo = (0, react_1.useRef)();
@@ -20,12 +21,14 @@ const Swipe = (_a) => {
         return consentPopupCate || (open && style && !consentResult);
     }, [consentPopupCate, open, style, consentResult]);
     (0, react_1.useEffect)(() => {
-        !consentPopupCate && open && style && handleGetAccount();
+        !consentPopupCate && open && style && !(0, localStore_1.getUserConsentResult)() && handleGetAccount();
     }, []);
     const handleClickAccept = () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
         const res = yield (accountSonsent === null || accountSonsent === void 0 ? void 0 : accountSonsent(true));
-        if (res)
+        if (res) {
             setConsentResult(true);
+            (0, localStore_1.setUserConsentResult)();
+        }
     });
     const handleTouchStart = (event) => {
         const touch = event.touches[0];

package/lib/materials/sxp/popup/ConsentDetail/index.d.ts

@@ -1,7 +1,11 @@
 import React, { CSSProperties } from 'react';
 import './index.less';
+interface richText {
+    html: any;
+    raw: any;
+}
 export interface IConsentDetailProps {
-    content?: string;
+    content?: richText | any;
     isTel?: boolean;
     style?: CSSProperties;
 }

package/lib/materials/sxp/popup/ConsentDetail/index.js

@@ -4,9 +4,10 @@ const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importStar(require("react"));
 require("./index.less");
 const ConsentDetail = (_a) => {
+    var _b;
     var { content, isTel, style } = _a, props = tslib_1.__rest(_a, ["content", "isTel", "style"]);
     return (react_1.default.createElement("article", { className: 'consentDetail-article', dangerouslySetInnerHTML: {
-            __html: typeof content === 'string' ? content : ''
+            __html: (_b = content === null || content === void 0 ? void 0 : content.html) !== null && _b !== void 0 ? _b : content
         }, onClick: (e) => {
             e.stopPropagation();
         }, style: style }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pb-sxp-ui",
-  "version": "1.15.6",
+  "version": "1.15.8",
   "description": "React enterprise-class UI components",
   "main": "dist/index.cjs",
   "module": "dist/index.js",