fix: resolve issue nicolaskruchten#1359

Seungwoo321 · Aug 22, 2024 · eff6e82 · eff6e82
1 parent 838ec2f
commit eff6e82
Show file tree

Hide file tree

Showing 10 changed files with 52 additions and 9 deletions.
diff --git a/dist/pivot.js b/dist/pivot.js
diff --git a/dist/pivot.js.map b/dist/pivot.js.map
diff --git a/dist/pivot.min.js b/dist/pivot.min.js
diff --git a/dist/pivot.min.js.map b/dist/pivot.min.js.map
diff --git a/dist/pivot_spec.js b/dist/pivot_spec.js
diff --git a/dist/pivot_spec.js.map b/dist/pivot_spec.js.map
diff --git a/dist/pivot_spec.min.js b/dist/pivot_spec.min.js
diff --git a/dist/pivot_spec.min.js.map b/dist/pivot_spec.min.js.map
diff --git a/src/pivot.coffee b/src/pivot.coffee
@@ -267,7 +267,8 @@ callWithJQuery ($) ->
             b1 = b.shift()
             if a1 != b1
                 if rd.test(a1) and rd.test(b1) #both are digit chunks
-                    return a1.replace(rz, ".0") - b1.replace(rz, ".0")
+                    numDiff = a1.replace(rz, ".0") - b1.replace(rz, ".0")
+                    return if numDiff != 0 then numDiff else a1.length - b1.length
                 else
                     return (if a1 > b1 then 1 else -1)
         return a.length - b.length

diff --git a/tests/pivot_spec.coffee b/tests/pivot_spec.coffee
@@ -329,6 +329,18 @@ describe "$.pivotUtilities", ->
                 expect pd.getAggregator([],[]).value()
                 .toBe (1+3)/(2+4)
 
+        describe "with a0-a00 input", ->
+            aoaInput =  [
+                {key: 'a0', ym: '2020-01'},
+                {key: 'a0', ym: '2020-02'},
+                {key: 'a00', ym: '2020-01'},
+                {key: 'a00', ym: '2020-02'}
+            ]
+            pd = new $.pivotUtilities.PivotData aoaInput, rows: ["key", "ym"], cols: []
+
+            it "has correctly-ordered row keys", ->
+                expect pd.getRowKeys()
+                .toEqual [["a0","2020-01"],["a0","2020-02"],["a00","2020-01"],["a00","2020-02"]]
 
         describe "with rows/cols", ->
             pd = new $.pivotUtilities.PivotData fixtureData,