Merge branch 'kewei' into 'master'

pipeline展示栏增加了自动部署和命名空间的展示



See merge request !24

src/views/pipeline/application.vue

@@ -32,6 +32,12 @@
 
       <el-table-column prop="new_user" label="创建者" align="center"/>
       <el-table-column prop="update_user" label="更新者" align="center"/>
+      <el-table-column prop="isDeploy" label="自动部署" align="center">
+        <template slot-scope="scope">
+          {{ scope.row.isDeploy | formatDeploy }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="namespace" label="命名空间" align="center"/>
       <el-table-column prop="create_time" label="创建时间" align="center"/>
       <el-table-column :label="$t('table.actions')" align="center" width="180" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -73,14 +79,14 @@
         <el-form-item v-if="temp.noticeType === 'dingding'" label="通知地址">
           <el-input :autosize="{ minRows: 3, maxRows: 4}" v-model="temp.noticeAddress" type="textarea" placeholder="Please input"/>
         </el-form-item>
-        <el-form-item label="是否部署到容器" label-width="120">
+        <el-form-item label="是否部署到容器" label-width="120px !important">
           <el-switch
             v-model="temp.isDeploy"
             inactive-color="#efefef"
             active-color="#13ce66"
           />
         </el-form-item>
-        <el-form-item v-if="temp.isDeploy" label="namespace" prop="namespace" >
+        <el-form-item v-if="temp.isDeploy" label="命名空间" prop="namespace" >
           <el-input v-model="temp.namespace"/>
         </el-form-item>
       </el-form>
@@ -118,6 +124,9 @@ export default {
     replaceeRef(ref) {
       return ref ? ref.replace('refs/heads/', '') : ''
     },
+    formatDeploy(ref) {
+      return ref ? '是' : '否'
+    },
     formatDate(date, pattern = 'YYYY-MM-DD HH:mm:ss') {
       return moment(date).format(pattern)
     }