zmdms-webui 3.5.1 → 3.5.2

package/dist/es/table/components/FilterDropdown.js

@@ -150,6 +150,38 @@ function useControlled(props, option) {
     };
 }
 var NULL_SIGN = "__null__";
+/** 匹配形似数字的字符串：可选正负号、千分符、小数、尾部百分号 */
+var NUMERIC_LIKE_REGEXP = /^[+-]?(\d{1,3}(,\d{3})+|\d+)(\.\d+)?%?$/;
+/**
+ * 将格式化的数值（千分符、百分号）解析为数字，用于过滤时的数值比较。
+ * 非形似数字的文本返回 null，不影响文本列的原有匹配逻辑。
+ * 百分比按显示值解析（"12.5%" -> 12.5），与页面展示口径保持一致。
+ */
+function parseNumericLike(value) {
+    if (typeof value === "number") {
+        return Number.isFinite(value) ? value : null;
+    }
+    if (typeof value !== "string") {
+        return null;
+    }
+    var str = value.trim();
+    if (!NUMERIC_LIKE_REGEXP.test(str)) {
+        return null;
+    }
+    var num = Number(str.replace(/,/g, "").replace(/%$/, ""));
+    return Number.isFinite(num) ? num : null;
+}
+/**
+ * 数值优先比较：过滤值与当前值都能识别为数字时按数值比较（兼容千分符、百分号格式化值），
+ * 否则回退为原有行为（隐式类型比较）
+ */
+function compareValues(subStr, currentValue, currentNumeric, comparator) {
+    var subNumeric = parseNumericLike(subStr);
+    if (currentNumeric != null && subNumeric != null) {
+        return comparator(currentNumeric, subNumeric);
+    }
+    return comparator(currentValue, Number(subStr));
+}
 var isMessage = false;
 /**
  * 过滤方法
@@ -162,7 +194,6 @@ function filterHandle(value, record, key, options) {
     var _a, _b, _c, _d;
     var _e = options || {}, column = _e.column, _f = _e.recordIndex, recordIndex = _f === void 0 ? 0 : _f, _g = _e.checkbox, checkbox = _g === void 0 ? [] : _g;
     var newValue = ((_b = (_a = value === null || value === void 0 ? void 0 : value.toString) === null || _a === void 0 ? void 0 : _a.call(value)) === null || _b === void 0 ? void 0 : _b.trim()) || null; // 查询的值
-    // const currentValue = record && key ? record[key] : null;
     var currentValue = record && key ? record[key] : null; // 当前遍历的值
     if (column === null || column === void 0 ? void 0 : column.render) {
         try {
@@ -190,30 +221,34 @@ function filterHandle(value, record, key, options) {
         return true;
     }
     if (currentValue != null && newValue != null) {
+        // render 可能返回千分符/百分比等格式化值，先解析出数值形式再参与比较
+        var currentNumeric = parseNumericLike(currentValue);
         if (newValue.startsWith("大于等于") || newValue.startsWith(">=")) {
-            var subValue = Number(newValue.substring(newValue.startsWith("大于等于") ? 4 : 2));
-            return currentValue >= subValue;
+            var subStr = newValue.substring(newValue.startsWith("大于等于") ? 4 : 2);
+            return compareValues(subStr, currentValue, currentNumeric, function (a, b) { return a >= b; });
         }
         if (newValue.startsWith("小于等于") || newValue.startsWith("<=")) {
-            var subValue = Number(newValue.substring(newValue.startsWith("小于等于") ? 4 : 2));
-            return currentValue <= subValue;
+            var subStr = newValue.substring(newValue.startsWith("小于等于") ? 4 : 2);
+            return compareValues(subStr, currentValue, currentNumeric, function (a, b) { return a <= b; });
         }
         if (newValue.startsWith("大于") || newValue.startsWith(">")) {
-            var subValue = Number(newValue.substring(newValue.startsWith("大于") ? 2 : 1));
-            return currentValue > subValue;
+            var subStr = newValue.substring(newValue.startsWith("大于") ? 2 : 1);
+            return compareValues(subStr, currentValue, currentNumeric, function (a, b) { return a > b; });
         }
         if (newValue.startsWith("小于") || newValue.startsWith("<")) {
-            var subValue = Number(newValue.substring(newValue.startsWith("小于") ? 2 : 1));
-            return currentValue < subValue;
+            var subStr = newValue.substring(newValue.startsWith("小于") ? 2 : 1);
+            return compareValues(subStr, currentValue, currentNumeric, function (a, b) { return a < b; });
         }
         if (newValue.startsWith("等于") || newValue.startsWith("=")) {
-            var subValue = Number(newValue.substring(newValue.startsWith("等于") ? 2 : 1));
+            var subStr = newValue.substring(newValue.startsWith("等于") ? 2 : 1);
             // eslint-disable-next-line eqeqeq
-            return currentValue == subValue;
+            return compareValues(subStr, currentValue, currentNumeric, function (a, b) { return a == b; });
         }
         // 使用eval执行代码 长度不能过长。防止一些恶意攻击
         if (newValue.indexOf("$0") !== -1 && newValue.length <= 100) {
-            var newEvalStr = newValue.replace(/\$0/g, currentValue);
+            // 千分符的逗号、百分号会破坏表达式语法，可识别为数字时替换为其数值形式
+            var replacement = currentNumeric != null ? String(currentNumeric) : currentValue;
+            var newEvalStr = newValue.replace(/\$0/g, replacement);
             var result = null;
             try {
                 // eslint-disable-next-line no-eval
@@ -230,7 +265,18 @@ function filterHandle(value, record, key, options) {
             }
             return result;
         }
-        return (_d = (_c = currentValue === null || currentValue === void 0 ? void 0 : currentValue.toString()) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === null || _d === void 0 ? void 0 : _d.includes(newValue.toLowerCase());
+        // 优先按显示文本匹配；格式化值再按数值形式匹配一次（如输入 1234 命中 1,234.56）
+        var currentStr = (_d = (_c = currentValue === null || currentValue === void 0 ? void 0 : currentValue.toString) === null || _c === void 0 ? void 0 : _c.call(currentValue)) !== null && _d !== void 0 ? _d : "";
+        if (currentStr.toLowerCase().includes(newValue.toLowerCase())) {
+            return true;
+        }
+        if (currentNumeric != null) {
+            return currentNumeric
+                .toString()
+                .toLowerCase()
+                .includes(newValue.toLowerCase());
+        }
+        return false;
     }
     // 空值的话排除
     if (currentValue == null || currentValue === "") {
@@ -252,4 +298,4 @@ function createFilterValue(input, checkbox) {
     return filteredValue;
 }
 
-export { NULL_SIGN, createFilterValue, FilterDropdown as default, filterHandle };
+export { NULL_SIGN, createFilterValue, FilterDropdown as default, filterHandle, parseNumericLike };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-webui",
-  "version": "3.5.1",
+  "version": "3.5.2",
   "private": false,
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",