pb-sxp-ui 1.5.0 → 1.5.1

package/dist/pb-ui.js

@@ -9198,7 +9198,7 @@
      * @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-13 15:06:44
      * @FilePath: \pb-sxp-ui\src\core\utils\materials.ts
      *
      */
@@ -9231,7 +9231,7 @@
         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);
@@ -9245,7 +9245,7 @@
             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 '.';
                     }
@@ -9261,8 +9261,16 @@
         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;