pb-sxp-ui 1.5.0 → 1.5.2

package/dist/index.cjs

@@ -9205,7 +9205,7 @@ var CommodityGroup$1 = React.memo(CommodityGroup);
  * @Author: binruan@chatlabs.com
  * @Date: 2024-03-20 14:56:16
  * @LastEditors: binruan@chatlabs.com
- * @LastEditTime: 2024-09-12 15:50:11
+ * @LastEditTime: 2024-09-14 10:07:47
  * @FilePath: \pb-sxp-ui\src\core\utils\materials.ts
  *
  */
@@ -9232,13 +9232,15 @@ const getMediaValueByMode = (obj) => {
             return file && file.length > 0 ? (_a = file[0]) === null || _a === void 0 ? void 0 : _a.url : null;
     }
 };
-const getPriceText = ({ product, enableFormattedPrice, globalConfig }) => {
+const getPriceText = ({ product, enableFormattedPrice, globalConfig, isHiddenDef }) => {
     var _a, _b, _c, _d, _e;
+    if ((!(product === null || product === void 0 ? void 0 : product.currency) || !(product === null || product === void 0 ? void 0 : product.price)) && isHiddenDef)
+        return null;
     let price = (product === null || product === void 0 ? void 0 : product.currency) && (product === null || product === void 0 ? void 0 : product.price) ? product === null || product === void 0 ? void 0 : product.price : 7000;
     let text = '';
     let 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';
+    const isToLocStr = enableFormattedPrice === undefined || enableFormattedPrice;
     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);
@@ -9252,7 +9254,7 @@ const getPriceText = ({ product, enableFormattedPrice, globalConfig }) => {
         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) {
+            text = text === null || text === void 0 ? void 0 : text.replace(/\,/g, function (match, index) {
                 if (index >= startIndex && index < endIndex) {
                     return '.';
                 }
@@ -9268,8 +9270,16 @@ const getPriceText = ({ product, enableFormattedPrice, globalConfig }) => {
     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.decimalPoint) === ',' && decInd > 0) {
+        // text = text.slice(0, decInd) + ',' + text.slice(decInd + 1);
+        text = text = text === null || text === void 0 ? void 0 : text.replace(/\./g, function (match, index) {
+            if (index >= decInd && index < (text === null || text === void 0 ? void 0 : text.length)) {
+                return ',';
+            }
+            else {
+                return match;
+            }
+        });
     }
     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;
@@ -13802,7 +13812,8 @@ const WaterfallFlowItem$1 = (props) => {
     const priceText = 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
+        globalConfig,
+        isHiddenDef: true
     });
     React.useEffect(() => {
         if (imgDom.current === null || src === '') {
@@ -14118,7 +14129,8 @@ const WaterfallFlowItem = (props) => {
     const priceText = 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
+        globalConfig,
+        isHiddenDef: true
     });
     // useEffect(() => {
     //   if (imgDom.current === null || src === '') {