!569 UI change dashboard jumping mode and default auto fresh time

Merge pull request !569 from 潘慧/r0.7

mindinsight/ui/src/locales/en-us.json

@@ -49,7 +49,8 @@
     "dataTraceback": "Dataset Lineage",
     "comparePlate": "Comparison Dashboard",
     "disableProfilerTip": "Failed to view profiling because no profiler log is available.",
-    "hardwareVisual": "Hardware Resources"
+    "hardwareVisual": "Hardware Resources",
+    "openNewTab": "Open Link in New Tab"
   },
   "modelTraceback": {
     "summaryPath": "Summary Path",

mindinsight/ui/src/locales/zh-cn.json

@@ -49,7 +49,8 @@
     "dataTraceback": "数据溯源",
     "comparePlate": "对比看板",
     "disableProfilerTip": "无profiler日志，无法查看性能分析",
-    "hardwareVisual": "硬件资源"
+    "hardwareVisual": "硬件资源",
+    "openNewTab": "打开新页签"
   },
   "modelTraceback": {
     "summaryPath": "训练日志路径",

mindinsight/ui/src/store.js

@@ -29,7 +29,7 @@ export default new Vuex.Store({
     // reload time
     timeReloadValue: localStorage.timeReloadValue
       ? localStorage.timeReloadValue
-      : 3,
+      : 10,
     // Scheduled hardware reload flag
     isHardwareTimeReload: localStorage.isHardwareTimeReload === 'false' ? false : true,
     // hardware reload time

mindinsight/ui/src/views/profiling-gpu/profiling.vue

@@ -65,7 +65,7 @@ import RequestService from '../../services/request-service';
 export default {
   data() {
     return {
-      summaryPath: this.$route.query.summaryPath,
+      summaryPath: '',
       tipsArrayList: [
         'step_trace-iter_interval',
         'minddata_pipeline-general',
@@ -100,6 +100,7 @@ export default {
         this.curDashboardInfo.query.id = this.$route.query.id;
         this.curDashboardInfo.query.dir = this.$route.query.dir;
         this.curDashboardInfo.query.path = this.$route.query.path;
+        this.summaryPath = decodeURIComponent( this.$route.query.id);
         this.getDeviceList();
       } else {
         this.curDashboardInfo.query.trainingJobId = '';

mindinsight/ui/src/views/profiling/profiling.vue

@@ -65,7 +65,7 @@ import RequestService from '../../services/request-service';
 export default {
   data() {
     return {
-      summaryPath: this.$route.query.summaryPath,
+      summaryPath: '',
       tipsArrayList: [
         'step_trace-iter_interval',
         'minddata_pipeline-general',
@@ -101,6 +101,7 @@ export default {
         this.curDashboardInfo.query.id = this.$route.query.id;
         this.curDashboardInfo.query.dir = this.$route.query.dir;
         this.curDashboardInfo.query.path = this.$route.query.path;
+        this.summaryPath = decodeURIComponent( this.$route.query.id);
         this.getDeviceList();
       } else {
         this.curDashboardInfo.query.trainingJobId = '';

mindinsight/ui/src/views/train-manage/compare-plate.vue

@@ -1208,9 +1208,7 @@ export default {
         this.$store.commit('setIsReload', false);
         this.isReloading = false;
       }
-      if (error.response && error.response.data) {
       this.clearAllData();
-      }
     },
 
     /**

mindinsight/ui/src/views/train-manage/summary-manage.vue

@@ -69,14 +69,15 @@ limitations under the License.
                              :label="$t('summaryManage.operation')"
                              width="240">
               <template slot-scope="scope">
-                <el-button type="text"
+                <span class="menu-item"
+                      @contextmenu.prevent="rightClick(scope.row, $event, 0)"
                       @click.stop="goToTrainDashboard(scope.row)">
-                  {{$t('summaryManage.viewDashboard')}} </el-button>
-                <el-button type="text"
-                           class="operate-btn"
+                  {{$t('summaryManage.viewDashboard')}} </span>
+                <span class="menu-item operate-btn"
                            v-if="scope.row.viewProfiler"
+                           @contextmenu.prevent="rightClick(scope.row, $event, 1)"
                            @click.stop="goToProfiler(scope.row)">
-                  {{$t('summaryManage.viewProfiler')}} </el-button>
+                  {{$t('summaryManage.viewProfiler')}} </span>
                 <el-button type="text"
                            class="operate-btn"
                            disabled
@@ -99,6 +100,13 @@ limitations under the License.
         </el-pagination>
       </div>
     </div>
+    <div id="contextMenu"
+         v-if="contextMenu.show"
+         :style="{left: contextMenu.left, top: contextMenu.top}">
+      <ul>
+        <li @click="doRightClick()">{{$t('summaryManage.openNewTab')}}</li>
+      </ul>
+    </div>
   </div>
 </template>
 
@@ -117,11 +125,20 @@ export default {
         total: 0,
         layout: 'total, prev, pager, next, jumper',
       },
+      contextMenu: {
+        show: false,
+        left: '',
+        top: '',
+        data: null,
+        type: 0,
+      },
     };
   },
   computed: {},
   watch: {},
-  destroyed() {},
+  destroyed() {
+    document.onclick = null;
+  },
   activated() {},
   mounted() {
     document.title = `${this.$t('summaryManage.summaryList')}-MindInsight`;
@@ -132,6 +149,10 @@ export default {
 
   methods: {
     init() {
+      document.onclick = () => {
+        this.contextMenu.show = false;
+      };
+
       const params = {
         limit: this.pagination.pageSize,
         offset: this.pagination.currentPage - 1,
@@ -187,19 +208,50 @@ export default {
      * @param {Object} row select row
      */
     goToTrainDashboard(row) {
+      this.contextMenu.show = false;
       const trainId = encodeURIComponent(row.train_id);
 
-      const routeUrl = this.$router.resolve({
+      this.$router.push({
         path: '/train-manage/training-dashboard',
         query: {id: trainId},
       });
-      window.open(routeUrl.href, '_blank');
     },
     /**
      * go to Profiler
      * @param {Object} row select row
      */
     goToProfiler(row) {
+      this.contextMenu.show = false;
+      const profilerDir = encodeURIComponent(row.profiler_dir);
+      const trainId = encodeURIComponent(row.train_id);
+      const path = encodeURIComponent(row.relative_path);
+      const router = `/profiling${row.profiler_type === 'gpu' ? '-gpu' : ''}`;
+
+      this.$router.push({
+        path: router,
+        query: {
+          dir: profilerDir,
+          id: trainId,
+          path: path,
+        },
+      });
+    },
+
+    rightClick(row, event, type) {
+      this.contextMenu.data = row;
+      this.contextMenu.type = type;
+      this.contextMenu.left = event.x + 'px';
+      this.contextMenu.top = event.y + 'px';
+      this.contextMenu.show = true;
+    },
+
+    doRightClick(key) {
+      const row = this.contextMenu.data;
+      if (!row) {
+        return;
+      }
+      if (this.contextMenu.type) {
+        this.contextMenu.show = false;
         const profilerDir = encodeURIComponent(row.profiler_dir);
         const trainId = encodeURIComponent(row.train_id);
         const path = encodeURIComponent(row.relative_path);
@@ -211,10 +263,19 @@ export default {
             dir: profilerDir,
             id: trainId,
             path: path,
-          summaryPath: row.train_id,
           },
         });
         window.open(routeUrl.href, '_blank');
+      } else {
+        this.contextMenu.show = false;
+        const trainId = encodeURIComponent(row.train_id);
+
+        const routeUrl = this.$router.resolve({
+          path: '/train-manage/training-dashboard',
+          query: {id: trainId},
+        });
+        window.open(routeUrl.href, '_blank');
+      }
     },
   },
   components: {},
@@ -282,5 +343,26 @@ export default {
   .operate-btn {
     margin-left: 20px;
   }
+  .menu-item {
+    color: #00a5a7;
+    cursor: pointer;
+  }
+  #contextMenu {
+    position: absolute;
+    min-width: 150px;
+    border: 1px solid #d4d4d4;
+    ul {
+      background-color: #f7faff;
+      border-radius: 2px;
+      li {
+        padding: 5px 18px;
+        cursor: pointer;
+        &:hover {
+          background-color: rgb(167, 167, 167);
+          color: white;
+        }
+      }
+    }
+  }
 }
 </style>