pb-sxp-ui 1.14.1 → 1.15.1

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

@@ -1,12 +1,18 @@
 import React, { memo, useEffect, useMemo } from 'react';
-import qs from 'qs';
 import { useSxpDataSource } from '../../../core/hooks';
 import { AGREE_POLICY } from '../../../core/utils/localStore';
+import { splitUrlParams } from '../../../core/utils/tool';
 const Consent = ({ width = window.innerWidth, height = window.innerHeight, privacy_title, privacy_context, privacy_policy_url, privacy_policy_title }) => {
     const { setIsAgreePolicy, bffEventReport } = useSxpDataSource();
     const channelObj = useMemo(() => {
+        var _a;
         const queryString = location.search.slice(1);
-        const params = qs.parse(queryString.replace(/\+/g, '%2B'));
+        const params = {};
+        (_a = splitUrlParams(queryString.replace(/\+/g, '%2B'))) === null || _a === void 0 ? void 0 : _a.map((val) => {
+            const key = val.split('=')[0];
+            const value = val.split('=')[1];
+            params[key] = value;
+        });
         for (const key in params) {
             params[key] = params[key].replace(/%2B/g, '+');
         }

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

@@ -10,7 +10,7 @@ import { useEventReport } from '../../../../core/hooks/useEventReport';
 import { getPriceText } from '../../../../core/utils/materials';
 const WaterfallFlowItem = (props) => {
     var _a;
-    const { rec, index, list, reportTagsView, textStyles, space } = props;
+    const { rec, index, list, reportTagsView, textStyles, space, openFixedSize } = props;
     const { swiperRef, setRtcList, setOpenHashtag, sxpParameter, globalConfig } = useSxpDataSource();
     const [showVideo, setShowVideo] = useState(false);
     const imgDom = useRef(null);
@@ -104,11 +104,11 @@ const WaterfallFlowItem = (props) => {
         }, 0);
     };
     return (React.createElement("div", { ref: ref, className: 'list-content-listItem', key: index, onClick: handleClickToDetail, style: { marginBottom: space } },
-        React.createElement("div", { className: 'list-content-listItem-picture' },
+        React.createElement("div", { className: (openFixedSize === null || openFixedSize === void 0 ? void 0 : openFixedSize.ratio) === '1' ? 'list-content-listItem-picture' : 'list-content-listItem-picture1609' },
             showVideo && (React.createElement("div", { style: { display: 'none' } },
                 React.createElement("video", { ref: videoDom, crossOrigin: 'anonymous', className: 'list-content-listItem-picture-img' }),
                 React.createElement("canvas", { ref: canvasRef }))),
-            React.createElement(FormatImage, { loading: 'lazy', className: 'list-content-listItem-picture-img', ref: imgDom })),
+            React.createElement(FormatImage, { loading: 'lazy', className: (openFixedSize === null || openFixedSize === void 0 ? void 0 : openFixedSize.ratio) === '1' ? 'list-content-listItem-picture-img' : 'list-content-listItem-picture1609-img', ref: imgDom })),
         React.createElement("div", { className: 'list-content-listItem-info' },
             React.createElement("div", { className: `${'list-content-listItem-info-title'} ${priceText ? 'list-content-listItem-info-nowrap' : ''}`, style: textStyles === null || textStyles === void 0 ? void 0 : textStyles.title, dangerouslySetInnerHTML: {
                     __html: setFontForText(title, textStyles === null || textStyles === void 0 ? void 0 : textStyles.title)

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

@@ -8,7 +8,7 @@ import List from './List';
 import { useSxpDataSource } from '../../../../core/hooks';
 import { useEventReport } from '../../../../core/hooks/useEventReport';
 const WaterFall = (props) => {
-    var _a;
+    var _a, _b;
     const { waterFallData, setOpenHashtag, openHashtag, swiperRef, setWaterFallData, cacheRtcList, setRtcList, cacheActiveIndex, rtcList, setCacheRtcList, setIsFromHashtag, isFromHashtag, bffEventReport, themeTag, selectTag, bffFbReport } = useSxpDataSource();
     const { backMainFeed } = useEventReport();
     const modalEleRef = useRef(null);
@@ -97,6 +97,6 @@ const WaterFall = (props) => {
             display: openHashtag ? 'block' : 'none'
         } },
         React.createElement(Navbar, { icon: left, styles: { top: '32px' }, textStyle: (_a = props === null || props === void 0 ? void 0 : props.textStyles) === null || _a === void 0 ? void 0 : _a.hashTagTitle, onClose: handleClose }),
-        (props === null || props === void 0 ? void 0 : props.openFixedSize) === true || (props === null || props === void 0 ? void 0 : props.openFixedSize) === undefined ? (React.createElement(List, Object.assign({ key: waterFallData, reportTagsView: reportTagsView }, props))) : (React.createElement(WaterfallList, Object.assign({ key: waterFallData, reportTagsView: reportTagsView }, props)))), modalEleRef.current);
+        ((_b = props === null || props === void 0 ? void 0 : props.openFixedSize) === null || _b === void 0 ? void 0 : _b.open) === true || (props === null || props === void 0 ? void 0 : props.openFixedSize) === undefined ? (React.createElement(List, Object.assign({ key: waterFallData, reportTagsView: reportTagsView }, props))) : (React.createElement(WaterfallList, Object.assign({ key: waterFallData, reportTagsView: reportTagsView }, props)))), modalEleRef.current);
 };
 export default memo(WaterFall);

package/es/core/context/SxpDataSourceProvider.js

@@ -1,13 +1,13 @@
 import { __awaiter } from "tslib";
 import React, { createContext, memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import qs from 'qs';
+import { cloneDeep } from 'lodash';
 import { refreshFeSessionId, storeAndLoadFeSessionId } from '../utils/sessionStore';
 import { storeAndLoadFeUserId, AGREE_POLICY } from '../utils/localStore';
 import { useIconLink } from '../components/SxpPageRender/useIconLink';
 import SXP_EVENT_BUS, { SXP_EVENT_TYPE } from '../utils/event';
 import Consent from '../components/Consent';
-import { getCookie } from '../utils/tool';
-import { cloneDeep } from 'lodash';
+import { getCookie, splitUrlParams } from '../utils/tool';
 export const SxpDataSourceContext = createContext({
     rtcList: [],
     tagList: []
@@ -138,7 +138,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             query = Object.assign(Object.assign({}, query), { channel: decodeURIComponent(channel) });
         }
         else if (utmVal) {
-            const val = (_k = (_j = (_h = utmVal === null || utmVal === void 0 ? void 0 : utmVal.split('&')) === null || _h === void 0 ? void 0 : _h.filter((val) => {
+            const val = (_k = (_j = (_h = splitUrlParams(utmVal)) === null || _h === void 0 ? void 0 : _h.filter((val) => {
                 var _a, _b;
                 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);
@@ -260,7 +260,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             !((_a = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.converApi) === null || _a === void 0 ? void 0 : _a[eventName])) {
             return;
         }
-        let jsonParams = cloneDeep((_b = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.converApi) === null || _b === void 0 ? void 0 : _b[eventName]);
+        const jsonParams = cloneDeep((_b = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.converApi) === null || _b === void 0 ? void 0 : _b[eventName]);
         const urlParams = new URLSearchParams(window.location.search);
         const fbclid = urlParams === null || urlParams === void 0 ? void 0 : urlParams.get('fbclid');
         const fix_par = {
@@ -341,7 +341,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         if (!utmVal || !isShowTag)
             return;
         try {
-            const val = (_10 = (_9 = (_8 = utmVal === null || utmVal === void 0 ? void 0 : utmVal.split('&')) === null || _8 === void 0 ? void 0 : _8.filter((val) => {
+            const val = (_10 = (_9 = (_8 = splitUrlParams(utmVal)) === null || _8 === void 0 ? void 0 : _8.filter((val) => {
                 var _a, _b;
                 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);
@@ -376,9 +376,14 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         });
     }, [bffEventReport, isFromHashtag]);
     const h5EnterLink = useCallback(() => {
-        var _a, _b;
+        var _a, _b, _c;
         const queryString = location.search.slice(1);
-        const params = qs.parse(queryString.replace(/\+/g, '%2B'));
+        const params = {};
+        (_a = splitUrlParams(queryString.replace(/\+/g, '%2B'))) === null || _a === void 0 ? void 0 : _a.map((val) => {
+            const key = val.split('=')[0];
+            const value = val.split('=')[1];
+            params[key] = value;
+        });
         for (const key in params) {
             params[key] = params[key].replace(/%2B/g, '+');
         }
@@ -396,7 +401,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
                 utmContent: getVal('utm_content'),
                 enterTime: Math.floor(time / 1000) + '',
                 requestId: null,
-                enterUrl: (_b = (_a = window === null || window === void 0 ? void 0 : window.location) === null || _a === void 0 ? void 0 : _a.href) !== null && _b !== void 0 ? _b : '',
+                enterUrl: (_c = (_b = window === null || window === void 0 ? void 0 : window.location) === null || _b === void 0 ? void 0 : _b.href) !== null && _c !== void 0 ? _c : '',
                 clSource: getVal('cl_source')
             },
             reportLayId: false

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

@@ -12,4 +12,5 @@ declare function getSystem(): string | null;
 declare function getDevice(): string | null;
 declare function getCookie(val: string): string;
 declare function getScreenReader(): boolean;
-export { uuid, getIndexByblockType, getBrowserInfo, getDevice, getSystem, getCookie, getScreenReader };
+declare function splitUrlParams(urlParams: string): string[] | undefined;
+export { uuid, getIndexByblockType, getBrowserInfo, getDevice, getSystem, getCookie, getScreenReader, splitUrlParams };

package/es/core/utils/tool.js

@@ -60,8 +60,8 @@ export const setFontForText = (textContent, style) => {
     const cnStyle = `font-family:${cn !== null && cn !== void 0 ? cn : 'inherit'}`;
     const enStyle = `font-family:${en !== null && en !== void 0 ? en : 'inherit'}`;
     const fn = (str) => {
-        let chineseStartIndex = str.search(chineseRegex);
-        let englishStartIndex = str.search(englishRegex);
+        const chineseStartIndex = str.search(chineseRegex);
+        const englishStartIndex = str.search(englishRegex);
         if (chineseStartIndex !== -1 && englishStartIndex !== -1 && chineseStartIndex < englishStartIndex) {
             content += `<span style="${cnStyle}">${str.substring(chineseStartIndex, englishStartIndex)}</span>`;
             text = str.substring(englishStartIndex, str === null || str === void 0 ? void 0 : str.length);
@@ -90,7 +90,7 @@ export const setFontForText = (textContent, style) => {
 };
 function getBrowserInfo() {
     var _a, _b, _c, _d, _e, _f, _g;
-    let userAgent = self.navigator.userAgent;
+    const userAgent = self.navigator.userAgent;
     if (!userAgent)
         return null;
     if (/edge\/([\d\.]+)/i.exec(userAgent))
@@ -111,7 +111,7 @@ function getBrowserInfo() {
 }
 function getSystem() {
     var _a, _b, _c;
-    let userAgent = self.navigator.userAgent;
+    const userAgent = self.navigator.userAgent;
     if (!userAgent)
         return null;
     if (/iphone/i.test(userAgent))
@@ -121,27 +121,27 @@ function getSystem() {
     if (/windows/i.test(userAgent))
         return `Windows ${(_c = userAgent.match(/Windows\s(.*?)\;/)) === null || _c === void 0 ? void 0 : _c[1]}`;
     if (/mac/i.test(userAgent))
-        return `Mac OS`;
+        return 'Mac OS';
     return null;
 }
 function getDevice() {
-    let userAgent = self.navigator.userAgent;
+    const userAgent = self.navigator.userAgent;
     if (!userAgent)
         return null;
     if (/iphone/i.test(userAgent))
-        return `iPhone`;
+        return 'iPhone';
     if (/android/i.test(userAgent)) {
-        var index1 = userAgent.indexOf('(');
-        var index2 = userAgent.indexOf(')');
+        const index1 = userAgent.indexOf('(');
+        const index2 = userAgent.indexOf(')');
         if (index1 !== -1 && index2 !== -1) {
-            var value = userAgent.substring(index1 + 1, index2);
+            const value = userAgent.substring(index1 + 1, index2);
             return `${value}`;
         }
     }
     if (/windows/i.test(userAgent))
-        return `Windows`;
+        return 'Windows';
     if (/mac/i.test(userAgent))
-        return `Mac`;
+        return 'Mac';
     return null;
 }
 function getCookie(val) {
@@ -157,7 +157,7 @@ function getCookie(val) {
     return value !== null && value !== void 0 ? value : '';
 }
 function getScreenReader() {
-    let userAgent = self.navigator.userAgent;
+    const userAgent = self.navigator.userAgent;
     if (!userAgent)
         return false;
     return (/TalkBack/i.test(userAgent) ||
@@ -167,4 +167,28 @@ function getScreenReader() {
         /JAWS/i.test(userAgent) ||
         /ChromeVox/i.test(userAgent));
 }
-export { uuid, getIndexByblockType, getBrowserInfo, getDevice, getSystem, getCookie, getScreenReader };
+function splitUrlParams(urlParams) {
+    if (!urlParams)
+        return;
+    const indList = [];
+    for (let i = 0; i < urlParams.length; i++) {
+        const item = urlParams[i];
+        const curStr = urlParams.substring(i + 1, urlParams.length);
+        if (item === '&' &&
+            (curStr === null || curStr === void 0 ? void 0 : curStr.indexOf('=')) !== -1 &&
+            ((curStr === null || curStr === void 0 ? void 0 : curStr.indexOf('=')) < (curStr === null || curStr === void 0 ? void 0 : curStr.indexOf('&')) || (curStr === null || curStr === void 0 ? void 0 : curStr.indexOf('&')) === -1)) {
+            indList.push(i);
+        }
+    }
+    const splitList = indList.length > 0 ? [] : [urlParams];
+    let lastIndex = 0;
+    indList === null || indList === void 0 ? void 0 : indList.map((i) => {
+        splitList === null || splitList === void 0 ? void 0 : splitList.push(urlParams.substring(lastIndex, i));
+        lastIndex = i + 1;
+        if (i === indList[indList.length - 1] && i < urlParams.length) {
+            splitList === null || splitList === void 0 ? void 0 : splitList.push(urlParams.substring(lastIndex, urlParams.length));
+        }
+    });
+    return splitList !== null && splitList !== void 0 ? splitList : [];
+}
+export { uuid, getIndexByblockType, getBrowserInfo, getDevice, getSystem, getCookie, getScreenReader, splitUrlParams };

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

@@ -14,7 +14,10 @@ export interface IHashTagProps {
     };
     buttonBgStyle: CSSProperties;
     showBanner?: boolean;
-    openFixedSize?: boolean;
+    openFixedSize?: {
+        open: true;
+        ratio: string;
+    };
 }
 declare const _default: React.NamedExoticComponent<IHashTagProps>;
 export default _default;

package/es/materials/sxp/HashTag/material.js

@@ -56,7 +56,8 @@ const HashTag = createMaterial(HashTagComponent, {
                 paddingLeft: 20,
                 paddingRight: 20,
                 paddingBottom: 20
-            }
+            },
+            openFixedSize: { open: true, ratio: '1' }
         }
     },
     w: 100,

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

@@ -5,12 +5,10 @@ declare const _default: ({
         label: string;
         name: string[];
         addonAfter: string;
-        initialValue?: undefined;
     } | {
         type: string;
         label: string;
         name: string[];
-        initialValue: boolean;
         addonAfter?: undefined;
     })[];
 } | {

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

@@ -19,10 +19,9 @@ export default [
                 addonAfter: 'px'
             },
             {
-                type: 'Switch',
+                type: 'HashTagFixedSize',
                 label: '固定宽高',
-                name: ['props', 'openFixedSize'],
-                initialValue: true
+                name: ['props', 'openFixedSize']
             }
         ]
     },

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

@@ -2,14 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importStar(require("react"));
-const qs_1 = tslib_1.__importDefault(require("qs"));
 const hooks_1 = require("../../../core/hooks");
 const localStore_1 = require("../../../core/utils/localStore");
+const tool_1 = require("../../../core/utils/tool");
 const Consent = ({ width = window.innerWidth, height = window.innerHeight, privacy_title, privacy_context, privacy_policy_url, privacy_policy_title }) => {
     const { setIsAgreePolicy, bffEventReport } = (0, hooks_1.useSxpDataSource)();
     const channelObj = (0, react_1.useMemo)(() => {
+        var _a;
         const queryString = location.search.slice(1);
-        const params = qs_1.default.parse(queryString.replace(/\+/g, '%2B'));
+        const params = {};
+        (_a = (0, tool_1.splitUrlParams)(queryString.replace(/\+/g, '%2B'))) === null || _a === void 0 ? void 0 : _a.map((val) => {
+            const key = val.split('=')[0];
+            const value = val.split('=')[1];
+            params[key] = value;
+        });
         for (const key in params) {
             params[key] = params[key].replace(/%2B/g, '+');
         }

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

@@ -12,7 +12,7 @@ const useEventReport_1 = require("../../../../core/hooks/useEventReport");
 const materials_1 = require("../../../../core/utils/materials");
 const WaterfallFlowItem = (props) => {
     var _a;
-    const { rec, index, list, reportTagsView, textStyles, space } = props;
+    const { rec, index, list, reportTagsView, textStyles, space, openFixedSize } = props;
     const { swiperRef, setRtcList, setOpenHashtag, sxpParameter, globalConfig } = (0, hooks_1.useSxpDataSource)();
     const [showVideo, setShowVideo] = (0, react_1.useState)(false);
     const imgDom = (0, react_1.useRef)(null);
@@ -106,11 +106,11 @@ const WaterfallFlowItem = (props) => {
         }, 0);
     };
     return (react_1.default.createElement("div", { ref: ref, className: 'list-content-listItem', key: index, onClick: handleClickToDetail, style: { marginBottom: space } },
-        react_1.default.createElement("div", { className: 'list-content-listItem-picture' },
+        react_1.default.createElement("div", { className: (openFixedSize === null || openFixedSize === void 0 ? void 0 : openFixedSize.ratio) === '1' ? 'list-content-listItem-picture' : 'list-content-listItem-picture1609' },
             showVideo && (react_1.default.createElement("div", { style: { display: 'none' } },
                 react_1.default.createElement("video", { ref: videoDom, crossOrigin: 'anonymous', className: 'list-content-listItem-picture-img' }),
                 react_1.default.createElement("canvas", { ref: canvasRef }))),
-            react_1.default.createElement(FormatImage_1.default, { loading: 'lazy', className: 'list-content-listItem-picture-img', ref: imgDom })),
+            react_1.default.createElement(FormatImage_1.default, { loading: 'lazy', className: (openFixedSize === null || openFixedSize === void 0 ? void 0 : openFixedSize.ratio) === '1' ? 'list-content-listItem-picture-img' : 'list-content-listItem-picture1609-img', ref: imgDom })),
         react_1.default.createElement("div", { className: 'list-content-listItem-info' },
             react_1.default.createElement("div", { className: `${'list-content-listItem-info-title'} ${priceText ? 'list-content-listItem-info-nowrap' : ''}`, style: textStyles === null || textStyles === void 0 ? void 0 : textStyles.title, dangerouslySetInnerHTML: {
                     __html: (0, tool_1.setFontForText)(title, textStyles === null || textStyles === void 0 ? void 0 : textStyles.title)

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

@@ -11,7 +11,7 @@ const List_1 = tslib_1.__importDefault(require("./List"));
 const hooks_1 = require("../../../../core/hooks");
 const useEventReport_1 = require("../../../../core/hooks/useEventReport");
 const WaterFall = (props) => {
-    var _a;
+    var _a, _b;
     const { waterFallData, setOpenHashtag, openHashtag, swiperRef, setWaterFallData, cacheRtcList, setRtcList, cacheActiveIndex, rtcList, setCacheRtcList, setIsFromHashtag, isFromHashtag, bffEventReport, themeTag, selectTag, bffFbReport } = (0, hooks_1.useSxpDataSource)();
     const { backMainFeed } = (0, useEventReport_1.useEventReport)();
     const modalEleRef = (0, react_1.useRef)(null);
@@ -100,6 +100,6 @@ const WaterFall = (props) => {
             display: openHashtag ? 'block' : 'none'
         } },
         react_1.default.createElement(Navbar_1.default, { icon: left_png_1.default, styles: { top: '32px' }, textStyle: (_a = props === null || props === void 0 ? void 0 : props.textStyles) === null || _a === void 0 ? void 0 : _a.hashTagTitle, onClose: handleClose }),
-        (props === null || props === void 0 ? void 0 : props.openFixedSize) === true || (props === null || props === void 0 ? void 0 : props.openFixedSize) === undefined ? (react_1.default.createElement(List_1.default, Object.assign({ key: waterFallData, reportTagsView: reportTagsView }, props))) : (react_1.default.createElement(WaterfallList_1.default, Object.assign({ key: waterFallData, reportTagsView: reportTagsView }, props)))), modalEleRef.current);
+        ((_b = props === null || props === void 0 ? void 0 : props.openFixedSize) === null || _b === void 0 ? void 0 : _b.open) === true || (props === null || props === void 0 ? void 0 : props.openFixedSize) === undefined ? (react_1.default.createElement(List_1.default, Object.assign({ key: waterFallData, reportTagsView: reportTagsView }, props))) : (react_1.default.createElement(WaterfallList_1.default, Object.assign({ key: waterFallData, reportTagsView: reportTagsView }, props)))), modalEleRef.current);
 };
 exports.default = (0, react_1.memo)(WaterFall);

package/lib/core/context/SxpDataSourceProvider.js

@@ -4,13 +4,13 @@ exports.DEFAULT_TAG = exports.SxpDataSourceContext = void 0;
 const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importStar(require("react"));
 const qs_1 = tslib_1.__importDefault(require("qs"));
+const lodash_1 = require("lodash");
 const sessionStore_1 = require("../utils/sessionStore");
 const localStore_1 = require("../utils/localStore");
 const useIconLink_1 = require("../components/SxpPageRender/useIconLink");
 const event_1 = tslib_1.__importStar(require("../utils/event"));
 const Consent_1 = tslib_1.__importDefault(require("../components/Consent"));
 const tool_1 = require("../utils/tool");
-const lodash_1 = require("lodash");
 exports.SxpDataSourceContext = (0, react_1.createContext)({
     rtcList: [],
     tagList: []
@@ -141,7 +141,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             query = Object.assign(Object.assign({}, query), { channel: decodeURIComponent(channel) });
         }
         else if (utmVal) {
-            const val = (_k = (_j = (_h = utmVal === null || utmVal === void 0 ? void 0 : utmVal.split('&')) === null || _h === void 0 ? void 0 : _h.filter((val) => {
+            const val = (_k = (_j = (_h = (0, tool_1.splitUrlParams)(utmVal)) === null || _h === void 0 ? void 0 : _h.filter((val) => {
                 var _a, _b;
                 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);
@@ -263,7 +263,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             !((_a = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.converApi) === null || _a === void 0 ? void 0 : _a[eventName])) {
             return;
         }
-        let jsonParams = (0, lodash_1.cloneDeep)((_b = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.converApi) === null || _b === void 0 ? void 0 : _b[eventName]);
+        const jsonParams = (0, lodash_1.cloneDeep)((_b = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.converApi) === null || _b === void 0 ? void 0 : _b[eventName]);
         const urlParams = new URLSearchParams(window.location.search);
         const fbclid = urlParams === null || urlParams === void 0 ? void 0 : urlParams.get('fbclid');
         const fix_par = {
@@ -344,7 +344,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         if (!utmVal || !isShowTag)
             return;
         try {
-            const val = (_10 = (_9 = (_8 = utmVal === null || utmVal === void 0 ? void 0 : utmVal.split('&')) === null || _8 === void 0 ? void 0 : _8.filter((val) => {
+            const val = (_10 = (_9 = (_8 = (0, tool_1.splitUrlParams)(utmVal)) === null || _8 === void 0 ? void 0 : _8.filter((val) => {
                 var _a, _b;
                 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);
@@ -379,9 +379,14 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         });
     }, [bffEventReport, isFromHashtag]);
     const h5EnterLink = (0, react_1.useCallback)(() => {
-        var _a, _b;
+        var _a, _b, _c;
         const queryString = location.search.slice(1);
-        const params = qs_1.default.parse(queryString.replace(/\+/g, '%2B'));
+        const params = {};
+        (_a = (0, tool_1.splitUrlParams)(queryString.replace(/\+/g, '%2B'))) === null || _a === void 0 ? void 0 : _a.map((val) => {
+            const key = val.split('=')[0];
+            const value = val.split('=')[1];
+            params[key] = value;
+        });
         for (const key in params) {
             params[key] = params[key].replace(/%2B/g, '+');
         }
@@ -399,7 +404,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
                 utmContent: getVal('utm_content'),
                 enterTime: Math.floor(time / 1000) + '',
                 requestId: null,
-                enterUrl: (_b = (_a = window === null || window === void 0 ? void 0 : window.location) === null || _a === void 0 ? void 0 : _a.href) !== null && _b !== void 0 ? _b : '',
+                enterUrl: (_c = (_b = window === null || window === void 0 ? void 0 : window.location) === null || _b === void 0 ? void 0 : _b.href) !== null && _c !== void 0 ? _c : '',
                 clSource: getVal('cl_source')
             },
             reportLayId: false

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

@@ -12,4 +12,5 @@ declare function getSystem(): string | null;
 declare function getDevice(): string | null;
 declare function getCookie(val: string): string;
 declare function getScreenReader(): boolean;
-export { uuid, getIndexByblockType, getBrowserInfo, getDevice, getSystem, getCookie, getScreenReader };
+declare function splitUrlParams(urlParams: string): string[] | undefined;
+export { uuid, getIndexByblockType, getBrowserInfo, getDevice, getSystem, getCookie, getScreenReader, splitUrlParams };

package/lib/core/utils/tool.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getScreenReader = exports.getCookie = exports.getSystem = exports.getDevice = exports.getBrowserInfo = exports.getIndexByblockType = exports.uuid = exports.setFontForText = exports.getUid = exports.generateRandomString = void 0;
+exports.splitUrlParams = exports.getScreenReader = exports.getCookie = exports.getSystem = exports.getDevice = exports.getBrowserInfo = exports.getIndexByblockType = exports.uuid = exports.setFontForText = exports.getUid = exports.generateRandomString = void 0;
 const uuid_1 = require("uuid");
 function uuid(len, radix) {
     const chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
@@ -67,8 +67,8 @@ const setFontForText = (textContent, style) => {
     const cnStyle = `font-family:${cn !== null && cn !== void 0 ? cn : 'inherit'}`;
     const enStyle = `font-family:${en !== null && en !== void 0 ? en : 'inherit'}`;
     const fn = (str) => {
-        let chineseStartIndex = str.search(chineseRegex);
-        let englishStartIndex = str.search(englishRegex);
+        const chineseStartIndex = str.search(chineseRegex);
+        const englishStartIndex = str.search(englishRegex);
         if (chineseStartIndex !== -1 && englishStartIndex !== -1 && chineseStartIndex < englishStartIndex) {
             content += `<span style="${cnStyle}">${str.substring(chineseStartIndex, englishStartIndex)}</span>`;
             text = str.substring(englishStartIndex, str === null || str === void 0 ? void 0 : str.length);
@@ -98,7 +98,7 @@ const setFontForText = (textContent, style) => {
 exports.setFontForText = setFontForText;
 function getBrowserInfo() {
     var _a, _b, _c, _d, _e, _f, _g;
-    let userAgent = self.navigator.userAgent;
+    const userAgent = self.navigator.userAgent;
     if (!userAgent)
         return null;
     if (/edge\/([\d\.]+)/i.exec(userAgent))
@@ -120,7 +120,7 @@ function getBrowserInfo() {
 exports.getBrowserInfo = getBrowserInfo;
 function getSystem() {
     var _a, _b, _c;
-    let userAgent = self.navigator.userAgent;
+    const userAgent = self.navigator.userAgent;
     if (!userAgent)
         return null;
     if (/iphone/i.test(userAgent))
@@ -130,28 +130,28 @@ function getSystem() {
     if (/windows/i.test(userAgent))
         return `Windows ${(_c = userAgent.match(/Windows\s(.*?)\;/)) === null || _c === void 0 ? void 0 : _c[1]}`;
     if (/mac/i.test(userAgent))
-        return `Mac OS`;
+        return 'Mac OS';
     return null;
 }
 exports.getSystem = getSystem;
 function getDevice() {
-    let userAgent = self.navigator.userAgent;
+    const userAgent = self.navigator.userAgent;
     if (!userAgent)
         return null;
     if (/iphone/i.test(userAgent))
-        return `iPhone`;
+        return 'iPhone';
     if (/android/i.test(userAgent)) {
-        var index1 = userAgent.indexOf('(');
-        var index2 = userAgent.indexOf(')');
+        const index1 = userAgent.indexOf('(');
+        const index2 = userAgent.indexOf(')');
         if (index1 !== -1 && index2 !== -1) {
-            var value = userAgent.substring(index1 + 1, index2);
+            const value = userAgent.substring(index1 + 1, index2);
             return `${value}`;
         }
     }
     if (/windows/i.test(userAgent))
-        return `Windows`;
+        return 'Windows';
     if (/mac/i.test(userAgent))
-        return `Mac`;
+        return 'Mac';
     return null;
 }
 exports.getDevice = getDevice;
@@ -169,7 +169,7 @@ function getCookie(val) {
 }
 exports.getCookie = getCookie;
 function getScreenReader() {
-    let userAgent = self.navigator.userAgent;
+    const userAgent = self.navigator.userAgent;
     if (!userAgent)
         return false;
     return (/TalkBack/i.test(userAgent) ||
@@ -180,3 +180,28 @@ function getScreenReader() {
         /ChromeVox/i.test(userAgent));
 }
 exports.getScreenReader = getScreenReader;
+function splitUrlParams(urlParams) {
+    if (!urlParams)
+        return;
+    const indList = [];
+    for (let i = 0; i < urlParams.length; i++) {
+        const item = urlParams[i];
+        const curStr = urlParams.substring(i + 1, urlParams.length);
+        if (item === '&' &&
+            (curStr === null || curStr === void 0 ? void 0 : curStr.indexOf('=')) !== -1 &&
+            ((curStr === null || curStr === void 0 ? void 0 : curStr.indexOf('=')) < (curStr === null || curStr === void 0 ? void 0 : curStr.indexOf('&')) || (curStr === null || curStr === void 0 ? void 0 : curStr.indexOf('&')) === -1)) {
+            indList.push(i);
+        }
+    }
+    const splitList = indList.length > 0 ? [] : [urlParams];
+    let lastIndex = 0;
+    indList === null || indList === void 0 ? void 0 : indList.map((i) => {
+        splitList === null || splitList === void 0 ? void 0 : splitList.push(urlParams.substring(lastIndex, i));
+        lastIndex = i + 1;
+        if (i === indList[indList.length - 1] && i < urlParams.length) {
+            splitList === null || splitList === void 0 ? void 0 : splitList.push(urlParams.substring(lastIndex, urlParams.length));
+        }
+    });
+    return splitList !== null && splitList !== void 0 ? splitList : [];
+}
+exports.splitUrlParams = splitUrlParams;

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

@@ -14,7 +14,10 @@ export interface IHashTagProps {
     };
     buttonBgStyle: CSSProperties;
     showBanner?: boolean;
-    openFixedSize?: boolean;
+    openFixedSize?: {
+        open: true;
+        ratio: string;
+    };
 }
 declare const _default: React.NamedExoticComponent<IHashTagProps>;
 export default _default;

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

@@ -60,7 +60,8 @@ const HashTag = (0, create_1.createMaterial)(_1.default, {
                 paddingLeft: 20,
                 paddingRight: 20,
                 paddingBottom: 20
-            }
+            },
+            openFixedSize: { open: true, ratio: '1' }
         }
     },
     w: 100,

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

@@ -5,12 +5,10 @@ declare const _default: ({
         label: string;
         name: string[];
         addonAfter: string;
-        initialValue?: undefined;
     } | {
         type: string;
         label: string;
         name: string[];
-        initialValue: boolean;
         addonAfter?: undefined;
     })[];
 } | {

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

@@ -21,10 +21,9 @@ exports.default = [
                 addonAfter: 'px'
             },
             {
-                type: 'Switch',
+                type: 'HashTagFixedSize',
                 label: '固定宽高',
-                name: ['props', 'openFixedSize'],
-                initialValue: true
+                name: ['props', 'openFixedSize']
             }
         ]
     },

package/package.json

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