Explorar el Código

fix: can set commit related type to no type

claws hace 4 años
padre
commit
033d2b16a0
Se han modificado 1 ficheros con 18 adiciones y 21 borrados
  1. 18 21
      src/views/Project/CommitDetails.vue

+ 18 - 21
src/views/Project/CommitDetails.vue

@@ -19,28 +19,22 @@
       </el-link>
       <div class="description-card-text">
         <el-row style="height: 25px; line-height: 25px">
-          <el-col :span="1">
+          <el-col :span="2">
             <b>类型:</b>
           </el-col>
-          <el-col :span="23">
+          <el-col :span="22">
             <span v-if="!typeEditMode">
-              <el-tag v-if="commitInfo.relatedType === 'bug_id'" class="type-line" color="chocolate" size="medium">缺陷</el-tag>
-              <el-tag v-else-if="commitInfo.relatedType === 'none'" class="type-line" color="#ccc" size="medium">无类型</el-tag>
-              <el-tag v-else class="type-line" color="#42b983" size="medium">需求</el-tag>
+              <el-tag v-if="commitInfo.relatedType === 'bug_id'" class="type-line type-tag" color="chocolate" size="medium">缺陷</el-tag>
+              <el-tag v-else-if="commitInfo.relatedType === 'none'" class="type-line type-tag" color="#ccc" size="medium">无类型</el-tag>
+              <el-tag v-else class="type-line type-tag" color="#42b983" size="medium">需求</el-tag>
               <span v-if="commitInfo.relatedType !== 'none'" class="type-line">关联节点ID: {{commitInfo.relatedId}}</span>
               <el-button type="primary" size="mini" class="type-line" @click="typeEditMode = true">修改关联</el-button>
             </span>
             <span v-if="typeEditMode">
               <el-radio v-model="relatedTypeEdit" label="TREE_ID" size="large">需求</el-radio>
               <el-radio v-model="relatedTypeEdit" label="BUG_ID" size="large">缺陷</el-radio>
-    <!--          <el-input-->
-    <!--            v-model="relatedIdEdit"-->
-    <!--            class="w-50 m-2 type-line"-->
-    <!--            style="width: 100px"-->
-    <!--            size="small"-->
-    <!--            placeholder="关联ID"-->
-    <!--          />-->
-              <el-select v-model="relatedIdEdit" class="m-2 type-line" size="small" placeholder="Select">
+              <el-radio v-model="relatedTypeEdit" label="NONE" size="large">空</el-radio>
+              <el-select v-if="relatedTypeEdit!='NONE'" v-model="relatedIdEdit" class="m-2 type-line" size="small" placeholder="Select">
                 <el-option
                   v-for="item in (relatedTypeEdit === 'TREE_ID'?treeList:bugList)"
                   :key="item.id"
@@ -56,40 +50,40 @@
       </div>
       <div class="description-card-text">
         <el-row>
-          <el-col :span="1">
+          <el-col :span="2">
             <b>信息:</b>
           </el-col>
-          <el-col :span="23">
+          <el-col :span="22">
             <span>{{ commitInfo.message }}</span>
           </el-col>
         </el-row>
       </div>
       <div class="description-card-text">
         <el-row>
-          <el-col :span="1">
+          <el-col :span="2">
             <b>时间:</b>
           </el-col>
-          <el-col :span="23">
+          <el-col :span="22">
             <span>{{ commitInfo.timestamp }}</span>
           </el-col>
         </el-row>
       </div>
       <div class="description-card-text">
         <el-row>
-          <el-col :span="1">
+          <el-col :span="2">
             <b>提交人:</b>
           </el-col>
-          <el-col :span="23">
+          <el-col :span="22">
             <span>{{ commitInfo.gitlabUsername }}</span>
           </el-col>
         </el-row>
       </div>
       <div class="description-card-text">
         <el-row style="height: 35px; line-height: 35px">
-          <el-col :span="1">
+          <el-col :span="2">
             <b>parent:</b>
           </el-col>
-          <el-col :span="23">
+          <el-col :span="22">
             <el-tag v-for="(parent, index) in commitInfo.parents"
                         :key="index"
                         @click="onParentTagClick(parent)"
@@ -326,6 +320,9 @@ export default {
 .type-line{
   margin: 0;
   margin-right: 20px;
+  /*color: #ffffff;*/
+}
+.type-tag{
   color: #ffffff;
 }
 </style>