@leevan/jtui 2.0.53 → 2.0.54

package/packages/jt-table/index.vue

@@ -1159,31 +1159,29 @@ export default {
     //全局排序自定义排序方法
     sortMethod({ data, column, property, order }) {
       let data1 = data.filter((item) => {
-        return property in item;
+        return property in item && item[property] != null;
       });
       let data2 = data.filter((item) => {
-        return !(property in item);
+        return !(property in item) || item[property] == null;
       });
       let list = [];
       if (order === "asc" || order === "desc") {
-        if(/.*[\u4e00-\u9fa5]+.*$/.test(data1[0][property]) ||
-        /[a-zA-Z]/i.test(data1[0][property])
-        ){
-          list = data1.sort((a, b) => {
-            return a[property].localeCompare(b[property]);
-          });
-        }else{
-          if(isNaN(data1[0][property])&&!isNaN(Date.parse(data1[0][property]))){
-            list = data1.sort((a, b) => {
-              return new Date(a[property]).getTime() - new Date(b[property]).getTime();
-            });
-          }else{
-            list = data1.sort((a, b) => {
-              return a[property] - b[property];
-            });
+        list = data1.sort((a, b) => {
+          const valA = a[property];
+          const valB = b[property];
+          const dateA = Date.parse(valA);
+          const dateB = Date.parse(valB);
+          if (!isNaN(dateA) && !isNaN(dateB)) {
+            return dateA - dateB;
           }
-          
-        }
+
+          const numA = Number(valA);
+          const numB = Number(valB);
+          if (!isNaN(numA) && !isNaN(numB)) {
+            return numA - numB;
+          }
+          return String(valA).localeCompare(String(valB));
+        });
       }
       if (order === "desc") {
         list.reverse();