fix: nicolaskruchten/pivottable#1359

Seungwoo321 · Aug 22, 2024 · 6f487e5 · 6f487e5
1 parent bc4169b
commit 6f487e5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/dist/vue-pivottable.mjs b/dist/vue-pivottable.mjs
@@ -55,8 +55,13 @@ const wn = function(e, n, o) {
     return i > r ? 1 : -1;
   for (i = i.match(Je), r = r.match(Je); i.length && r.length; ) {
     const a = i.shift(), s = r.shift();
-    if (a !== s)
-      return oe.test(a) && oe.test(s) ? a.replace(Qe, ".0") - s.replace(Qe, ".0") : a > s ? 1 : -1;
+    if (a !== s) {
+      if (oe.test(a) && oe.test(s)) {
+        const l = a.replace(Qe, ".0") - s.replace(Qe, ".0");
+        return l !== 0 ? l : a.length - s.length;
+      }
+      return a > s ? 1 : -1;
+    }
   }
   return i.length - r.length;
 }, un = function(e) {

diff --git a/dist/vue-pivottable.umd.js b/dist/vue-pivottable.umd.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-pivottable",
-  "version": "0.4.66",
+  "version": "0.4.67",
   "main": "dist/vue-pivottable.mjs",
   "files": [
     "dist",

diff --git a/src/helper/utils.js b/src/helper/utils.js
@@ -100,7 +100,8 @@ const naturalSort = (as, bs) => {
     const b1 = b.shift()
     if (a1 !== b1) {
       if (rd.test(a1) && rd.test(b1)) {
-        return a1.replace(rz, '.0') - b1.replace(rz, '.0')
+        const numDiff = a1.replace(rz, '.0') - b1.replace(rz, '.0');
+        return (numDiff !== 0) ? numDiff : a1.length - b1.length;
       }
       return a1 > b1 ? 1 : -1
     }