From 2dd9b7872a2c689431b22f869c4b98a5fe572047 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com> Date: Mon, 7 Apr 2025 16:03:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/js/common/common.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/common/js/common/common.js b/common/js/common/common.js index 789f0c9e..2134c59d 100644 --- a/common/js/common/common.js +++ b/common/js/common/common.js @@ -65,9 +65,9 @@ export const custom_condition_judg = (fieldValue, type, value) => { case 'less-than': case 'equal': // 根据字段值的类型,进行数字间的比较 - if (typeof fieldValue === 'number' || typeof fieldValue === 'string') { + if (typeof fieldValue === 'number' || (typeof fieldValue === 'string' && isPureNumber(fieldValue))) { return compare_numbers(Number(fieldValue), numberValue, type); - } else if (Array.isArray(fieldValue)) { + } else if (Array.isArray(fieldValue) || (typeof fieldValue === 'string' && !isPureNumber(fieldValue))) { // 如果字段值是数组或字符串,比较数组长度和指定值 const valueLength = fieldValue?.length || 0; return compare_numbers(valueLength, numberValue, type); @@ -81,6 +81,11 @@ export const custom_condition_judg = (fieldValue, type, value) => { } } +// 判断是否是纯数字 +function isPureNumber(input) { + return /^\d+$/.test(input); +} + /** * 比较两个数字的大小 * @param a 第一个数字