From 4f39e2597fe277436618f2fddf22d8ec77fc8bb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=99=8C?= <xiaomo.drip@gmail.com>
Date: Fri, 21 Jul 2023 17:13:44 +0800
Subject: [PATCH] no message

---
 src/components/xFilterBar/index.vue     | 14 ++++++++++++--
 src/components/xForm/item.vue           |  7 +------
 src/components/xTable/columnItem.vue    | 10 ++++++++++
 src/components/xTable/columnSetting.vue |  4 ++--
 src/views/system/table/index.vue        |  2 +-
 5 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/components/xFilterBar/index.vue b/src/components/xFilterBar/index.vue
index 443015a..9184505 100644
--- a/src/components/xFilterBar/index.vue
+++ b/src/components/xFilterBar/index.vue
@@ -4,10 +4,10 @@
 <template>
 	<slot :filterLength="filterObjLength" :openFilter="openFilter">
 		<el-badge :value="filterObjLength" type="danger" :hidden="filterObjLength<=0">
-			<el-button icon="el-icon-filter" @click="openFilter"></el-button>
+			<el-button icon="el-icon-filter" @click="openFilter" v-if="filtermoreLength"></el-button>
 		</el-badge>
 		<div class="right-panel-search" v-if="filter.length>0">
-			<el-form :inline="true" :model="data">
+			<el-form ref="form" :inline="true" :model="data" @submit.prevent="ok">
 				<el-form-item :style="{ 'margin-bottom': '0px', 'margin-right': '6px', 'width': getWidth(i) }" v-for="(i,index) in fieldTop" :key="index">
 					<x-item  :item="i" v-model="data"></x-item>
 				</el-form-item>
@@ -96,6 +96,7 @@
 				defaultValue: Object.assign({}, this.modelValue),
 				defaultField: [].concat(this.options),
 				filterObjLength: 0,
+				filtermoreLength: 0,
 				saveLoading: false,
 				data: this.modelValue,
 				optionsList: [],
@@ -131,12 +132,21 @@
 		  	}
 		},
 		mounted(){
+
+
 			//默认显示的过滤项
 			this.fields.forEach((item) => {
+
+
 				if(item.selected){
+					item.options.placeholder = item.options.placeholder ? item.options.placeholder : item.label;
+					item.options.clearable = true;
 					this.fieldTop.push(item)
 					item.value = item.name;
 					this.filter.push(item)
+				}else{
+
+					this.filtermoreLength++
 				}
 			})
 			this.optionsList = [].concat(this.fields);
diff --git a/src/components/xForm/item.vue b/src/components/xForm/item.vue
index a88493d..4a6a9f7 100644
--- a/src/components/xForm/item.vue
+++ b/src/components/xForm/item.vue
@@ -12,12 +12,7 @@
 	</template>
 	<!-- checkbox -->
 	<template v-else-if="item.component=='checkbox'">
-		<template v-if="item.name" >
-			<el-checkbox v-model="data[item.name][_item.name]" :label="_item.label"  v-for="(_item, _index) in item.options.items" :key="_index"></el-checkbox>
-		</template>
-		<template v-else >
-			<el-checkbox v-model="data[_item.name]" :label="_item.label"  v-for="(_item, _index) in item.options.items" :key="_index"></el-checkbox>
-		</template>
+		<el-checkbox v-model="data[item.name]" :label="_item.value"  v-for="(_item, _index) in item.options.items" :key="_index">{{ _item.label }}</el-checkbox>
 	</template>
 	<!-- radio -->
 	<template v-else-if="item.component=='radio'">
diff --git a/src/components/xTable/columnItem.vue b/src/components/xTable/columnItem.vue
index 6c20777..6c64c94 100644
--- a/src/components/xTable/columnItem.vue
+++ b/src/components/xTable/columnItem.vue
@@ -18,6 +18,16 @@
 		<p v-else-if="item.columntype=='input'">
 			<input class="el-input__inner" type="text" readonly :value="row[item.name]">
 		</p>
+		<p v-else-if="item.columntype=='button' && item.options.items && item.options.items.length>0">
+			<el-button v-for="op in item.options.items" :key="op.value" :type="op.type || 'warning'" style="margin: 0;" :size="op.size || 'small'" :icon="op.icon" v-show="op.value==row[item.name]">
+				{{ op.label }}
+			</el-button>
+		</p>
+		<p v-else-if="item.columntype=='button'">
+			<el-button :type="item.options.type || 'warning'" :size="item.options.size || 'small'" :icon="item.options.icon">
+				{{ row[item.name] }}
+			</el-button>
+		</p>
 		<slot v-else-if="item.columntype=='select'" :name="item.name" v-bind="scope"> 
 			<p style="overflow:hidden; white-space: nowrap; text-overflow: ellipsis; -o-text-overflow:ellipsis;" :title="row[item.name]">
 				{{ getNameByValue( row[item.name],  item.options.items) }}
diff --git a/src/components/xTable/columnSetting.vue b/src/components/xTable/columnSetting.vue
index feb6469..3b71382 100644
--- a/src/components/xTable/columnSetting.vue
+++ b/src/components/xTable/columnSetting.vue
@@ -30,7 +30,7 @@
 						<el-switch v-model="item.sortable"></el-switch>
 					</span>
 					<span class="tabletype">
-						<el-select v-model="item.columntype" size="small" placeholder="选择">
+						<el-select v-model="item.columntype" size="small" :teleported="false" placeholder="选择">
 							<el-option value="" key="" label=""> 请选择 </el-option>
 							<el-option value="avatar" key="avatar" label="用户"> 用户 </el-option>
 							<el-option value="badge" key="badge" label="徽章"> 徽章 </el-option>
@@ -44,7 +44,7 @@
 						</el-select>
 					</span>
 					<span class="tabletype">
-						<el-select v-model="item.component" size="small" placeholder="选择">
+						<el-select v-model="item.component" size="small" :teleported="false" placeholder="选择">
 							<el-option value="" key="" label=""> 请选择 </el-option>
 							<el-option value="input" key="input" label="Input"> Input </el-option>
 							<el-option value="title" key="title" label="标题占位"> 标题占位 </el-option>
diff --git a/src/views/system/table/index.vue b/src/views/system/table/index.vue
index 8c30155..a7e0408 100644
--- a/src/views/system/table/index.vue
+++ b/src/views/system/table/index.vue
@@ -171,7 +171,7 @@
 
 				if(mode=='edit'){
 					if (data) {
-						this.$refs.table.tableData.filter(item => item.id===data.id ).forEach(item => {
+						this.$refs.table.tableData.filter(item => item[this.key]===data[this.key] ).forEach(item => {
 							Object.assign(item, data, data)
 						})
 					}else{