pb-sxp-ui 1.4.3 → 1.5.0

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

@@ -4,7 +4,8 @@ export default [
         child: [
             {
                 type: 'link',
-                name: 'onClick'
+                name: 'onClick',
+                hiddenUrl: true
             }
         ]
     }

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

@@ -3,6 +3,7 @@ declare const _default: {
     child: {
         type: string;
         name: string;
+        hiddenUrl: boolean;
     }[];
 }[];
 export default _default;

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

@@ -4,7 +4,8 @@ export default [
         child: [
             {
                 type: 'link',
-                name: 'onClick'
+                name: 'onClick',
+                hiddenUrl: true
             }
         ]
     }

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

@@ -3,6 +3,7 @@ declare const _default: {
     child: {
         type: string;
         name: string;
+        hiddenUrl: boolean;
     }[];
 }[];
 export default _default;

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

@@ -4,7 +4,8 @@ export default [
         child: [
             {
                 type: 'link',
-                name: 'onClick'
+                name: 'onClick',
+                hiddenUrl: true
             }
         ]
     }

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

@@ -3,6 +3,7 @@ declare const _default: {
     child: {
         type: string;
         name: string;
+        hiddenUrl: boolean;
     }[];
 }[];
 export default _default;

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

@@ -4,7 +4,8 @@ export default [
         child: [
             {
                 type: 'link',
-                name: 'onClick'
+                name: 'onClick',
+                hiddenUrl: true
             }
         ]
     }

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

@@ -3,6 +3,7 @@ declare const _default: {
     child: {
         type: string;
         name: string;
+        hiddenUrl: boolean;
     }[];
 }[];
 export default _default;

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

@@ -4,7 +4,8 @@ export default [
         child: [
             {
                 type: 'link',
-                name: 'onClick'
+                name: 'onClick',
+                hiddenUrl: true
             }
         ]
     }

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

@@ -5,7 +5,7 @@ import LinkComponent from '.';
 import { createMaterial } from '../../../../core/create';
 import interactionRender from './interactionRender';
 const Link = createMaterial(LinkComponent, {
-    displayName: '跳转指引',
+    displayName: '普通CTA',
     icon: '',
     category: 'template',
     type: 'Link',

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

@@ -3,6 +3,7 @@ declare const _default: {
     child: {
         type: string;
         name: string;
+        hiddenUrl: boolean;
     }[];
 }[];
 export default _default;

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

@@ -4,7 +4,8 @@ export default [
         child: [
             {
                 type: 'link',
-                name: 'onClick'
+                name: 'onClick',
+                hiddenUrl: true
             }
         ]
     }

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

@@ -3,6 +3,7 @@ declare const _default: {
     child: {
         type: string;
         name: string;
+        hiddenUrl: boolean;
     }[];
 }[];
 export default _default;

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

@@ -4,7 +4,8 @@ export default [
         child: [
             {
                 type: 'link',
-                name: 'onClick'
+                name: 'onClick',
+                hiddenUrl: true
             }
         ]
     }

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

@@ -3,6 +3,7 @@ declare const _default: {
     child: {
         type: string;
         name: string;
+        hiddenUrl: boolean;
     }[];
 }[];
 export default _default;

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

@@ -4,7 +4,8 @@ export default [
         child: [
             {
                 type: 'link',
-                name: 'onClick'
+                name: 'onClick',
+                hiddenUrl: true
             }
         ]
     }

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

@@ -9,10 +9,11 @@ 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 materials_1 = require("../../../../core/utils/materials");
 const WaterfallFlowItem = (props) => {
     var _a;
     const { rec, index, list, reportTagsView, textStyles, space } = props;
-    const { swiperRef, setRtcList, setOpenHashtag, sxpParameter } = (0, hooks_1.useSxpDataSource)();
+    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);
     const ref = (0, react_1.useRef)(null);
@@ -38,20 +39,11 @@ const WaterfallFlowItem = (props) => {
         var _a, _b;
         return ((_a = rec === null || rec === void 0 ? void 0 : rec.product) === null || _a === void 0 ? void 0 : _a.title) || ((_b = rec === null || rec === void 0 ? void 0 : rec.video) === null || _b === void 0 ? void 0 : _b.title) || null;
     }, [rec]);
-    const priceText = (0, react_1.useMemo)(() => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-        const isToLocStr = ((_a = textStyles === null || textStyles === void 0 ? void 0 : textStyles.price) === null || _a === void 0 ? void 0 : _a.enableFormattedPrice) === undefined || ((_b = textStyles === null || textStyles === void 0 ? void 0 : textStyles.price) === null || _b === void 0 ? void 0 : _b.enableFormattedPrice);
-        if (((_c = rec === null || rec === void 0 ? void 0 : rec.product) === null || _c === void 0 ? void 0 : _c.currency) && ((_d = rec === null || rec === void 0 ? void 0 : rec.product) === null || _d === void 0 ? void 0 : _d.price)) {
-            return `${(_h = (_g = (_f = (_e = rec === null || rec === void 0 ? void 0 : rec.product) === null || _e === void 0 ? void 0 : _e.currency) === null || _f === void 0 ? void 0 : _f.split('-')[1]) === null || _g === void 0 ? void 0 : _g.toUpperCase()) !== null && _h !== void 0 ? _h : ''}${isToLocStr
-                ? (_l = (_k = (_j = rec === null || rec === void 0 ? void 0 : rec.product) === null || _j === void 0 ? void 0 : _j.price) === null || _k === void 0 ? void 0 : _k.toLocaleString('zh', {
-                    minimumFractionDigits: 0
-                })) !== null && _l !== void 0 ? _l : ''
-                : (_m = rec === null || rec === void 0 ? void 0 : rec.product) === null || _m === void 0 ? void 0 : _m.price}`;
-        }
-        else {
-            return null;
-        }
-    }, [rec, (_a = textStyles === null || textStyles === void 0 ? void 0 : textStyles.price) === null || _a === void 0 ? void 0 : _a.enableFormattedPrice]);
+    const priceText = (0, materials_1.getPriceText)({
+        product: rec === null || rec === void 0 ? void 0 : rec.product,
+        enableFormattedPrice: (_a = textStyles === null || textStyles === void 0 ? void 0 : textStyles.price) === null || _a === void 0 ? void 0 : _a.enableFormattedPrice,
+        globalConfig
+    });
     (0, react_1.useEffect)(() => {
         const observer = new IntersectionObserver((entries) => {
             entries.forEach((entry) => {

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

@@ -9,10 +9,11 @@ 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 materials_1 = require("../../../../core/utils/materials");
 const WaterfallFlowItem = (props) => {
     var _a;
     const { rec, style = {}, sizeChange = () => { }, unitWidth, index, showBorder, list, reportTagsView, textStyles, space } = props;
-    const { swiperRef, setRtcList, setOpenHashtag, sxpParameter } = (0, hooks_1.useSxpDataSource)();
+    const { swiperRef, setRtcList, setOpenHashtag, sxpParameter, globalConfig } = (0, hooks_1.useSxpDataSource)();
     const [showVideo, setShowVideo] = (0, react_1.useState)(false);
     const [isLoading, setIsLoading] = (0, react_1.useState)(false);
     const [imgInfo, setImgInfo] = (0, react_1.useState)({
@@ -61,20 +62,11 @@ const WaterfallFlowItem = (props) => {
             return false;
         }
     }, [top, showBorder]);
-    const priceText = (0, react_1.useMemo)(() => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-        const isToLocStr = ((_a = textStyles === null || textStyles === void 0 ? void 0 : textStyles.price) === null || _a === void 0 ? void 0 : _a.enableFormattedPrice) === undefined || ((_b = textStyles === null || textStyles === void 0 ? void 0 : textStyles.price) === null || _b === void 0 ? void 0 : _b.enableFormattedPrice);
-        if (((_c = rec === null || rec === void 0 ? void 0 : rec.product) === null || _c === void 0 ? void 0 : _c.currency) && ((_d = rec === null || rec === void 0 ? void 0 : rec.product) === null || _d === void 0 ? void 0 : _d.price)) {
-            return `${(_h = (_g = (_f = (_e = rec === null || rec === void 0 ? void 0 : rec.product) === null || _e === void 0 ? void 0 : _e.currency) === null || _f === void 0 ? void 0 : _f.split('-')[1]) === null || _g === void 0 ? void 0 : _g.toUpperCase()) !== null && _h !== void 0 ? _h : ''}${isToLocStr
-                ? (_l = (_k = (_j = rec === null || rec === void 0 ? void 0 : rec.product) === null || _j === void 0 ? void 0 : _j.price) === null || _k === void 0 ? void 0 : _k.toLocaleString('zh', {
-                    minimumFractionDigits: 0
-                })) !== null && _l !== void 0 ? _l : ''
-                : (_m = rec === null || rec === void 0 ? void 0 : rec.product) === null || _m === void 0 ? void 0 : _m.price}`;
-        }
-        else {
-            return null;
-        }
-    }, [rec, (_a = textStyles === null || textStyles === void 0 ? void 0 : textStyles.price) === null || _a === void 0 ? void 0 : _a.enableFormattedPrice]);
+    const priceText = (0, materials_1.getPriceText)({
+        product: rec === null || rec === void 0 ? void 0 : rec.product,
+        enableFormattedPrice: (_a = textStyles === null || textStyles === void 0 ? void 0 : textStyles.price) === null || _a === void 0 ? void 0 : _a.enableFormattedPrice,
+        globalConfig
+    });
     (0, react_1.useEffect)(() => {
         if (imgDom.current === null || src === '') {
             return;

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

@@ -51,6 +51,12 @@ export interface ISxpPageRenderProps {
         enableSwiperTip?: boolean;
         logoBar?: any;
         textUnderlineOffset?: number;
+        priceSymbol?: {
+            millesimalSymbol?: string;
+            decimalPoint?: string;
+            currencyPosition?: string;
+            showTwoDecimalPoint?: boolean;
+        };
     };
     descStyle?: CSSProperties;
     tipText?: {

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

@@ -195,6 +195,8 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
                     return null;
                 }
             });
+        if (!(list === null || list === void 0 ? void 0 : list.length))
+            return [];
         return !waterFallData && !isNoMoreData ? list.concat([{ loading: true }]) : list;
     }, [data, activeIndex, waterFallData, isEditor, isNoMoreData]);
     const renderLogo = (0, react_1.useMemo)(() => {

package/lib/core/context/SxpDataSourceProvider.js

@@ -125,6 +125,8 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
                 }
                 setLoading(false);
                 list = list.concat((_w = (_v = (_u = (_t = result === null || result === void 0 ? void 0 : result.data) === null || _t === void 0 ? void 0 : _t.recList) === null || _u === void 0 ? void 0 : _u.filter) === null || _v === void 0 ? void 0 : _v.call(_u, (item) => (item === null || item === void 0 ? void 0 : item.product) || (item === null || item === void 0 ? void 0 : item.video))) !== null && _w !== void 0 ? _w : []);
+                setRtcList(getFilterRecList(Object.assign(Object.assign({}, result.data), { recList: list })));
+                setCacheRtcList(getFilterRecList(Object.assign(Object.assign({}, result.data), { recList: list })));
                 const isNotNullList = (_y = (_x = result === null || result === void 0 ? void 0 : result.data) === null || _x === void 0 ? void 0 : _x.recList) === null || _y === void 0 ? void 0 : _y.some((item) => (item === null || item === void 0 ? void 0 : item.product) || (item === null || item === void 0 ? void 0 : item.video));
                 if (isNotNullList) {
                     pageNum = pageNum + 1;

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

@@ -1,3 +1,5 @@
+import { ISxpPageRenderProps } from '../components/SxpPageRender';
+import { ProductInfoType } from '../components/SxpPageRender/typing';
 export declare const getMediaValueByMode: (obj?: Record<string, any>) => any;
 export declare const getBgStyle: (imgSrc: string) => "" | {
     backgroundImage: string;
@@ -9,3 +11,8 @@ export declare const getBgStyleByImg: (data: any) => "" | {
     backgroundRepeat: string;
     backgroundSize: string;
 };
+export declare const getPriceText: ({ product, enableFormattedPrice, globalConfig }: {
+    product: ProductInfoType | undefined | null;
+    enableFormattedPrice: boolean | undefined;
+    globalConfig: ISxpPageRenderProps['globalConfig'];
+}) => string;

package/lib/core/utils/materials.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBgStyleByImg = exports.getBgStyle = exports.getMediaValueByMode = void 0;
+exports.getPriceText = exports.getBgStyleByImg = exports.getBgStyle = exports.getMediaValueByMode = void 0;
 const getMediaValueByMode = (obj) => {
     var _a;
     if (!obj || typeof obj !== 'object') {
@@ -35,3 +35,51 @@ const getBgStyleByImg = (data) => {
     return (0, exports.getBgStyle)(imgSrc);
 };
 exports.getBgStyleByImg = getBgStyleByImg;
+const getPriceText = ({ product, enableFormattedPrice, globalConfig }) => {
+    var _a, _b, _c, _d, _e;
+    let price = (product === null || product === void 0 ? void 0 : product.currency) && (product === null || product === void 0 ? void 0 : product.price) ? product === null || product === void 0 ? void 0 : product.price : 7000;
+    let text = '';
+    let priceSymbol = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.priceSymbol;
+    let currency = (product === null || product === void 0 ? void 0 : product.currency) ? (_c = (_b = (_a = product === null || product === void 0 ? void 0 : product.currency) === null || _a === void 0 ? void 0 : _a.split('-')[1]) === null || _b === void 0 ? void 0 : _b.toUpperCase()) !== null && _c !== void 0 ? _c : '' : '$';
+    const isToLocStr = enableFormattedPrice === undefined || enableFormattedPrice || (priceSymbol === null || priceSymbol === void 0 ? void 0 : priceSymbol.millesimalSymbol) !== 'none';
+    let decPic = price.toString();
+    if (priceSymbol === null || priceSymbol === void 0 ? void 0 : priceSymbol.showTwoDecimalPoint) {
+        decPic = price === null || price === void 0 ? void 0 : price.toFixed(2);
+    }
+    let decInd = (_d = decPic === null || decPic === void 0 ? void 0 : decPic.indexOf('.')) !== null && _d !== void 0 ? _d : -1;
+    if (isToLocStr) {
+        text =
+            (_e = price === null || price === void 0 ? void 0 : price.toLocaleString('zh', {
+                minimumFractionDigits: (priceSymbol === null || priceSymbol === void 0 ? void 0 : priceSymbol.showTwoDecimalPoint) ? 2 : 0
+            })) !== null && _e !== void 0 ? _e : '';
+        let startIndex = 0;
+        let endIndex = decInd !== null && decInd !== void 0 ? decInd : text === null || text === void 0 ? void 0 : text.length;
+        if ((priceSymbol === null || priceSymbol === void 0 ? void 0 : priceSymbol.millesimalSymbol) === '.') {
+            text = text === null || text === void 0 ? void 0 : text.replace(/,/g, function (match, index) {
+                if (index >= startIndex && index < endIndex) {
+                    return '.';
+                }
+                else {
+                    return match;
+                }
+            });
+        }
+        else if ((priceSymbol === null || priceSymbol === void 0 ? void 0 : priceSymbol.millesimalSymbol) === ' ') {
+            text = text === null || text === void 0 ? void 0 : text.replace(',', ' ');
+        }
+    }
+    else {
+        text = `${(priceSymbol === null || priceSymbol === void 0 ? void 0 : priceSymbol.showTwoDecimalPoint) ? price === null || price === void 0 ? void 0 : price.toFixed(2) : price}`;
+    }
+    if ((priceSymbol === null || priceSymbol === void 0 ? void 0 : priceSymbol.decimalPoint) === ',' && decInd > 0 && decInd + 1 < (text === null || text === void 0 ? void 0 : text.length)) {
+        text = text.slice(0, decInd + 1) + ',' + text.slice(decInd + 2);
+    }
+    if ((priceSymbol === null || priceSymbol === void 0 ? void 0 : priceSymbol.currencyPosition) && (priceSymbol === null || priceSymbol === void 0 ? void 0 : priceSymbol.currencyPosition) !== 'none') {
+        text = (priceSymbol === null || priceSymbol === void 0 ? void 0 : priceSymbol.currencyPosition) === 'left' ? currency + text : text + currency;
+    }
+    else if ((priceSymbol === null || priceSymbol === void 0 ? void 0 : priceSymbol.currencyPosition) !== 'none') {
+        text = currency + text;
+    }
+    return text;
+};
+exports.getPriceText = getPriceText;

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

@@ -28,6 +28,7 @@ declare const _default: ({
             name: string[];
             initialValue: string;
             child?: undefined;
+            belong?: undefined;
         } | {
             type: string;
             label: string;
@@ -39,6 +40,7 @@ declare const _default: ({
             options?: undefined;
             name?: undefined;
             initialValue?: undefined;
+            belong?: undefined;
         } | {
             type: string;
             label: string;
@@ -54,6 +56,7 @@ declare const _default: ({
             options?: undefined;
             name?: undefined;
             initialValue?: undefined;
+            belong?: undefined;
         } | {
             label: string;
             type: string;
@@ -61,11 +64,13 @@ declare const _default: ({
             name?: undefined;
             initialValue?: undefined;
             child?: undefined;
+            belong?: undefined;
         } | {
             label: string;
             type: string;
             name: string[];
             initialValue: boolean;
+            belong: string;
             options?: undefined;
             child?: undefined;
         })[];

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

@@ -110,7 +110,8 @@ exports.default = [
                         label: '价格千分符展示',
                         type: 'Switch',
                         name: ['enableFormattedPrice'],
-                        initialValue: true
+                        initialValue: true,
+                        belong: 'price'
                     }
                 ]
             }

package/lib/materials/sxp/cta/AniLink/interactionRender.d.ts

@@ -3,6 +3,7 @@ declare const _default: ({
     child: {
         type: string;
         name: string;
+        hiddenUrl: boolean;
     }[];
 } | {
     title: string;

package/lib/materials/sxp/cta/AniLink/interactionRender.js

@@ -6,7 +6,8 @@ exports.default = [
         child: [
             {
                 type: 'link',
-                name: 'onClick'
+                name: 'onClick',
+                hiddenUrl: true
             }
         ]
     },

package/lib/materials/sxp/cta/AniLinkPopup/interactionRender.d.ts

@@ -3,6 +3,7 @@ declare const _default: ({
     child: {
         type: string;
         name: string;
+        hiddenUrl: boolean;
     }[];
 } | {
     title: string;

package/lib/materials/sxp/cta/AniLinkPopup/interactionRender.js

@@ -6,7 +6,8 @@ exports.default = [
         child: [
             {
                 type: 'link',
-                name: 'onClick'
+                name: 'onClick',
+                hiddenUrl: true
             }
         ]
     },

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

@@ -13,10 +13,11 @@ const ExpandableText_1 = tslib_1.__importDefault(require("../../../../core/compo
 const FormatImage_1 = tslib_1.__importDefault(require("../../../../core/components/SxpPageRender/FormatImage"));
 const tool_1 = require("../../../../core/utils/tool");
 const CommodityGroup_1 = tslib_1.__importDefault(require("../../template/components/CommodityGroup"));
+const materials_1 = require("../../../../core/utils/materials");
 const CommodityDetail = (_a) => {
     var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
     var { content, style, bgImg, onClick, schema, isDefault, bottom_image, tipText, isPost, viewTime, rec, swiper, commodityStyles, buttonStyle, index, commodityGroup, popupBg, iframeIcon, commodityImgRatio, isTel, iframeBgColor } = _a, props = tslib_1.__rest(_a, ["content", "style", "bgImg", "onClick", "schema", "isDefault", "bottom_image", "tipText", "isPost", "viewTime", "rec", "swiper", "commodityStyles", "buttonStyle", "index", "commodityGroup", "popupBg", "iframeIcon", "commodityImgRatio", "isTel", "iframeBgColor"]);
-    const { sxpParameter, popupDetailData, isPreview, bffFbReport, popupCurTimeRef, checkCommodityIndexRef } = (0, hooks_1.useSxpDataSource)();
+    const { sxpParameter, popupDetailData, isPreview, bffFbReport, popupCurTimeRef, checkCommodityIndexRef, globalConfig } = (0, hooks_1.useSxpDataSource)();
     const { jumpToWeb, productView } = (0, useEventReport_1.useEventReport)();
     const curTimeRef = (0, react_1.useRef)(null);
     const [showModal, setShowModal] = (0, react_1.useState)(false);
@@ -61,20 +62,11 @@ const CommodityDetail = (_a) => {
             window.removeEventListener('pageshow', initTime);
         };
     }, []);
-    const priceText = (0, react_1.useMemo)(() => {
-        var _a, _b, _c, _d, _e, _f, _g;
-        const isToLocStr = ((_a = commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price) === null || _a === void 0 ? void 0 : _a.enableFormattedPrice) === undefined || ((_b = commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price) === null || _b === void 0 ? void 0 : _b.enableFormattedPrice);
-        if ((product === null || product === void 0 ? void 0 : product.currency) && (product === null || product === void 0 ? void 0 : product.price)) {
-            return `${(_e = (_d = (_c = product === null || product === void 0 ? void 0 : product.currency) === null || _c === void 0 ? void 0 : _c.split('-')[1]) === null || _d === void 0 ? void 0 : _d.toUpperCase()) !== null && _e !== void 0 ? _e : ''}${isToLocStr
-                ? (_g = (_f = product === null || product === void 0 ? void 0 : product.price) === null || _f === void 0 ? void 0 : _f.toLocaleString('zh', {
-                    minimumFractionDigits: 0
-                })) !== null && _g !== void 0 ? _g : ''
-                : product === null || product === void 0 ? void 0 : product.price}`;
-        }
-        else {
-            return '$7,000';
-        }
-    }, [product === null || product === void 0 ? void 0 : product.price, product === null || product === void 0 ? void 0 : product.currency, (_t = commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price) === null || _t === void 0 ? void 0 : _t.enableFormattedPrice]);
+    const priceText = (0, materials_1.getPriceText)({
+        product: product,
+        enableFormattedPrice: (_t = commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price) === null || _t === void 0 ? void 0 : _t.enableFormattedPrice,
+        globalConfig
+    });
     const width = (isPreview ? 375 : (_u = style === null || style === void 0 ? void 0 : style.width) !== null && _u !== void 0 ? _u : window.innerWidth) - ((_v = popupBg === null || popupBg === void 0 ? void 0 : popupBg.horizontalMargin) !== null && _v !== void 0 ? _v : 0) * 2;
     const height = commodityImgRatio ? width * (commodityImgRatio.h / commodityImgRatio.w) : width;
     const renderContent = ({ isPost }) => {

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

@@ -95,6 +95,7 @@ declare const _default: ({
             name: string[];
             initialValue: string;
             child?: undefined;
+            belong?: undefined;
         } | {
             type: string;
             child: {
@@ -107,6 +108,7 @@ declare const _default: ({
             options?: undefined;
             name?: undefined;
             initialValue?: undefined;
+            belong?: undefined;
         } | {
             type: string;
             label: string;
@@ -118,6 +120,7 @@ declare const _default: ({
             options?: undefined;
             name?: undefined;
             initialValue?: undefined;
+            belong?: undefined;
         } | {
             type: string;
             label: string;
@@ -133,6 +136,7 @@ declare const _default: ({
             options?: undefined;
             name?: undefined;
             initialValue?: undefined;
+            belong?: undefined;
         } | {
             label: string;
             type: string;
@@ -140,6 +144,7 @@ declare const _default: ({
             name?: undefined;
             initialValue?: undefined;
             child?: undefined;
+            belong?: undefined;
         } | {
             label: string;
             type: string;
@@ -147,11 +152,13 @@ declare const _default: ({
             options?: undefined;
             initialValue?: undefined;
             child?: undefined;
+            belong?: undefined;
         } | {
             label: string;
             type: string;
             name: string[];
             initialValue: boolean;
+            belong: string;
             options?: undefined;
             child?: undefined;
         })[];
@@ -238,12 +245,14 @@ declare const _default: ({
         label: string;
         name: string[];
         type: string;
+        initialValue: string;
         addonAfter?: undefined;
     } | {
         label: string;
         name: string[];
         type: string;
         addonAfter: string;
+        initialValue?: undefined;
     })[];
 })[];
 export default _default;

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

@@ -219,7 +219,8 @@ exports.default = [
                         label: '价格千分符展示',
                         type: 'Switch',
                         name: ['enableFormattedPrice'],
-                        initialValue: true
+                        initialValue: true,
+                        belong: 'price'
                     }
                 ]
             }
@@ -335,12 +336,14 @@ exports.default = [
             {
                 label: '背景色',
                 name: ['props', 'swiper', 'dotsBgColor'],
-                type: 'Color'
+                type: 'Color',
+                initialValue: 'rgba(0,0,0,.2)'
             },
             {
                 label: '选中色',
                 name: ['props', 'swiper', 'dotsActiveColor'],
-                type: 'Color'
+                type: 'Color',
+                initialValue: 'rgba(0,0,0,1)'
             },
             {
                 label: '底边距',

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

@@ -13,11 +13,12 @@ const useEventReport_1 = require("../../../../core/hooks/useEventReport");
 const FormatImage_1 = tslib_1.__importDefault(require("../../../../core/components/SxpPageRender/FormatImage"));
 const tool_1 = require("../../../../core/utils/tool");
 const CommodityGroup_1 = tslib_1.__importDefault(require("../../template/components/CommodityGroup"));
+const materials_1 = require("../../../../core/utils/materials");
 const CommodityDetailDiroNew = (_a) => {
     var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4;
     var { style, isDefault, rec, viewTime, isPost, bottom_image, tipText, swiper, commodityStyles, buttonStyle, index, commodityGroup, popupBg, iframeIcon, commodityImgRatio, isTel, iframeBgColor } = _a, props = tslib_1.__rest(_a, ["style", "isDefault", "rec", "viewTime", "isPost", "bottom_image", "tipText", "swiper", "commodityStyles", "buttonStyle", "index", "commodityGroup", "popupBg", "iframeIcon", "commodityImgRatio", "isTel", "iframeBgColor"]);
     const [spread, setSpread] = (0, react_1.useState)(true);
-    const { sxpParameter, popupCurTimeRef, popupDetailData, isPreview, bffFbReport, checkCommodityIndexRef } = (0, hooks_1.useSxpDataSource)();
+    const { sxpParameter, popupCurTimeRef, popupDetailData, isPreview, bffFbReport, checkCommodityIndexRef, globalConfig } = (0, hooks_1.useSxpDataSource)();
     const { jumpToWeb, productView } = (0, useEventReport_1.useEventReport)();
     const [stopSlide, setStopSlide] = (0, react_1.useState)(false);
     const [isBottom, setIsBottom] = (0, react_1.useState)(false);
@@ -65,20 +66,11 @@ const CommodityDetailDiroNew = (_a) => {
             window.removeEventListener('pageshow', initTime);
         };
     }, []);
-    const priceText = (0, react_1.useMemo)(() => {
-        var _a, _b, _c, _d, _e, _f, _g;
-        const isToLocStr = ((_a = commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price) === null || _a === void 0 ? void 0 : _a.enableFormattedPrice) === undefined || ((_b = commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price) === null || _b === void 0 ? void 0 : _b.enableFormattedPrice);
-        if ((product === null || product === void 0 ? void 0 : product.currency) && (product === null || product === void 0 ? void 0 : product.price)) {
-            return `${(_e = (_d = (_c = product === null || product === void 0 ? void 0 : product.currency) === null || _c === void 0 ? void 0 : _c.split('-')[1]) === null || _d === void 0 ? void 0 : _d.toUpperCase()) !== null && _e !== void 0 ? _e : ''}${isToLocStr
-                ? (_g = (_f = product === null || product === void 0 ? void 0 : product.price) === null || _f === void 0 ? void 0 : _f.toLocaleString('zh', {
-                    minimumFractionDigits: 0
-                })) !== null && _g !== void 0 ? _g : ''
-                : product === null || product === void 0 ? void 0 : product.price}`;
-        }
-        else {
-            return '£102,300.00';
-        }
-    }, [product === null || product === void 0 ? void 0 : product.price, product === null || product === void 0 ? void 0 : product.currency, (_t = commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price) === null || _t === void 0 ? void 0 : _t.enableFormattedPrice]);
+    const priceText = (0, materials_1.getPriceText)({
+        product,
+        enableFormattedPrice: (_t = commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price) === null || _t === void 0 ? void 0 : _t.enableFormattedPrice,
+        globalConfig
+    });
     const width = (isPreview ? 375 : (_u = style === null || style === void 0 ? void 0 : style.width) !== null && _u !== void 0 ? _u : window.innerWidth) - ((_v = popupBg === null || popupBg === void 0 ? void 0 : popupBg.horizontalMargin) !== null && _v !== void 0 ? _v : 0) * 2;
     const height = commodityImgRatio ? width * (commodityImgRatio.h / commodityImgRatio.w) : width;
     const handleClickCollapse = () => {