From 70e23fe88248a64b34f394d4567f91c874b9743c Mon Sep 17 00:00:00 2001
From: ph <panhui3@huawei.com>
Date: Thu, 18 Jun 2020 10:41:28 +0800
Subject: [PATCH] fix operator table sort issue

---
 .../ui/src/views/train-manage/operator.vue    | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/mindinsight/ui/src/views/train-manage/operator.vue b/mindinsight/ui/src/views/train-manage/operator.vue
index 992e9cf..8431525 100644
--- a/mindinsight/ui/src/views/train-manage/operator.vue
+++ b/mindinsight/ui/src/views/train-manage/operator.vue
@@ -491,8 +491,9 @@ export default {
     /**
      * get core detail list
      * @param {Object} row type row
+     * @param {Boolean} isSort if sort
      */
-    getCoreDetailList(row) {
+    getCoreDetailList(row, isSort) {
       const params = {};
       params.params = {
         profile: this.profile_dir,
@@ -518,10 +519,12 @@ export default {
                     childProp: row.op_sort_condition.name,
                     childOrder: row.op_sort_condition.type,
                   };
-                  item.sort(
-                      row.op_sort_condition.name,
-                      row.op_sort_condition.type,
-                  );
+                  if (isSort) {
+                    item.sort(
+                        row.op_sort_condition.name,
+                        row.op_sort_condition.type,
+                    );
+                  }
                 }
               });
             }
@@ -584,7 +587,7 @@ export default {
      */
     opDetailPageChange(row, pageIndex) {
       row.opDetailPage.offset = pageIndex - 1;
-      this.getCoreDetailList(row);
+      this.getCoreDetailList(row, false);
     },
     /**
      * cpu list page change
@@ -608,7 +611,7 @@ export default {
         } else {
           this.opAllTypeList.op_filter_condition = {};
         }
-        this.getCoreDetailList(this.opAllTypeList);
+        this.getCoreDetailList(this.opAllTypeList, false);
       } else {
         this.op_filter_condition = {};
         if (this.searchByTypeInput) {
@@ -653,7 +656,7 @@ export default {
         type: column.order,
       };
       row.opDetailPage.offset = 0;
-      this.getCoreDetailList(row);
+      this.getCoreDetailList(row, false);
     },
     /**
      * cpu detail sort
@@ -699,7 +702,6 @@ export default {
       row.isExpanded = !row.isExpanded;
       if (row.isExpanded) {
         if (this.curActiveRow.rowItem) {
-          this.curActiveRow.rowItem.isExpanded = false;
           const item = this.$refs['expandTable'];
           if (item) {
             item.toggleRowExpansion(this.curActiveRow.rowItem, false);
@@ -715,7 +717,7 @@ export default {
         row.opDetailPage.offset = 0;
         row.pageTotal = 0;
         row.op_sort_condition = {name: 'execution_time', type: 'descending'};
-        this.getCoreDetailList(row);
+        this.getCoreDetailList(row, true);
       } else {
         this.curActiveRow = {
           rowItem: null,
@@ -756,7 +758,7 @@ export default {
           name: 'execution_time',
           type: 'descending',
         };
-        this.getCoreDetailList(this.opAllTypeList);
+        this.getCoreDetailList(this.opAllTypeList, true);
       }
     },
     /**
-- 
GitLab