Procházet zdrojové kódy

fix(table): table column sorting fix

Torkel Ödegaard před 9 roky
rodič
revize
5d652dcaef

+ 2 - 0
public/app/core/table_model.ts

@@ -32,6 +32,8 @@ export default class TableModel {
     if (options.desc) {
     if (options.desc) {
       this.rows.reverse();
       this.rows.reverse();
       this.columns[options.col].desc = true;
       this.columns[options.col].desc = true;
+    } else {
+      this.columns[options.col].desc = false;
     }
     }
   }
   }
 }
 }

+ 5 - 0
public/app/plugins/panel/table/module.ts

@@ -120,6 +120,11 @@ class TablePanelCtrl extends MetricsPanelCtrl {
   }
   }
 
 
   toggleColumnSort(col, colIndex) {
   toggleColumnSort(col, colIndex) {
+    // remove sort flag from current column
+    if (this.table.columns[this.panel.sort.col]) {
+      this.table.columns[this.panel.sort.col].sort = false;
+    }
+
     if (this.panel.sort.col === colIndex) {
     if (this.panel.sort.col === colIndex) {
       if (this.panel.sort.desc) {
       if (this.panel.sort.desc) {
         this.panel.sort.desc = false;
         this.panel.sort.desc = false;