😎调整文件管理页面

Web/src/views/system/file/index.vue

@@ -5,17 +5,17 @@
 				<el-row :gutter="10">
 					<el-col class="mb5" :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
 						<el-form-item label="文件名称" prop="fileName">
-							<el-input v-model="state.queryParams.fileName" placeholder="文件名称" clearable @keyup.enter.native="handleQuery(true)" />
+							<el-input v-model="state.queryParams.fileName" placeholder="文件名称" clearable @keyup.enter.native="handleQuery" />
 						</el-form-item>
 					</el-col>
 					<el-col class="mb5" :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
 						<el-form-item label="开始时间" prop="name">
-							<el-date-picker v-model="state.queryParams.startTime" type="datetime" placeholder="开始时间" value-format="YYYY-MM-DD HH:mm:ss" />
+							<el-date-picker v-model="state.queryParams.startTime" type="datetime" placeholder="开始时间" value-format="YYYY-MM-DD HH:mm:ss" class="w100" />
 						</el-form-item>
 					</el-col>
 					<el-col class="mb5" :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
 						<el-form-item label="结束时间" prop="code">
-							<el-date-picker v-model="state.queryParams.endTime" type="datetime" placeholder="结束时间" value-format="YYYY-MM-DD HH:mm:ss" />
+							<el-date-picker v-model="state.queryParams.endTime" type="datetime" placeholder="结束时间" value-format="YYYY-MM-DD HH:mm:ss" class="w100" />
 						</el-form-item>
 					</el-col>
 				</el-row>
@@ -26,7 +26,7 @@
 			<el-row>
 				<el-col>
 					<el-button-group>
-						<el-button type="primary" icon="ele-Search" @click="handleQuery(true)" v-auth="'sysFile:page'" :loading="options.loading"> 查询 </el-button>
+						<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysFile:page'" :loading="options.loading"> 查询 </el-button>
 						<el-button icon="ele-Refresh" @click="resetQuery" :loading="options.loading"> 重置 </el-button>
 					</el-button-group>
 				</el-col>
@@ -34,7 +34,7 @@
 		</el-card>
 
 		<el-card class="full-table" shadow="hover" style="margin-top: 5px">
-			<vxe-grid ref="xGrid" class="xGrid-style" v-bind="options" @sort-change="sortChange">
+			<vxe-grid ref="xGrid" class="xGrid-style" v-bind="options" v-on="gridEvents">
 				<template #toolbar_buttons>
 					<el-button type="primary" icon="ele-Plus" @click="showUpload" v-auth="'sysFile:uploadFile'"> 上传 </el-button>
 				</template>
@@ -72,15 +72,6 @@
 						<el-button icon="ele-Download" size="small" text type="primary" @click="handleDownload(row)" v-auth="'sysFile:downloadFile'" />
 					</el-tooltip>
 				</template>
-				<template #pager>
-					<vxe-pager
-						:loading="options.loading"
-						v-model:current-page="state.tableParams.page"
-						v-model:page-size="state.tableParams.pageSize"
-						:total="state.tableParams.total"
-						@page-change="pageChange"
-					/>
-				</template>
 			</vxe-grid>
 		</el-card>
 
@@ -133,8 +124,9 @@
 import { onMounted, reactive, ref } from 'vue';
 import { ElMessageBox, ElMessage, UploadInstance } from 'element-plus';
 import { auth } from '/@/utils/authFunction';
-import { VxeGridInstance, VxePagerEvents, VxePagerDefines } from 'vxe-table';
+import { VxeGridInstance, VxeGridListeners, VxeGridPropTypes } from 'vxe-table';
-import { useVxeTable } from '/@/hooks/vxeTableOptionsHook';
+import { useVxeTable } from '/@/hooks/useVxeTableOptionsHook';
+import { Local } from '/@/utils/storage';
 import { downloadByUrl } from '/@/utils/download';
 import VueOfficeDocx from '@vue-office/docx';
 import VueOfficeExcel from '@vue-office/excel';
@@ -146,7 +138,7 @@ import EditFile from '/@/views/system/file/component/editFile.vue';
 
 import { getAPI } from '/@/utils/axios-utils';
 import { SysFileApi } from '/@/api-services/api';
-import { SysFile } from '/@/api-services/models';
+import { SysFile, PageFileInput } from '/@/api-services/models';
 
 const xGrid = ref<VxeGridInstance>();
 // const baseUrl = window.__env__.VITE_API_URL;
@@ -158,13 +150,9 @@ const state = reactive({
 		startTime: undefined,
 		endTime: undefined,
 	},
-	tableParams: {
+	localPageParam: {
-		page: 1,
+		pageSize: 50 as number,
-		pageSize: 50,
+		defaultSort: { field: 'orderNo', order: 'asc', descStr: 'desc' },
-		field: 'id', // 默认的排序字段
-		order: 'aes', // 排序方向
-		descStr: 'desc', // 降序排序的关键字符
-		total: 0 as any,
 	},
 	visible: false,
 	diaglogEditFile: false,
@@ -181,6 +169,8 @@ const state = reactive({
 	previewList: [] as string[],
 });
 
+// 本地存储参数
+const localPageParamKey = 'localPageParam:sysFile';
 // 表格参数配置
 const options = useVxeTable<SysFile>(
 	{
@@ -204,11 +194,20 @@ const options = useVxeTable<SysFile>(
 			{ field: 'remark', title: '备注', minWidth: 200, showOverflow: 'tooltip' },
 			{ title: '操作', fixed: 'right', width: 150, showOverflow: true, slots: { default: 'row_buttons' } },
 		],
-		enableExport: auth('sysFile:export'),
-		searchCallback: () => handleQuery(),
-		queryAllCallback: () => fetchData({ pageSize: 99999 }),
 	},
-	{ rowConfig: { height: 80 } }
+	// vxeGrid配置参数(此处可覆写任何参数)，参考vxe-table官方文档
+	{
+		// 代理配置
+		proxyConfig: { autoLoad: true, ajax: { query: ({ page, sort }) => handleQueryApi(page, sort) } },
+		// 排序配置
+		sortConfig: { defaultSort: Local.get(localPageParamKey)?.defaultSort || state.localPageParam.defaultSort },
+		// 分页配置
+		pagerConfig: { pageSize: Local.get(localPageParamKey)?.pageSize || state.localPageParam.pageSize },
+		// 工具栏配置
+		toolbarConfig: { export: false },
+		// 行设置
+		rowConfig: { height: 80 },
+	}
 );
 
 // 页面初始化
@@ -216,42 +215,23 @@ onMounted(async () => {
 	await handleQuery();
 });
 
-// 查询操作
+// 查询api
-const handleQuery = async (reset = false) => {
+const handleQueryApi = async (page: VxeGridPropTypes.ProxyAjaxQueryPageParams, sort: VxeGridPropTypes.ProxyAjaxQuerySortCheckedParams) => {
-	options.loading = true;
+	const params = Object.assign(state.queryParams, { page: page.currentPage, pageSize: page.pageSize, field: sort.field, order: sort.order, descStr: 'desc' }) as PageFileInput;
-	if (reset) state.tableParams.page = 1;
-	var res = await fetchData(null);
-	xGrid.value?.loadData(res.data.result?.items ?? []);
-	state.tableParams.total = res.data.result?.total;
-	options.loading = false;
-};
-
-// 获取数据
-const fetchData = async (tableParams: any) => {
-	let params = Object.assign(state.queryParams, state.tableParams, tableParams);
 	return getAPI(SysFileApi).apiSysFilePagePost(params);
 };
 
+// 查询操作
+const handleQuery = async () => {
+	await xGrid.value?.commitProxy('query');
+};
+
 // 重置操作
-const resetQuery = () => {
+const resetQuery = async () => {
 	state.queryParams.fileName = undefined;
 	state.queryParams.startTime = undefined;
 	state.queryParams.endTime = undefined;
-	handleQuery(true);
+	await xGrid.value?.commitProxy('reload');
-};
-
-// 改变页码序号或页面容量
-const pageChange: VxePagerEvents.PageChange = ({ currentPage, pageSize }: VxePagerDefines.PageChangeEventParams) => {
-	state.tableParams.page = currentPage;
-	state.tableParams.pageSize = pageSize;
-	handleQuery();
-};
-
-// 列排序
-const sortChange = (options: any) => {
-	state.tableParams.field = options.field;
-	state.tableParams.order = options.order;
-	handleQuery();
 };
 
 // 打开上传页面
@@ -296,6 +276,20 @@ const handleDelete = (row: any) => {
 		.catch(() => {});
 };
 
+// 表格事件
+const gridEvents: VxeGridListeners<SysFile> = {
+	// 只对 pager-config 配置时有效，分页发生改变时会触发该事件
+	async pageChange({ pageSize }) {
+		state.localPageParam.pageSize = pageSize;
+		Local.set(localPageParamKey, state.localPageParam);
+	},
+	// 当排序条件发生变化时会触发该事件
+	async sortChange({ field, order }) {
+		state.localPageParam.defaultSort = { field: field, order: order!, descStr: 'desc' };
+		Local.set(localPageParamKey, state.localPageParam);
+	},
+};
+
 // 打开Pdf预览页面
 const showPreviewDialog = async (row: any) => {
 	if (row.suffix == '.pdf') {

Web/src/views/system/log/difflog/index.vue

@@ -66,7 +66,7 @@ const state = reactive({
 	},
 	localPageParam: {
 		pageSize: 50 as number,
-		defaultSort: { field: 'orderNo', order: 'asc', descStr: 'desc' },
+		defaultSort: { field: 'logDateTime', order: 'asc', descStr: 'desc' },
 	},
 });
 

Web/src/views/system/log/exlog/index.vue

@@ -119,7 +119,7 @@ const state = reactive({
 	},
 	localPageParam: {
 		pageSize: 50 as number,
-		defaultSort: { field: 'orderNo', order: 'asc', descStr: 'desc' },
+		defaultSort: { field: 'logDateTime', order: 'asc', descStr: 'desc' },
 	},
 	visible: false,
 	detail: {

Web/src/views/system/log/oplog/index.vue

@@ -5,12 +5,12 @@
 				<el-row :gutter="10">
 					<el-col class="mb5" :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
 						<el-form-item label="开始时间" prop="name">
-							<el-date-picker v-model="state.queryParams.startTime" type="datetime" placeholder="开始时间" :shortcuts="shortcuts" />
+							<el-date-picker v-model="state.queryParams.startTime" type="datetime" placeholder="开始时间" :shortcuts="shortcuts" class="w100" />
 						</el-form-item>
 					</el-col>
 					<el-col class="mb5" :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
 						<el-form-item label="结束时间" prop="code">
-							<el-date-picker v-model="state.queryParams.endTime" type="datetime" placeholder="结束时间" :shortcuts="shortcuts" />
+							<el-date-picker v-model="state.queryParams.endTime" type="datetime" placeholder="结束时间" :shortcuts="shortcuts" class="w100" />
 						</el-form-item>
 					</el-col>
 					<el-col class="mb5" :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
@@ -119,7 +119,7 @@ const state = reactive({
 	},
 	localPageParam: {
 		pageSize: 50 as number,
-		defaultSort: { field: 'orderNo', order: 'asc', descStr: 'desc' },
+		defaultSort: { field: 'logDateTime', order: 'asc', descStr: 'desc' },
 	},
 	visible: false,
 	detail: {

Web/src/views/system/log/vislog/index.vue

@@ -5,12 +5,12 @@
 				<el-row :gutter="10">
 					<el-col class="mb5" :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
 						<el-form-item label="开始时间" prop="name">
-							<el-date-picker v-model="state.queryParams.startTime" type="datetime" placeholder="开始时间" :shortcuts="shortcuts" />
+							<el-date-picker v-model="state.queryParams.startTime" type="datetime" placeholder="开始时间" :shortcuts="shortcuts" class="w100" />
 						</el-form-item>
 					</el-col>
 					<el-col class="mb5" :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
 						<el-form-item label="结束时间" prop="code">
-							<el-date-picker v-model="state.queryParams.endTime" type="datetime" placeholder="结束时间" :shortcuts="shortcuts" />
+							<el-date-picker v-model="state.queryParams.endTime" type="datetime" placeholder="结束时间" :shortcuts="shortcuts" class="w100" />
 						</el-form-item>
 					</el-col>
 					<el-col class="mb5" :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
@@ -86,7 +86,7 @@ const state = reactive({
 	},
 	localPageParam: {
 		pageSize: 50 as number,
-		defaultSort: { field: 'orderNo', order: 'asc', descStr: 'desc' },
+		defaultSort: { field: 'logDateTime', order: 'asc', descStr: 'desc' },
 	},
 	title: '',
 });