Merge remote-tracking branch 'origin/dev' into dev

frontend/src/business/components/common/components/MsTestHeatmap.vue

@@ -4,7 +4,7 @@
       <span class="title">{{$t('commons.calendar_heatmap')}}</span>
     </template>
     <calendar-heatmap :end-date="endDate" :values="values" :locale="locale"
-                      tooltip-unit="tests"
+                      :tooltip-unit="unit"
                       :range-color="colorRange"/>
   </el-card>
 </template>
@@ -16,18 +16,45 @@
     data() {
       return {
         endDate: new Date(),
-        colorRange: ['#ebedf0', '#dae2ef', '#c0ddf9', '#73b3f3', '#3886e1', '#17459e'],
+        unit: 'tests',
+        colorRange: ['#ebedf0', '#c6e48b', '#7bc96f', '#239a3b', '#196127'],
         locale: {
           // 一月 二月 三月 四月 五月 六月 七月 八月 九月 十月 十一月 十二月
           months: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
           // 星期日 Sun. 星期一 Mon. 星期二 Tues. 星期三 Wed. 星期四 Thur. 星期五 Fri. 星期六 Sat.
           days: ['Sun', 'Mon', 'Tues', 'Wed', 'Thur', 'Fri', 'Sat'],
           No: 'No',
-          on: 'on',
+          on: ',',
           less: 'Less',
           more: 'More'
         },
       }
+    },
+    mounted() {
+      this.locale.months = [
+        this.$t('commons.months_1'),
+        this.$t('commons.months_2'),
+        this.$t('commons.months_3'),
+        this.$t('commons.months_4'),
+        this.$t('commons.months_5'),
+        this.$t('commons.months_6'),
+        this.$t('commons.months_7'),
+        this.$t('commons.months_8'),
+        this.$t('commons.months_9'),
+        this.$t('commons.months_10'),
+        this.$t('commons.months_11'),
+        this.$t('commons.months_12')
+      ];
+      this.locale.days = [
+        this.$t('commons.weeks_0'),
+        this.$t('commons.weeks_1'),
+        this.$t('commons.weeks_2'),
+        this.$t('commons.weeks_3'),
+        this.$t('commons.weeks_4'),
+        this.$t('commons.weeks_5'),
+        this.$t('commons.weeks_6')
+      ];
+      this.unit = this.$t('commons.test_unit')
     }
   }
 </script>

frontend/src/business/components/performance/home/PerformanceReportRecentList.vue

@@ -50,7 +50,7 @@
       },
       link(row) {
         this.$router.push({
-          path: '/api/report/view/' + row.id,
+          path: '/performance/report/view/' + row.id,
         })
       }
     },

frontend/src/business/components/performance/home/PerformanceTestHome.vue

@@ -10,7 +10,9 @@
         </el-col>
       </el-row>
       <el-row>
-        <ms-test-heatmap :values="values"></ms-test-heatmap>
+        <el-col :span="12">
+          <ms-test-heatmap :values="values"/>
+        </el-col>
       </el-row>
     </ms-main-container>
   </ms-container>

frontend/src/business/components/performance/home/PerformanceTestRecentList.vue

@@ -51,7 +51,7 @@
       },
       link(row) {
         this.$router.push({
-          path: '/api/test/edit?id=' + row.id,
+          path: '/performance/test/edit?id=' + row.id,
         })
       }
     },

frontend/src/i18n/en-US.js

@@ -60,7 +60,27 @@ export default {
     'title': 'Title',
     'custom': 'Custom',
     'select_date': 'Select date',
-    'calendar_heatmap': 'Calendar Heatmap'
+    'calendar_heatmap': 'Calendar Heatmap',
+    'months_1': 'Jan',
+    'months_2': 'Feb',
+    'months_3': 'Mar',
+    'months_4': 'Apr',
+    'months_5': 'May',
+    'months_6': 'Jun',
+    'months_7': 'Jul',
+    'months_8': 'Aug',
+    'months_9': 'Sep',
+    'months_10': 'Oct',
+    'months_11': 'Nov',
+    'months_12': 'Dec',
+    'weeks_0': 'Sun',
+    'weeks_1': 'Mon',
+    'weeks_2': 'Tues',
+    'weeks_3': 'Wed',
+    'weeks_4': 'Thur',
+    'weeks_5': 'Fri',
+    'weeks_6': 'Sat',
+    'test_unit': 'tests',
   },
   workspace: {
     'create': 'Create Workspace',

frontend/src/i18n/zh-CN.js

@@ -60,7 +60,27 @@ export default {
     'title': '标题',
     'custom': '自定义',
     'select_date': '选择日期',
-    'calendar_heatmap': '测试日历'
+    'calendar_heatmap': '测试日历',
+    'months_1': '一月',
+    'months_2': '二月',
+    'months_3': '三月',
+    'months_4': '四月',
+    'months_5': '五月',
+    'months_6': '六月',
+    'months_7': '七月',
+    'months_8': '八月',
+    'months_9': '九月',
+    'months_10': '十月',
+    'months_11': '十一月',
+    'months_12': '十二月',
+    'weeks_0': '周日',
+    'weeks_1': '周一',
+    'weeks_2': '周二',
+    'weeks_3': '周三',
+    'weeks_4': '周四',
+    'weeks_5': '周五',
+    'weeks_6': '周六',
+    'test_unit': '测试',
   },
   workspace: {
     'create': '创建工作空间',

frontend/src/i18n/zh-TW.js

@@ -60,7 +60,27 @@ export default {
     'title': '標題',
     'custom': '自定義',
     'select_date': '選擇日期',
-    'calendar_heatmap': '測試日曆'
+    'calendar_heatmap': '測試日曆',
+    'months_1': '一月',
+    'months_2': '二月',
+    'months_3': '三月',
+    'months_4': '四月',
+    'months_5': '五月',
+    'months_6': '六月',
+    'months_7': '七月',
+    'months_8': '八月',
+    'months_9': '九月',
+    'months_10': '十月',
+    'months_11': '十一月',
+    'months_12': '十二月',
+    'weeks_0': '周日',
+    'weeks_1': '周一',
+    'weeks_2': '周二',
+    'weeks_3': '周三',
+    'weeks_4': '周四',
+    'weeks_5': '周五',
+    'weeks_6': '周六',
+    'test_unit': '測試',
   },
   workspace: {
     'create': '創建工作空間',