pb-sxp-ui 1.0.69 → 1.0.71

package/es/materials/sxp/template/components/settingRender.d.ts

@@ -40,6 +40,56 @@ declare const _default: ({
         child?: undefined;
     })[];
     type?: undefined;
+} | {
+    title: string;
+    child: ({
+        type: string;
+        label: string;
+        child: {
+            type: string;
+            name: string[];
+            addonAfter: string;
+        }[];
+        addonAfter?: undefined;
+        name?: undefined;
+        min?: undefined;
+        initialValue?: undefined;
+    } | {
+        type: string;
+        label: string;
+        child: ({
+            type: string;
+            name: string[];
+            max: number;
+            addonAfter?: undefined;
+        } | {
+            type: string;
+            name: string[];
+            addonAfter: string;
+            max: number;
+        })[];
+        addonAfter?: undefined;
+        name?: undefined;
+        min?: undefined;
+        initialValue?: undefined;
+    } | {
+        type: string;
+        label: string;
+        addonAfter: string;
+        name: string[];
+        child?: undefined;
+        min?: undefined;
+        initialValue?: undefined;
+    } | {
+        label: string;
+        type: string;
+        name: string[];
+        min: number;
+        addonAfter: string;
+        initialValue: number;
+        child?: undefined;
+    })[];
+    type?: undefined;
 } | {
     title: string;
     type: string;

package/es/materials/sxp/template/components/settingRender.js

@@ -97,6 +97,14 @@ export default [
                 label: '与右侧边距',
                 addonAfter: 'px',
                 name: ['props', 'ctaTempStyles', 'img', 'marginRight']
+            },
+            {
+                label: '居中垂直偏移',
+                type: 'Number',
+                name: ['props', 'translateY'],
+                min: -100,
+                addonAfter: '%',
+                initialValue: 0
             }
         ]
     },

package/lib/core/components/DiyPortalPreview/VideoWidget.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importStar(require("react"));
+const hls_js_1 = tslib_1.__importDefault(require("hls.js"));
 const useIconLink_1 = require("../SxpPageRender/useIconLink");
 const FormatImage_1 = tslib_1.__importDefault(require("../SxpPageRender/FormatImage"));
 const hooks_1 = require("../../../core/hooks");
@@ -141,8 +142,8 @@ const VideoWidget = ({ rec, index, height, data, muted, activeIndex, videoPostCo
         if (!videoRef.current.src) {
             const videoSrc = rec.video.url;
             if (videoSrc.includes('.m3u8')) {
-                if (typeof window !== 'undefined' && (window === null || window === void 0 ? void 0 : window.Hls.isSupported())) {
-                    const hls = new window.Hls();
+                if (hls_js_1.default.isSupported()) {
+                    const hls = new hls_js_1.default();
                     hls.loadSource(videoSrc);
                     hls.attachMedia(videoRef.current);
                 }

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

@@ -12,14 +12,14 @@ Object.values(_materials_).forEach((v) => {
     RESOLVER[v.extend.type] = v;
 });
 const SxpPageCore = ({ data, maxSize = 10, defaultSize = 10, hashTagSize = 20, loadingImage, appDomain, licenseUrl, enabledMetaConversionApi }) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    var _a, _b, _c, _d, _e, _f;
     const utmVal = (0, react_1.useMemo)(() => {
         var _a;
         const searchParams = (location === null || location === void 0 ? void 0 : location.search) ? (_a = location === null || location === void 0 ? void 0 : location.search) === null || _a === void 0 ? void 0 : _a.replace('?', '') : '';
         return searchParams;
     }, []);
     return (react_1.default.createElement(core_1.EditorCore, { resolver: RESOLVER, enableDataSource: false, schema: data === null || data === void 0 ? void 0 : data.data, utmVal: utmVal },
-        react_1.default.createElement(SxpDataSourceProvider_1.default, { utmVal: utmVal, dataSources: data === null || data === void 0 ? void 0 : data.data_sources, sxpParameter: data === null || data === void 0 ? void 0 : data.sxp_parameter, maxSize: (_b = (_a = data === null || data === void 0 ? void 0 : data.sxp_parameter) === null || _a === void 0 ? void 0 : _a.personalized_recommend) !== null && _b !== void 0 ? _b : maxSize, defaultSize: (_d = (_c = data === null || data === void 0 ? void 0 : data.sxp_parameter) === null || _c === void 0 ? void 0 : _c.default_recommend) !== null && _d !== void 0 ? _d : defaultSize, hashTagSize: (_f = (_e = data === null || data === void 0 ? void 0 : data.sxp_parameter) === null || _e === void 0 ? void 0 : _e.hash_tag_size) !== null && _f !== void 0 ? _f : hashTagSize, loadingImage: loadingImage, appDomain: appDomain, enabledMetaConversionApi: enabledMetaConversionApi, isShowTag: (_j = (_h = (_g = data === null || data === void 0 ? void 0 : data.data) === null || _g === void 0 ? void 0 : _g.sxpPageConf) === null || _h === void 0 ? void 0 : _h.globalConfig) === null || _j === void 0 ? void 0 : _j.isShowTag, render: ({ rtcList, tagList }) => {
+        react_1.default.createElement(SxpDataSourceProvider_1.default, { utmVal: utmVal, dataSources: data === null || data === void 0 ? void 0 : data.data_sources, sxpParameter: data === null || data === void 0 ? void 0 : data.sxp_parameter, maxSize: (_b = (_a = data === null || data === void 0 ? void 0 : data.sxp_parameter) === null || _a === void 0 ? void 0 : _a.personalized_recommend) !== null && _b !== void 0 ? _b : maxSize, defaultSize: (_d = (_c = data === null || data === void 0 ? void 0 : data.sxp_parameter) === null || _c === void 0 ? void 0 : _c.default_recommend) !== null && _d !== void 0 ? _d : defaultSize, hashTagSize: (_f = (_e = data === null || data === void 0 ? void 0 : data.sxp_parameter) === null || _e === void 0 ? void 0 : _e.hash_tag_size) !== null && _f !== void 0 ? _f : hashTagSize, loadingImage: loadingImage, appDomain: appDomain, enabledMetaConversionApi: enabledMetaConversionApi, render: ({ rtcList, tagList }) => {
                 var _a;
                 return (react_1.default.createElement(react_1.default.Fragment, null,
                     react_1.default.createElement(SxpPageRender_1.default, Object.assign({}, (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.sxpPageConf, { tagList: tagList, data: rtcList, resolver: RESOLVER, licenseUrl: licenseUrl })),

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

@@ -1,6 +1,7 @@
-import { FC } from 'react';
+import { CSSProperties, FC } from 'react';
 interface IProps {
     imageUrl?: string;
+    style?: CSSProperties;
 }
 declare const FingerSwipeTip: FC<IProps>;
 export default FingerSwipeTip;

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

@@ -4,7 +4,7 @@ const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importStar(require("react"));
 const useIconLink_1 = require("../useIconLink");
 const hooks_1 = require("../../../../core/hooks");
-const FingerSwipeTip = ({ imageUrl }) => {
+const FingerSwipeTip = ({ imageUrl, style }) => {
     const [show, setShow] = (0, react_1.useState)(true);
     const { schema: { sxpPageConf } } = (0, hooks_1.useEditor)();
     (0, react_1.useEffect)(() => {
@@ -16,7 +16,7 @@ const FingerSwipeTip = ({ imageUrl }) => {
     const animationCls = (0, react_1.useMemo)(() => {
         return show ? 'pb-fadeIn' : 'pb-fadeOut';
     }, [show]);
-    return (react_1.default.createElement("div", { hidden: !show, className: `pb-finger-wrap ${animationCls}` },
+    return (react_1.default.createElement("div", { hidden: !show, className: `pb-finger-wrap ${animationCls}`, style: style },
         react_1.default.createElement("img", { src: imageUrl || FINGER_SWIPE_ICON })));
 };
 exports.default = FingerSwipeTip;

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

@@ -13,7 +13,6 @@ const FormatImage = (0, react_1.forwardRef)((props, ref) => {
     (0, react_1.useEffect)(() => {
         setImgSrc(src);
     }, [src]);
-    const imgRef = (0, react_1.useRef)(null);
     return (react_1.default.createElement(react_1.default.Fragment, null, (imgSrc === null || imgSrc === void 0 ? void 0 : imgSrc.includes('.avif')) ? (react_1.default.createElement("picture", null,
         react_1.default.createElement("source", { type: 'image/avif', srcSet: imgSrc }),
         react_1.default.createElement("source", { type: 'image/webp', srcSet: `${imgSrc}?imageMogr2/format/webp` }),

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

@@ -11,7 +11,7 @@ const Nudge = ({ nudge }) => {
             backgroundColor: nudge === null || nudge === void 0 ? void 0 : nudge.backgroundColor,
             borderRadius: (_f = nudge === null || nudge === void 0 ? void 0 : nudge.borderRadius) !== null && _f !== void 0 ? _f : 4
         } },
-        (nudge === null || nudge === void 0 ? void 0 : nudge.icon) ? react_1.default.createElement("img", { src: nudge.icon, style: { height: '100%', objectFit: 'cover' } }) : null,
-        react_1.default.createElement("p", { style: Object.assign(Object.assign({}, nudge === null || nudge === void 0 ? void 0 : nudge.textStyle), { textWrap: 'nowrap', textOverflow: 'ellipsis', overflow: 'hidden', whiteSpace: 'nowrap' }) }, (_g = nudge === null || nudge === void 0 ? void 0 : nudge.content) !== null && _g !== void 0 ? _g : '')))));
+        (nudge === null || nudge === void 0 ? void 0 : nudge.icon) ? react_1.default.createElement("img", { src: nudge.icon, style: { height: '100%', objectFit: 'cover', flexShrink: 0 } }) : null,
+        react_1.default.createElement("p", { style: Object.assign(Object.assign({}, nudge === null || nudge === void 0 ? void 0 : nudge.textStyle), { textWrap: 'nowrap', textOverflow: 'ellipsis', overflow: 'hidden', whiteSpace: 'nowrap', flex: 1, marginBottom: 0 }) }, (_g = nudge === null || nudge === void 0 ? void 0 : nudge.content) !== null && _g !== void 0 ? _g : '')))));
 };
 exports.default = Nudge;

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

@@ -184,7 +184,6 @@ const VideoWidget = ({ rec, index, height, data, muted, activeIndex, videoPostCo
         const videoSrc = rec.video.url;
         if (!videoSrc)
             return;
-        videoRef === null || videoRef === void 0 ? void 0 : videoRef.src(videoSrc);
         setIsPauseVideo(false);
         const videoPlayerWrapperNode = document.querySelector(`#${videoId}`);
         const dom = document.querySelector('#player-container-id');
@@ -192,6 +191,7 @@ const VideoWidget = ({ rec, index, height, data, muted, activeIndex, videoPostCo
         if (!dom && !dom2)
             return;
         videoPlayerWrapperNode === null || videoPlayerWrapperNode === void 0 ? void 0 : videoPlayerWrapperNode.appendChild(dom || dom2);
+        videoRef === null || videoRef === void 0 ? void 0 : videoRef.src(videoSrc);
         videoRef === null || videoRef === void 0 ? void 0 : videoRef.on('loadedmetadata', handleLoadedmetadata);
         videoRef === null || videoRef === void 0 ? void 0 : videoRef.on('loadeddata', handLoadeddata);
         videoRef === null || videoRef === void 0 ? void 0 : videoRef.on('playing', handlePlaying);

package/lib/core/components/SxpPageRender/WaterFall/List.js

@@ -16,19 +16,15 @@ const WaterfallFlowItem = (props) => {
     const canvasRef = (0, react_1.useRef)(null);
     const [firstFrameSrc, setFirstFrameSrc] = (0, react_1.useState)('');
     const src = (0, react_1.useMemo)(() => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         if ((_a = rec === null || rec === void 0 ? void 0 : rec.video) === null || _a === void 0 ? void 0 : _a.cover) {
             return (_b = rec === null || rec === void 0 ? void 0 : rec.video) === null || _b === void 0 ? void 0 : _b.cover;
         }
-        else if ((_c = rec === null || rec === void 0 ? void 0 : rec.video) === null || _c === void 0 ? void 0 : _c.url) {
-            setShowVideo(true);
-            return (_d = rec === null || rec === void 0 ? void 0 : rec.video) === null || _d === void 0 ? void 0 : _d.url;
+        else if ((_d = (_c = rec === null || rec === void 0 ? void 0 : rec.video) === null || _c === void 0 ? void 0 : _c.imgUrls) === null || _d === void 0 ? void 0 : _d.length) {
+            return (_f = (_e = rec === null || rec === void 0 ? void 0 : rec.video) === null || _e === void 0 ? void 0 : _e.imgUrls) === null || _f === void 0 ? void 0 : _f[0];
         }
-        else if ((_f = (_e = rec === null || rec === void 0 ? void 0 : rec.video) === null || _e === void 0 ? void 0 : _e.imgUrls) === null || _f === void 0 ? void 0 : _f.length) {
-            return (_h = (_g = rec === null || rec === void 0 ? void 0 : rec.video) === null || _g === void 0 ? void 0 : _g.imgUrls) === null || _h === void 0 ? void 0 : _h[0];
-        }
-        else if ((_k = (_j = rec === null || rec === void 0 ? void 0 : rec.product) === null || _j === void 0 ? void 0 : _j.homePage) === null || _k === void 0 ? void 0 : _k.length) {
-            return (_m = (_l = rec === null || rec === void 0 ? void 0 : rec.product) === null || _l === void 0 ? void 0 : _l.homePage) === null || _m === void 0 ? void 0 : _m[0];
+        else if ((_h = (_g = rec === null || rec === void 0 ? void 0 : rec.product) === null || _g === void 0 ? void 0 : _g.homePage) === null || _h === void 0 ? void 0 : _h.length) {
+            return (_k = (_j = rec === null || rec === void 0 ? void 0 : rec.product) === null || _j === void 0 ? void 0 : _j.homePage) === null || _k === void 0 ? void 0 : _k[0];
         }
         else {
             return (sxpParameter === null || sxpParameter === void 0 ? void 0 : sxpParameter.bottom_image) || '';

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

@@ -29,6 +29,11 @@ export interface ISxpPageRenderProps {
         isOpenTextShadow?: boolean;
         videoPost?: postConfigType;
         imgUrlsPost?: postConfigType;
+        muteIconXPosit?: string;
+        muteIconYPosit?: string;
+        likeIconYPosit?: string;
+        likeIconXPosit?: string;
+        swipeTipOffset?: number;
     };
     descStyle?: CSSProperties;
     tipText?: {

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

@@ -23,10 +23,10 @@ const sessionStore_1 = require("../../../core/utils/sessionStore");
 require("./index.less");
 const useEventReport_1 = require("../../../core/hooks/useEventReport");
 const withBindDataSource_1 = tslib_1.__importDefault(require("../../../core/hoc/withBindDataSource"));
-const localStore_1 = require("../../../core/utils/localStore");
 const Tagbar_1 = tslib_1.__importDefault(require("./Tagbar"));
+const localStore_1 = require("../../../core/utils/localStore");
 const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.innerHeight, containerWidth = window.innerWidth, tempMap, resolver, data = [], ctaType, tipText, nudge, _schema, hashTagStyle, tagList = [], licenseUrl }) => {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     const { schema } = (0, hooks_1.useEditor)();
     const [activeIndex, setActiveIndex] = (0, react_1.useState)(0);
     const viewImageStartTime = (0, react_1.useRef)(0);
@@ -79,29 +79,23 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
     };
     const firstRef = (0, react_1.useRef)();
     (0, react_1.useEffect)(() => {
-        var _a, _b, _c;
-        if (!firstRef.current && !videoRef && (playerRef === null || playerRef === void 0 ? void 0 : playerRef.current) && (data === null || data === void 0 ? void 0 : data.length) > 0) {
+        if (!firstRef.current && !videoRef) {
             firstRef.current = true;
             const player = TCPlayer('player-container-id', {
                 licenseUrl,
                 controls: false,
+                autoplay: false,
                 loop: false,
-                autoplay: true,
                 muted: true,
                 preload: 'auto',
                 posterImage: false,
-                bigPlayButton: true,
-                sources: [
-                    {
-                        src: (_c = (_b = (_a = data === null || data === void 0 ? void 0 : data[0]) === null || _a === void 0 ? void 0 : _a.video) === null || _b === void 0 ? void 0 : _b.url) !== null && _c !== void 0 ? _c : ''
-                    }
-                ]
+                bigPlayButton: true
             });
             player === null || player === void 0 ? void 0 : player.ready(() => {
                 setVideoRef(player);
             });
         }
-    }, [videoRef, licenseUrl, data]);
+    }, [videoRef, licenseUrl]);
     (0, react_1.useEffect)(() => {
         if (!isInit)
             handleH5EnterLink();
@@ -267,7 +261,7 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
         lineGradStyle
     ]);
     const renderLikeButton = (0, react_1.useCallback)((rec, index) => {
-        var _a, _b;
+        var _a, _b, _c, _d;
         if (!(globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.isShowLike))
             return;
         let top = (_a = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.likeIconY) !== null && _a !== void 0 ? _a : 400;
@@ -276,8 +270,8 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
         }
         if (rec.video) {
             return (react_1.default.createElement(LikeButton_1.default, { key: rec.position, activeIcon: globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.likeIcon, unActicveIcon: globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.unlikeIcon, active: rec.isCollected, recData: rec, className: 'clc-sxp-like-button', style: {
-                    top,
-                    right: (_b = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.likeIconX) !== null && _b !== void 0 ? _b : 0
+                    [(_b = globalConfig.likeIconXPosit) !== null && _b !== void 0 ? _b : 'right']: (_c = globalConfig.likeIconX) !== null && _c !== void 0 ? _c : 0,
+                    [(_d = globalConfig.likeIconYPosit) !== null && _d !== void 0 ? _d : 'bottom']: top
                 }, position: index }));
         }
         return null;
@@ -304,7 +298,7 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
         }
     };
     const handleScrollEvent = (swiper) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         viewTime.current = new Date();
         const item = data[swiper.previousIndex];
         if (!item)
@@ -334,14 +328,17 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
             handleReportViewImageEnd(item);
         }
         handleReportProductView(item);
+        const curItem = data[swiper.activeIndex];
+        if (!((_j = curItem === null || curItem === void 0 ? void 0 : curItem.video) === null || _j === void 0 ? void 0 : _j.url) && !((_k = curItem === null || curItem === void 0 ? void 0 : curItem.video) === null || _k === void 0 ? void 0 : _k.imgUrls) && (curItem === null || curItem === void 0 ? void 0 : curItem.product)) {
+            bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
+                eventName: 'ProductView'
+            });
+        }
     };
     const handleReportProductView = (item) => {
         var _a, _b, _c;
         if (!((_a = item === null || item === void 0 ? void 0 : item.video) === null || _a === void 0 ? void 0 : _a.url) && !((_b = item === null || item === void 0 ? void 0 : item.video) === null || _b === void 0 ? void 0 : _b.imgUrls) && (item === null || item === void 0 ? void 0 : item.product)) {
             productView(item, item.product, (_c = item === null || item === void 0 ? void 0 : item.product) === null || _c === void 0 ? void 0 : _c.bindCta, viewTime.current, activeIndex);
-            bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-                eventName: 'ProductView'
-            });
         }
     };
     (0, react_1.useEffect)(() => {
@@ -411,7 +408,7 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
             } })),
         renderLogo,
         react_1.default.createElement(Tagbar_1.default, { tagList: tagList, setActiveIndex: setActiveIndex }),
-        isShowFingerTip ? react_1.default.createElement(FingerSwipeTip_1.default, { imageUrl: globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.swipeTipIcon }) : null,
+        isShowFingerTip ? (react_1.default.createElement(FingerSwipeTip_1.default, { imageUrl: globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.swipeTipIcon, style: { top: `${50 + ((_a = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.swipeTipOffset) !== null && _a !== void 0 ? _a : 0)}%` } })) : null,
         react_1.default.createElement(react_2.Swiper, { ref: swiperRef, onSlideChange: () => {
                 swiperRef.current.swiper.allowTouchMove = false;
                 setTimeout(() => {
@@ -435,13 +432,13 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
             }, direction: 'vertical', height: height },
             react_1.default.createElement(ToggleButton_1.default, { style: {
                     position: 'fixed',
-                    right: (_a = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.muteIconX) !== null && _a !== void 0 ? _a : 0,
                     visibility: ((_c = (_b = data === null || data === void 0 ? void 0 : data[activeIndex]) === null || _b === void 0 ? void 0 : _b.video) === null || _c === void 0 ? void 0 : _c.url) ? 'visible' : 'hidden',
-                    bottom: (_d = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.muteIconY) !== null && _d !== void 0 ? _d : 23,
-                    zIndex: 999
+                    zIndex: 999,
+                    [(_d = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.muteIconXPosit) !== null && _d !== void 0 ? _d : 'right']: (_e = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.muteIconX) !== null && _e !== void 0 ? _e : 0,
+                    [(_f = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.muteIconYPosit) !== null && _f !== void 0 ? _f : 'bottom']: (_g = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.muteIconY) !== null && _g !== void 0 ? _g : 23
                 }, defaultValue: isMuted, activeIcon: (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.unMuteIcon) ? globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.unMuteIcon : mutedIcon, unactiveIcon: (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.muteIcon) ? globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.muteIcon : unmutedIcon, onChange: setIsMuted }),
             renderView),
-        react_1.default.createElement(WaterFall_1.default, Object.assign({}, (_g = (_f = (_e = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.hashTag) === null || _e === void 0 ? void 0 : _e[0]) === null || _f === void 0 ? void 0 : _f.item) === null || _g === void 0 ? void 0 : _g.props)),
+        react_1.default.createElement(WaterFall_1.default, Object.assign({}, (_k = (_j = (_h = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.hashTag) === null || _h === void 0 ? void 0 : _h[0]) === null || _j === void 0 ? void 0 : _j.item) === null || _k === void 0 ? void 0 : _k.props)),
         react_1.default.createElement("div", { style: { position: 'absolute', zIndex: -100 } },
             react_1.default.createElement("video", { ref: playerRef, id: 'player-container-id', playsInline: true, crossOrigin: 'anonymous', style: {
                     backgroundColor: 'transparent',

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

@@ -40,6 +40,7 @@ export type ProductInfoType = {
     currency: string;
     bindCta?: CTAInfoType;
     taxInfo?: string;
+    cover?: string;
 };
 export type VideoInfoType = {
     bindCtaId: string;

package/lib/core/context/SxpDataSourceProvider.d.ts

@@ -102,7 +102,6 @@ export interface SxpDataSourceProviderProps {
     loadingImage?: string;
     isOpenHashTag?: boolean;
     enabledMetaConversionApi?: boolean;
-    isShowTag?: boolean;
 }
 declare const _default: React.NamedExoticComponent<SxpDataSourceProviderProps>;
 export default _default;

package/lib/core/context/SxpDataSourceProvider.js

@@ -17,7 +17,7 @@ var DataSourceType;
     DataSourceType[DataSourceType["BFF"] = 5] = "BFF";
 })(DataSourceType || (DataSourceType = {}));
 const UTM_KEYS = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_id', 'utm_content', 'cl_source'];
-const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent = true, maxSize, defaultSize, isPreview = false, sxpParameter, appDomain, hashTagSize, loadingImage, isOpenHashTag = false, enabledMetaConversionApi = false, isShowTag = true }) => {
+const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent = true, maxSize, defaultSize, isPreview = false, sxpParameter, appDomain, hashTagSize, loadingImage, isOpenHashTag = false, enabledMetaConversionApi = false }) => {
     const [rtcList, setRtcList] = (0, react_1.useState)([]);
     const [tagList, setTagList] = (0, react_1.useState)([]);
     const [loading, setLoading] = (0, react_1.useState)(false);
@@ -139,9 +139,17 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         if (!enableReportEvent || !enabledMetaConversionApi) {
             return;
         }
+        const fakeUserId = (0, localStore_1.storeAndLoadFeUserId)();
         return bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/fb/events', {
             method: 'POST',
-            body: { eventName, actionSource, eventSourceUrl, 'userData.externalId': externalId },
+            body: {
+                eventName,
+                actionSource,
+                eventSourceUrl,
+                userData: {
+                    externalId: fakeUserId
+                }
+            },
             type: 'beacon'
         });
     }, [bffFetch, enableReportEvent, enabledMetaConversionApi]);
@@ -159,7 +167,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
     }), [bffFetch]);
     const bffGetTagList = (0, react_1.useCallback)(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
         var _h, _j, _k, _l, _m;
-        if (!utmVal || !isShowTag)
+        if (!utmVal)
             return;
         try {
             const val = (_k = (_j = (_h = utmVal === null || utmVal === void 0 ? void 0 : utmVal.split('&')) === null || _h === void 0 ? void 0 : _h.filter((val) => {
@@ -172,7 +180,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         catch (e) {
             console.log('e', e);
         }
-    }), [bffFetch, utmVal, isShowTag]);
+    }), [bffFetch, utmVal]);
     const ctaEvent = (0, react_1.useCallback)((eventInfo, rec, product, position) => {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         const cta = product === null || product === void 0 ? void 0 : product.bindCta;

package/lib/materials/sxp/HashTag/settingRender.d.ts

@@ -1,16 +1,11 @@
 declare const _default: ({
     title: string;
-    child: ({
-        type: string;
-        label: string;
-        name: string[];
-        addonAfter?: undefined;
-    } | {
+    child: {
         type: string;
         label: string;
         name: string[];
         addonAfter: string;
-    })[];
+    }[];
 } | {
     title: string;
     child: {

package/lib/materials/sxp/HashTag/settingRender.js

@@ -6,11 +6,6 @@ exports.default = [
     {
         title: '卡片样式',
         child: [
-            {
-                type: 'Number',
-                label: '文本行数',
-                name: ['props', 'lineClamp']
-            },
             {
                 type: 'Number',
                 label: '上下边距',

package/lib/materials/sxp/defaultSetting.d.ts

@@ -3,9 +3,6 @@ export declare const fontOptions: {
     value: string;
 }[];
 declare const _default: {
-    fontOptions: {
-        label: string;
-        value: string;
-    }[];
+    fontOptions: any[];
 };
 export default _default;

package/lib/materials/sxp/defaultSetting.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fontOptions = void 0;
-exports.fontOptions = [
-    { label: '应用字体', value: 'appFont' },
-    { label: '黑体', value: '黑体' }
-];
+exports.fontOptions = [{ label: 'defalut', value: 'appFont' }];
+const sxpFonts = typeof window !== 'undefined' && (window === null || window === void 0 ? void 0 : window.localStorage.getItem('sxp_font_links'));
+const data = sxpFonts && sxpFonts !== '' ? JSON.parse(sxpFonts) : [];
 exports.default = {
-    fontOptions: exports.fontOptions
+    fontOptions: [...exports.fontOptions, ...data]
 };

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

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { CSSProperties } from 'react';
 import './index.less';
 export interface IAppointFormProps {
     columns?: any[];
@@ -14,6 +14,7 @@ export interface IAppointFormProps {
     layoutType?: 'horizontal' | 'vertical' | 'inline';
     isExternalLink?: boolean;
     isPopup?: boolean;
+    submitButtonStyle?: CSSProperties;
     onClick?: () => void;
     onClose?: () => void;
 }

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

@@ -3,13 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const css_1 = require("@emotion/css");
 const react_1 = tslib_1.__importStar(require("react"));
-const pro_components_1 = require("@ant-design/pro-components");
 const lodash_1 = require("lodash");
 const hooks_1 = require("../../../../core/hooks");
 require("./index.less");
 const useEventReport_1 = require("../../../../core/hooks/useEventReport");
 const AppointForm = (_a) => {
-    var { columns, style, title, textStyle, submitBgColor, submitColor, submitText, layoutType, isExternalLink, isPopup, onClick, onClose } = _a, props = tslib_1.__rest(_a, ["columns", "style", "title", "textStyle", "submitBgColor", "submitColor", "submitText", "layoutType", "isExternalLink", "isPopup", "onClick", "onClose"]);
+    var { columns, style, title, textStyle, submitBgColor, submitColor, submitText, layoutType, isExternalLink, isPopup, onClick, onClose, submitButtonStyle } = _a, props = tslib_1.__rest(_a, ["columns", "style", "title", "textStyle", "submitBgColor", "submitColor", "submitText", "layoutType", "isExternalLink", "isPopup", "onClick", "onClose", "submitButtonStyle"]);
     const { submitForm, popupDetailData } = (0, hooks_1.useSxpDataSource)();
     const { jumpToWeb } = (0, useEventReport_1.useEventReport)();
     const formRef = (0, react_1.useRef)();
@@ -83,12 +82,8 @@ const AppointForm = (_a) => {
     return (react_1.default.createElement("div", { className: 'pb-appoint-form' },
         react_1.default.createElement("div", { className: `pb-appoint-form-title ${(0, css_1.css)(Object.assign({}, textStyle))}` }, title),
         react_1.default.createElement("div", Object.assign({ className: (0, css_1.css)(Object.assign({}, style)) }, props),
-            react_1.default.createElement("div", { className: 'pb-appoint-form-container' },
-                react_1.default.createElement(pro_components_1.BetaSchemaForm, { columns: columnsData, submitter: false, layout: layoutType, autoFocusFirstInput: false, size: 'large', formRef: formRef, className: 'panel-reset' }))),
+            react_1.default.createElement("div", { className: 'pb-appoint-form-container' })),
         react_1.default.createElement("div", { className: 'pb-appoint-form-btn-wrapper' },
-            react_1.default.createElement("button", { onClick: handleSubmit, className: 'pb-appoint-form-btn', style: {
-                    color: submitColor,
-                    background: submitBgColor
-                } }, loading ? react_1.default.createElement(react_1.default.Fragment, null, "loading...") : submitText))));
+            react_1.default.createElement("button", { onClick: handleSubmit, className: 'pb-appoint-form-btn', style: Object.assign({ color: submitColor, background: submitBgColor }, submitButtonStyle) }, loading ? react_1.default.createElement(react_1.default.Fragment, null, "loading...") : submitText))));
 };
 exports.default = (0, react_1.memo)(AppointForm);

package/lib/materials/sxp/popup/AppointForm/settingRender.d.ts

@@ -51,16 +51,37 @@ declare const _default: ({
         })[];
         name: string[];
         child?: undefined;
-    })[];
-    type?: undefined;
-    label?: undefined;
-    name?: undefined;
-} | {
-    title: string;
-    child: {
+    } | {
+        type: string;
+        label: string;
+        child: ({
+            type: string;
+            name: string[];
+            initialValue: string;
+            options?: undefined;
+            addonAfter?: undefined;
+        } | {
+            type: string;
+            name: string[];
+            options: any[];
+            initialValue: any;
+            addonAfter?: undefined;
+        } | {
+            type: string;
+            name: string[];
+            addonAfter: string;
+            initialValue: number;
+            options?: undefined;
+        })[];
+        name?: undefined;
+        options?: undefined;
+    } | {
         type: string;
         name: string[];
-    }[];
+        label?: undefined;
+        child?: undefined;
+        options?: undefined;
+    })[];
     type?: undefined;
     label?: undefined;
     name?: undefined;

package/lib/materials/sxp/popup/AppointForm/settingRender.js

@@ -1,7 +1,8 @@
 "use strict";
-var _a;
+var _a, _b, _c;
 Object.defineProperty(exports, "__esModule", { value: true });
-const defaultSetting_1 = require("../../defaultSetting");
+const tslib_1 = require("tslib");
+const defaultSetting_1 = tslib_1.__importStar(require("../../defaultSetting"));
 exports.default = [
     {
         type: 'Text',
@@ -71,6 +72,37 @@ exports.default = [
                 type: 'Text',
                 name: ['props', 'submitText']
             },
+            {
+                type: 'Group',
+                label: '提交按钮字体',
+                child: [
+                    {
+                        type: 'Color',
+                        name: ['props', 'submitButtonStyle', 'color'],
+                        initialValue: '#fff'
+                    },
+                    {
+                        type: 'Select',
+                        name: ['props', 'submitButtonStyle', 'fontFamily'],
+                        options: defaultSetting_1.default === null || defaultSetting_1.default === void 0 ? void 0 : defaultSetting_1.default.fontOptions,
+                        initialValue: (_c = (_b = defaultSetting_1.default === null || defaultSetting_1.default === void 0 ? void 0 : defaultSetting_1.default.fontOptions) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.value
+                    },
+                    {
+                        type: 'Number',
+                        name: ['props', 'submitButtonStyle', 'fontSize'],
+                        addonAfter: 'px',
+                        initialValue: 12
+                    }
+                ]
+            },
+            {
+                type: 'TextStyle',
+                name: ['props', 'submitButtonStyle']
+            },
+            {
+                type: 'TextAlign',
+                name: ['props', 'submitButtonStyle']
+            },
             {
                 label: '提交文本颜色',
                 type: 'Color',

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

@@ -20,6 +20,7 @@ export interface ICommodityDetailProps {
     swiper: {
         dotsAlign: 'left' | 'center';
         delay: number;
+        translateY?: number;
     };
     commodityStyles?: {
         title: CSSProperties;