From 6a3976ed29746968e32962357718243152f50bdb Mon Sep 17 00:00:00 2001
From: wwx691809 <wangweining2@huawei.com>
Date: Thu, 20 Aug 2020 18:37:28 +0800
Subject: [PATCH] Caching status replacement Icon

1.Caching status replacement Icon
2.add tips
3.Add translation
---
 .../ui/src/components/multiselectGroup.vue    | 16 ++++++----
 mindinsight/ui/src/locales/en-us.json         |  3 +-
 mindinsight/ui/src/locales/zh-cn.json         |  3 +-
 .../src/views/train-manage/compare-plate.vue  | 31 ++++++-------------
 4 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/mindinsight/ui/src/components/multiselectGroup.vue b/mindinsight/ui/src/components/multiselectGroup.vue
index 94a7a3a7..ff3970f 100644
--- a/mindinsight/ui/src/components/multiselectGroup.vue
+++ b/mindinsight/ui/src/components/multiselectGroup.vue
@@ -48,9 +48,11 @@ limitations under the License.
                         popper-class="tooltip-show-content"
                         :content="item.label"
                         placement="top">
-              <span class="select-disable"><i title="CACHING"
-                   v-if="item.loading"
-                   class="el-icon-loading"></i>{{item.label}}</span>
+              <span class="select-disable">
+                <i :title="$t('components.cache')"
+                   class="el-icon-time"
+                   v-if="item.checked && (item.loading==='CACHING' || item.loading==='NOT_IN_CACHE')"></i>
+                {{item.label}}</span>
             </el-tooltip>
           </span>
         </div>
@@ -80,9 +82,11 @@ limitations under the License.
                       popper-class="tooltip-show-content"
                       :content="item.label"
                       placement="top">
-            <span class="select-disable"><i title="CACHING"
-                 v-if="item.loading"
-                 class="el-icon-loading"></i>{{item.label}}</span>
+            <span class="select-disable">
+              <i :title="$t('components.cache')"
+                 class="el-icon-time"
+                 v-if="item.checked && (item.loading==='CACHING' || item.loading==='NOT_IN_CACHE')"></i>
+              {{item.label}}</span>
           </el-tooltip>
         </span>
       </div>
diff --git a/mindinsight/ui/src/locales/en-us.json b/mindinsight/ui/src/locales/en-us.json
index b6548e0..ae4af96 100644
--- a/mindinsight/ui/src/locales/en-us.json
+++ b/mindinsight/ui/src/locales/en-us.json
@@ -450,7 +450,8 @@
     "gridIncorrectDataError": "A maximum of two-dimensionalarrays can be displayed.",
     "gridAccuracy": "Decimal places are reserved.",
     "inCorrectInput": "Invalid input.",
-    "gridTableNoData": "No data in the table."
+    "gridTableNoData": "No data in the table.",
+    "cache":"CACHING"
   },
   "error": {
     "50540000": "System error.",
diff --git a/mindinsight/ui/src/locales/zh-cn.json b/mindinsight/ui/src/locales/zh-cn.json
index 29fd29d..b2cf465 100644
--- a/mindinsight/ui/src/locales/zh-cn.json
+++ b/mindinsight/ui/src/locales/zh-cn.json
@@ -449,7 +449,8 @@
     "gridIncorrectDataError": "当前只支持最多二维数组的展示",
     "gridAccuracy": "保留小数位",
     "inCorrectInput": "无效输入",
-    "gridTableNoData": "表格无数据"
+    "gridTableNoData": "表格无数据",
+    "cache":"正在加载"
   },
   "error": {
     "50540000": "系统错误",
diff --git a/mindinsight/ui/src/views/train-manage/compare-plate.vue b/mindinsight/ui/src/views/train-manage/compare-plate.vue
index 22f7a2e..3a6e0c1 100644
--- a/mindinsight/ui/src/views/train-manage/compare-plate.vue
+++ b/mindinsight/ui/src/views/train-manage/compare-plate.vue
@@ -174,7 +174,6 @@ export default {
       curBenchX: 'stepData', // Front axle reference
       curAxisName: this.$t('scalar.step'), // Current chart tip
       axisBenchChangeTimer: null, // Horizontal axis reference switching timing
-      cacheStatus: 'CACHING', // cache
     };
   },
   computed: {
@@ -321,13 +320,11 @@ export default {
               colorIndex: colorIndex,
             });
 
-            if (summaryObj.cache_status === this.cacheStatus) {
-              tempSummaryList.forEach((item) => {
-                if (item.label === summaryObj.train_id) {
-                  item.loading = true;
-                }
-              });
-            }
+            tempSummaryList.forEach((item) => {
+              if (item.label === summaryObj.train_id) {
+                item.loading = summaryObj.cache_status;
+              }
+            });
 
             summaryObj.plugins.scalar.forEach((tagObj) => {
               // tag with the same name exists
@@ -1336,19 +1333,11 @@ export default {
           summaryColor = this.summaryOperateList[sameSummaryIndex].color;
         }
 
-        if (summaryObj.cache_status === this.cacheStatus) {
-          this.summaryOperateList.forEach((item) => {
-            if (item.label === summaryObj.train_id) {
-              item.loading = true;
-            }
-          });
-        } else {
-          this.summaryOperateList.forEach((item) => {
-            if (item.label === summaryObj.train_id) {
-              item.loading = false;
-            }
-          });
-        }
+        this.summaryOperateList.forEach((item) => {
+          if (item.label === summaryObj.train_id) {
+            item.loading = summaryObj.cache_status;
+          }
+        });
 
         summaryObj.plugins.scalar.forEach((tagObj) => {
           let sameTagIndex = -1;
-- 
GitLab