浏览代码

[beeswax][spark] Fix charts sorting

Enrico Berti 10 年之前
父节点
当前提交
a7914755fb

+ 6 - 6
apps/beeswax/src/beeswax/templates/execute.mako

@@ -2981,12 +2981,12 @@ function pieChartDataTransformer(data) {
 
   if (viewModel.chartSorting() == "asc"){
     _data.sort(function(a, b){
-      return a.value > b.value
+      return a.value - b.value
     });
   }
   if (viewModel.chartSorting() == "desc"){
     _data.sort(function(a, b){
-      return b.value > a.value
+      return b.value - a.value
     });
   }
 
@@ -3023,12 +3023,12 @@ function barChartDataTransformer(rawDatum) {
 
   if (viewModel.chartSorting() == "asc"){
     _data.sort(function(a, b){
-      return a.y > b.y
+      return a.y - b.y
     });
   }
   if (viewModel.chartSorting() == "desc"){
     _data.sort(function(a, b){
-      return b.y > a.y
+      return b.y - a.y
     });
   }
 
@@ -3064,12 +3064,12 @@ function lineChartDataTransformer(rawDatum) {
 
     if (viewModel.chartSorting() == "asc"){
       _data.sort(function(a, b){
-        return a.y > b.y
+        return a.y - b.y
       });
     }
     if (viewModel.chartSorting() == "desc"){
       _data.sort(function(a, b){
-        return b.y > a.y
+        return b.y - a.y
       });
     }
 

+ 4 - 4
apps/spark/src/spark/templates/editor_components.mako

@@ -1020,12 +1020,12 @@ from desktop.views import _ko
 
     if (rawDatum.sorting == "asc") {
       _data.sort(function (a, b) {
-        return a.value > b.value
+        return a.value - b.value
       });
     }
     if (rawDatum.sorting == "desc") {
       _data.sort(function (a, b) {
-        return b.value > a.value
+        return b.value - a.value
       });
     }
 
@@ -1127,12 +1127,12 @@ from desktop.views import _ko
           });
           if (rawDatum.sorting == "asc") {
             _data.sort(function (a, b) {
-              return a.y > b.y
+              return a.y - b.y
             });
           }
           if (rawDatum.sorting == "desc") {
             _data.sort(function (a, b) {
-              return b.y > a.y
+              return b.y - a.y
             });
           }
           _datum.push({