From 9f4b1797f93c01b051b01fb2c094a200deb4db4d 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, 10 Mar 2022 23:38:05 +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

---
 .../XmIterationForProjectComplex.vue          |  2 +-
 .../xmProduct/XmProductForProjectComplex.vue  | 32 +++++++++++--------
 .../xm/core/xmProduct/XmProductSelect.vue     |  8 ++++-
 .../xm/core/xmProject/XmProjectComplex.vue    |  2 +-
 4 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue b/src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue
index 3b6f8495..82439d13 100644
--- a/src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue
+++ b/src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue
@@ -8,7 +8,7 @@
 							<el-popover
 								placement="right"
 								width="400"
-								trigger="hover"> 
+								trigger="click"> 
 								<xm-iteration-select :auto-select="true" :sel-project="selProject" :product-id="xmProduct?xmProduct.id:null"  @row-click="onIterationRowClick" @clear-select="onIterationClearSelect"></xm-iteration-select>
  								<el-link type="warning" slot="reference"  icon="el-icon-search"><font style="font-size:14px;">{{xmIteration?xmIteration.iterationName:'选择迭代'}}</font></el-link> 
 							</el-popover> 
diff --git a/src/views/xm/core/xmProduct/XmProductForProjectComplex.vue b/src/views/xm/core/xmProduct/XmProductForProjectComplex.vue
index bd3588b5..348ec1f2 100644
--- a/src/views/xm/core/xmProduct/XmProductForProjectComplex.vue
+++ b/src/views/xm/core/xmProduct/XmProductForProjectComplex.vue
@@ -1,32 +1,36 @@
 <template>
 	<section class="page-container border">
-		<el-row>
-			<el-col :span="productVisible==true?4:0" >
-				<xm-product-select :sel-project="selProject" :xm-iteration="xmIteration"  @row-click="onProductRowClick" @clear-select="onProductClearSelect"></xm-product-select>
-			</el-col>
-			<el-col :span="productVisible==true?20:24" v-show="xmProduct && xmProduct.id">
+		<el-row> 
+			<el-col :span="24" v-show="xmProduct && xmProduct.id">
 				<el-tabs type="border-card"  :value="showPanel"  @tab-click="tabClick">
-					<el-tab-pane disabled>
-						<el-button type="text" v-show="productVisible==true" slot="label" @click.stop="productVisible=false" ><i class="el-icon-d-arrow-left" ></i> 隐藏</el-button>
-						<el-button type="text" v-show="productVisible==false" slot="label" @click.stop="productVisible=true"><i class="el-icon-d-arrow-right" ></i> 展开</el-button>
+					<el-tab-pane disabled> 
+						<div  slot="label">
+							<el-popover
+								placement="right"
+								width="400"
+								trigger="click"> 
+								<xm-product-select :auto-select="true" :sel-project="selProject" :xm-iteration="xmIteration"  @row-click="onProductRowClick" @clear-select="onProductClearSelect"></xm-product-select>
+ 								 <el-link type="warning" slot="reference" @click.stop="showProjectSelect" icon="el-icon-search"><font style="font-size:14px;">{{xmProduct?xmProduct.productName:'选择产品'}}</font></el-link> 
+							</el-popover> 
+						</div>
 					</el-tab-pane>
-					<el-tab-pane label="产品概览"   name="productOverview">
+					<el-tab-pane label="产品概览"   name="productOverview" v-if="xmProduct && xmProduct.id">
 						 <xm-product-overview v-if="xmProduct && showPanel=='productOverview'"  :xm-product="xmProduct" :sel-project="selProject"></xm-product-overview>
 
           			</el-tab-pane>
-					<el-tab-pane label="迭代"   name="iterations" v-if=" !xmIteration" >
+					<el-tab-pane label="迭代"   name="iterations" v-if=" !xmIteration && xmProduct && xmProduct.id" >
 						 <xm-iteration-mng v-if=" xmProduct && showPanel=='iterations' && !xmIteration"   :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"></xm-iteration-mng>
 					</el-tab-pane>
-					<el-tab-pane label="项目" lazy  name="projects" v-if="!selProject">
+					<el-tab-pane label="项目" lazy  name="projects" v-if="!selProject && xmProduct && xmProduct.id">
 						<xm-product-project-for-link v-if="xmProduct && showPanel=='projects'"  :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"></xm-product-project-for-link>
 					</el-tab-pane>
-					<el-tab-pane label="需求" lazy name="menus" >
+					<el-tab-pane label="需求" lazy name="menus" v-if="xmProduct && xmProduct.id">
 						<xm-menu-mng v-if="xmProduct && showPanel=='menus'"   :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"  :disabled-mng="false"></xm-menu-mng>
 					</el-tab-pane>
-					<el-tab-pane label="任务" lazy name="tasks" >
+					<el-tab-pane label="任务" lazy name="tasks" v-if="xmProduct && xmProduct.id">
 						<xm-task-mng v-if="xmProduct && showPanel=='tasks'"  :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"></xm-task-mng>
 					</el-tab-pane>
-					<el-tab-pane label="缺陷" lazy name="bugs" >
+					<el-tab-pane label="缺陷" lazy name="bugs" v-if="xmProduct && xmProduct.id">
 						<xm-question-mng v-if="xmProduct && showPanel=='bugs'"  :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"></xm-question-mng>
 					</el-tab-pane>
 				</el-tabs>
diff --git a/src/views/xm/core/xmProduct/XmProductSelect.vue b/src/views/xm/core/xmProduct/XmProductSelect.vue
index f178761f..32bf7e63 100644
--- a/src/views/xm/core/xmProduct/XmProductSelect.vue
+++ b/src/views/xm/core/xmProduct/XmProductSelect.vue
@@ -99,7 +99,7 @@
 
 	
 	export default { 
-		props:['isSelectProduct','selProject','xmIteration'],
+		props:['isSelectProduct','selProject','xmIteration','autoSelect'],
 		computed: {
 		    ...mapGetters([
 		      'userInfo','roles'
@@ -244,6 +244,12 @@
 						this.pageInfo.total = res.data.total;
 						this.pageInfo.count=false;
 						this.xmProducts = res.data.data;
+						
+						if(this.autoSelect===true&&this.xmProducts.length>0){ 
+							var row=this.xmProducts[0];
+							this.$refs.table.setCurrentRow(row);
+							this.rowClick(row);
+						}
 					}else{
 						this.$notify({showClose: true, message: tips.msg, type: 'error' });
 					} 
diff --git a/src/views/xm/core/xmProject/XmProjectComplex.vue b/src/views/xm/core/xmProject/XmProjectComplex.vue
index c2689c17..3db5161e 100644
--- a/src/views/xm/core/xmProject/XmProjectComplex.vue
+++ b/src/views/xm/core/xmProject/XmProjectComplex.vue
@@ -8,7 +8,7 @@
 							<el-popover
 								placement="right"
 								width="400"
-								trigger="hover"> 
+								trigger="click"> 
 								<xm-project-select :auto-select="true"  :xm-iteration="xmIteration" :xm-product="xmProduct"  @row-click="onProjectRowClick" @clear-select="onProjectClearSelect"></xm-project-select>
  								 <el-link type="warning" slot="reference" @click.stop="showProjectSelect" icon="el-icon-search"><font style="font-size:14px;">{{selProject?selProject.name:'选择项目'}}</font></el-link> 
 							</el-popover>