jtui-vite 1.0.30 → 1.0.31

package/dist/jtui-vite.es.js

@@ -16661,22 +16661,20 @@ function td(e, t, o) {
 }
 function nd() {
   let e = Ce([]);
-  function t({
-    data: o,
-    sortList: n
-  }) {
-    const {
-      property: r,
-      order: l
-    } = n[0];
-    let s = o.filter((c) => r in c && c[r] != null), u = o.filter((c) => !(r in c) || c[r] == null), a = [];
-    return (l === "asc" || l === "desc") && (a = s.sort((c, d) => {
-      const b = c[r], y = d[r], f = Date.parse(b), C = Date.parse(y);
-      if (!isNaN(f) && !isNaN(C))
-        return f - C;
-      const g = Number(b), p = Number(y);
-      return !isNaN(g) && !isNaN(p) ? g - p : String(b).localeCompare(String(y));
-    })), l === "desc" && a.reverse(), e.value = a.concat(u), a.concat(u);
+  function t(o) {
+    let n, r, l;
+    if (o.sortList && o.sortList[0] ? (n = o.sortList[0].property, r = o.sortList[0].order, l = o.data) : (n = o.property, r = o.order, l = o.data), !l || !l.length)
+      return l;
+    let s = l.filter((d) => n in d && d[n] != null && d[n] !== "" && !(typeof d[n] == "string" && d[n].trim() === "")), u = l.filter((d) => !(n in d) || d[n] == null || d[n] === "" || typeof d[n] == "string" && d[n].trim() === ""), a = [];
+    (r === "asc" || r === "desc") && (a = [...s].sort((d, b) => {
+      const y = d[n], f = b[n], C = Date.parse(y), g = Date.parse(f), p = typeof y == "string" && /[-/:]/.test(y) && !isNaN(C), x = typeof f == "string" && /[-/:]/.test(f) && !isNaN(g);
+      if (p && x)
+        return C - g;
+      const L = Number(y), O = Number(f);
+      return !isNaN(L) && !isNaN(O) ? L - O : String(y).localeCompare(String(f));
+    })), r === "desc" && a.reverse();
+    const c = a.concat(u);
+    return e.value = c, c;
   }
   return {
     sortMethod: t,