From d469502c537ceba3717cfcdc34046c02c975dafb 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, 9 Feb 2023 22:58:27 +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/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue | 14 +++++++++-----
 src/views/xm/core/xmQuestion/XmQuestionEdit.vue   | 11 +++++++----
 src/views/xm/core/xmTestPlan/XmTestPlanMng.vue    |  2 +-
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue b/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue
index c68fd3ee..dd7315bd 100644
--- a/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue
+++ b/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue
@@ -1,9 +1,9 @@
 <template>
 	<section class="padding"> 
 		<el-row > 
-			<xm-product-select ref="xmProductSelect1" style="display:inline;" v-if="!xmProduct"   :auto-select="false" :link-project-id="selProject?selProject.id:null" @row-click="onProductSelected"  :iterationId="xmIteration?xmIteration.id:null"  @clear="onProductClearSelect"></xm-product-select> 
+			<xm-product-select ref="xmProductSelect1" style="display:inline;" v-if="!xmProduct || !xmProduct.id"   :auto-select="false" :link-project-id="selProject?selProject.id:null" @row-click="onProductSelected"  :iterationId="xmIteration?xmIteration.id:null"  @clear="onProductClearSelect"></xm-product-select> 
 				
-			<el-input style="width:120px;" v-model="filters.key" placeholder="名称模糊查询"  clearable></el-input>
+			<el-input v-if="xmProduct && xmProduct.id" style="width:10em;" v-model="filters.key" placeholder="名称模糊查询"  clearable></el-input>
 			<el-button icon="el-icon-search" @click="searchXmMenus()"></el-button> 
 			<el-button v-if="showSelect!==false && multi===true" type="primary" @click="selectConfirm()">确认选择</el-button> 
 			</el-row>
@@ -14,7 +14,9 @@
 					</el-table-column> 
 				</template>
 				<el-table-column prop="menuName" label="史诗、特性名称" min-width="150" >
-					<template slot="header">史诗、特性名称 &nbsp;<el-button type="text" @click="unselectRow()">清除选中的行</el-button></template>
+					<template slot="header">史诗、特性名称 
+						<el-input v-if="!xmProduct || !xmProduct.id" style="width:10em;" v-model="filters.key" placeholder="名称模糊查询"  clearable></el-input>
+					</template>
 					<template slot-scope="scope">
 						<div  v-if="scope.row.dclass=='1'" class="icon" style="background-color:  rgb(255, 153, 51);">
 						<i class="el-icon-s-promotion"></i>
@@ -25,8 +27,10 @@
 						<div v-if="scope.row.dclass=='3'" class="icon" style="background-color:  rgb(79, 140, 255);">
 						<i class="el-icon-document"></i>
 						</div>
-						<span>{{scope.row.seqNo}} &nbsp; {{scope.row.menuName}} </span> 
-						<span  
+						<span class="hidden-md-and-down">{{scope.row.seqNo}} &nbsp;</span><span>{{scope.row.menuName}} </span> 
+						<el-button type="text" size="mini" circle plain v-if="editForm&&editForm.menuId==scope.row.menuId" @click.stop="unselectRow()" title="清除选中的行" icon="el-icon-circle-close"></el-button>
+
+						<span  style="float:right;"
 							:style="{borderRadius: '30px',color:scope.row.finishRate >= 100 ? 'green' : 'blue'}" 
 						>
 							{{ (scope.row.finishRate != null ? scope.row.finishRate : 0) + "%" }}
diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
index bb52d668..fc5d6690 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
@@ -80,11 +80,11 @@
 												<mdp-date-x label="结束时间" style="max-width:100%;" value-format="yyyy-MM-dd HH:mm:ss" v-model="editForm.endTime" @change="editXmQuestionSomeFields(editForm,'endTime',$event)"></mdp-date-x>
  									</el-col>
 								</el-row>
-								<el-tabs v-model="activateTabPaneName">
+								<el-tabs v-model="activateTabPaneName" ref="editRef">
 								
-									<el-tab-pane label="缺陷描述" name="12">
+									<el-tab-pane label="缺陷描述" name="12" >
 										<el-form-item label="" prop="description" label-width="0px">  
-												<vue-editor v-if="visible && activateTabPaneName=='12'" class="rich-context" :id="'description_'+editForm.id" :branch-id="userInfo.branchId" v-model="editForm.description"></vue-editor> 
+												<vue-editor :height="maxTableHeight" v-if="visible && activateTabPaneName=='12'" class="rich-context" :id="'description_'+editForm.id" :branch-id="userInfo.branchId" v-model="editForm.description"></vue-editor> 
 										</el-form-item>
 										<el-row style="float:right;" v-if="opType!=='add'">
 												<el-button @click.native="handleCancel">取消</el-button>
@@ -344,6 +344,7 @@
 				funcVisible:false,
 				stepConfigVisible:false,
 				caseVisible:false,
+				maxTableHeight:300,
 				/**end 在上面加自定义属性**/
 			}//end return
 		},//end data
@@ -676,7 +677,9 @@
 			'xm-workload-record':()=>import("../xmWorkload/XmWorkloadRecord"),
 		},
 		mounted() { 
-			this.initData();
+			this.initData(); 
+			this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.editRef.$el)-200;
+
 			initSimpleDicts('all',['bugSeverity','bugSolution','bugStatus','bugType','priority','bugRepRate','bugReason']).then(res=>{
 				if(res.data.tips.isOk){
 					 this.dicts=res.data.data
diff --git a/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue b/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue
index ddfdece2..c0c90414 100644
--- a/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue
+++ b/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue
@@ -26,7 +26,7 @@
 				    <template slot-scope="scope">
 				        <span> <el-link type="primary" @click="goToTestPlanCase(scope.row)"> {{scope.row.name}}</el-link> </span>
                         <span  class="tool-bar"> 
-                         <el-button type="primary" @click="showEdit(scope.row)" icon="el-icon-edit"  circle title="编辑"></el-button> 
+                         <el-button  @click="showEdit(scope.row)" icon="el-icon-edit"  circle title="编辑"></el-button> 
                          </span>
                     </template>
 				</el-table-column>