From e10523a974d731184dcb026f10b3c7ae52190c67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 19 Jul 2022 00:35:22 +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/XmEpicFeatures.vue     | 11 +++++------
 .../xm/core/xmMenu/XmEpicFeaturesSelect.vue     | 17 +++++++++--------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/views/xm/core/xmMenu/XmEpicFeatures.vue b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
index aed67e2b..26c8d4d8 100644
--- a/src/views/xm/core/xmMenu/XmEpicFeatures.vue
+++ b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
@@ -4,11 +4,9 @@
 			<el-col :span="24">
 					<el-row >
 						
-						<span style="float:left;">
- 						
-						<el-input style="width:120px;" v-model="filters.key" placeholder="名称模糊查询"  clearable></el-input>
-						<el-button icon="el-icon-search" @click="searchXmMenus()"></el-button> 
-						<el-popover style="padding-left:10px;"
+						<span style="float:left;"> 
+						<el-input style="width:60%;" v-model="filters.key" placeholder="名称 按回车"  clearable @keyup.enter.native="searchXmMenus()"></el-input>
+ 						<el-popover style="padding-left:10px;"
 							placement="top-start"
 							width="250"
 							trigger="click" >
@@ -90,7 +88,8 @@
 								<el-table-column sortable type="selection" width="40"></el-table-column> 
 							</template>
 							
-							<el-table-column prop="menuName" label="史诗、特性名称" min-width="150" >
+							<el-table-column prop="menuName" label="史诗、特性名称" min-width="150" > 
+								<template slot="header">史诗、特性名称 &nbsp;<el-button type="text" @click="unselectRow()">清除选中的行</el-button></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>
diff --git a/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue b/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue
index bc448f87..6163a4fd 100644
--- a/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue
+++ b/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue
@@ -17,6 +17,7 @@
 								</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-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>
@@ -338,19 +339,19 @@
 				return params;
 			},
 
-			rowClick: function(row, event, column){
-				if(this.editForm && row.menuId===this.editForm.menuId){
-					this.editForm=null;
-					this.$emit('row-click',null)
-					this.$refs.table.setCurrentRow(); 
-					return;
-				}  
+			rowClick: function(row, event, column){ 
 				this.editForm=row 
 				this.$emit('row-click',row, event, column);//  @row-click="rowClick"
       		},
 			selectConfirm(){
 				this.$emit('menus-selected',this.sels)
-			}
+			},
+			
+			unselectRow(){
+				this.editForm=null;
+				this.$emit('row-click',null)
+				this.$refs.table.setCurrentRow(); 
+			},
 		},//end methods
 		components: { 
 			XmProductSelect,