@nutui/nutui-react-taro 3.0.19-cpp.22-2 → 3.0.19-cpp.22-3

package/dist/cjs/packages/price/price.js

@@ -29,16 +29,18 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
     thousands: false,
     position: 'before',
     size: 'normal',
-    line: false
+    line: false,
+    raw: false
 });
 var Price = function Price(props) {
-    var _$_object_spread = (0, _object_spread._)({}, defaultProps, props), color = _$_object_spread.color, originalPrice = _$_object_spread.price, symbol = _$_object_spread.symbol, digits = _$_object_spread.digits, thousands = _$_object_spread.thousands, position = _$_object_spread.position, size = _$_object_spread.size, line = _$_object_spread.line, className = _$_object_spread.className, style = _$_object_spread.style;
+    var _$_object_spread = (0, _object_spread._)({}, defaultProps, props), color = _$_object_spread.color, originalPrice = _$_object_spread.price, symbol = _$_object_spread.symbol, digits = _$_object_spread.digits, thousands = _$_object_spread.thousands, position = _$_object_spread.position, size = _$_object_spread.size, line = _$_object_spread.line, raw = _$_object_spread.raw, className = _$_object_spread.className, style = _$_object_spread.style;
     var classPrefix = 'nut-price';
     var rtl = (0, _index.useRtl)();
     var isRenderPriceRaw = (0, _react.useMemo)(function() {
-        return typeof originalPrice === 'string' && (0, _shouldrenderpriceraw.shouldRenderPriceAsRaw)(originalPrice);
+        return typeof originalPrice === 'string' && (0, _shouldrenderpriceraw.shouldRenderPriceAsRaw)(originalPrice) || raw && typeof originalPrice === 'string' && (0, _shouldrenderpriceraw.hasNonPriceChars)(originalPrice);
     }, [
-        originalPrice
+        originalPrice,
+        raw
     ]);
     var price = (0, _react.useMemo)(function() {
         if (isRenderPriceRaw) return '';

package/dist/cjs/types/spec/price/base.d.ts

@@ -17,4 +17,5 @@ export interface BasePrice extends BaseProps {
     position: string;
     size: PriceSize;
     line: boolean;
+    raw: boolean;
 }

package/dist/cjs/utils/should-render-price-raw.d.ts

@@ -1 +1,2 @@
 export declare function shouldRenderPriceAsRaw(s: string): boolean;
+export declare function hasNonPriceChars(s: string): boolean;

package/dist/cjs/utils/should-render-price-raw.js

@@ -2,14 +2,23 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "shouldRenderPriceAsRaw", {
-    enumerable: true,
-    get: function() {
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: Object.getOwnPropertyDescriptor(all, name).get
+    });
+}
+_export(exports, {
+    get hasNonPriceChars () {
+        return hasNonPriceChars;
+    },
+    get shouldRenderPriceAsRaw () {
         return shouldRenderPriceAsRaw;
     }
 });
-var CJK = /[\u4E00-\u9FFF]/;
 var RE_NUM = /\d+(?:\.\d+)?/g;
+// 价格合法字符：数字、小数点、负号、大写货币代码（HK USD EUR 等）、常见货币符号 Unicode 区块（含全角 ￥）
+var PRICE_CHARS = /^[\d.\-A-Z¥￥$€£₩₹₽₺₴₪฿\u20A0-\u20CF\uFE69\uFF04\uFFE5]*$/;
 function hasNoExtractablePrice(s) {
     var t = s.trim();
     if (!t) return true;
@@ -22,7 +31,6 @@ function shouldRenderPriceAsRaw(s) {
         return true;
     }
     var t = s.trim();
-    if (!CJK.test(t)) return false;
     var matches = Array.from(t.matchAll(RE_NUM));
     if (matches.length < 2) return false;
     var a = matches[0];
@@ -30,5 +38,8 @@ function shouldRenderPriceAsRaw(s) {
     var i0 = a.index;
     var i1 = b.index;
     var between = t.slice(i0 + a[0].length, i1);
-    return CJK.test(between);
+    return !PRICE_CHARS.test(between);
+}
+function hasNonPriceChars(s) {
+    return !PRICE_CHARS.test(s);
 }

package/dist/es/packages/price/price.js

@@ -8,7 +8,7 @@ import { ComponentDefaults } from "../../utils/typings";
 import { useRtl } from "../configprovider/index";
 import { PriceColorEnum } from "../../types";
 import { harmony } from "../../utils/taro/platform";
-import { shouldRenderPriceAsRaw } from "../../utils/should-render-price-raw";
+import { shouldRenderPriceAsRaw, hasNonPriceChars } from "../../utils/should-render-price-raw";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     color: 'primary',
     price: 0,
@@ -17,16 +17,18 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     thousands: false,
     position: 'before',
     size: 'normal',
-    line: false
+    line: false,
+    raw: false
 });
 export var Price = function(props) {
-    var _$_object_spread = _object_spread({}, defaultProps, props), color = _$_object_spread.color, originalPrice = _$_object_spread.price, symbol = _$_object_spread.symbol, digits = _$_object_spread.digits, thousands = _$_object_spread.thousands, position = _$_object_spread.position, size = _$_object_spread.size, line = _$_object_spread.line, className = _$_object_spread.className, style = _$_object_spread.style;
+    var _$_object_spread = _object_spread({}, defaultProps, props), color = _$_object_spread.color, originalPrice = _$_object_spread.price, symbol = _$_object_spread.symbol, digits = _$_object_spread.digits, thousands = _$_object_spread.thousands, position = _$_object_spread.position, size = _$_object_spread.size, line = _$_object_spread.line, raw = _$_object_spread.raw, className = _$_object_spread.className, style = _$_object_spread.style;
     var classPrefix = 'nut-price';
     var rtl = useRtl();
     var isRenderPriceRaw = useMemo(function() {
-        return typeof originalPrice === 'string' && shouldRenderPriceAsRaw(originalPrice);
+        return typeof originalPrice === 'string' && shouldRenderPriceAsRaw(originalPrice) || raw && typeof originalPrice === 'string' && hasNonPriceChars(originalPrice);
     }, [
-        originalPrice
+        originalPrice,
+        raw
     ]);
     var price = useMemo(function() {
         if (isRenderPriceRaw) return '';

package/dist/es/types/spec/price/base.d.ts

@@ -41,4 +41,5 @@ export interface BasePrice extends BaseProps {
     * 是否划线价
     */
     line: boolean
+    raw: boolean;
 }

package/dist/es/utils/should-render-price-raw.d.ts

@@ -1 +1,2 @@
 export declare function shouldRenderPriceAsRaw(s: string): boolean;
+export declare function hasNonPriceChars(s: string): boolean;

package/dist/es/utils/should-render-price-raw.js

@@ -1,5 +1,6 @@
-var CJK = /[\u4E00-\u9FFF]/;
 var RE_NUM = /\d+(?:\.\d+)?/g;
+// 价格合法字符：数字、小数点、负号、大写货币代码（HK USD EUR 等）、常见货币符号 Unicode 区块（含全角 ￥）
+var PRICE_CHARS = /^[\d.\-A-Z¥￥$€£₩₹₽₺₴₪฿\u20A0-\u20CF\uFE69\uFF04\uFFE5]*$/;
 function hasNoExtractablePrice(s) {
     var t = s.trim();
     if (!t) return true;
@@ -12,7 +13,6 @@ export function shouldRenderPriceAsRaw(s) {
         return true;
     }
     var t = s.trim();
-    if (!CJK.test(t)) return false;
     var matches = Array.from(t.matchAll(RE_NUM));
     if (matches.length < 2) return false;
     var a = matches[0];
@@ -20,5 +20,8 @@ export function shouldRenderPriceAsRaw(s) {
     var i0 = a.index;
     var i1 = b.index;
     var between = t.slice(i0 + a[0].length, i1);
-    return CJK.test(between);
+    return !PRICE_CHARS.test(between);
+}
+export function hasNonPriceChars(s) {
+    return !PRICE_CHARS.test(s);
 }

package/dist/nutui.react.umd.js

@@ -39842,8 +39842,8 @@
     return PriceColorEnum2;
   }({});
   var destroyList = [];
-  var CJK = /[\u4E00-\u9FFF]/;
   var RE_NUM = /\d+(?:\.\d+)?/g;
+  var PRICE_CHARS = /^[\d.\-A-Z¥￥$€£₩₹₽₺₴₪฿\u20A0-\u20CF\uFE69\uFF04\uFFE5]*$/;
   function hasNoExtractablePrice(s) {
     var t = s.trim();
     if (!t) return true;
@@ -39856,7 +39856,6 @@
       return true;
     }
     var t = s.trim();
-    if (!CJK.test(t)) return false;
     var matches = Array.from(t.matchAll(RE_NUM));
     if (matches.length < 2) return false;
     var a = matches[0];
@@ -39864,7 +39863,10 @@
     var i0 = a.index;
     var i1 = b.index;
     var between = t.slice(i0 + a[0].length, i1);
-    return CJK.test(between);
+    return !PRICE_CHARS.test(between);
+  }
+  function hasNonPriceChars(s) {
+    return !PRICE_CHARS.test(s);
   }
   var defaultProps$f = _object_spread_props(_object_spread({}, ComponentDefaults), {
     color: "primary",
@@ -39874,16 +39876,18 @@
     thousands: false,
     position: "before",
     size: "normal",
-    line: false
+    line: false,
+    raw: false
   });
   var Price = function(props) {
-    var _$_object_spread = _object_spread({}, defaultProps$f, props), color = _$_object_spread.color, originalPrice = _$_object_spread.price, symbol = _$_object_spread.symbol, digits = _$_object_spread.digits, thousands = _$_object_spread.thousands, position2 = _$_object_spread.position, size = _$_object_spread.size, line = _$_object_spread.line, className = _$_object_spread.className, style = _$_object_spread.style;
+    var _$_object_spread = _object_spread({}, defaultProps$f, props), color = _$_object_spread.color, originalPrice = _$_object_spread.price, symbol = _$_object_spread.symbol, digits = _$_object_spread.digits, thousands = _$_object_spread.thousands, position2 = _$_object_spread.position, size = _$_object_spread.size, line = _$_object_spread.line, raw = _$_object_spread.raw, className = _$_object_spread.className, style = _$_object_spread.style;
     var classPrefix2 = "nut-price";
     var rtl = useRtl();
     var isRenderPriceRaw = React.useMemo(function() {
-      return typeof originalPrice === "string" && shouldRenderPriceAsRaw(originalPrice);
+      return typeof originalPrice === "string" && shouldRenderPriceAsRaw(originalPrice) || raw && typeof originalPrice === "string" && hasNonPriceChars(originalPrice);
     }, [
-      originalPrice
+      originalPrice,
+      raw
     ]);
     var price = React.useMemo(function() {
       if (isRenderPriceRaw) return "";