pb-sxp-ui 1.15.4 → 1.15.6

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

@@ -554,7 +554,8 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
         isReload,
         renderToggleButton
     ]);
-    return (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(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` })) },
         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)) {
@@ -613,6 +614,6 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
             renderToggleButton(!!(globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.muteIconFixed))),
         React.createElement(WaterFall, Object.assign({}, (_u = (_t = (_s = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.hashTag) === null || _s === void 0 ? void 0 : _s[0]) === null || _t === void 0 ? void 0 : _t.item) === null || _u === void 0 ? void 0 : _u.props)),
         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 } })))));
+        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;

package/es/core/context/SxpDataSourceProvider.js

@@ -21,7 +21,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
     var _a, _b, _c, _d, _e;
     const [rtcList, setRtcList] = useState([]);
     const [tagList, setTagList] = useState([]);
-    const [loading, setLoading] = useState(false);
+    const [loading, setLoading] = useState(true);
     const [curReqInfo, setCurReqInfo] = useState({ rtc: '', requestId: '' });
     const swiperRef = useRef(null);
     const isInit = useRef(false);

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

@@ -14,6 +14,7 @@ export interface IClickProps {
         style?: CSSProperties;
     };
     consentPopupCate?: string;
+    showRejectButton?: boolean;
 }
 declare const _default: React.NamedExoticComponent<IClickProps>;
 export default _default;

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

@@ -6,32 +6,36 @@ import tel from './tel.png';
 import { setFontForText } from '../../../../core/utils/tool';
 import { useSxpDataSource } from '../../../../core/hooks';
 const Click = (_a) => {
-    var { isTel, open, content, style, consentPopupCate, acceptButton, rejectButton } = _a, props = __rest(_a, ["isTel", "open", "content", "style", "consentPopupCate", "acceptButton", "rejectButton"]);
+    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();
-    const [consentResult, setConsentResult] = useState(false);
+    const [consentResult, setConsentResult] = useState(true);
     const handleGetAccount = () => __awaiter(void 0, void 0, void 0, function* () {
         const res = yield (getAccount === null || getAccount === void 0 ? void 0 : getAccount());
         setConsentResult(res);
     });
-    useEffect(() => {
-        handleGetAccount();
-    }, []);
     const visivle = useMemo(() => {
         return consentPopupCate || (open && style && !consentResult);
     }, [consentPopupCate, open, style, consentResult]);
-    const handleClick = (v) => {
-        accountSonsent === null || accountSonsent === void 0 ? void 0 : accountSonsent(v);
-        setConsentResult(true);
+    useEffect(() => {
+        !consentPopupCate && open && style && 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)
+            setConsentResult(true);
+    });
+    const handleClickReject = () => {
+        history === null || history === void 0 ? void 0 : history.back();
     };
     return (React.createElement(React.Fragment, null, isTel ? (React.createElement("img", { src: tel, style: { objectFit: 'cover', width: '100%', height: '100%' } })) : (React.createElement(React.Fragment, null, visivle && (React.createElement("div", { className: 'consentPopupClick' },
         React.createElement("div", { className: 'consentPopupClick-container', style: style },
             React.createElement("div", { className: 'consentPopupClick-container-content' },
                 React.createElement(ConsentDetail, { content: content, style: { padding: 0 } })),
-            React.createElement("button", { style: acceptButton === null || acceptButton === void 0 ? void 0 : acceptButton.style, onClick: () => handleClick(true), dangerouslySetInnerHTML: {
+            React.createElement("button", { style: acceptButton === null || acceptButton === void 0 ? void 0 : acceptButton.style, onClick: handleClickAccept, dangerouslySetInnerHTML: {
                     __html: setFontForText(acceptButton === null || acceptButton === void 0 ? void 0 : acceptButton.text, acceptButton === null || acceptButton === void 0 ? void 0 : acceptButton.style)
                 } }),
-            React.createElement("button", { style: rejectButton === null || rejectButton === void 0 ? void 0 : rejectButton.style, onClick: () => handleClick(false), dangerouslySetInnerHTML: {
+            showRejectButton && (React.createElement("button", { style: rejectButton === null || rejectButton === void 0 ? void 0 : rejectButton.style, onClick: handleClickReject, dangerouslySetInnerHTML: {
                     __html: setFontForText(rejectButton === null || rejectButton === void 0 ? void 0 : rejectButton.text, rejectButton === null || rejectButton === void 0 ? void 0 : rejectButton.style)
-                } }))))))));
+                } })))))))));
 };
 export default memo(Click);

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

@@ -121,6 +121,11 @@ export default [
     {
         title: '拒绝按钮样式',
         child: [
+            {
+                type: 'Switch',
+                label: '开启',
+                name: ['props', 'showRejectButton']
+            },
             {
                 type: 'Color',
                 label: '背景色',

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

@@ -7,7 +7,6 @@ export interface ISwipeProps {
     isTel?: boolean;
     consentPopupCate?: string;
     swipeIcon?: string;
-    closeIcon?: string;
 }
 declare const _default: React.NamedExoticComponent<ISwipeProps>;
 export default _default;

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

@@ -5,25 +5,26 @@ import ConsentDetail from '../../popup/ConsentDetail';
 import tel from './tel.png';
 import { useSxpDataSource } from '../../../../core/hooks';
 const Swipe = (_a) => {
-    var { isTel, open, content, style, consentPopupCate, swipeIcon, closeIcon } = _a, props = __rest(_a, ["isTel", "open", "content", "style", "consentPopupCate", "swipeIcon", "closeIcon"]);
+    var { isTel, open, content, style, consentPopupCate, swipeIcon } = _a, props = __rest(_a, ["isTel", "open", "content", "style", "consentPopupCate", "swipeIcon"]);
     const touchInfo = useRef();
     const threshold = 50;
     const { getAccount, accountSonsent } = useSxpDataSource();
-    const [consentResult, setConsentResult] = useState(false);
+    const [consentResult, setConsentResult] = useState(true);
     const handleGetAccount = () => __awaiter(void 0, void 0, void 0, function* () {
         const res = yield (getAccount === null || getAccount === void 0 ? void 0 : getAccount());
         setConsentResult(res);
     });
-    useEffect(() => {
-        handleGetAccount();
-    }, []);
     const visivle = useMemo(() => {
         return consentPopupCate || (open && style && !consentResult);
     }, [consentPopupCate, open, style, consentResult]);
-    const handleClick = (v) => {
-        accountSonsent === null || accountSonsent === void 0 ? void 0 : accountSonsent(v);
-        setConsentResult(true);
-    };
+    useEffect(() => {
+        !consentPopupCate && open && style && 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)
+            setConsentResult(true);
+    });
     const handleTouchStart = (event) => {
         const touch = event.touches[0];
         touchInfo.current = { y: touch.clientY, d: 0 };
@@ -42,7 +43,7 @@ const Swipe = (_a) => {
             return;
         const { d } = touchInfo.current || {};
         if (d > threshold) {
-            handleClick(true);
+            handleClickAccept();
         }
         touchInfo.current = {};
     };
@@ -50,9 +51,7 @@ const Swipe = (_a) => {
         React.createElement("div", { className: 'consentPopupSwipe-container', style: style },
             React.createElement("div", { className: 'consentPopupSwipe-container-content' },
                 React.createElement(ConsentDetail, { content: content, style: { padding: 0 } })),
-            React.createElement("button", { "aria-label": 'close', className: 'consentPopupSwipe-container-close', onClick: () => handleClick(false) },
-                React.createElement("img", { src: closeIcon, alt: 'close' })),
-            swipeIcon && (React.createElement("div", { className: 'consentPopupSwipe-container-swipeIcon', onClick: () => handleClick(false) },
+            swipeIcon && (React.createElement("div", { className: 'consentPopupSwipe-container-swipeIcon' },
                 React.createElement("img", { src: swipeIcon, alt: 'Swipe Icon' }))))))))));
 };
 export default memo(Swipe);

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

@@ -12,8 +12,7 @@ const Swipe = createMaterial(SwipeComponent, {
     },
     defaulSetting: {
         props: {
-            content: '<p><span style="font- size: 14px"><strong><span style="line - height: 3">Your Cookie Preferences</span></strong></span></p><p><span style="line- height: 1"><span style="font- size: 12px">We use cookie, including third-party cookies, to</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">ensure the proper functioning and security of</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">this site, to analyse its use, and to show you</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">personalised content.</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">You can authorise the use of all cookies by</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">clicking on &#x27;Accept all cookies&#x27;. If you click on</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">&#x27;Reject all cookies&#x27;, we will only use cookies</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">necessary for the proper functioning and </span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">security of this site. To personalise or adjust</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">your preferences at any time, click on &#x27;Cookies</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">Settings&#x27; below or at the bottom of any</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">Fendi.com webpage.</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">For more information, <u>read our Cookie Policy</u>.</span></span></p>',
-            closeIcon: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAjhJREFUWEfFlztOw0AQhmeWiJ4CCmpQ5DiRQsIJyAWg5A0lR0AIChDiCJS8ER0cADgBeRSxt4CCDgkaKiq8i+zYeWx2413HEWmiJJv9v535Z2aN8M8vFPT9z3zETD0aAUChUJjwvPFHAJhBhB3Hqd6OAsK2yyucwykAvP38eJX398Z3AJDLlVYR8ToU9Rhj25TWr9KEsKy5dULIGQCMtfZly45TvwsAstm56UwG6wA4FUFwzrdctxZBDcWSy5XWEPG8I84/GcMipdWPtgcsaz5PCHtKG0IuTiqUvjT9U/WYMG2IOPE+AP+LtCB0xKUAAyA2Xbd2o2OG0NQXvTnvhL17D7EPtH9TRCIWwkRcGYGIQgYBABuqPuHXOQBc6pw80lBGwBQiiXhsBHQhkoprA6iM6acjhDQKu5YJZW6XeOI3XJdpvfsdTu52VfXEekD8owQiXGIubpSCbhDbLu8DwKEAd+A41SOdPpE4BS0viFOtvV2iKWqUgn5x/tmS70xR01GuDSCKc86/OCcLgTyyZ0ScDGNhFAktAJV4NFJ9YyaFiAWIE+9uVkkgBgLoig8DMWAa9ro9ynkUdlW5maZDCmB6clmz0k1HH4Cs1Ezbq2p2yEpUuBOKTSZZex00RUWIrltxuuK6EOGDSbGIOPZicpMx6fny650377qNRgBgWeVFQuA+6UjVgREhGIMlSqsPUQqIbZdOOIdZQmCv2axRnU1N1+TzJYsxOEaEV8ep7frPZ7Gd0FTEdP0ft0/kMNdg0eoAAAAASUVORK5CYII='
+            content: '<p><span style="font- size: 14px"><strong><span style="line - height: 3">Your Cookie Preferences</span></strong></span></p><p><span style="line- height: 1"><span style="font- size: 12px">We use cookie, including third-party cookies, to</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">ensure the proper functioning and security of</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">this site, to analyse its use, and to show you</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">personalised content.</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">You can authorise the use of all cookies by</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">clicking on &#x27;Accept all cookies&#x27;. If you click on</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">&#x27;Reject all cookies&#x27;, we will only use cookies</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">necessary for the proper functioning and </span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">security of this site. To personalise or adjust</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">your preferences at any time, click on &#x27;Cookies</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">Settings&#x27; below or at the bottom of any</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">Fendi.com webpage.</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">For more information, <u>read our Cookie Policy</u>.</span></span></p>'
         },
         style: {
             backgroundColor: '#fff',

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

@@ -17,11 +17,6 @@ export default [
                 label: '内边距',
                 name: ['style', 'padding'],
                 addonAfter: 'px'
-            },
-            {
-                label: '关闭按钮',
-                type: 'Upload',
-                name: ['props', 'closeIcon']
             }
         ]
     },

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

@@ -557,7 +557,8 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
         isReload,
         renderToggleButton
     ]);
-    return (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(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` })) },
         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)) {
@@ -616,6 +617,6 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
             renderToggleButton(!!(globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.muteIconFixed))),
         react_1.default.createElement(WaterFall_1.default, Object.assign({}, (_u = (_t = (_s = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.hashTag) === null || _s === void 0 ? void 0 : _s[0]) === null || _t === void 0 ? void 0 : _t.item) === null || _u === void 0 ? void 0 : _u.props)),
         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 } })))));
+        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;

package/lib/core/context/SxpDataSourceProvider.js

@@ -24,7 +24,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
     var _a, _b, _c, _d, _e;
     const [rtcList, setRtcList] = (0, react_1.useState)([]);
     const [tagList, setTagList] = (0, react_1.useState)([]);
-    const [loading, setLoading] = (0, react_1.useState)(false);
+    const [loading, setLoading] = (0, react_1.useState)(true);
     const [curReqInfo, setCurReqInfo] = (0, react_1.useState)({ rtc: '', requestId: '' });
     const swiperRef = (0, react_1.useRef)(null);
     const isInit = (0, react_1.useRef)(false);

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

@@ -14,6 +14,7 @@ export interface IClickProps {
         style?: CSSProperties;
     };
     consentPopupCate?: string;
+    showRejectButton?: boolean;
 }
 declare const _default: React.NamedExoticComponent<IClickProps>;
 export default _default;

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

@@ -8,32 +8,36 @@ const tel_png_1 = tslib_1.__importDefault(require("./tel.png"));
 const tool_1 = require("../../../../core/utils/tool");
 const hooks_1 = require("../../../../core/hooks");
 const Click = (_a) => {
-    var { isTel, open, content, style, consentPopupCate, acceptButton, rejectButton } = _a, props = tslib_1.__rest(_a, ["isTel", "open", "content", "style", "consentPopupCate", "acceptButton", "rejectButton"]);
+    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)();
-    const [consentResult, setConsentResult] = (0, react_1.useState)(false);
+    const [consentResult, setConsentResult] = (0, react_1.useState)(true);
     const handleGetAccount = () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
         const res = yield (getAccount === null || getAccount === void 0 ? void 0 : getAccount());
         setConsentResult(res);
     });
-    (0, react_1.useEffect)(() => {
-        handleGetAccount();
-    }, []);
     const visivle = (0, react_1.useMemo)(() => {
         return consentPopupCate || (open && style && !consentResult);
     }, [consentPopupCate, open, style, consentResult]);
-    const handleClick = (v) => {
-        accountSonsent === null || accountSonsent === void 0 ? void 0 : accountSonsent(v);
-        setConsentResult(true);
+    (0, react_1.useEffect)(() => {
+        !consentPopupCate && open && style && 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)
+            setConsentResult(true);
+    });
+    const handleClickReject = () => {
+        history === null || history === void 0 ? void 0 : history.back();
     };
     return (react_1.default.createElement(react_1.default.Fragment, null, isTel ? (react_1.default.createElement("img", { src: tel_png_1.default, style: { objectFit: 'cover', width: '100%', height: '100%' } })) : (react_1.default.createElement(react_1.default.Fragment, null, visivle && (react_1.default.createElement("div", { className: 'consentPopupClick' },
         react_1.default.createElement("div", { className: 'consentPopupClick-container', style: style },
             react_1.default.createElement("div", { className: 'consentPopupClick-container-content' },
                 react_1.default.createElement(ConsentDetail_1.default, { content: content, style: { padding: 0 } })),
-            react_1.default.createElement("button", { style: acceptButton === null || acceptButton === void 0 ? void 0 : acceptButton.style, onClick: () => handleClick(true), dangerouslySetInnerHTML: {
+            react_1.default.createElement("button", { style: acceptButton === null || acceptButton === void 0 ? void 0 : acceptButton.style, onClick: handleClickAccept, dangerouslySetInnerHTML: {
                     __html: (0, tool_1.setFontForText)(acceptButton === null || acceptButton === void 0 ? void 0 : acceptButton.text, acceptButton === null || acceptButton === void 0 ? void 0 : acceptButton.style)
                 } }),
-            react_1.default.createElement("button", { style: rejectButton === null || rejectButton === void 0 ? void 0 : rejectButton.style, onClick: () => handleClick(false), dangerouslySetInnerHTML: {
+            showRejectButton && (react_1.default.createElement("button", { style: rejectButton === null || rejectButton === void 0 ? void 0 : rejectButton.style, onClick: handleClickReject, dangerouslySetInnerHTML: {
                     __html: (0, tool_1.setFontForText)(rejectButton === null || rejectButton === void 0 ? void 0 : rejectButton.text, rejectButton === null || rejectButton === void 0 ? void 0 : rejectButton.style)
-                } }))))))));
+                } })))))))));
 };
 exports.default = (0, react_1.memo)(Click);

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

@@ -123,6 +123,11 @@ exports.default = [
     {
         title: '拒绝按钮样式',
         child: [
+            {
+                type: 'Switch',
+                label: '开启',
+                name: ['props', 'showRejectButton']
+            },
             {
                 type: 'Color',
                 label: '背景色',

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

@@ -7,7 +7,6 @@ export interface ISwipeProps {
     isTel?: boolean;
     consentPopupCate?: string;
     swipeIcon?: string;
-    closeIcon?: string;
 }
 declare const _default: React.NamedExoticComponent<ISwipeProps>;
 export default _default;

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

@@ -7,25 +7,26 @@ const ConsentDetail_1 = tslib_1.__importDefault(require("../../popup/ConsentDeta
 const tel_png_1 = tslib_1.__importDefault(require("./tel.png"));
 const hooks_1 = require("../../../../core/hooks");
 const Swipe = (_a) => {
-    var { isTel, open, content, style, consentPopupCate, swipeIcon, closeIcon } = _a, props = tslib_1.__rest(_a, ["isTel", "open", "content", "style", "consentPopupCate", "swipeIcon", "closeIcon"]);
+    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)();
     const threshold = 50;
     const { getAccount, accountSonsent } = (0, hooks_1.useSxpDataSource)();
-    const [consentResult, setConsentResult] = (0, react_1.useState)(false);
+    const [consentResult, setConsentResult] = (0, react_1.useState)(true);
     const handleGetAccount = () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
         const res = yield (getAccount === null || getAccount === void 0 ? void 0 : getAccount());
         setConsentResult(res);
     });
-    (0, react_1.useEffect)(() => {
-        handleGetAccount();
-    }, []);
     const visivle = (0, react_1.useMemo)(() => {
         return consentPopupCate || (open && style && !consentResult);
     }, [consentPopupCate, open, style, consentResult]);
-    const handleClick = (v) => {
-        accountSonsent === null || accountSonsent === void 0 ? void 0 : accountSonsent(v);
-        setConsentResult(true);
-    };
+    (0, react_1.useEffect)(() => {
+        !consentPopupCate && open && style && 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)
+            setConsentResult(true);
+    });
     const handleTouchStart = (event) => {
         const touch = event.touches[0];
         touchInfo.current = { y: touch.clientY, d: 0 };
@@ -44,7 +45,7 @@ const Swipe = (_a) => {
             return;
         const { d } = touchInfo.current || {};
         if (d > threshold) {
-            handleClick(true);
+            handleClickAccept();
         }
         touchInfo.current = {};
     };
@@ -52,9 +53,7 @@ const Swipe = (_a) => {
         react_1.default.createElement("div", { className: 'consentPopupSwipe-container', style: style },
             react_1.default.createElement("div", { className: 'consentPopupSwipe-container-content' },
                 react_1.default.createElement(ConsentDetail_1.default, { content: content, style: { padding: 0 } })),
-            react_1.default.createElement("button", { "aria-label": 'close', className: 'consentPopupSwipe-container-close', onClick: () => handleClick(false) },
-                react_1.default.createElement("img", { src: closeIcon, alt: 'close' })),
-            swipeIcon && (react_1.default.createElement("div", { className: 'consentPopupSwipe-container-swipeIcon', onClick: () => handleClick(false) },
+            swipeIcon && (react_1.default.createElement("div", { className: 'consentPopupSwipe-container-swipeIcon' },
                 react_1.default.createElement("img", { src: swipeIcon, alt: 'Swipe Icon' }))))))))));
 };
 exports.default = (0, react_1.memo)(Swipe);

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

@@ -16,8 +16,7 @@ const Swipe = (0, create_1.createMaterial)(_1.default, {
     },
     defaulSetting: {
         props: {
-            content: '<p><span style="font- size: 14px"><strong><span style="line - height: 3">Your Cookie Preferences</span></strong></span></p><p><span style="line- height: 1"><span style="font- size: 12px">We use cookie, including third-party cookies, to</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">ensure the proper functioning and security of</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">this site, to analyse its use, and to show you</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">personalised content.</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">You can authorise the use of all cookies by</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">clicking on &#x27;Accept all cookies&#x27;. If you click on</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">&#x27;Reject all cookies&#x27;, we will only use cookies</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">necessary for the proper functioning and </span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">security of this site. To personalise or adjust</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">your preferences at any time, click on &#x27;Cookies</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">Settings&#x27; below or at the bottom of any</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">Fendi.com webpage.</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">For more information, <u>read our Cookie Policy</u>.</span></span></p>',
-            closeIcon: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAjhJREFUWEfFlztOw0AQhmeWiJ4CCmpQ5DiRQsIJyAWg5A0lR0AIChDiCJS8ER0cADgBeRSxt4CCDgkaKiq8i+zYeWx2413HEWmiJJv9v535Z2aN8M8vFPT9z3zETD0aAUChUJjwvPFHAJhBhB3Hqd6OAsK2yyucwykAvP38eJX398Z3AJDLlVYR8ToU9Rhj25TWr9KEsKy5dULIGQCMtfZly45TvwsAstm56UwG6wA4FUFwzrdctxZBDcWSy5XWEPG8I84/GcMipdWPtgcsaz5PCHtKG0IuTiqUvjT9U/WYMG2IOPE+AP+LtCB0xKUAAyA2Xbd2o2OG0NQXvTnvhL17D7EPtH9TRCIWwkRcGYGIQgYBABuqPuHXOQBc6pw80lBGwBQiiXhsBHQhkoprA6iM6acjhDQKu5YJZW6XeOI3XJdpvfsdTu52VfXEekD8owQiXGIubpSCbhDbLu8DwKEAd+A41SOdPpE4BS0viFOtvV2iKWqUgn5x/tmS70xR01GuDSCKc86/OCcLgTyyZ0ScDGNhFAktAJV4NFJ9YyaFiAWIE+9uVkkgBgLoig8DMWAa9ro9ynkUdlW5maZDCmB6clmz0k1HH4Cs1Ezbq2p2yEpUuBOKTSZZex00RUWIrltxuuK6EOGDSbGIOPZicpMx6fny650377qNRgBgWeVFQuA+6UjVgREhGIMlSqsPUQqIbZdOOIdZQmCv2axRnU1N1+TzJYsxOEaEV8ep7frPZ7Gd0FTEdP0ft0/kMNdg0eoAAAAASUVORK5CYII='
+            content: '<p><span style="font- size: 14px"><strong><span style="line - height: 3">Your Cookie Preferences</span></strong></span></p><p><span style="line- height: 1"><span style="font- size: 12px">We use cookie, including third-party cookies, to</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">ensure the proper functioning and security of</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">this site, to analyse its use, and to show you</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">personalised content.</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">You can authorise the use of all cookies by</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">clicking on &#x27;Accept all cookies&#x27;. If you click on</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">&#x27;Reject all cookies&#x27;, we will only use cookies</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">necessary for the proper functioning and </span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">security of this site. To personalise or adjust</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">your preferences at any time, click on &#x27;Cookies</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">Settings&#x27; below or at the bottom of any</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">Fendi.com webpage.</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">For more information, <u>read our Cookie Policy</u>.</span></span></p>'
         },
         style: {
             backgroundColor: '#fff',

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

@@ -19,11 +19,6 @@ exports.default = [
                 label: '内边距',
                 name: ['style', 'padding'],
                 addonAfter: 'px'
-            },
-            {
-                label: '关闭按钮',
-                type: 'Upload',
-                name: ['props', 'closeIcon']
             }
         ]
     },

package/package.json

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