pb-sxp-ui 14.0.5 → 14.0.7

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

@@ -120,7 +120,7 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
                 contentId: (_m = item === null || item === void 0 ? void 0 : item.video) === null || _m === void 0 ? void 0 : _m.itemId,
                 productId: (_o = item === null || item === void 0 ? void 0 : item.product) === null || _o === void 0 ? void 0 : _o.itemId,
                 position: activeIndex + '',
-                fromKName: fk ? fk : fromKName,
+                fromKName: fk || fromKName,
                 fromKPage: location === null || location === void 0 ? void 0 : location.href,
                 ctatId: (_r = (_q = (_p = item === null || item === void 0 ? void 0 : item.video) === null || _p === void 0 ? void 0 : _p.bindCta) === null || _q === void 0 ? void 0 : _q.itemId) !== null && _r !== void 0 ? _r : '',
                 traceInfo: (_v = (_t = (_s = item === null || item === void 0 ? void 0 : item.video) === null || _s === void 0 ? void 0 : _s.traceInfo) !== null && _t !== void 0 ? _t : (_u = item === null || item === void 0 ? void 0 : item.product) === null || _u === void 0 ? void 0 : _u.traceInfo) !== null && _v !== void 0 ? _v : ''
@@ -147,9 +147,12 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
                     setIsReload(new Date().getTime());
                     skipLinkRef.current = false;
                 }
+                refreshFeSession === null || refreshFeSession === void 0 ? void 0 : refreshFeSession(false);
                 handleH5EnterLink();
                 if (repCond) {
-                    event_1.default.emit(event_1.SXP_EVENT_TYPE.PAGE_DID_SHOW, item);
+                    setTimeout(() => {
+                        event_1.default.emit(event_1.SXP_EVENT_TYPE.PAGE_DID_SHOW, item);
+                    });
                     backMainFeed('external', selectTag);
                 }
             }

package/lib/core/context/SxpDataSourceProvider.js

@@ -102,29 +102,32 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
     const bffDataSource = (0, react_1.useMemo)(() => {
         return dataSources === null || dataSources === void 0 ? void 0 : dataSources.find((d) => d.type === DataSourceType.BFF);
     }, [dataSources]);
+    const fakeUserId = (0, react_1.useMemo)(() => {
+        var _a;
+        return ((_a = bffDataSource === null || bffDataSource === void 0 ? void 0 : bffDataSource.headers) === null || _a === void 0 ? void 0 : _a['x-app-id']) + (0, localStore_1.storeAndLoadFeUserId)();
+    }, [bffDataSource]);
     const bffFetch = (0, react_1.useCallback)((path, options) => {
         if (!bffDataSource)
             return;
         const url = bffDataSource.url;
-        const fakeUserId = (0, localStore_1.storeAndLoadFeUserId)();
         if (options === null || options === void 0 ? void 0 : options.query) {
             const queryString = qs_1.default.stringify(options.query);
             path = `${path}?${queryString}`;
         }
         if (options.type === 'beacon' && navigator.sendBeacon) {
-            return navigator.sendBeacon(`${url}/api/v1${path}`, new Blob([
+            return navigator.sendBeacon(`${url}/api/${path}`, new Blob([
                 JSON.stringify(Object.assign(Object.assign(Object.assign({}, options.body), bffDataSource.headers), { 'x-user-id': fakeUserId }))
             ], { type: 'application/json;charset=UTF-8' }));
         }
         return window
-            .fetch(`${url}/api/v1${path}`, {
+            .fetch(`${url}/api/${path}`, {
             headers: Object.assign({ 'Content-Type': 'application/json', 'x-user-id': fakeUserId }, bffDataSource.headers),
             method: options.method,
             body: JSON.stringify(options.body)
         })
             .then((res) => res.json())
             .catch((err) => Promise.reject(err));
-    }, [bffDataSource]);
+    }, [bffDataSource, fakeUserId]);
     const getRecommendVideos = (0, react_1.useCallback)((query) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
         var _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
         query = {
@@ -161,14 +164,16 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             const recurveRecList = (query) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
                 var _v, _w, _x, _y, _z, _0;
                 query.pageNum = pageNum;
-                result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/recommend/list', { method: 'POST', body: query }));
+                result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('v1/recommend/list', { method: 'POST', body: query }));
                 if (!(result === null || result === void 0 ? void 0 : result.success)) {
                     return undefined;
                 }
                 setLoading(false);
                 list = list.concat((_y = (_x = (_w = (_v = result === null || result === void 0 ? void 0 : result.data) === null || _v === void 0 ? void 0 : _v.recList) === null || _w === void 0 ? void 0 : _w.filter) === null || _x === void 0 ? void 0 : _x.call(_w, (item) => (item === null || item === void 0 ? void 0 : item.product) || (item === null || item === void 0 ? void 0 : item.video))) !== null && _y !== void 0 ? _y : []);
-                setRtcList(getFilterRecList(Object.assign(Object.assign({}, result.data), { recList: list })));
-                setCacheRtcList(getFilterRecList(Object.assign(Object.assign({}, result.data), { recList: list })));
+                if ((rtcList === null || rtcList === void 0 ? void 0 : rtcList.length) === 0) {
+                    setRtcList(getFilterRecList(Object.assign(Object.assign({}, result === null || result === void 0 ? void 0 : result.data), { recList: list })));
+                    setCacheRtcList(getFilterRecList(Object.assign(Object.assign({}, result === null || result === void 0 ? void 0 : result.data), { recList: list })));
+                }
                 const isNotNullList = (_0 = (_z = result === null || result === void 0 ? void 0 : result.data) === null || _z === void 0 ? void 0 : _z.recList) === null || _0 === void 0 ? void 0 : _0.some((item) => (item === null || item === void 0 ? void 0 : item.product) || (item === null || item === void 0 ? void 0 : item.video));
                 if (isNotNullList) {
                     pageNum = pageNum + 1;
@@ -178,12 +183,12 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             yield recurveRecList(query);
             if (!(query === null || query === void 0 ? void 0 : query.hashTag) && result)
                 setCurReqInfo({ rtc: (_l = result === null || result === void 0 ? void 0 : result.data) === null || _l === void 0 ? void 0 : _l.rtc, requestId: (_m = result === null || result === void 0 ? void 0 : result.data) === null || _m === void 0 ? void 0 : _m.requestId });
-            return Object.assign(Object.assign({}, result.data), { recList: list });
+            return Object.assign(Object.assign({}, result === null || result === void 0 ? void 0 : result.data), { recList: list });
         }
         if (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview) {
             query = Object.assign(Object.assign({}, query), { directPage: true, level: 1, pageNum: (_o = query === null || query === void 0 ? void 0 : query.pageNum) !== null && _o !== void 0 ? _o : 1 });
         }
-        const result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/recommend/list', { method: 'POST', body: query }));
+        const result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('v1/recommend/list', { method: 'POST', body: query }));
         if (!(result === null || result === void 0 ? void 0 : result.success)) {
             return undefined;
         }
@@ -233,6 +238,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         return expire;
     }, [data]);
     const bffEventReport = (0, react_1.useCallback)(({ userInfo, eventInfo, reportLayId = true }) => {
+        var _a, _b;
         if (!enableReportEvent || (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview)) {
             return;
         }
@@ -240,7 +246,16 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             userInfo = {};
         }
         const sessionID = (0, sessionStore_1.storeAndLoadFeSessionId)();
-        const ef = Object.assign(Object.assign(Object.assign(Object.assign({ sessionID, rtc: curReqInfo.rtc, requestId: curReqInfo.requestId }, { playbookType }), (layoutVariantId && reportLayId && { layoutVariantId })), eventInfo), ((eventInfo === null || eventInfo === void 0 ? void 0 : eventInfo.position) && channel && { position: Number(eventInfo === null || eventInfo === void 0 ? void 0 : eventInfo.position) + 1 + '' }));
+        const params = {};
+        const queryString = location.search.slice(1);
+        (_a = (0, tool_1.splitUrlParams)(queryString)) === null || _a === void 0 ? void 0 : _a.map((val) => {
+            const key = val.split('=')[0];
+            const value = val.split('=')[1];
+            params[key] = value;
+        });
+        console.log(params, '111');
+        const cl_source = params === null || params === void 0 ? void 0 : params.cl_source;
+        const ef = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ sessionID, rtc: curReqInfo.rtc, requestId: curReqInfo.requestId }, { playbookType }), (layoutVariantId && reportLayId && { layoutVariantId })), eventInfo), ((eventInfo === null || eventInfo === void 0 ? void 0 : eventInfo.position) && channel && { position: Number(eventInfo === null || eventInfo === void 0 ? void 0 : eventInfo.position) + 1 + '' })), (cl_source && { cl_source }));
         const realUserInfo = Object.entries(userInfo).map(([k, v]) => ({ name: k, value: v }));
         const realEventInfo = Object.entries(ef)
             .map(([k, v]) => v && { name: k, value: v })
@@ -249,14 +264,23 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         console.log('userInfo:', userInfo);
         console.log('eventInfo:', ef);
         console.log('========= 结束 =========');
-        return bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/event/report', {
+        return bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch(`v2/event/report/CLD/${(_b = bffDataSource === null || bffDataSource === void 0 ? void 0 : bffDataSource.headers) === null || _b === void 0 ? void 0 : _b['x-app-id']}/${eventInfo === null || eventInfo === void 0 ? void 0 : eventInfo.eventSubject}`, {
             method: 'POST',
             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,
+        bffDataSource
+    ]);
     const bffFbReport = (0, react_1.useCallback)(({ eventName, product }) => {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         if (!enableReportEvent ||
             !enabledMetaConversionApi ||
             (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview) ||
@@ -268,7 +292,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         const fbclid = urlParams === null || urlParams === void 0 ? void 0 : urlParams.get('fbclid');
         const fix_par = {
             event_source_url: (_c = window === null || window === void 0 ? void 0 : window.location) === null || _c === void 0 ? void 0 : _c.href,
-            external_id: (0, localStore_1.storeAndLoadFeUserId)(),
+            external_id: fakeUserId,
             client_user_agent: (_e = (_d = window === null || window === void 0 ? void 0 : window.navigator) === null || _d === void 0 ? void 0 : _d.userAgent) !== null && _e !== void 0 ? _e : '',
             fbc: fbclid ? `fb.2.${new Date().getTime()}.${fbclid}` : '',
             fbp: (0, tool_1.getCookie)('_fbp') ? `fb.2.${new Date().getTime()}.${(0, tool_1.getCookie)('_fbp')}` : '',
@@ -320,22 +344,30 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             }
         };
         getEventParams(jsonParams);
-        return bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/fb/events', {
+        return bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch(`v2/event/report/FB/${(_f = bffDataSource === null || bffDataSource === void 0 ? void 0 : bffDataSource.headers) === null || _f === void 0 ? void 0 : _f['x-app-id']}/${eventName}`, {
             method: 'POST',
             body: jsonParams,
             type: 'beacon'
         });
-    }, [bffFetch, enableReportEvent, enabledMetaConversionApi, globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview, globalConfig]);
+    }, [
+        bffFetch,
+        enableReportEvent,
+        enabledMetaConversionApi,
+        globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview,
+        globalConfig,
+        fakeUserId,
+        bffDataSource
+    ]);
     const bffMutateLike = (0, react_1.useCallback)((body) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/recommend/like', { method: 'POST', body }));
+        const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('v1/recommend/like', { method: 'POST', body }));
         return res === null || res === void 0 ? void 0 : res.success;
     }), [bffFetch]);
     const bffMutateUnlike = (0, react_1.useCallback)((body) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/recommend/unlike', { method: 'POST', body }));
+        const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('v1/recommend/unlike', { method: 'POST', body }));
         return res === null || res === void 0 ? void 0 : res.success;
     }), [bffFetch]);
     const bffSubmitForm = (0, react_1.useCallback)((body) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/customform', { method: 'POST', body }));
+        const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('v1/customform', { method: 'POST', body }));
         return res === null || res === void 0 ? void 0 : res.success;
     }), [bffFetch]);
     const bffGetTagList = (0, react_1.useCallback)((data) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
@@ -349,7 +381,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
                 const key = val.split('=')[0];
                 return (_b = ((_a = utmParameter === null || utmParameter === void 0 ? void 0 : utmParameter.channels) !== null && _a !== void 0 ? _a : [])) === null || _b === void 0 ? void 0 : _b.includes(key);
             })) === null || _9 === void 0 ? void 0 : _9.join('&')) !== null && _10 !== void 0 ? _10 : '';
-            const result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/tag/list', { method: 'GET', query: { channel: decodeURIComponent(val) } }));
+            const result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('v1/tag/list', { method: 'GET', query: { channel: decodeURIComponent(val) } }));
             setTagList((_12 = (_11 = result === null || result === void 0 ? void 0 : result.data) === null || _11 === void 0 ? void 0 : _11.tags) !== null && _12 !== void 0 ? _12 : []);
         }
         catch (e) {
@@ -428,10 +460,10 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
                 let curData;
                 let gldata;
                 if (data === null || data === void 0 ? void 0 : data.layoutVariantId) {
+                    layId = data === null || data === void 0 ? void 0 : data.layoutVariantId;
+                    setLayoutVariantId(data === null || data === void 0 ? void 0 : data.layoutVariantId);
                     const id = (_b = (_a = data === null || data === void 0 ? void 0 : data.layoutVariantId) === null || _a === void 0 ? void 0 : _a.split('-')) === null || _b === void 0 ? void 0 : _b[1];
                     if (id) {
-                        layId = id;
-                        setLayoutVariantId(id);
                         curData = dataList === null || dataList === void 0 ? void 0 : dataList.find((item) => (item === null || item === void 0 ? void 0 : item.id) === id);
                         if (curData) {
                             setPageData(curData);

package/lib/core/utils/materials.js

@@ -38,14 +38,16 @@ const getBgStyleByImg = (data) => {
 exports.getBgStyleByImg = getBgStyleByImg;
 const getPriceText = ({ product, enableFormattedPrice, globalConfig, isHiddenDef, style }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h;
+    let text = '';
     if ((!(product === null || product === void 0 ? void 0 : product.currency) || !(product === null || product === void 0 ? void 0 : product.price)) && isHiddenDef)
         return null;
-    let price = (product === null || product === void 0 ? void 0 : product.currency) && (product === null || product === void 0 ? void 0 : product.price) ? product === null || product === void 0 ? void 0 : product.price : 7000;
-    let text = '';
+    let price = Number((product === null || product === void 0 ? void 0 : product.currency) && (product === null || product === void 0 ? void 0 : product.price) ? product === null || product === void 0 ? void 0 : product.price : 7000);
+    if (typeof price !== 'number')
+        return text;
     let priceSymbol = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.priceSymbol;
     let currency = (product === null || product === void 0 ? void 0 : product.currency) ? (_c = (_b = (_a = product === null || product === void 0 ? void 0 : product.currency) === null || _a === void 0 ? void 0 : _a.split('-')[1]) === null || _b === void 0 ? void 0 : _b.toUpperCase()) !== null && _c !== void 0 ? _c : '' : '$';
     const isToLocStr = enableFormattedPrice === undefined || enableFormattedPrice;
-    let decPic = price.toString();
+    let decPic = price === null || price === void 0 ? void 0 : price.toString();
     if (priceSymbol === null || priceSymbol === void 0 ? void 0 : priceSymbol.showTwoDecimalPoint) {
         decPic = price === null || price === void 0 ? void 0 : price.toFixed(2);
     }

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

@@ -0,0 +1,19 @@
+import React, { CSSProperties } from 'react';
+import './index.less';
+export interface IClickProps {
+    open?: boolean;
+    content?: string;
+    style?: Record<string, any>;
+    isTel?: boolean;
+    acceptButton?: {
+        text?: string;
+        style?: CSSProperties;
+    };
+    rejectButton?: {
+        text?: string;
+        style?: CSSProperties;
+    };
+    consentPopupCate?: string;
+}
+declare const _default: React.NamedExoticComponent<IClickProps>;
+export default _default;

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

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const react_1 = tslib_1.__importStar(require("react"));
+require("./index.less");
+const tel_png_1 = tslib_1.__importDefault(require("./tel.png"));
+const ConsentDetail_1 = tslib_1.__importDefault(require("../../popup/ConsentDetail"));
+const Click = (_a) => {
+    var { isTel, open, content, style, consentPopupCate, acceptButton, rejectButton } = _a, props = tslib_1.__rest(_a, ["isTel", "open", "content", "style", "consentPopupCate", "acceptButton", "rejectButton"]);
+    const visivle = (0, react_1.useMemo)(() => {
+        return consentPopupCate || (open && style);
+    }, [consentPopupCate, open]);
+    const handleClickAccept = () => { };
+    const handleClickReject = () => { };
+    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(ConsentDetail_1.default, { content: content, style: { padding: 0 } }),
+            react_1.default.createElement("button", { style: acceptButton === null || acceptButton === void 0 ? void 0 : acceptButton.style, onClick: handleClickAccept }, acceptButton === null || acceptButton === void 0 ? void 0 : acceptButton.text),
+            react_1.default.createElement("button", { style: rejectButton === null || rejectButton === void 0 ? void 0 : rejectButton.style, onClick: handleClickReject }, rejectButton === null || rejectButton === void 0 ? void 0 : rejectButton.text))))))));
+};
+exports.default = (0, react_1.memo)(Click);

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

@@ -0,0 +1,2 @@
+declare const Click: import("../../../../core/create").MaterialComponet<import(".").IClickProps>;
+export { Click };

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

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Click = void 0;
+const tslib_1 = require("tslib");
+const settingRender_1 = tslib_1.__importDefault(require("./settingRender"));
+const _1 = tslib_1.__importDefault(require("."));
+const create_1 = require("../../../../core/create");
+const Click = (0, create_1.createMaterial)(_1.default, {
+    displayName: 'Click Consent',
+    icon: '',
+    category: 'consentPopup',
+    type: 'Click',
+    related: {
+        settingRender: settingRender_1.default,
+        bindableProps: []
+    },
+    defaulSetting: {
+        props: {
+            content: '<p><strong><span style="font-size:14px"><span style="line-height:3">Your Cookie Preferences</span></span></strong></p><p>We use cookie, including third-party cookies, to ensure the proper functioning and security of this site, to analyse its use, and to show you personalised content. You can authorise the use of all cookies by clicking on &quot;Accept all cookies&quot;. If you click on &quot;Reject all cookies&quot;, we will only use cookies necessary for the proper functioning and security of this site. To personalise on adjust your preferences at any time, click on &quot;Cookies Settings&quot; below or at the bottom of any Fendi.com webpage. For more information, read our Cookie Policy.</p><p></p>',
+            acceptButton: {
+                text: 'Accept all cookies',
+                style: {
+                    backgroundColor: '#000',
+                    height: 45,
+                    color: '#fff',
+                    fontSize: 12,
+                    textAlign: 'center',
+                    marginTop: 5,
+                    marginBottom: 5
+                }
+            },
+            rejectButton: {
+                text: 'Reject all cookies',
+                style: {
+                    backgroundColor: '#000',
+                    height: 45,
+                    color: '#fff',
+                    fontSize: 12,
+                    textAlign: 'center',
+                    marginTop: 5,
+                    marginBottom: 5
+                }
+            }
+        },
+        style: {
+            backgroundColor: '#fff',
+            padding: 18
+        }
+    },
+    sort: 2
+});
+exports.Click = Click;

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

@@ -0,0 +1,63 @@
+declare const _default: ({
+    title: string;
+    child: {
+        type: string;
+        name: string[];
+    }[];
+} | {
+    title: string;
+    child: ({
+        type: string;
+        label: string;
+        name: string[];
+        addonAfter?: undefined;
+        child?: undefined;
+    } | {
+        type: string;
+        label: string;
+        name: string[];
+        addonAfter: string;
+        child?: undefined;
+    } | {
+        type: string;
+        label: string;
+        child: ({
+            type: string;
+            name: string[];
+            max: number;
+            addonAfter?: undefined;
+        } | {
+            type: string;
+            name: string[];
+            addonAfter: string;
+            max: number;
+        })[];
+        name?: undefined;
+        addonAfter?: undefined;
+    } | {
+        type: string;
+        label: string;
+        child: {
+            type: string;
+            name: string[];
+            bottomText: string;
+        }[];
+        name?: undefined;
+        addonAfter?: undefined;
+    } | {
+        type: string;
+        label: string;
+        child: ({
+            type: string;
+            name: string[];
+            addonAfter?: undefined;
+        } | {
+            type: string;
+            name: string[];
+            addonAfter: string;
+        })[];
+        name?: undefined;
+        addonAfter?: undefined;
+    })[];
+})[];
+export default _default;

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

@@ -0,0 +1,212 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = [
+    {
+        title: '全局设置',
+        child: [
+            {
+                type: 'Switch',
+                label: '弹窗开关',
+                name: ['props', 'open']
+            },
+            {
+                type: 'Color',
+                label: '背景色',
+                name: ['style', 'backgroundColor']
+            },
+            {
+                type: 'Number',
+                label: '内边距',
+                name: ['style', 'padding'],
+                addonAfter: 'px'
+            }
+        ]
+    },
+    {
+        title: '弹窗文本',
+        child: [
+            {
+                type: 'RichText',
+                name: ['props', 'content']
+            }
+        ]
+    },
+    {
+        title: '接受按钮样式',
+        child: [
+            {
+                type: 'Color',
+                label: '背景色',
+                name: ['props', 'acceptButton', 'style', 'backgroundColor']
+            },
+            {
+                type: 'Number',
+                label: '尺寸',
+                name: ['props', 'acceptButton', 'style', 'height'],
+                addonAfter: 'H'
+            },
+            {
+                type: 'Group',
+                label: '圆角',
+                child: [
+                    {
+                        type: 'Slider',
+                        name: ['props', 'acceptButton', 'style', 'borderRadius'],
+                        max: 100
+                    },
+                    {
+                        type: 'Number',
+                        name: ['props', 'acceptButton', 'style', 'borderRadius'],
+                        addonAfter: 'px',
+                        max: 100
+                    }
+                ]
+            },
+            {
+                type: 'TextMargin',
+                label: '边距',
+                name: ['props', 'acceptButton', 'style']
+            },
+            {
+                type: 'Group',
+                label: '字体',
+                child: [
+                    {
+                        type: 'Select',
+                        name: ['props', 'acceptButton', 'style', 'fontFamily-cn'],
+                        bottomText: '中文字体'
+                    },
+                    {
+                        type: 'Select',
+                        name: ['props', 'acceptButton', 'style', 'fontFamily-en'],
+                        bottomText: '英文/其他字体'
+                    }
+                ]
+            },
+            {
+                type: 'Group',
+                label: '',
+                child: [
+                    {
+                        type: 'Color',
+                        name: ['props', 'acceptButton', 'style', 'color']
+                    },
+                    {
+                        type: 'Number',
+                        name: ['props', 'acceptButton', 'style', 'fontSize'],
+                        addonAfter: 'px'
+                    }
+                ]
+            },
+            {
+                label: '样式',
+                type: 'TextStyle',
+                name: ['props', 'acceptButton', 'style']
+            },
+            {
+                label: '对齐',
+                type: 'TextAlign',
+                name: ['props', 'acceptButton', 'style']
+            },
+            {
+                label: '间距',
+                type: 'TextSpace',
+                name: ['props', 'acceptButton', 'style']
+            },
+            {
+                label: '文本',
+                type: 'TextArea',
+                name: ['props', 'acceptButton', 'text']
+            }
+        ]
+    },
+    {
+        title: '拒绝按钮样式',
+        child: [
+            {
+                type: 'Color',
+                label: '背景色',
+                name: ['props', 'rejectButton', 'style', 'backgroundColor']
+            },
+            {
+                type: 'Number',
+                label: '尺寸',
+                name: ['props', 'rejectButton', 'style', 'height'],
+                addonAfter: 'H'
+            },
+            {
+                type: 'Group',
+                label: '圆角',
+                child: [
+                    {
+                        type: 'Slider',
+                        name: ['props', 'rejectButton', 'style', 'borderRadius'],
+                        max: 100
+                    },
+                    {
+                        type: 'Number',
+                        name: ['props', 'rejectButton', 'style', 'borderRadius'],
+                        addonAfter: 'px',
+                        max: 100
+                    }
+                ]
+            },
+            {
+                type: 'TextMargin',
+                label: '边距',
+                name: ['props', 'acceptButton', 'style']
+            },
+            {
+                type: 'Group',
+                label: '字体',
+                child: [
+                    {
+                        type: 'Select',
+                        name: ['props', 'rejectButton', 'style', 'fontFamily-cn'],
+                        bottomText: '中文字体'
+                    },
+                    {
+                        type: 'Select',
+                        name: ['props', 'rejectButton', 'style', 'fontFamily-en'],
+                        bottomText: '英文/其他字体'
+                    }
+                ]
+            },
+            {
+                type: 'Group',
+                label: '',
+                child: [
+                    {
+                        type: 'Color',
+                        name: ['props', 'rejectButton', 'style', 'color']
+                    },
+                    {
+                        type: 'Number',
+                        name: ['props', 'rejectButton', 'style', 'fontSize'],
+                        addonAfter: 'px'
+                    }
+                ]
+            },
+            {
+                label: '样式',
+                type: 'TextStyle',
+                name: ['props', 'rejectButton', 'style']
+            },
+            {
+                label: '对齐',
+                type: 'TextAlign',
+                name: ['props', 'rejectButton', 'style']
+            },
+            {
+                label: '间距',
+                type: 'TextSpace',
+                name: ['props', 'rejectButton', 'style']
+            },
+            {
+                label: '文本',
+                type: 'TextArea',
+                name: ['props', 'rejectButton', 'text']
+            }
+        ]
+    }
+];

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

@@ -13,9 +13,9 @@ export interface IDisplayProps {
     };
     style?: Record<string, any>;
     isTel?: boolean;
-    onClick?: () => void;
-    contsentState?: boolean;
     isShowClose?: boolean;
+    consentPopupCate?: string;
+    onClick?: () => void;
 }
 declare const _default: React.NamedExoticComponent<IDisplayProps>;
 export default _default;

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

@@ -3,18 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importStar(require("react"));
 require("./index.less");
-const EditorDataProvider_1 = require("../../../../core/context/EditorDataProvider");
 const close_svg_1 = tslib_1.__importDefault(require("./close.svg"));
 const tel_png_1 = tslib_1.__importDefault(require("./tel.png"));
 const tool_1 = require("../../../../core/utils/tool");
+const localStore_1 = require("../../../../core/utils/localStore");
 const Display = (_a) => {
     var _b, _c;
-    var { isTel, isShowOnce, open, content, interaction, style, onClick, contsentState, isShowClose } = _a, props = tslib_1.__rest(_a, ["isTel", "isShowOnce", "open", "content", "interaction", "style", "onClick", "contsentState", "isShowClose"]);
-    const { consentPopupCate } = (0, EditorDataProvider_1.useEditorDataProvider)();
+    var { isTel, isShowOnce, open, content, interaction, style, onClick, isShowClose, consentPopupCate } = _a, props = tslib_1.__rest(_a, ["isTel", "isShowOnce", "open", "content", "interaction", "style", "onClick", "isShowClose", "consentPopupCate"]);
     const [isClose, setIsClose] = (0, react_1.useState)(false);
+    const contsentState = (0, react_1.useMemo)(() => {
+        return (0, localStore_1.getContsentState)();
+    }, []);
     const visivle = (0, react_1.useMemo)(() => {
-        return consentPopupCate === 'Display' || (open && (isShowOnce || contsentState) && style && !isClose);
-    }, [consentPopupCate, open, isClose]);
+        return consentPopupCate || (open && (isShowOnce || contsentState) && style && !isClose);
+    }, [consentPopupCate, open, isClose, contsentState]);
     const handleClickClose = (0, react_1.useCallback)(() => {
         setIsClose(true);
     }, []);