From 0fa943544c5ab513395f74229e64105423173c9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=99=8C?= <xiaomo.drip@gmail.com>
Date: Tue, 8 Aug 2023 15:40:11 +0800
Subject: [PATCH] no message

---
 src/components/xTable/columnItem.vue | 31 ++++++++++++++--------------
 src/components/xTable/index.vue      |  7 +++----
 src/views/system/log/index.vue       | 15 ++++++++++++--
 3 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/src/components/xTable/columnItem.vue b/src/components/xTable/columnItem.vue
index b8487d3..64f88a3 100644
--- a/src/components/xTable/columnItem.vue
+++ b/src/components/xTable/columnItem.vue
@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<x-avatar v-if="item.columntype=='avatar' || item.component=='avatar'" :name="item.name" :options="item.options" v-model="row"></x-avatar>
+		<x-avatar v-if="item.columntype=='avatar' || item.component=='avatar'" :name="item.name" :options="item.options"></x-avatar>
 		<el-badge v-else-if="item.columntype=='badge' || item.columntype=='imagegroup'" :value="getType(row[item.name])"  :type="item.options.type || 'warning'"></el-badge>
 		<el-image v-else-if="item.columntype=='image'" :preview-src-list="[getImg(row[item.name])]" :preview-teleported="true" hide-on-click-modal="true" lazy="true" style="max-width: 60px; height: 26px; border-radius: 2px;" fit="cover" :src="getImg(row[item.name])">
 			<template #error>
@@ -39,27 +39,26 @@
 <script>
 
 	export default {
-		name: 'xTablecolumnitem',
+		name: 'XTableColumnItem',
 		props: {
 			item: { type: Object, default: () => {} },
-			modelValue: { type: Array, default: () => [] },
+			row: { type: Object, default: () => {} },
 		},
-		watch: {
+		// watch: {
+		//   modelValue(newValue) {
+		//     this.row = newValue;
+		//   },
+		// },
+		// data() {
+		// 	return {
+		// 		row : this.modelValue,
+		// 	}
+		// },
+		// mounted() {
 
-		},
-		computed: {
-		},
-		data() {
-			return {
-				row : this.modelValue,
-			}
-		},
-		mounted() {
-
-		},
+		// },
 		methods: {
 			handleClick(row, item){
-
 				// 打开编辑层
 				if (item.update && (item.update.url || item.update.name)) {
 					this.$emit('xtableupdate', row, {
diff --git a/src/components/xTable/index.vue b/src/components/xTable/index.vue
index 8b9a1d4..b739c47 100644
--- a/src/components/xTable/index.vue
+++ b/src/components/xTable/index.vue
@@ -8,14 +8,14 @@
 					<el-table-column :align="item.align || 'left'" :label="item.label" v-if="item.column && item.column.length>0">
 					    <el-table-column v-for="(items, indexs) in item.column" :key="indexs" :align="items.align || 'left'" :column-key="items.prop||items.name" :label="items.label" :prop="items.prop||items.name" :width="items.width || 'auto'" :min-width="items.minWidth || 'auto'" :sortable="items.sortable" :fixed="items.fixed" :filters="items.filters" :filter-method="remoteFilter||!items.filters?null:filterHandler" :show-overflow-tooltip="items.showOverflowTooltip">
 					    	<template #default="scope">
-					    		<columnItem v-model="scope.row" :item="items" @xtableupdate="xtableupdate"> </columnItem>
+					    		<columnItem :row="scope.row" :item="items" @xtableupdate="xtableupdate"> </columnItem>
 					    	</template>
 					    </el-table-column>
 					</el-table-column>
 
 					<el-table-column v-else-if="!item.hide && (item.name || item.prop)" :align="item.align || 'left'" :column-key="item.prop||item.name" :label="item.label" :prop="item.prop||item.name" :width="item.width || 'auto'" :min-width="item.minWidth || 'auto'" :sortable="item.sortable" :fixed="item.fixed" :filters="item.filters" :filter-method="remoteFilter||!item.filters?null:filterHandler" :show-overflow-tooltip="item.showOverflowTooltip">
 						<template #default="scope">
-							<columnItem v-model="scope.row" :item="item" @xtableupdate="xtableupdate"> </columnItem>
+							<columnItem :row="scope.row" :item="item" @xtableupdate="xtableupdate"> </columnItem>
 						</template>
 					</el-table-column>
 				</template>
@@ -224,8 +224,7 @@
 					    	this.summary = response.summary || {};
 					    	this.loading = false;
 					    }
-
-					    // this.$refs.xTable.setScrollTop(0)
+					    this.$refs.xTable.setScrollTop(0)
 					    // 回调
 					    this.$emit('dataChange', res, this.tableData)
 					});
diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue
index b619880..5f15bca 100644
--- a/src/views/system/log/index.vue
+++ b/src/views/system/log/index.vue
@@ -21,6 +21,11 @@
 									<span>{{scope.$index+(currentPage - 1) * limit + 1}}</span>
 								</template>
 							</el-table-column>
+							<!-- <el-table-column v-bind="item" v-for="(item, index) in tableColumn" :key="index">
+								<template #default="scope">
+									<columnItem row="scope.row" :item="item"> </columnItem>
+								</template>
+							</el-table-column> -->
 						</xTable>
 					</el-main>
 				</el-container>
@@ -36,11 +41,13 @@
 <script>
 	import info from './info'
 	import xEcharts from '@/components/xEcharts'
+	import columnItem from '@/components/xTable/columnItem'
 
 	export default {
 		name: 'log',
 		components: {
 			info,
+			columnItem,
 			xEcharts
 		},
 		data() {
@@ -90,9 +97,13 @@
 				});
 			},
 			getCurrent(){
-				this.tableColumn = this.config[this.column] || this.config.default;
+				if (Object.keys(this.tableColumn).length==0) {
+					this.tableColumn = this.config[this.column] || this.config.default;
+				}
+				if (!this.api) {
+					this.api = 'log/admin/lists'
+				}
 				this.params = { type: this.current }
-				this.api = 'log/admin/lists'
 				this.$refs.table.reload(this.params)
 			},
 			upsearch(){