From 0b3aa6abc1089f2d70aeb7cbdd3025da369188f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 21 Jul 2022 12:30:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DictSelect/index.vue           | 101 ++++++++++++++++++
 src/components/DictTag/index.vue              |  60 +++++++++++
 src/main.js                                   |   6 +-
 .../xmTestPlanCase/XmTestPlanCaseEdit.vue     |  40 +++----
 4 files changed, 181 insertions(+), 26 deletions(-)
 create mode 100644 src/components/DictSelect/index.vue
 create mode 100644 src/components/DictTag/index.vue

diff --git a/src/components/DictSelect/index.vue b/src/components/DictSelect/index.vue
new file mode 100644
index 00000000..f12f12b0
--- /dev/null
+++ b/src/components/DictSelect/index.vue
@@ -0,0 +1,101 @@
+<template>   
+    <el-select class="my-select" v-model="myVal" @change="onChange" :clearable="clearable">
+        <slot>
+            <el-option :style="styleObj" v-for="(item,index) in dict" :key="index" :value="item.id" :label="item.name"> 
+             <slot :item="item" :dict="dict"> 
+                    <span :style="{backgroundColor:getMyColor(item),color:'aliceblue'}" class="padding">  
+                            <i  v-if="item.icon||getIcon" :class="getMyIcon(item)" ></i> 
+                        {{item.name}}
+                    </span>  
+                    <i v-if="myVal==item.id" class="el-icon-check"></i> 
+                    <i v-else>&nbsp;&nbsp;</i> 
+             </slot>
+            </el-option>
+        </slot>
+    </el-select> 
+  </template>
+  
+  <script>  
+  export default {
+    name: 'dict-select',
+    components: {   },
+    computed: {
+       
+    },
+    data(){
+        return {
+            myVal:'',
+        }
+    },
+    watch:{ 
+        value:{ 
+          deep:true,
+          handler(){
+             this.initData();
+          }
+           
+        }, 
+        myVal(){
+            this.$emit('input',this.myVal)
+        }
+    },
+    props: {
+        clearable:{
+            type:Boolean,
+            default:false,
+        },
+      dict:{
+        type:Array,
+        default:function(){return []}
+      },
+      value: {
+        
+      },  
+      getIcon:{
+         type:Function 
+      },
+      getColor:{
+        type:Function 
+      } ,
+      styleObj:{
+          type:Object,
+          default:function(){return { marginTop:'5px' }}
+      }, 
+    },
+    methods: { 
+        
+        initData(){
+             this.myVal=this.value
+            
+        },
+        getMyColor(item){
+            if(this.getColor){
+                return this.getColor(item.id)
+            }
+            if(item.color){
+                return item.color
+            }
+            return ""
+        },
+        getMyIcon(item){
+            if(this.getIcon){
+                return this.getIcon(item.id)
+            }
+            if(item.icon){
+                return item.icon
+            }
+            return "";
+        },
+        onChange(data){ 
+            this.$emit('change',data)
+        }
+    },
+    mounted(){
+        this.initData();
+    }
+  }
+  </script>
+  
+  <style rel="stylesheet/scss" lang="scss" scoped> 
+  </style>
+  
\ No newline at end of file
diff --git a/src/components/DictTag/index.vue b/src/components/DictTag/index.vue
new file mode 100644
index 00000000..b21bf9ad
--- /dev/null
+++ b/src/components/DictTag/index.vue
@@ -0,0 +1,60 @@
+<template>    
+    <el-tag v-if="currentItem"  :type="currentItem.className" :closable="closable">{{currentItem.name}}</el-tag>
+  </template>
+  
+  <script>  
+  export default {
+    name: 'dict-tag',
+    components: {   },
+    computed: {
+       currentItem(){
+        if(this.dict){
+           return this.dict.find(k=>k.id==this.myVal)
+        }else{
+            return null;
+        }
+       }
+    },
+    data(){
+        return {
+            myVal:'', 
+        }
+    },
+    watch:{ 
+        value:{ 
+          deep:true,
+          handler(){
+             this.initData();
+          }
+           
+        },  
+    },
+    props: {
+        closable:{
+            type:Boolean,
+            default:false,
+        },
+      dict:{
+        type:Array,
+        default:function(){return []}
+      },
+      value: {
+        
+      },   
+    },
+    methods: { 
+        
+        initData(){
+             this.myVal=this.value
+            
+        }, 
+    },
+    mounted(){
+        this.initData();
+    }
+  }
+  </script>
+  
+  <style rel="stylesheet/scss" lang="scss" scoped> 
+  </style>
+  
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index a2c62b7b..dff3464e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -24,10 +24,14 @@ Vue.use(VueQriously)
 
 
 import DateRange from '@/components/dateRange/index'
+import DictSelect from '@/components/DictSelect/index'
+import DictTag from '@/components/DictTag/index'
 
 Vue.prototype.$echarts = echarts
 Vue.use(Print); //注册
-Vue.component('date-range',DateRange)
+Vue.component('date-range',DateRange) 
+Vue.component('dict-select',DictSelect)
+Vue.component('dict-tag',DictTag)
 Vue.use(Element, {
   size: 'small', // set element-ui default size
   i18n: (key, value) => i18n.t(key, value)
diff --git a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue
index 8fe06ad1..7c7bb9b7 100644
--- a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue
+++ b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue
@@ -15,15 +15,15 @@
 						<el-col :span="8" class="field-box"> 
 							<el-avatar class="avater"> {{editForm.execUsername}} </el-avatar> 
 							<div class="msg">
-								<span class="title">{{editForm.execUsername}} </span>
-								<span class="sub-title">执行人</span>
+								<span class="field-value">{{editForm.execUsername}} </span>
+								<span class="field-label">执行人</span>
 							</div>   
 						</el-col> 
 						<el-col :span="8" class="field-box"> 
 							<el-avatar class="avater" icon="el-icon-top" :style="{backgroundColor:getColor(editForm.priority)}"></el-avatar> 
 							<div class="msg">
-								<span class="title">{{formatDicts(dicts,'priority',editForm.priority)}} </span>
-								<span class="sub-title">优先级</span>
+								<span class="field-value">{{formatDicts(dicts,'priority',editForm.priority)}} </span>
+								<span class="field-label">优先级</span>
 							</div>   
 							<el-select class="my-select" v-model="editForm.priority" @change="editSomeFields(editForm,'priority',$event)" clearable>
 								<el-option style="margin-top:5px;" v-for="(item,index) in dicts['priority']" :key="index" :value="item.id" :label="item.name">
@@ -40,8 +40,8 @@
   								<el-button size="medium " :type="getType(editForm.execStatus)" :icon="getExecStatusIcon(editForm.execStatus)" circle></el-button>
 							</div>
 							<div class="msg">
-								<span class="title">{{formatDicts(dicts,'testStepTcode',editForm.execStatus)}} </span>
-								<span class="sub-title">执行结果</span>
+								<span class="field-value">{{formatDicts(dicts,'testStepTcode',editForm.execStatus)}} </span>
+								<span class="field-label">执行结果</span>
 							</div>   
 						</el-col> 
 					</el-row>
@@ -55,8 +55,7 @@
 									用例状态
 								</el-row>
 								<el-row>
-									<el-tag class="cell-text" v-for="(item,index) in formatDictsWithClass(dicts,'testCaseStatus',editForm.caseStatus)" :key="index" :type="item.className">{{item.name}}</el-tag>
-                                 
+                                 	 <dict-tag class="cell-text" :dict="dicts['testCaseStatus']" v-model="editForm.caseStatus"></dict-tag>
 								</el-row>
 							</el-col>
 							<el-col :span="6">
@@ -73,7 +72,7 @@
 									用例类型
 								</el-row>
 								<el-row>
-									<el-tag  v-for="(item,index) in formatDictsWithClass(dicts,'caseType',editForm.caseType)" :key="index" :type="item.className">{{item.name}}</el-tag>
+									<dict-tag  :dict="dicts['caseType']" v-model="editForm.caseType"></dict-tag>
 
 								</el-row>
 							</el-col>
@@ -156,19 +155,10 @@
 					<el-button size="medium " :type="getType(editForm.execStatus)" :icon="getExecStatusIcon(editForm.execStatus)" circle></el-button>
 				</div>
 				<div class="msg">
-					<span class="title">{{formatDicts(dicts,'testStepTcode',editForm.execStatus)}} </span> 
+					<span class="field-value">{{formatDicts(dicts,'testStepTcode',editForm.execStatus)}} </span> 
 				</div> 
-				<el-select class="my-select" v-model="editForm.execStatus" @change="editSomeFields(editForm,'execStatus',$event)">
-					<el-option style="margin-top:5px;" v-for="(item,index) in dicts['testStepTcode']" :key="index" :value="item.id" :label="item.name"> 
-						
-						<span :style="{backgroundColor:item.color,color:'aliceblue'}" class="padding"> 
-							<i  :class="getExecStatusIcon(item.id)"></i>
-							{{item.name}}
-						</span> 
-						<i v-if="editForm.execStatus==item.id" class="el-icon-check"></i> 
-						<i v-else>&nbsp;&nbsp;</i>
-					</el-option>
-				</el-select>   
+				<dict-select class="my-select" v-model="editForm.execStatus" :dict="dicts['testStepTcode']" @change="editSomeFields(editForm,'execStatus',$event)"> 
+				</dict-select>   
 				<el-button style="margin-left:10px;" @click="$emit('next')">下一条</el-button>
 			</el-col> 
 			
@@ -185,7 +175,7 @@
 		
 		<!--新增 XmQuestion xm_question界面-->
 		<el-dialog title="新增缺陷"  :visible.sync="addBugVisible"   width="90%" top="20px"  append-to-body   :close-on-click-modal="false">
-			<xm-question-add   :xm-product="{id:editForm.productId,productName:editForm.productName}" :xm-test-plan-case="editForm" :qtype="qtype" :sel-project=" {id:editForm.projectId,name:editForm.projectName} "  :visible="addBugVisible" @cancel="addBugVisible=false" ></xm-question-add>
+			<xm-question-add   :xm-product="{id:editForm.productId,productName:editForm.productName}" :xm-test-plan-case="editForm"  :sel-project=" {id:editForm.projectId,name:editForm.projectName} "  :visible="addBugVisible" @cancel="addBugVisible=false" ></xm-question-add>
 		</el-dialog>
 	</section>
 </template>
@@ -237,10 +227,10 @@ import  XmQuestionMng from '@/views/xm/core/xmQuestion/XmQuestionMng';//修改
 					]
 				},
 				editForm: {
-					bugs:'',execUserid:'',caseId:'',ltime:'',ctime:'',execStatus:'',execUsername:'',planId:'',caseName:'',priority:'',remark:'',testStep:''
+					bugs:'',execUserid:'',caseId:'',ltime:'',ctime:'',execStatus:'',execUsername:'',planId:'',caseName:'',priority:'',remark:'',testStep:'',caseType:''
 				},
 				editFormBak: {
-					bugs:'',execUserid:'',caseId:'',ltime:'',ctime:'',execStatus:'',execUsername:'',planId:'',caseName:'',priority:'',remark:'',testStep:''
+					bugs:'',execUserid:'',caseId:'',ltime:'',ctime:'',execStatus:'',execUsername:'',planId:'',caseName:'',priority:'',remark:'',testStep:'',caseType:''
 				},
                 maxTableHeight:300,
 				menuVisible:false,
@@ -367,7 +357,7 @@ import  XmQuestionMng from '@/views/xm/core/xmQuestion/XmQuestionMng';//修改
 			margin-top: 5px;
             font-size: 16px; 
         } 
-		.sub-title{  
+		.field-label{  
 			margin-top: -10px;
 			 font-size: 14px;
 			 color: #C0C4CC;