pb-sxp-ui 1.2.10 → 1.3.1

package/es/materials/sxp/popup/Prompt/settingRender.js

@@ -1,6 +1,21 @@
 export default [
     {
-        title: '',
+        title: '弹窗背景',
+        child: [
+            {
+                type: 'Number',
+                label: '左右边距',
+                name: ['props', 'popupBg', 'horizontalMargin']
+            },
+            {
+                type: 'Number',
+                label: '下边距',
+                name: ['props', 'popupBg', 'bottomMargin']
+            }
+        ]
+    },
+    {
+        title: '内容',
         child: [
             {
                 type: 'Media',

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

@@ -3,3 +3,4 @@ export * from './CommodityDetail/material';
 export * from './Prompt/material';
 export * from './CommodityDetailDiroNew/material';
 export * from './CommodityList/material';
+export * from './Iframe/material';

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

@@ -3,3 +3,4 @@ export * from './CommodityDetail/material';
 export * from './Prompt/material';
 export * from './CommodityDetailDiroNew/material';
 export * from './CommodityList/material';
+export * from './Iframe/material';

package/es/materials/sxp/template/Link/index.js

@@ -8,21 +8,15 @@ import Img from '../components/Img';
 import { setFontForText } from '../../../../core/utils/tool';
 import styles from './index.module.less';
 const Link = (_a) => {
-    var _b, _c, _d, _e, _f, _g, _h, _j;
+    var _b, _c, _d, _e, _f, _g, _h, _j, _k;
     var { content, style, bgImg, recData, bottom_image, ctaTempStyles, index, customTitle } = _a, props = __rest(_a, ["content", "style", "bgImg", "recData", "bottom_image", "ctaTempStyles", "index", "customTitle"]);
     const { sxpParameter, bffEventReport } = useSxpDataSource();
     const { jumpToWeb } = useEventReport();
     const cta = (_b = recData === null || recData === void 0 ? void 0 : recData.video) === null || _b === void 0 ? void 0 : _b.bindCta;
     const product = (_c = recData === null || recData === void 0 ? void 0 : recData.video) === null || _c === void 0 ? void 0 : _c.bindProduct;
-    const handleTo = () => {
-        if (cta === null || cta === void 0 ? void 0 : cta.link) {
-            jumpToWeb(recData, product, cta, index);
-            window.location.href = window.getJointUtmLink(cta.link);
-        }
-    };
     const src = (_e = (_d = cta === null || cta === void 0 ? void 0 : cta.icon) !== null && _d !== void 0 ? _d : sxpParameter === null || sxpParameter === void 0 ? void 0 : sxpParameter.bottom_image) !== null && _e !== void 0 ? _e : bottom_image;
-    return (React.createElement(EventProvider, Object.assign({ index: index, rec: recData, className: css(Object.assign({ alignItems: 'center' }, style)), style: { display: 'flex' } }, props, { onClick: handleTo }),
-        React.createElement(Img, { src: src, rec: recData, item: (_g = (_f = recData === null || recData === void 0 ? void 0 : recData.video) === null || _f === void 0 ? void 0 : _f.bindProduct) !== null && _g !== void 0 ? _g : recData === null || recData === void 0 ? void 0 : recData.video, index: index, imgStyle: ctaTempStyles === null || ctaTempStyles === void 0 ? void 0 : ctaTempStyles.img }),
+    return (React.createElement(EventProvider, Object.assign({ index: index, rec: recData, className: css(Object.assign({ alignItems: 'center' }, style)), style: { display: 'flex' } }, props, { jumpLink: (_f = cta === null || cta === void 0 ? void 0 : cta.link) !== null && _f !== void 0 ? _f : '' }),
+        React.createElement(Img, { src: src, rec: recData, item: (_h = (_g = recData === null || recData === void 0 ? void 0 : recData.video) === null || _g === void 0 ? void 0 : _g.bindProduct) !== null && _h !== void 0 ? _h : recData === null || recData === void 0 ? void 0 : recData.video, index: index, imgStyle: ctaTempStyles === null || ctaTempStyles === void 0 ? void 0 : ctaTempStyles.img }),
         React.createElement("div", { className: css({
                 display: 'flex',
                 alignItems: 'center',
@@ -31,9 +25,9 @@ const Link = (_a) => {
             }) },
             React.createElement("div", null,
                 React.createElement("div", { className: styles['tow-line-ellipsis'], style: ctaTempStyles === null || ctaTempStyles === void 0 ? void 0 : ctaTempStyles.ctaTitle, dangerouslySetInnerHTML: {
-                        __html: setFontForText((_h = cta === null || cta === void 0 ? void 0 : cta.enTitle) !== null && _h !== void 0 ? _h : 'Product Name', ctaTempStyles === null || ctaTempStyles === void 0 ? void 0 : ctaTempStyles.ctaTitle)
+                        __html: setFontForText((_j = cta === null || cta === void 0 ? void 0 : cta.enTitle) !== null && _j !== void 0 ? _j : 'Product Name', ctaTempStyles === null || ctaTempStyles === void 0 ? void 0 : ctaTempStyles.ctaTitle)
                     } }),
-                (customTitle === null || customTitle === void 0 ? void 0 : customTitle.display) && (React.createElement("div", { style: Object.assign(Object.assign({}, customTitle === null || customTitle === void 0 ? void 0 : customTitle.style), { lineHeight: ((_j = customTitle === null || customTitle === void 0 ? void 0 : customTitle.style) === null || _j === void 0 ? void 0 : _j.height) + 'px' }), className: styles['one-line-ellipsis'], dangerouslySetInnerHTML: {
+                (customTitle === null || customTitle === void 0 ? void 0 : customTitle.display) && (React.createElement("div", { style: Object.assign(Object.assign({}, customTitle === null || customTitle === void 0 ? void 0 : customTitle.style), { lineHeight: ((_k = customTitle === null || customTitle === void 0 ? void 0 : customTitle.style) === null || _k === void 0 ? void 0 : _k.height) + 'px' }), className: styles['one-line-ellipsis'], dangerouslySetInnerHTML: {
                         __html: setFontForText(customTitle === null || customTitle === void 0 ? void 0 : customTitle.text, customTitle === null || customTitle === void 0 ? void 0 : customTitle.style)
                     } }))))));
 };

package/es/materials/sxp/template/Link/interactionRender.d.ts

@@ -0,0 +1,8 @@
+declare const _default: {
+    title: string;
+    child: {
+        type: string;
+        name: string;
+    }[];
+}[];
+export default _default;

package/es/materials/sxp/template/Link/interactionRender.js

@@ -0,0 +1,11 @@
+export default [
+    {
+        title: '点击事件',
+        child: [
+            {
+                type: 'link',
+                name: 'onClick'
+            }
+        ]
+    }
+];

package/es/materials/sxp/template/Link/material.js

@@ -3,6 +3,7 @@ import settingRender from '../components/settingRender';
 import linkSettingRender from './settingRender';
 import LinkComponent from '.';
 import { createMaterial } from '../../../../core/create';
+import interactionRender from './interactionRender';
 const Link = createMaterial(LinkComponent, {
     displayName: '跳转指引',
     icon: '',
@@ -10,7 +11,8 @@ const Link = createMaterial(LinkComponent, {
     type: 'Link',
     related: {
         settingRender: (_a = settingRender === null || settingRender === void 0 ? void 0 : settingRender.filter((i) => i.type !== 'commodityTitle')) === null || _a === void 0 ? void 0 : _a.concat(linkSettingRender),
-        bindableProps: []
+        bindableProps: [],
+        interactionRender
     },
     defaulSetting: {
         props: {

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

@@ -1,6 +1,6 @@
 import React, { CSSProperties } from 'react';
 import { RecItemType } from '../../../../core/components/SxpPageRender/typing';
-export interface IImgProps {
+export interface IEventProviderProps {
     rec?: RecItemType;
     children: any;
     className?: any;
@@ -8,6 +8,7 @@ export interface IImgProps {
     style?: CSSProperties;
     isExternalLink?: boolean;
     index?: number;
+    jumpLink?: string;
 }
-declare const _default: React.NamedExoticComponent<IImgProps>;
+declare const _default: React.NamedExoticComponent<IEventProviderProps>;
 export default _default;

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

@@ -4,7 +4,7 @@ import { throttle } from 'lodash';
 import { useEditor, useSxpDataSource } from '../../../../core/hooks';
 import { useEventReport } from '../../../../core/hooks/useEventReport';
 const EventProvider = (_a) => {
-    var { rec, children, className, onClick, style, isExternalLink = false, index } = _a, props = __rest(_a, ["rec", "children", "className", "onClick", "style", "isExternalLink", "index"]);
+    var { rec, children, className, onClick, style, isExternalLink = false, index, jumpLink } = _a, props = __rest(_a, ["rec", "children", "className", "onClick", "style", "isExternalLink", "index", "jumpLink"]);
     const ref = useRef(null);
     const { popup } = useEditor();
     const { setPopupDetailData, ctaEvent } = useSxpDataSource();
@@ -18,11 +18,11 @@ const EventProvider = (_a) => {
         }, rec, item, index);
         setPopupDetailData === null || setPopupDetailData === void 0 ? void 0 : setPopupDetailData(Object.assign(Object.assign({}, rec), { index }));
         if (isExternalLink) {
-            if ((_d = (_c = rec === null || rec === void 0 ? void 0 : rec.video) === null || _c === void 0 ? void 0 : _c.bindProduct) === null || _d === void 0 ? void 0 : _d.link) {
+            if (jumpLink || ((_d = (_c = rec === null || rec === void 0 ? void 0 : rec.video) === null || _c === void 0 ? void 0 : _c.bindProduct) === null || _d === void 0 ? void 0 : _d.link)) {
                 const cta = (_e = rec === null || rec === void 0 ? void 0 : rec.video) === null || _e === void 0 ? void 0 : _e.bindCta;
                 const product = (_f = rec === null || rec === void 0 ? void 0 : rec.video) === null || _f === void 0 ? void 0 : _f.bindProduct;
                 jumpToWeb(rec, product, cta, index);
-                window.location.href = window.getJointUtmLink((_h = (_g = rec === null || rec === void 0 ? void 0 : rec.video) === null || _g === void 0 ? void 0 : _g.bindProduct) === null || _h === void 0 ? void 0 : _h.link);
+                window.location.href = window.getJointUtmLink(jumpLink || ((_h = (_g = rec === null || rec === void 0 ? void 0 : rec.video) === null || _g === void 0 ? void 0 : _g.bindProduct) === null || _h === void 0 ? void 0 : _h.link) || '');
             }
         }
         else {

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

@@ -20,7 +20,7 @@ const FormatImage = (0, react_1.forwardRef)((props, ref) => {
     }, [src]);
     (0, react_1.useEffect)(() => {
         const onShow = () => {
-            if (src && !visible) {
+            if (src && !visible && imgRef.current) {
                 imgRef.current.src = '';
                 imgRef.current.src = src;
             }

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

@@ -7,7 +7,7 @@ const ReactDOM = tslib_1.__importStar(require("react-dom"));
 const hooks_1 = require("../../../../core/hooks");
 const closeIcon = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAjhJREFUWEfFlztOw0AQhmeWiJ4CCmpQ5DiRQsIJyAWg5A0lR0AIChDiCJS8ER0cADgBeRSxt4CCDgkaKiq8i+zYeWx2413HEWmiJJv9v535Z2aN8M8vFPT9z3zETD0aAUChUJjwvPFHAJhBhB3Hqd6OAsK2yyucwykAvP38eJX398Z3AJDLlVYR8ToU9Rhj25TWr9KEsKy5dULIGQCMtfZly45TvwsAstm56UwG6wA4FUFwzrdctxZBDcWSy5XWEPG8I84/GcMipdWPtgcsaz5PCHtKG0IuTiqUvjT9U/WYMG2IOPE+AP+LtCB0xKUAAyA2Xbd2o2OG0NQXvTnvhL17D7EPtH9TRCIWwkRcGYGIQgYBABuqPuHXOQBc6pw80lBGwBQiiXhsBHQhkoprA6iM6acjhDQKu5YJZW6XeOI3XJdpvfsdTu52VfXEekD8owQiXGIubpSCbhDbLu8DwKEAd+A41SOdPpE4BS0viFOtvV2iKWqUgn5x/tmS70xR01GuDSCKc86/OCcLgTyyZ0ScDGNhFAktAJV4NFJ9YyaFiAWIE+9uVkkgBgLoig8DMWAa9ro9ynkUdlW5maZDCmB6clmz0k1HH4Cs1Ezbq2p2yEpUuBOKTSZZex00RUWIrltxuuK6EOGDSbGIOPZicpMx6fny650377qNRgBgWeVFQuA+6UjVgREhGIMlSqsPUQqIbZdOOIdZQmCv2axRnU1N1+TzJYsxOEaEV8ep7frPZ7Gd0FTEdP0ft0/kMNdg0eoAAAAASUVORK5CYII=';
 const Modal = ({ visible, onClose, children, modalStyle, padding, popup, schema, fullHeight = window.innerHeight, isFullScreen = false }) => {
-    var _a, _b;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
     const touchRef = (0, react_1.useRef)(null);
     const fTouchRef = (0, react_1.useRef)(null);
     const touchMoveRef = (0, react_1.useRef)(null);
@@ -34,12 +34,16 @@ const Modal = ({ visible, onClose, children, modalStyle, padding, popup, schema,
     const isOpen = (0, react_1.useMemo)(() => {
         return ((popup === null || popup === void 0 ? void 0 : popup.id) && (popup === null || popup === void 0 ? void 0 : popup.id) !== '') || visible;
     }, [visible, popup]);
-    const isScrollFullScreen = (0, react_1.useMemo)(() => {
-        var _a, _b, _c, _d, _e;
+    const getPopupById = (0, react_1.useMemo)(() => {
+        var _a, _b, _c;
         const schemaData = schema !== null && schema !== void 0 ? schema : _schema;
         const value = (_c = (_b = (_a = schemaData === null || schemaData === void 0 ? void 0 : schemaData.sxpPageConf) === null || _a === void 0 ? void 0 : _a.globalConfig) === null || _b === void 0 ? void 0 : _b.popupList) === null || _c === void 0 ? void 0 : _c.find((value) => (value === null || value === void 0 ? void 0 : value.id) === (popup === null || popup === void 0 ? void 0 : popup.id));
-        return ((_e = (_d = value === null || value === void 0 ? void 0 : value.item) === null || _d === void 0 ? void 0 : _d.event) === null || _e === void 0 ? void 0 : _e.isScrollFullScreen) || false;
+        return value;
     }, [popup, schema, _schema]);
+    const isScrollFullScreen = (0, react_1.useMemo)(() => {
+        var _a, _b;
+        return ((_b = (_a = getPopupById === null || getPopupById === void 0 ? void 0 : getPopupById.item) === null || _a === void 0 ? void 0 : _a.event) === null || _b === void 0 ? void 0 : _b.isScrollFullScreen) || false;
+    }, [getPopupById]);
     (0, react_1.useEffect)(() => {
         if (isOpen) {
             setIsShow(true);
@@ -103,21 +107,31 @@ const Modal = ({ visible, onClose, children, modalStyle, padding, popup, schema,
         touchMoveRef.current = false;
     };
     return ReactDOM.createPortal(react_1.default.createElement(react_1.default.Fragment, null, isShow && (react_1.default.createElement("div", { className: 'modal-bg', style: Object.assign({ display: 'flex', backgroundColor: isOpen ? 'rgba(0, 0, 0, 0.7)' : 'rgba(0, 0, 0, 0)' }, modalStyle), onClick: handleClose },
-        react_1.default.createElement("div", Object.assign({ className: `modal-container ${isOpen ? 'modal-popIn' : 'modal-popOut'}`, style: Object.assign({ padding, animationDuration: ((_a = popup === null || popup === void 0 ? void 0 : popup.duration) !== null && _a !== void 0 ? _a : 0) / 1000 + 's' }, (isScrollFullScreen && {
-                transform: `translateY(${modalTrans}px)`
-            })), onClick: (e) => {
-                e.stopPropagation();
-                e.preventDefault();
-            } }, (isScrollFullScreen && {
-            onTouchMove: handleTouchMove,
-            onTouchStart: handleTouchStart,
-            onTouchEnd: handleTouchEnd
-        })),
-            react_1.default.createElement("div", { onClick: onClose, className: 'modal-icon-wrapper' },
-                react_1.default.createElement("img", { src: (_b = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.popupCloseIcon) !== null && _b !== void 0 ? _b : closeIcon, alt: 'close', className: 'modal-icon' })),
-            react_1.default.createElement("div", { ref: ref, style: {
-                    height: isScrollFullScreen ? fullHeight : MODAL_DEF_CON_H,
-                    overflow: (isScrollFullScreen && modalTrans <= 0) || !isScrollFullScreen ? 'auto' : 'hidden'
-                } }, children))))), modalEleRef.current);
+        react_1.default.createElement("div", { style: {
+                position: 'relative',
+                left: `${(_d = (_c = (_b = (_a = getPopupById === null || getPopupById === void 0 ? void 0 : getPopupById.item) === null || _a === void 0 ? void 0 : _a.props) === null || _b === void 0 ? void 0 : _b.popupBg) === null || _c === void 0 ? void 0 : _c.horizontalMargin) !== null && _d !== void 0 ? _d : 0}px`,
+                right: `${(_h = (_g = (_f = (_e = getPopupById === null || getPopupById === void 0 ? void 0 : getPopupById.item) === null || _e === void 0 ? void 0 : _e.props) === null || _f === void 0 ? void 0 : _f.popupBg) === null || _g === void 0 ? void 0 : _g.horizontalMargin) !== null && _h !== void 0 ? _h : 0}px`,
+                bottom: `${(_m = (_l = (_k = (_j = getPopupById === null || getPopupById === void 0 ? void 0 : getPopupById.item) === null || _j === void 0 ? void 0 : _j.props) === null || _k === void 0 ? void 0 : _k.popupBg) === null || _l === void 0 ? void 0 : _l.bottomMargin) !== null && _m !== void 0 ? _m : 0}px`,
+                overflow: 'hidden',
+                width: `calc(100% - ${((_r = (_q = (_p = (_o = getPopupById === null || getPopupById === void 0 ? void 0 : getPopupById.item) === null || _o === void 0 ? void 0 : _o.props) === null || _p === void 0 ? void 0 : _p.popupBg) === null || _q === void 0 ? void 0 : _q.horizontalMargin) !== null && _r !== void 0 ? _r : 0) * 2}px)`,
+                height: '100%'
+            } },
+            react_1.default.createElement("div", Object.assign({ className: `modal-container ${isOpen ? 'modal-popIn' : 'modal-popOut'}`, style: Object.assign({ padding, animationDuration: ((_s = popup === null || popup === void 0 ? void 0 : popup.duration) !== null && _s !== void 0 ? _s : 0) / 1000 + 's' }, (isScrollFullScreen && {
+                    transform: `translateY(${modalTrans}px)`
+                })), onClick: (e) => {
+                    e.stopPropagation();
+                    e.preventDefault();
+                } }, (isScrollFullScreen && {
+                onTouchMove: handleTouchMove,
+                onTouchStart: handleTouchStart,
+                onTouchEnd: handleTouchEnd
+            })),
+                react_1.default.createElement("div", { onClick: onClose, className: 'modal-icon-wrapper' },
+                    react_1.default.createElement("img", { src: (_t = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.popupCloseIcon) !== null && _t !== void 0 ? _t : closeIcon, alt: 'close', className: 'modal-icon' })),
+                react_1.default.createElement("div", { ref: ref, style: {
+                        height: (isScrollFullScreen ? fullHeight : MODAL_DEF_CON_H) -
+                            ((_w = (_v = (_u = getPopupById === null || getPopupById === void 0 ? void 0 : getPopupById.item) === null || _u === void 0 ? void 0 : _u.props) === null || _v === void 0 ? void 0 : _v.popupBg) === null || _w === void 0 ? void 0 : _w.bottomMargin),
+                        overflow: (isScrollFullScreen && modalTrans <= 0) || !isScrollFullScreen ? 'auto' : 'hidden'
+                    } }, children)))))), modalEleRef.current);
 };
 exports.default = (0, react_1.memo)(Modal);

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

@@ -61,14 +61,14 @@ const Popup = () => {
     const renderPopupDetail = (0, react_1.useMemo)(() => {
         var _a, _b, _c;
         return (_c = (_b = (_a = schema === null || schema === void 0 ? void 0 : schema.sxpPageConf) === null || _a === void 0 ? void 0 : _a.globalConfig) === null || _b === void 0 ? void 0 : _b.popupList) === null || _c === void 0 ? void 0 : _c.map((value, index) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
             if ((value === null || value === void 0 ? void 0 : value.id) === (popup === null || popup === void 0 ? void 0 : popup.id)) {
                 const t = resolver[(_a = value === null || value === void 0 ? void 0 : value.item) === null || _a === void 0 ? void 0 : _a.type];
                 const Component = (0, withBindDataSource_1.default)(t);
                 const isExternalLink = ((_d = (_c = (_b = value === null || value === void 0 ? void 0 : value.item) === null || _b === void 0 ? void 0 : _b.event) === null || _c === void 0 ? void 0 : _c.onClick) === null || _d === void 0 ? void 0 : _d.linkType) === 'externalLink';
                 const isPopup = ((_g = (_f = (_e = value === null || value === void 0 ? void 0 : value.item) === null || _e === void 0 ? void 0 : _e.event) === null || _f === void 0 ? void 0 : _f.onClick) === null || _g === void 0 ? void 0 : _g.linkType) === 'popup';
                 const defaulSetting = (_h = t === null || t === void 0 ? void 0 : t.extend) === null || _h === void 0 ? void 0 : _h.defaulSetting;
-                return (react_1.default.createElement(Component, Object.assign({ key: index, style: Object.assign(Object.assign(Object.assign({}, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.style), (_j = value === null || value === void 0 ? void 0 : value.item) === null || _j === void 0 ? void 0 : _j.style), { width: (_k = window.innerWidth) !== null && _k !== void 0 ? _k : '100vw', height: '100%' }), textStyle: Object.assign(Object.assign({}, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.textStyle), (_l = value === null || value === void 0 ? void 0 : value.item) === null || _l === void 0 ? void 0 : _l.textStyle), bindDatas: (_o = (_m = value === null || value === void 0 ? void 0 : value.item) === null || _m === void 0 ? void 0 : _m.bindDatas) !== null && _o !== void 0 ? _o : [] }, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.props, (_p = value === null || value === void 0 ? void 0 : value.item) === null || _p === void 0 ? void 0 : _p.props, { event: ((_q = value === null || value === void 0 ? void 0 : value.item) === null || _q === void 0 ? void 0 : _q.event) || {}, schema: schema, id: value === null || value === void 0 ? void 0 : value.id, isExternalLink: isExternalLink, isPopup: isPopup, onClose: handleClose })));
+                return (react_1.default.createElement(Component, Object.assign({ key: index, style: Object.assign(Object.assign(Object.assign({}, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.style), (_j = value === null || value === void 0 ? void 0 : value.item) === null || _j === void 0 ? void 0 : _j.style), { height: '100%' }), textStyle: Object.assign(Object.assign({}, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.textStyle), (_k = value === null || value === void 0 ? void 0 : value.item) === null || _k === void 0 ? void 0 : _k.textStyle), bindDatas: (_m = (_l = value === null || value === void 0 ? void 0 : value.item) === null || _l === void 0 ? void 0 : _l.bindDatas) !== null && _m !== void 0 ? _m : [] }, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.props, (_o = value === null || value === void 0 ? void 0 : value.item) === null || _o === void 0 ? void 0 : _o.props, { event: ((_p = value === null || value === void 0 ? void 0 : value.item) === null || _p === void 0 ? void 0 : _p.event) || {}, schema: schema, id: value === null || value === void 0 ? void 0 : value.id, isExternalLink: isExternalLink, isPopup: isPopup, onClose: handleClose })));
             }
             else {
                 return react_1.default.createElement(react_1.default.Fragment, null);

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

@@ -10,6 +10,9 @@ const ToggleButton = ({ defaultValue, activeIcon, unactiveIcon, onChange, style
         setIsTure(result);
         onChange === null || onChange === void 0 ? void 0 : onChange(result);
     };
+    (0, react_1.useEffect)(() => {
+        setIsTure(defaultValue);
+    }, [defaultValue]);
     return (react_1.default.createElement("button", { style: style, "aria-label": 'toggle button', className: 'pb-toggle-button', onClick: handleClick },
         react_1.default.createElement("img", { className: 'pb-toggle-button-icon', alt: 'toggle image', src: isTrue ? activeIcon : unactiveIcon })));
 };

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

@@ -8,9 +8,10 @@ const preview_json_1 = tslib_1.__importDefault(require("./preview.json"));
 const hooks_1 = require("../../../../core/hooks");
 const css_1 = require("@emotion/css");
 const tool_1 = require("../../../../core/utils/tool");
+const useEventReport_1 = require("../../../../core/hooks/useEventReport");
 const WaterfallFlowItem = (props) => {
     const { rec, index, list, reportTagsView, textStyles, space } = props;
-    const { swiperRef, setRtcList, setOpenHashtag, bffEventReport, sxpParameter } = (0, hooks_1.useSxpDataSource)();
+    const { swiperRef, setRtcList, setOpenHashtag, sxpParameter } = (0, hooks_1.useSxpDataSource)();
     const [showVideo, setShowVideo] = (0, react_1.useState)(false);
     const imgDom = (0, react_1.useRef)(null);
     const ref = (0, react_1.useRef)(null);
@@ -123,38 +124,30 @@ const WaterfallFlowItem = (props) => {
 function WaterfallList(_a) {
     var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
     var { reportTagsView, showBanner } = _a, props = tslib_1.__rest(_a, ["reportTagsView", "showBanner"]);
-    const { waterFallData, getRecommendVideos, hashTagSize, loadingImage, isOpenHashTag } = (0, hooks_1.useSxpDataSource)();
+    const { waterFallData, getRecommendVideos, hashTagSize, loadingImage, isOpenHashTag, cacheActiveIndex } = (0, hooks_1.useSxpDataSource)();
+    const { jumpToWeb } = (0, useEventReport_1.useEventReport)();
     const [list, setList] = (0, react_1.useState)();
     const [data, setData] = (0, react_1.useState)();
     const [isLoadingData, setIsLoadingData] = (0, react_1.useState)(false);
     const containerRef = (0, react_1.useRef)(null);
     const [isLoadMore, setIsLoadMore] = (0, react_1.useState)(false);
     const loadMoreData = (0, react_1.useCallback)(() => {
+        var _a, _b, _c, _d;
         if (isLoadMore)
             return;
         setIsLoadMore(true);
         waterFallData &&
-            (getRecommendVideos === null || getRecommendVideos === void 0 ? void 0 : getRecommendVideos({
-                hashTag: waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.hashTag,
-                'itemFilter.itemId': waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.itemId,
-                'itemFilter.itemType': waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.itemType
-            }).then((res) => {
+            (getRecommendVideos === null || getRecommendVideos === void 0 ? void 0 : getRecommendVideos(Object.assign(Object.assign({ hashTag: waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.hashTag }, (((_b = (_a = waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.rec) === null || _a === void 0 ? void 0 : _a.product) === null || _b === void 0 ? void 0 : _b.itemId) && { productFilter: (_d = (_c = waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.rec) === null || _c === void 0 ? void 0 : _c.product) === null || _d === void 0 ? void 0 : _d.itemId })), ((waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.itemId) && { contentFilter: waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.itemId }))).then((res) => {
                 var _a;
                 setList(list === null || list === void 0 ? void 0 : list.concat((_a = res === null || res === void 0 ? void 0 : res.recList) !== null && _a !== void 0 ? _a : []));
                 setIsLoadMore(false);
             }));
     }, [waterFallData, getRecommendVideos, list, isLoadMore]);
     (0, react_1.useEffect)(() => {
-        var _a, _b;
+        var _a, _b, _c, _d, _e, _f;
         setIsLoadingData(true);
         waterFallData &&
-            (getRecommendVideos === null || getRecommendVideos === void 0 ? void 0 : getRecommendVideos({
-                hashTag: waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.hashTag,
-                'itemFilter.itemId': waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.itemId,
-                'itemFilter.itemType': waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.itemType,
-                defaultSize: hashTagSize,
-                maxSize: hashTagSize
-            }).then((res) => {
+            (getRecommendVideos === null || getRecommendVideos === void 0 ? void 0 : getRecommendVideos(Object.assign(Object.assign(Object.assign({ hashTag: waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.hashTag }, (((_b = (_a = waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.rec) === null || _a === void 0 ? void 0 : _a.product) === null || _b === void 0 ? void 0 : _b.itemId) && { productFilter: (_d = (_c = waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.rec) === null || _c === void 0 ? void 0 : _c.product) === null || _d === void 0 ? void 0 : _d.itemId })), ((waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.itemId) && { contentFilter: waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.itemId })), { defaultSize: hashTagSize, maxSize: hashTagSize })).then((res) => {
                 var _a, _b;
                 setData(res);
                 setList((_b = (_a = res === null || res === void 0 ? void 0 : res.recList) === null || _a === void 0 ? void 0 : _a.filter((item) => (item === null || item === void 0 ? void 0 : item.video) !== null || (item === null || item === void 0 ? void 0 : item.product) !== null)) !== null && _b !== void 0 ? _b : []);
@@ -163,15 +156,17 @@ function WaterfallList(_a) {
         if (isOpenHashTag) {
             const res = preview_json_1.default;
             setData(res);
-            setList((_b = (_a = res === null || res === void 0 ? void 0 : res.recList) === null || _a === void 0 ? void 0 : _a.filter((item) => (item === null || item === void 0 ? void 0 : item.video) !== null || (item === null || item === void 0 ? void 0 : item.product) !== null)) !== null && _b !== void 0 ? _b : []);
+            setList((_f = (_e = res === null || res === void 0 ? void 0 : res.recList) === null || _e === void 0 ? void 0 : _e.filter((item) => (item === null || item === void 0 ? void 0 : item.video) !== null || (item === null || item === void 0 ? void 0 : item.product) !== null)) !== null && _f !== void 0 ? _f : []);
             setIsLoadingData(false);
         }
     }, [waterFallData, getRecommendVideos, hashTagSize, isOpenHashTag]);
     const handleClickLink = () => {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         if ((_a = data === null || data === void 0 ? void 0 : data.tag) === null || _a === void 0 ? void 0 : _a.link) {
             reportTagsView();
-            window.location.href = window.getJointUtmLink((_b = data === null || data === void 0 ? void 0 : data.tag) === null || _b === void 0 ? void 0 : _b.link);
+            const rec = waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.rec;
+            jumpToWeb(rec, (_b = rec === null || rec === void 0 ? void 0 : rec.video) === null || _b === void 0 ? void 0 : _b.bindProduct, (_c = rec === null || rec === void 0 ? void 0 : rec.video) === null || _c === void 0 ? void 0 : _c.bindCta, cacheActiveIndex, (_d = rec === null || rec === void 0 ? void 0 : rec.video) === null || _d === void 0 ? void 0 : _d.traceInfo);
+            window.location.href = window.getJointUtmLink((_e = data === null || data === void 0 ? void 0 : data.tag) === null || _e === void 0 ? void 0 : _e.link);
         }
     };
     return (react_1.default.createElement(react_1.default.Fragment, null, isLoadingData ? (react_1.default.createElement("div", { style: { height: '100%', width: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center' } },

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

@@ -8,6 +8,7 @@ const preview_json_1 = tslib_1.__importDefault(require("./preview.json"));
 const FormatImage_1 = tslib_1.__importDefault(require("../FormatImage"));
 const css_1 = require("@emotion/css");
 const tool_1 = require("../../../../core/utils/tool");
+const useEventReport_1 = require("../../../../core/hooks/useEventReport");
 const WaterfallFlowItem = (props) => {
     const { rec, style = {}, sizeChange = () => { }, unitWidth, index, showBorder, list, reportTagsView, textStyles, space } = props;
     const { swiperRef, setRtcList, setOpenHashtag, sxpParameter } = (0, hooks_1.useSxpDataSource)();
@@ -115,7 +116,8 @@ const WaterfallFlowItem = (props) => {
 function WaterfallList(_a) {
     var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
     var { reportTagsView, showBanner } = _a, props = tslib_1.__rest(_a, ["reportTagsView", "showBanner"]);
-    const { waterFallData, getRecommendVideos, hashTagSize, loadingImage, isOpenHashTag } = (0, hooks_1.useSxpDataSource)();
+    const { waterFallData, getRecommendVideos, hashTagSize, loadingImage, isOpenHashTag, cacheActiveIndex } = (0, hooks_1.useSxpDataSource)();
+    const { jumpToWeb } = (0, useEventReport_1.useEventReport)();
     const scrollParent = (0, react_1.useRef)(null);
     const [scrollTop, setScrollTop] = (0, react_1.useState)(0);
     const [data, setData] = (0, react_1.useState)();
@@ -209,16 +211,10 @@ function WaterfallList(_a) {
         styleListRef.current = getStyleList();
     }, [unitWidth, rowsNum, list]);
     (0, react_1.useEffect)(() => {
-        var _a, _b;
+        var _a, _b, _c, _d, _e, _f;
         setIsLoadingData(true);
         waterFallData &&
-            (getRecommendVideos === null || getRecommendVideos === void 0 ? void 0 : getRecommendVideos({
-                hashTag: waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.hashTag,
-                'itemFilter.itemId': waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.itemId,
-                'itemFilter.itemType': waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.itemType,
-                defaultSize: hashTagSize,
-                maxSize: hashTagSize
-            }).then((res) => {
+            (getRecommendVideos === null || getRecommendVideos === void 0 ? void 0 : getRecommendVideos(Object.assign(Object.assign({ hashTag: waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.hashTag, defaultSize: hashTagSize, maxSize: hashTagSize }, (((_b = (_a = waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.rec) === null || _a === void 0 ? void 0 : _a.product) === null || _b === void 0 ? void 0 : _b.itemId) && { productFilter: (_d = (_c = waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.rec) === null || _c === void 0 ? void 0 : _c.product) === null || _d === void 0 ? void 0 : _d.itemId })), ((waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.itemId) && { contentFilter: waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.itemId }))).then((res) => {
                 var _a, _b;
                 setData(res);
                 setList((_b = (_a = res === null || res === void 0 ? void 0 : res.recList) === null || _a === void 0 ? void 0 : _a.filter((item) => (item === null || item === void 0 ? void 0 : item.video) !== null || (item === null || item === void 0 ? void 0 : item.product) !== null)) !== null && _b !== void 0 ? _b : []);
@@ -227,7 +223,7 @@ function WaterfallList(_a) {
         if (isOpenHashTag) {
             const res = preview_json_1.default;
             setData(res);
-            setList((_b = (_a = res === null || res === void 0 ? void 0 : res.recList) === null || _a === void 0 ? void 0 : _a.filter((item) => (item === null || item === void 0 ? void 0 : item.video) !== null || (item === null || item === void 0 ? void 0 : item.product) !== null)) !== null && _b !== void 0 ? _b : []);
+            setList((_f = (_e = res === null || res === void 0 ? void 0 : res.recList) === null || _e === void 0 ? void 0 : _e.filter((item) => (item === null || item === void 0 ? void 0 : item.video) !== null || (item === null || item === void 0 ? void 0 : item.product) !== null)) !== null && _f !== void 0 ? _f : []);
             setIsLoadingData(false);
         }
     }, [waterFallData, getRecommendVideos, hashTagSize, isOpenHashTag]);
@@ -252,13 +248,10 @@ function WaterfallList(_a) {
         };
     }, [onResize]);
     const loadMoreData = (0, react_1.useCallback)(() => {
+        var _a, _b, _c, _d;
         setIsLoadingData(true);
         waterFallData &&
-            (getRecommendVideos === null || getRecommendVideos === void 0 ? void 0 : getRecommendVideos({
-                hashTag: waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.hashTag,
-                'itemFilter.itemId': waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.itemId,
-                'itemFilter.itemType': waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.itemType
-            }).then((res) => {
+            (getRecommendVideos === null || getRecommendVideos === void 0 ? void 0 : getRecommendVideos(Object.assign(Object.assign({ hashTag: waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.hashTag }, (((_b = (_a = waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.rec) === null || _a === void 0 ? void 0 : _a.product) === null || _b === void 0 ? void 0 : _b.itemId) && { productFilter: (_d = (_c = waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.rec) === null || _c === void 0 ? void 0 : _c.product) === null || _d === void 0 ? void 0 : _d.itemId })), ((waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.itemId) && { contentFilter: waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.itemId }))).then((res) => {
                 var _a, _b;
                 setList(list === null || list === void 0 ? void 0 : list.concat((_b = (_a = res === null || res === void 0 ? void 0 : res.recList) === null || _a === void 0 ? void 0 : _a.filter((item) => !(item === null || item === void 0 ? void 0 : item.video))) !== null && _b !== void 0 ? _b : []));
                 setIsLoadingData(false);
@@ -276,10 +269,12 @@ function WaterfallList(_a) {
         };
     }, [onScroll, scrollParent]);
     const handleClickLink = () => {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         if ((_a = data === null || data === void 0 ? void 0 : data.tag) === null || _a === void 0 ? void 0 : _a.link) {
             reportTagsView();
-            window.location.href = window.getJointUtmLink((_b = data === null || data === void 0 ? void 0 : data.tag) === null || _b === void 0 ? void 0 : _b.link);
+            const rec = waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.rec;
+            jumpToWeb(rec, (_b = rec === null || rec === void 0 ? void 0 : rec.video) === null || _b === void 0 ? void 0 : _b.bindProduct, (_c = rec === null || rec === void 0 ? void 0 : rec.video) === null || _c === void 0 ? void 0 : _c.bindCta, cacheActiveIndex, (_d = rec === null || rec === void 0 ? void 0 : rec.video) === null || _d === void 0 ? void 0 : _d.traceInfo);
+            window.location.href = window.getJointUtmLink((_e = data === null || data === void 0 ? void 0 : data.tag) === null || _e === void 0 ? void 0 : _e.link);
         }
     };
     return (react_1.default.createElement(react_1.default.Fragment, null, isLoadingData ? (react_1.default.createElement("div", { style: { height: '100%', width: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center' } },

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

@@ -43,6 +43,11 @@ export interface ISxpPageRenderProps {
         popupCloseIcon?: string;
         openSlideSkip?: boolean;
         slideSkipStartTime?: number;
+        muteIconFixed?: boolean;
+        likeIconFixed?: boolean;
+        enablePreview?: boolean;
+        enableSwiperTip?: boolean;
+        logoBar?: any;
     };
     descStyle?: CSSProperties;
     tipText?: {
@@ -74,7 +79,7 @@ export interface ISxpPageRenderProps {
     data?: RecItemType[];
     tagList?: string[];
     resolver: any;
-    ctaType?: string;
+    ctaType?: Array<string>;
     _schema?: any;
     hashTagStyle?: CSSProperties;
     licenseUrl?: string;