Merge branch 'dev-1.2.0_k8s' into 'develop'

Dev 1.2.0 k8s

See merge request luban/dataspherestudio!237

Author: 万安沛

dss-data-api/dss-data-api-server/src/main/java/com/webank/wedatasphere/dss/data/api/server/dao/impl/ApiConfigMapper.xml

@@ -56,6 +56,6 @@
         <if test="apiName != null and apiName != ''">
             AND a.api_name LIKE concat('%', #{apiName}, '%')
         </if>
-        ORDER BY a.create_by DESC
+        ORDER BY a.update_time DESC
     </select>
 </mapper>

web/src/apps/dataService/i18n/en.json

@@ -51,6 +51,8 @@
         "col_groupName": "GroupName",
         "col_label": "Label",
         "col_createBy": "CreateBy",
+        "col_updateTime": "updateTime",
+        "col_createTime": "createTime",
         "viewMonitor": "View Monitor"
       },
       "apiCall": {

web/src/apps/dataService/i18n/zh.json

@@ -51,6 +51,8 @@
         "col_groupName": "业务流程",
         "col_label": "标签",
         "col_createBy": "负责人",
+        "col_updateTime": "更新时间",
+        "col_createTime": "创建时间",
         "viewMonitor": "查看监控图表"
       },
       "apiCall": {

web/src/apps/dataService/module/dataManagement/apiCall.vue

@@ -94,9 +94,7 @@
         </Form-item>
         <Form-item :label="$t('message.dataService.apiCall.authForm.labelFlow')" prop="groupId">
           <Select filterable v-model="authFormData.groupId" :disabled="!!authFormData.id">
-            <Option v-for="item in groups" :key="item.groupId" :value="`${item.groupId}`">
-              {{ item.groupName}}
-            </Option>
+            <Option v-for="item in groups" :key="item.groupId" :value="`${item.groupId}`">{{ item.groupName}}</Option>
           </Select>
         </Form-item>
       </Form>

web/src/apps/dataService/module/dataManagement/apiMonitor.vue

@@ -195,6 +195,14 @@ export default {
           title: this.$t("message.dataService.apiMonitor.col_createBy"),
           key: 'createBy'
         },
+        {
+          title: this.$t("message.dataService.apiMonitor.col_updateTime"),
+          key: 'updateTime'
+        },
+        {
+          title: this.$t("message.dataService.apiMonitor.col_createTime"),
+          key: 'createTime'
+        },
         {
           title: this.$t("message.dataService.operation"),
           key: "operation",
@@ -540,4 +548,4 @@ export default {
   margin: 15px 0;
   padding: 10px 0;
 }
-</style>
+</style>