From 9ca83ba733da2e0f477b1d4938da9ee79fde8dc2 Mon Sep 17 00:00:00 2001
From: xuyuxiang <xuyuxiang29@foxmail.com>
Date: Wed, 17 Sep 2025 11:58:55 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E7=BB=A7?=
 =?UTF-8?q?=E7=BB=AD=E4=BC=98=E5=8C=96=E5=85=B6=E4=BB=96=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=9C=A8=E5=B0=8F=E5=B1=8F=E5=B9=95=E4=B8=8B=E7=9A=84=E8=A1=A8?=
 =?UTF-8?q?=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Selector/orgSelectorPlus.vue   |   4 +-
 .../components/Selector/posSelectorPlus.vue   |   4 +-
 .../components/Selector/roleSelectorPlus.vue  |   4 +-
 .../components/Selector/userSelectorPlus.vue  |   4 +-
 .../src/components/XnGroupSelector/index.vue  |   2 +-
 .../src/components/XnOrgSelector/index.vue    |   2 +-
 .../components/XnPositionSelector/index.vue   |   2 +-
 .../src/components/XnRoleSelector/index.vue   |   6 +-
 .../src/components/XnUserSelector/index.vue   |   2 +-
 .../src/views/auth/third/index.vue            |  29 +-
 snowy-admin-web/src/views/biz/dict/index.vue  |  66 +++--
 .../src/views/biz/notice/index.vue            |   2 +-
 snowy-admin-web/src/views/biz/org/index.vue   |   2 +-
 .../src/views/biz/position/index.vue          |   2 +-
 snowy-admin-web/src/views/biz/user/index.vue  |   4 +-
 .../src/views/client/user/index.vue           |   4 +-
 .../src/views/dev/config/sysConfig.vue        | 267 +++++++++---------
 .../src/views/dev/dict/category/index.vue     | 139 +++++----
 snowy-admin-web/src/views/dev/email/index.vue |  44 +--
 snowy-admin-web/src/views/dev/file/index.vue  |  44 +--
 snowy-admin-web/src/views/dev/job/index.vue   |   2 +-
 .../src/views/dev/log/oplog/index.vue         |   2 +-
 .../src/views/dev/log/vislog/index.vue        |   2 +-
 .../src/views/dev/message/index.vue           |  43 +--
 snowy-admin-web/src/views/dev/push/index.vue  |  45 +--
 .../src/views/dev/slideshow/index.vue         |   2 +-
 snowy-admin-web/src/views/dev/sms/index.vue   |  45 +--
 .../src/views/mobile/resource/menu/index.vue  |   2 +-
 .../views/mobile/resource/module/index.vue    |   2 +-
 snowy-admin-web/src/views/sys/group/index.vue |  14 +-
 snowy-admin-web/src/views/sys/org/index.vue   |   2 +-
 .../src/views/sys/position/index.vue          |   2 +-
 .../src/views/sys/resource/menu/form.vue      |  22 +-
 .../src/views/sys/resource/menu/index.vue     |  49 ++--
 .../src/views/sys/resource/module/index.vue   |  29 +-
 snowy-admin-web/src/views/sys/role/index.vue  |  83 ++++--
 snowy-admin-web/src/views/sys/user/index.vue  |   4 +-
 37 files changed, 570 insertions(+), 413 deletions(-)

diff --git a/snowy-admin-web/src/components/Selector/orgSelectorPlus.vue b/snowy-admin-web/src/components/Selector/orgSelectorPlus.vue
index fb512cfc..5ae521b1 100644
--- a/snowy-admin-web/src/components/Selector/orgSelectorPlus.vue
+++ b/snowy-admin-web/src/components/Selector/orgSelectorPlus.vue
@@ -23,7 +23,7 @@
 			</a-col>
 			<a-col :span="11">
 				<div class="table-operator xn-mb10">
-					<a-form ref="searchFormRef" name="advanced_search" class="ant-advanced-search-form" :model="searchFormState">
+					<a-form ref="searchFormRef" :model="searchFormState">
 						<a-row :gutter="24">
 							<a-col :span="12">
 								<a-form-item name="searchKey">
@@ -32,7 +32,7 @@
 							</a-col>
 							<a-col :span="12">
 								<a-button type="primary" class="primarySele" @click="loadData()"> 查询 </a-button>
-								<a-button class="snowy-button-left" @click="() => reset()"> 重置 </a-button>
+								<a-button @click="() => reset()"> 重置 </a-button>
 							</a-col>
 						</a-row>
 					</a-form>
diff --git a/snowy-admin-web/src/components/Selector/posSelectorPlus.vue b/snowy-admin-web/src/components/Selector/posSelectorPlus.vue
index 8a695e52..3b46f276 100644
--- a/snowy-admin-web/src/components/Selector/posSelectorPlus.vue
+++ b/snowy-admin-web/src/components/Selector/posSelectorPlus.vue
@@ -23,7 +23,7 @@
 			</a-col>
 			<a-col :span="11">
 				<div class="table-operator xn-mb10">
-					<a-form ref="searchFormRef" name="advanced_search" class="ant-advanced-search-form" :model="searchFormState">
+					<a-form ref="searchFormRef" :model="searchFormState">
 						<a-row :gutter="24">
 							<a-col :span="12">
 								<a-form-item name="searchKey">
@@ -32,7 +32,7 @@
 							</a-col>
 							<a-col :span="12">
 								<a-button type="primary" class="primarySele" @click="loadData()"> 查询 </a-button>
-								<a-button class="snowy-button-left" @click="() => reset()"> 重置 </a-button>
+								<a-button @click="() => reset()"> 重置 </a-button>
 							</a-col>
 						</a-row>
 					</a-form>
diff --git a/snowy-admin-web/src/components/Selector/roleSelectorPlus.vue b/snowy-admin-web/src/components/Selector/roleSelectorPlus.vue
index 31d5c25d..5d7e658a 100644
--- a/snowy-admin-web/src/components/Selector/roleSelectorPlus.vue
+++ b/snowy-admin-web/src/components/Selector/roleSelectorPlus.vue
@@ -23,7 +23,7 @@
 			</a-col>
 			<a-col :span="11">
 				<div class="table-operator xn-mb10">
-					<a-form ref="searchFormRef" name="advanced_search" class="ant-advanced-search-form" :model="searchFormState">
+					<a-form ref="searchFormRef" :model="searchFormState">
 						<a-row :gutter="24">
 							<a-col :span="12">
 								<a-form-item name="searchKey">
@@ -32,7 +32,7 @@
 							</a-col>
 							<a-col :span="12">
 								<a-button type="primary" class="primarySele" @click="loadData()"> 查询 </a-button>
-								<a-button class="snowy-button-left" @click="() => reset()"> 重置 </a-button>
+								<a-button @click="() => reset()"> 重置 </a-button>
 							</a-col>
 						</a-row>
 					</a-form>
diff --git a/snowy-admin-web/src/components/Selector/userSelectorPlus.vue b/snowy-admin-web/src/components/Selector/userSelectorPlus.vue
index a000738c..0c68368d 100644
--- a/snowy-admin-web/src/components/Selector/userSelectorPlus.vue
+++ b/snowy-admin-web/src/components/Selector/userSelectorPlus.vue
@@ -23,7 +23,7 @@
 			</a-col>
 			<a-col :span="11">
 				<div class="table-operator xn-mb10">
-					<a-form ref="searchFormRef" name="advanced_search" class="ant-advanced-search-form" :model="searchFormState">
+					<a-form ref="searchFormRef" :model="searchFormState">
 						<a-row :gutter="24">
 							<a-col :span="12">
 								<a-form-item name="searchKey">
@@ -32,7 +32,7 @@
 							</a-col>
 							<a-col :span="12">
 								<a-button type="primary" class="primarySele" @click="loadData()"> 查询 </a-button>
-								<a-button class="snowy-button-left" @click="reset()"> 重置 </a-button>
+								<a-button @click="reset()"> 重置 </a-button>
 							</a-col>
 						</a-row>
 					</a-form>
diff --git a/snowy-admin-web/src/components/XnGroupSelector/index.vue b/snowy-admin-web/src/components/XnGroupSelector/index.vue
index 4c230f5e..5fb63fa8 100644
--- a/snowy-admin-web/src/components/XnGroupSelector/index.vue
+++ b/snowy-admin-web/src/components/XnGroupSelector/index.vue
@@ -28,7 +28,7 @@
 		<a-row :gutter="10">
 			<a-col :xs="24" :sm="24" :md="24" :lg="14" :xl="14">
 				<div class="table-operator xn-mb10">
-					<a-form ref="searchFormRef" name="advanced_search" class="ant-advanced-search-form" :model="searchFormState">
+					<a-form ref="searchFormRef" :model="searchFormState">
 						<a-row :gutter="24">
 							<a-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
 								<a-form-item name="searchKey">
diff --git a/snowy-admin-web/src/components/XnOrgSelector/index.vue b/snowy-admin-web/src/components/XnOrgSelector/index.vue
index 32b4e566..084146b0 100644
--- a/snowy-admin-web/src/components/XnOrgSelector/index.vue
+++ b/snowy-admin-web/src/components/XnOrgSelector/index.vue
@@ -42,7 +42,7 @@
 			</a-col>
 			<a-col :xs="24" :sm="24" :md="24" :lg="11" :xl="11">
 				<div class="table-operator xn-mb10">
-					<a-form ref="searchFormRef" name="advanced_search" class="ant-advanced-search-form" :model="searchFormState">
+					<a-form ref="searchFormRef" :model="searchFormState">
 						<a-row :gutter="24">
 							<a-col :xs="24" :sm="8" :md="8" :lg="0" :xl="0">
 								<a-form-item label="上级组织：" name="parentId">
diff --git a/snowy-admin-web/src/components/XnPositionSelector/index.vue b/snowy-admin-web/src/components/XnPositionSelector/index.vue
index c94222e7..bafdefa7 100644
--- a/snowy-admin-web/src/components/XnPositionSelector/index.vue
+++ b/snowy-admin-web/src/components/XnPositionSelector/index.vue
@@ -42,7 +42,7 @@
 			</a-col>
 			<a-col :xs="24" :sm="24" :md="24" :lg="11" :xl="11">
 				<div class="table-operator xn-mb10">
-					<a-form ref="searchFormRef" name="advanced_search" class="ant-advanced-search-form" :model="searchFormState">
+					<a-form ref="searchFormRef" :model="searchFormState">
 						<a-row :gutter="24">
 							<a-col :xs="24" :sm="8" :md="8" :lg="0" :xl="0">
 								<a-form-item label="组织：" name="orgId">
diff --git a/snowy-admin-web/src/components/XnRoleSelector/index.vue b/snowy-admin-web/src/components/XnRoleSelector/index.vue
index d70370c3..702ee1bd 100644
--- a/snowy-admin-web/src/components/XnRoleSelector/index.vue
+++ b/snowy-admin-web/src/components/XnRoleSelector/index.vue
@@ -42,7 +42,7 @@
 			</a-col>
 			<a-col :xs="24" :sm="24" :md="24" :lg="11" :xl="11">
 				<div class="table-operator xn-mb10">
-					<a-form ref="searchFormRef" name="advanced_search" class="ant-advanced-search-form" :model="searchFormState">
+					<a-form ref="searchFormRef" :model="searchFormState">
 						<a-row :gutter="24">
 							<a-col :xs="24" :sm="8" :md="8" :lg="0" :xl="0">
 								<a-form-item label="组织：" name="categoryOrOrgId">
@@ -471,7 +471,6 @@
 			searchFormState.value.orgId = selectedId
 			delete searchFormState.value.category
 		}
-		delete searchFormState.value.categoryOrOrgId
 	}
 	const dataArray = ref([])
 	// 确定
@@ -499,6 +498,9 @@
 	// 重置
 	const reset = () => {
 		searchFormRef.value.resetFields()
+		delete searchFormState.value.categoryOrOrgId
+		delete searchFormState.value.orgId
+		delete searchFormState.value.category
 		loadData()
 	}
 	const handleClose = () => {
diff --git a/snowy-admin-web/src/components/XnUserSelector/index.vue b/snowy-admin-web/src/components/XnUserSelector/index.vue
index 65e0c520..7bd23241 100644
--- a/snowy-admin-web/src/components/XnUserSelector/index.vue
+++ b/snowy-admin-web/src/components/XnUserSelector/index.vue
@@ -49,7 +49,7 @@
 			</a-col>
 			<a-col :xs="24" :sm="24" :md="24" :lg="11" :xl="11">
 				<div class="table-operator xn-mb10">
-					<a-form ref="searchFormRef" name="advanced_search" class="ant-advanced-search-form" :model="searchFormState">
+					<a-form ref="searchFormRef" :model="searchFormState">
 						<a-row :gutter="24">
 							<a-col :xs="24" :sm="8" :md="8" :lg="0" :xl="0">
 								<a-form-item label="组织：" name="orgId">
diff --git a/snowy-admin-web/src/views/auth/third/index.vue b/snowy-admin-web/src/views/auth/third/index.vue
index 6e724ab3..ef3042ed 100644
--- a/snowy-admin-web/src/views/auth/third/index.vue
+++ b/snowy-admin-web/src/views/auth/third/index.vue
@@ -1,13 +1,13 @@
 <template>
 	<a-card :bordered="false" :body-style="{ 'padding-bottom': '0px' }" class="mb-2">
-		<a-form ref="searchFormRef" name="advanced_search" :model="searchFormState" class="ant-advanced-search-form">
-			<a-row :gutter="24">
-				<a-col :span="8">
+		<a-form ref="searchFormRef" :model="searchFormState">
+			<a-row :gutter="10">
+				<a-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
 					<a-form-item label="关键词" name="searchKey">
 						<a-input v-model:value="searchFormState.searchKey" placeholder="请输入用户名或昵称关键词"></a-input>
 					</a-form-item>
 				</a-col>
-				<a-col :span="8">
+				<a-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
 					<a-form-item label="分类" name="category">
 						<a-select
 							v-model:value="searchFormState.category"
@@ -18,9 +18,23 @@
 						</a-select>
 					</a-form-item>
 				</a-col>
-				<a-col :span="6">
-					<a-button type="primary" @click="tableRef.refresh(true)">查询</a-button>
-					<a-button class="xn-mg08" @click="reset">重置</a-button>
+				<a-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
+					<a-form-item>
+						<a-space>
+							<a-button type="primary" @click="tableRef.refresh(true)">
+								<template #icon>
+									<SearchOutlined/>
+								</template>
+								查询
+							</a-button>
+							<a-button @click="reset">
+								<template #icon>
+									<redo-outlined/>
+								</template>
+								重置
+							</a-button>
+						</a-space>
+					</a-form-item>
 				</a-col>
 			</a-row>
 		</a-form>
@@ -34,6 +48,7 @@
 			bordered
 			:row-key="(record) => record.id"
 			:tool-config="toolConfig"
+			:scroll="{ x: 'max-content' }"
 		>
 			<template #bodyCell="{ column, record }">
 				<template v-if="column.dataIndex === 'avatar'">
diff --git a/snowy-admin-web/src/views/biz/dict/index.vue b/snowy-admin-web/src/views/biz/dict/index.vue
index 0ff1d5b3..8b9c8e5a 100644
--- a/snowy-admin-web/src/views/biz/dict/index.vue
+++ b/snowy-admin-web/src/views/biz/dict/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<a-row :gutter="10">
-		<a-col :xs="24" :sm="24" :md="24" :lg="5" :xl="5">
+		<a-col :xs="0" :sm="0" :md="0" :lg="4" :xl="4">
 			<a-card :bordered="false" :loading="cardLoading" class="left-tree-container">
 				<a-tree
 					v-if="treeData.length > 0"
@@ -12,7 +12,7 @@
 				<a-empty v-else :image="Empty.PRESENTED_IMAGE_SIMPLE" />
 			</a-card>
 		</a-col>
-		<a-col :xs="24" :sm="24" :md="24" :lg="19" :xl="19">
+		<a-col :xs="24" :sm="24" :md="24" :lg="20" :xl="20">
 			<a-card :bordered="false" class="xn-mb10">
 				<a-form
 					ref="searchFormRef"
@@ -20,21 +20,48 @@
 					class="ant-advanced-search-form mb-3"
 					:model="searchFormState"
 				>
-					<a-row :gutter="24">
-						<a-col :span="8">
-							<a-form-item name="searchKey" label="字典名称">
-								<a-input v-model:value="searchFormState.searchKey" placeholder="请输入字典名称" />
+					<a-row :gutter="10">
+						<a-col :xs="24" :sm="8" :md="8" :lg="0" :xl="0">
+							<a-form-item label="请选择上级字典：" name="parentId">
+								<a-tree-select
+									v-model:value="searchFormState.parentId"
+									class="xn-wd"
+									:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+									placeholder="请选择上级字典"
+									allow-clear
+									:tree-data="treeData"
+									:field-names="{
+												children: 'children',
+												label: 'name',
+												value: 'id'
+											}"
+									selectable="false"
+									tree-line
+								/>
 							</a-form-item>
 						</a-col>
-						<a-col :span="8">
-							<a-button type="primary" @click="tableRef.refresh(true)">
-								<template #icon><SearchOutlined /></template>
-								查询
-							</a-button>
-							<a-button class="snowy-button-left" @click="reset">
-								<template #icon><redo-outlined /></template>
-								重置
-							</a-button>
+						<a-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
+							<a-form-item name="searchKey" label="字典名称关键词">
+								<a-input v-model:value="searchFormState.searchKey" placeholder="请输入字典名称关键词" />
+							</a-form-item>
+						</a-col>
+						<a-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
+							<a-form-item>
+								<a-space>
+									<a-button type="primary" @click="tableRef.refresh(true)">
+										<template #icon>
+											<SearchOutlined/>
+										</template>
+										查询
+									</a-button>
+									<a-button @click="reset">
+										<template #icon>
+											<redo-outlined/>
+										</template>
+										重置
+									</a-button>
+								</a-space>
+							</a-form-item>
 						</a-col>
 					</a-row>
 				</a-form>
@@ -48,6 +75,7 @@
 					bordered
 					:tool-config="toolConfig"
 					:row-key="(record) => record.id"
+					:scroll="{ x: 'max-content' }"
 				>
 					<template #bodyCell="{ column, record }">
 						<template v-if="column.dataIndex === 'level'">
@@ -91,6 +119,7 @@
 			title: '操作',
 			dataIndex: 'action',
 			align: 'center',
+			fixed: 'right',
 			width: '150px'
 		})
 	}
@@ -184,10 +213,5 @@
 </script>
 
 <style lang="less" scoped>
-	.ant-form-item {
-		margin-bottom: 0 !important;
-	}
-	.snowy-button-left {
-		margin-left: 8px;
-	}
+
 </style>
diff --git a/snowy-admin-web/src/views/biz/notice/index.vue b/snowy-admin-web/src/views/biz/notice/index.vue
index 1ba236d6..dd27459d 100644
--- a/snowy-admin-web/src/views/biz/notice/index.vue
+++ b/snowy-admin-web/src/views/biz/notice/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<a-card :bordered="false">
-		<a-form ref="searchFormRef" name="advanced_search" :model="searchFormState" class="ant-advanced-search-form">
+		<a-form ref="searchFormRef" :model="searchFormState">
 			<a-row :gutter="24">
 				<a-col :span="6">
 					<a-form-item label="标题" name="title">
diff --git a/snowy-admin-web/src/views/biz/org/index.vue b/snowy-admin-web/src/views/biz/org/index.vue
index ff032926..646e5156 100644
--- a/snowy-admin-web/src/views/biz/org/index.vue
+++ b/snowy-admin-web/src/views/biz/org/index.vue
@@ -47,7 +47,7 @@
 										<template #icon><SearchOutlined /></template>
 										查询
 									</a-button>
-									<a-button class="snowy-button-left" @click="reset">
+									<a-button @click="reset">
 										<template #icon><redo-outlined /></template>
 										重置
 									</a-button>
diff --git a/snowy-admin-web/src/views/biz/position/index.vue b/snowy-admin-web/src/views/biz/position/index.vue
index 8a5959fb..7e14087d 100644
--- a/snowy-admin-web/src/views/biz/position/index.vue
+++ b/snowy-admin-web/src/views/biz/position/index.vue
@@ -47,7 +47,7 @@
 										<template #icon><SearchOutlined /></template>
 										查询
 									</a-button>
-									<a-button class="snowy-button-left" @click="reset">
+									<a-button @click="reset">
 										<template #icon><redo-outlined /></template>
 										重置
 									</a-button>
diff --git a/snowy-admin-web/src/views/biz/user/index.vue b/snowy-admin-web/src/views/biz/user/index.vue
index 21581453..a7670029 100644
--- a/snowy-admin-web/src/views/biz/user/index.vue
+++ b/snowy-admin-web/src/views/biz/user/index.vue
@@ -12,7 +12,7 @@
 				<a-empty v-else :image="Empty.PRESENTED_IMAGE_SIMPLE" />
 			</a-card>
 		</a-col>
-		<a-col :xs="24" :sm="20" :md="20" :lg="20" :xl="20">
+		<a-col :xs="24" :sm="24" :md="24" :lg="20" :xl="20">
 			<a-card :bordered="false" class="xn-mb10">
 				<a-form ref="searchFormRef" :model="searchFormState">
 					<a-row :gutter="10">
@@ -63,7 +63,7 @@
 										<template #icon><SearchOutlined /></template>
 										{{ $t('common.searchButton') }}
 									</a-button>
-									<a-button class="snowy-button-left" @click="reset">
+									<a-button @click="reset">
 										<template #icon><redo-outlined /></template>
 										{{ $t('common.resetButton') }}
 									</a-button>
diff --git a/snowy-admin-web/src/views/client/user/index.vue b/snowy-admin-web/src/views/client/user/index.vue
index 57edd762..5f1bd666 100644
--- a/snowy-admin-web/src/views/client/user/index.vue
+++ b/snowy-admin-web/src/views/client/user/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<div>
 		<a-card :bordered="false" style="margin-bottom: 10px">
-			<a-form ref="searchFormRef" name="advanced_search" class="ant-advanced-search-form" :model="searchFormState">
+			<a-form ref="searchFormRef" :model="searchFormState">
 				<a-row :gutter="24">
 					<a-col :span="8">
 						<a-form-item name="searchKey" label="用户关键词">
@@ -13,7 +13,7 @@
 							<template #icon><SearchOutlined /></template>
 							查询
 						</a-button>
-						<a-button class="snowy-button-left" @click="reset">
+						<a-button @click="reset">
 							<template #icon><redo-outlined /></template>
 							重置
 						</a-button>
diff --git a/snowy-admin-web/src/views/dev/config/sysConfig.vue b/snowy-admin-web/src/views/dev/config/sysConfig.vue
index c8ca2520..05992202 100644
--- a/snowy-admin-web/src/views/dev/config/sysConfig.vue
+++ b/snowy-admin-web/src/views/dev/config/sysConfig.vue
@@ -9,8 +9,9 @@
 			:wrapper-col="{ ...layout.wrapperCol, offset: 0 }"
 			style="width: 90%"
 		>
-			<a-row :gutter="16">
-				<a-col :span="4">
+			<a-alert message="系统基础配置" type="info" :closable="false" class="mb-2" show-icon/>
+			<a-row :gutter="8">
+				<a-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 					<a-form-item label="系统LOGO：" name="SNOWY_SYS_LOGO">
 						<a-upload
 							v-model:file-list="formData.SNOWY_SYS_LOGO"
@@ -28,149 +29,143 @@
 						</a-upload>
 					</a-form-item>
 				</a-col>
-			</a-row>
-			<a-row :gutter="8">
-				<a-col :span="8">
-					<a-form-item label="系统名称：" name="SNOWY_SYS_NAME">
-						<a-input v-model:value="formData.SNOWY_SYS_NAME" placeholder="请输入系统名称" />
-					</a-form-item>
-				</a-col>
-				<a-col :span="14">
-					<a-row :gutter="8">
-						<a-col :span="12">
-							<a-form-item label="后台验证码开关：" name="SNOWY_SYS_DEFAULT_CAPTCHA_OPEN_FLAG_FOR_B">
-								<a-switch
-									v-model:checked="formData.SNOWY_SYS_DEFAULT_CAPTCHA_OPEN_FLAG_FOR_B"
-									checked-children="开"
-									un-checked-children="关"
-									placeholder="请选择后台验证码开关"
-								/>
-							</a-form-item>
-						</a-col>
-						<a-col :span="12">
-							<a-form-item label="前台验证码开关：" name="SNOWY_SYS_DEFAULT_CAPTCHA_OPEN_FLAG_FOR_C">
-								<a-switch
-									v-model:checked="formData.SNOWY_SYS_DEFAULT_CAPTCHA_OPEN_FLAG_FOR_C"
-									checked-children="开"
-									un-checked-children="关"
-									placeholder="请选择前台验证码开关"
-								/>
-							</a-form-item>
-						</a-col>
-					</a-row>
-				</a-col>
-			</a-row>
-			<a-row :gutter="8">
-				<a-col :span="8">
-					<a-form-item label="系统版本：" name="SNOWY_SYS_VERSION">
-						<a-input v-model:value="formData.SNOWY_SYS_VERSION" placeholder="请输入系统版本" />
-					</a-form-item>
-				</a-col>
-				<a-col :span="14">
-					<a-row :gutter="8">
-						<a-col :span="12">
-							<a-form-item label="全局后台验证码失效时间：" name="SNOWY_SYS_DEFAULT_CAPTCHA_EXPIRED_DURATION_FOR_B">
-								<a-input-number
-									v-model:value="formData.SNOWY_SYS_DEFAULT_CAPTCHA_EXPIRED_DURATION_FOR_B"
-									placeholder="分钟"
-								>
-									<template #addonAfter> 分钟 </template>
-								</a-input-number>
-							</a-form-item>
-						</a-col>
-						<a-col :span="12">
-							<a-form-item label="全局前台验证码失效时间：" name="SNOWY_SYS_DEFAULT_CAPTCHA_EXPIRED_DURATION_FOR_C">
-								<a-input-number
-									v-model:value="formData.SNOWY_SYS_DEFAULT_CAPTCHA_EXPIRED_DURATION_FOR_C"
-									placeholder="分钟"
-								>
-									<template #addonAfter> 分钟 </template>
-								</a-input-number>
-							</a-form-item>
-						</a-col>
-					</a-row>
-				</a-col>
-			</a-row>
-			<a-row :gutter="8">
-				<a-col :span="8">
-					<a-form-item label="版权信息：" name="SNOWY_SYS_COPYRIGHT">
-						<a-input v-model:value="formData.SNOWY_SYS_COPYRIGHT" placeholder="请输入版权信息" />
-					</a-form-item>
-				</a-col>
-				<a-col :span="14">
-					<a-row :gutter="8">
-						<a-col :span="12">
-							<a-form-item label="默认文件引擎：" name="SNOWY_SYS_DEFAULT_FILE_ENGINE">
-								<a-radio-group
-									v-model:value="formData.SNOWY_SYS_DEFAULT_FILE_ENGINE"
-									:options="fileEngineOptions"
-									placeholder="请选择系统默认文件引擎"
-								/>
-							</a-form-item>
-						</a-col>
-						<a-col :span="12">
-							<a-form-item label="默认短信引擎：" name="SNOWY_SYS_DEFAULT_SMS_ENGINE">
-								<a-radio-group
-									v-model:value="formData.SNOWY_SYS_DEFAULT_SMS_ENGINE"
-									:options="smsEngineOptions"
-									placeholder="请选择系统默认短信引擎"
-								/>
-							</a-form-item>
-						</a-col>
-					</a-row>
-				</a-col>
-			</a-row>
-			<a-row :gutter="8">
-				<a-col :span="8">
-					<a-form-item label="版权链接URL：" name="SNOWY_SYS_COPYRIGHT_URL">
-						<a-input v-model:value="formData.SNOWY_SYS_COPYRIGHT_URL" placeholder="请输入版权链接URL" />
-					</a-form-item>
-				</a-col>
-				<a-col :span="14">
-					<a-row :gutter="8">
-						<a-col :span="12">
-							<a-form-item label="默认邮件引擎：" name="SNOWY_SYS_DEFAULT_EMAIL_ENGINE">
-								<a-radio-group
-									v-model:value="formData.SNOWY_SYS_DEFAULT_EMAIL_ENGINE"
-									:options="emailEngineOptions"
-									placeholder="请选择系统默认邮件引擎"
-								/>
-							</a-form-item>
-						</a-col>
-						<a-col :span="12">
-							<a-form-item label="默认消息推送引擎：" name="SNOWY_SYS_DEFAULT_PUSH_ENGINE">
-								<a-radio-group
-									v-model:value="formData.SNOWY_SYS_DEFAULT_PUSH_ENGINE"
-									:options="pushEngineOptions"
-									placeholder="请选择系统默认消息推送引擎"
-								/>
-							</a-form-item>
-						</a-col>
-					</a-row>
-				</a-col>
-			</a-row>
-
-			<a-row :gutter="16">
-				<a-col :span="8">
-					<a-form-item label="默认快捷方式：" name="SNOWY_SYS_DEFAULT_WORKBENCH_DATA">
-						<menuTreeSelect ref="menuTreeSelectRef" :resultData="true" />
-					</a-form-item>
-				</a-col>
-				<a-col :span="14">
+				<a-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 					<a-form-item label="系统描述：" name="SNOWY_SYS_DEFAULT_DESCRRIPTION">
 						<a-textarea
 							v-model:value="formData.SNOWY_SYS_DEFAULT_DESCRRIPTION"
 							placeholder="请输入系统描述"
-							:auto-size="{ minRows: 3, maxRows: 6 }"
+							:auto-size="{ minRows: 3, maxRows: 8 }"
 						/>
 					</a-form-item>
 				</a-col>
 			</a-row>
-			<a-row :gutter="14">
-				<a-col :span="12">
+			<a-row :gutter="8">
+				<a-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+					<a-form-item label="系统名称：" name="SNOWY_SYS_NAME">
+						<a-input v-model:value="formData.SNOWY_SYS_NAME" placeholder="请输入系统名称" />
+					</a-form-item>
+				</a-col>
+				<a-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+					<a-form-item label="系统版本：" name="SNOWY_SYS_VERSION">
+						<a-input v-model:value="formData.SNOWY_SYS_VERSION" placeholder="请输入系统版本" />
+					</a-form-item>
+				</a-col>
+			</a-row>
+			<a-row :gutter="8">
+				<a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+					<a-form-item label="默认快捷方式：" name="SNOWY_SYS_DEFAULT_WORKBENCH_DATA">
+						<menuTreeSelect ref="menuTreeSelectRef" :resultData="true" />
+					</a-form-item>
+				</a-col>
+			</a-row>
+			<a-alert message="验证码配置" type="info" :closable="false" class="mb-2" show-icon/>
+			<a-row :gutter="8">
+				<a-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+					<a-form-item label="后台验证码开关：" name="SNOWY_SYS_DEFAULT_CAPTCHA_OPEN_FLAG_FOR_B">
+						<a-switch
+							v-model:checked="formData.SNOWY_SYS_DEFAULT_CAPTCHA_OPEN_FLAG_FOR_B"
+							checked-children="开"
+							un-checked-children="关"
+							placeholder="请选择后台验证码开关"
+						/>
+					</a-form-item>
+				</a-col>
+				<a-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+					<a-form-item label="前台验证码开关：" name="SNOWY_SYS_DEFAULT_CAPTCHA_OPEN_FLAG_FOR_C">
+						<a-switch
+							v-model:checked="formData.SNOWY_SYS_DEFAULT_CAPTCHA_OPEN_FLAG_FOR_C"
+							checked-children="开"
+							un-checked-children="关"
+							placeholder="请选择前台验证码开关"
+						/>
+					</a-form-item>
+				</a-col>
+			</a-row>
+			<a-row :gutter="8">
+				<a-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+					<a-form-item label="后台验证码失效时间：" name="SNOWY_SYS_DEFAULT_CAPTCHA_EXPIRED_DURATION_FOR_B">
+						<a-input-number
+							v-model:value="formData.SNOWY_SYS_DEFAULT_CAPTCHA_EXPIRED_DURATION_FOR_B"
+							placeholder="分钟"
+						>
+							<template #addonAfter> 分钟 </template>
+						</a-input-number>
+					</a-form-item>
+				</a-col>
+				<a-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+					<a-form-item label="前台验证码失效时间：" name="SNOWY_SYS_DEFAULT_CAPTCHA_EXPIRED_DURATION_FOR_C">
+						<a-input-number
+							v-model:value="formData.SNOWY_SYS_DEFAULT_CAPTCHA_EXPIRED_DURATION_FOR_C"
+							placeholder="分钟"
+						>
+							<template #addonAfter> 分钟 </template>
+						</a-input-number>
+					</a-form-item>
+				</a-col>
+			</a-row>
+			<a-alert message="默认引擎配置" type="info" :closable="false" class="mb-2" show-icon/>
+			<a-row :gutter="8">
+				<a-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+					<a-form-item label="默认文件引擎：" name="SNOWY_SYS_DEFAULT_FILE_ENGINE">
+						<a-radio-group
+							v-model:value="formData.SNOWY_SYS_DEFAULT_FILE_ENGINE"
+							:options="fileEngineOptions"
+							placeholder="请选择系统默认文件引擎"
+						/>
+					</a-form-item>
+				</a-col>
+				<a-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+					<a-form-item label="默认邮件引擎：" name="SNOWY_SYS_DEFAULT_EMAIL_ENGINE">
+						<a-radio-group
+							v-model:value="formData.SNOWY_SYS_DEFAULT_EMAIL_ENGINE"
+							:options="emailEngineOptions"
+							placeholder="请选择系统默认邮件引擎"
+						/>
+					</a-form-item>
+				</a-col>
+			</a-row>
+			<a-row :gutter="8">
+				<a-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+					<a-form-item label="默认短信引擎：" name="SNOWY_SYS_DEFAULT_SMS_ENGINE">
+						<a-radio-group
+							v-model:value="formData.SNOWY_SYS_DEFAULT_SMS_ENGINE"
+							:options="smsEngineOptions"
+							placeholder="请选择系统默认短信引擎"
+						/>
+					</a-form-item>
+				</a-col>
+				<a-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+					<a-form-item label="默认消息推送引擎：" name="SNOWY_SYS_DEFAULT_PUSH_ENGINE">
+						<a-radio-group
+							v-model:value="formData.SNOWY_SYS_DEFAULT_PUSH_ENGINE"
+							:options="pushEngineOptions"
+							placeholder="请选择系统默认消息推送引擎"
+						/>
+					</a-form-item>
+				</a-col>
+			</a-row>
+			<a-alert message="版权信息配置" type="info" :closable="false" class="mb-2" show-icon/>
+			<a-row :gutter="8">
+				<a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+					<a-form-item label="版权信息：" name="SNOWY_SYS_COPYRIGHT">
+						<a-input v-model:value="formData.SNOWY_SYS_COPYRIGHT" placeholder="请输入版权信息" />
+					</a-form-item>
+				</a-col>
+			</a-row>
+			<a-row :gutter="8">
+				<a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+					<a-form-item label="版权链接URL：" name="SNOWY_SYS_COPYRIGHT_URL">
+						<a-input v-model:value="formData.SNOWY_SYS_COPYRIGHT_URL" placeholder="请输入版权链接URL" />
+					</a-form-item>
+				</a-col>
+			</a-row>
+			<a-row :gutter="8">
+				<a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
 					<a-form-item>
-						<a-button type="primary" :loading="submitLoading" @click="onSubmit()">保存</a-button>
-						<a-button class="xn-ml10" @click="resetForm">重置</a-button>
+						<a-space>
+							<a-button type="primary" :loading="submitLoading" @click="onSubmit()">保存</a-button>
+							<a-button class="xn-ml10" @click="resetForm">重置</a-button>
+						</a-space>
 					</a-form-item>
 				</a-col>
 			</a-row>
diff --git a/snowy-admin-web/src/views/dev/dict/category/index.vue b/snowy-admin-web/src/views/dev/dict/category/index.vue
index 6e997856..b8e8f560 100644
--- a/snowy-admin-web/src/views/dev/dict/category/index.vue
+++ b/snowy-admin-web/src/views/dev/dict/category/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<a-row :gutter="10">
-		<a-col :xs="24" :sm="24" :md="24" :lg="5" :xl="5">
-			<div class="left-tree-container">
+		<a-col :xs="0" :sm="0" :md="0" :lg="4" :xl="4">
+			<a-card :bordered="false" :loading="cardLoading" class="left-tree-container">
 				<a-tree
 					v-if="treeData.length > 0"
 					v-model:expandedKeys="defaultExpandedKeys"
@@ -11,58 +11,89 @@
 				>
 				</a-tree>
 				<a-empty v-else :image="Empty.PRESENTED_IMAGE_SIMPLE" />
-			</div>
+			</a-card>
 		</a-col>
-		<a-col :xs="24" :sm="24" :md="24" :lg="19" :xl="19">
-			<a-form ref="searchFormRef" name="advanced_search" class="ant-advanced-search-form mb-3" :model="searchFormState">
-				<a-row :gutter="24">
-					<a-col :span="8">
-						<a-form-item name="searchKey" label="字典名称">
-							<a-input v-model:value="searchFormState.searchKey" placeholder="请输入字典名称" />
-						</a-form-item>
-					</a-col>
-					<a-col :span="8">
-						<a-button type="primary" @click="tableRef.refresh(true)">
-							<template #icon><SearchOutlined /></template>
-							查询
-						</a-button>
-						<a-button class="snowy-button-left" @click="reset">
-							<template #icon><redo-outlined /></template>
-							重置
-						</a-button>
-					</a-col>
-				</a-row>
+		<a-col :xs="24" :sm="24" :md="24" :lg="20" :xl="20">
+			<a-card :bordered="false">
+				<a-form ref="searchFormRef" :model="searchFormState">
+					<a-row :gutter="10">
+						<a-col :xs="24" :sm="8" :md="8" :lg="0" :xl="0">
+							<a-form-item label="请选择上级字典：" name="parentId">
+								<a-tree-select
+									v-model:value="searchFormState.parentId"
+									class="xn-wd"
+									:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+									placeholder="请选择上级字典"
+									allow-clear
+									:tree-data="treeData"
+									:field-names="{
+												children: 'children',
+												label: 'name',
+												value: 'id'
+											}"
+									selectable="false"
+									tree-line
+								/>
+							</a-form-item>
+						</a-col>
+						<a-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
+							<a-form-item name="searchKey" label="关键词">
+								<a-input v-model:value="searchFormState.searchKey" placeholder="请输入字典名称关键词" />
+							</a-form-item>
+						</a-col>
+						<a-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
+							<a-form-item>
+								<a-space>
+									<a-button type="primary" @click="tableRef.refresh(true)">
+										<template #icon>
+											<SearchOutlined/>
+										</template>
+										查询
+									</a-button>
+									<a-button @click="reset">
+										<template #icon>
+											<redo-outlined/>
+										</template>
+										重置
+									</a-button>
+								</a-space>
+							</a-form-item>
+						</a-col>
+					</a-row>
 			</a-form>
-			<a-divider class="m-3 mx-0" />
-			<s-table
-				ref="tableRef"
-				:columns="columns"
-				:data="loadData"
-				:expand-row-by-click="true"
-				bordered
-				:tool-config="toolConfig"
-				:row-key="(record) => record.id"
-			>
-				<template #operator class="table-operator">
-					<a-button type="primary" @click="formRef.onOpen(undefined, categoryType, searchFormState.parentId)">
-						<template #icon><plus-outlined /></template>
-						新增
-					</a-button>
-				</template>
-				<template #bodyCell="{ column, record }">
-					<template v-if="column.dataIndex === 'level'">
-						<a-tag color="blue" v-if="record.level">{{ record.level }}</a-tag>
-						<a-tag color="green" v-else>子级</a-tag>
+			</a-card>
+			<a-card :bordered="false">
+				<s-table
+					ref="tableRef"
+					:columns="columns"
+					:data="loadData"
+					:expand-row-by-click="true"
+					bordered
+					:tool-config="toolConfig"
+					:row-key="(record) => record.id"
+					:scroll="{ x: 'max-content' }"
+				>
+					<template #operator class="table-operator">
+						<a-button type="primary" @click="formRef.onOpen(undefined, categoryType, searchFormState.parentId)">
+							<template #icon><plus-outlined /></template>
+							新增
+						</a-button>
 					</template>
-					<template v-if="column.dataIndex === 'action'">
-						<a @click="formRef.onOpen(record, categoryType)">编辑</a>
-						<a-divider type="vertical" />
-						<a-popconfirm title="删除此字典与下级字典吗？" @confirm="remove(record)">
-							<a-button type="link" danger size="small">删除</a-button>
-						</a-popconfirm>
+					<template #bodyCell="{ column, record }">
+						<template v-if="column.dataIndex === 'level'">
+							<a-tag color="blue" v-if="record.level">{{ record.level }}</a-tag>
+							<a-tag color="green" v-else>子级</a-tag>
+						</template>
+						<template v-if="column.dataIndex === 'action'">
+							<a @click="formRef.onOpen(record, categoryType)">编辑</a>
+							<a-divider type="vertical" />
+							<a-popconfirm title="删除此字典与下级字典吗？" @confirm="remove(record)">
+								<a-button type="link" danger size="small">删除</a-button>
+							</a-popconfirm>
+						</template>
 					</template>
-				</template>
-			</s-table>
+				</s-table>
+			</a-card>
 		</a-col>
 	</a-row>
 	<Form ref="formRef" @successful="formSuccessful()" />
@@ -98,6 +129,7 @@
 			title: '操作',
 			dataIndex: 'action',
 			align: 'center',
+			fixed: 'right',
 			width: '150px'
 		}
 	]
@@ -202,10 +234,5 @@
 </script>
 
 <style scoped lang="less">
-	.ant-form-item {
-		margin-bottom: 0 !important;
-	}
-	.snowy-button-left {
-		margin-left: 8px;
-	}
+
 </style>
diff --git a/snowy-admin-web/src/views/dev/email/index.vue b/snowy-admin-web/src/views/dev/email/index.vue
index 72eca9b9..2777276e 100644
--- a/snowy-admin-web/src/views/dev/email/index.vue
+++ b/snowy-admin-web/src/views/dev/email/index.vue
@@ -1,8 +1,8 @@
 <template>
 	<a-card :bordered="false" class="xn-mb10">
-		<a-form ref="searchFormRef" name="advanced_search" class="ant-advanced-search-form" :model="searchFormState">
-			<a-row :gutter="24">
-				<a-col :span="8">
+		<a-form ref="searchFormRef" :model="searchFormState">
+			<a-row :gutter="10">
+				<a-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
 					<a-form-item name="engine" label="邮件引擎">
 						<a-select
 							v-model:value="searchFormState.engine"
@@ -13,20 +13,28 @@
 						></a-select>
 					</a-form-item>
 				</a-col>
-				<a-col :span="8">
-					<a-form-item name="searchKey" label="主题关键词">
+				<a-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
+					<a-form-item name="searchKey" label="关键词">
 						<a-input v-model:value="searchFormState.searchKey" placeholder="请输入邮件主题关键词"></a-input>
 					</a-form-item>
 				</a-col>
-				<a-col :span="8">
-					<a-button type="primary" @click="tableRef.refresh(true)">
-						<template #icon><SearchOutlined /></template>
-						查询
-					</a-button>
-					<a-button class="snowy-button-left" @click="reset">
-						<template #icon><redo-outlined /></template>
-						重置
-					</a-button>
+				<a-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
+					<a-form-item>
+						<a-space>
+							<a-button type="primary" @click="tableRef.refresh(true)">
+								<template #icon>
+									<SearchOutlined/>
+								</template>
+								查询
+							</a-button>
+							<a-button @click="reset">
+								<template #icon>
+									<redo-outlined/>
+								</template>
+								重置
+							</a-button>
+						</a-space>
+					</a-form-item>
 				</a-col>
 			</a-row>
 		</a-form>
@@ -41,6 +49,7 @@
 			bordered
 			:row-key="(record) => record.id"
 			:row-selection="options.rowSelection"
+			:scroll="{ x: 'max-content' }"
 		>
 			<template #operator class="table-operator">
 				<a-space>
@@ -114,6 +123,7 @@
 			title: '操作',
 			dataIndex: 'action',
 			align: 'center',
+			fixed: 'right',
 			width: '150px'
 		}
 	]
@@ -173,10 +183,4 @@
 </script>
 
 <style scoped>
-	.ant-form-item {
-		margin-bottom: 0 !important;
-	}
-	.snowy-button-left {
-		margin-left: 8px;
-	}
 </style>
diff --git a/snowy-admin-web/src/views/dev/file/index.vue b/snowy-admin-web/src/views/dev/file/index.vue
index a1e1ae38..62af8aeb 100644
--- a/snowy-admin-web/src/views/dev/file/index.vue
+++ b/snowy-admin-web/src/views/dev/file/index.vue
@@ -1,14 +1,14 @@
 <template>
 	<div v-if="indexShow">
 		<a-card :bordered="false" class="xn-mb10">
-			<a-form ref="searchFormRef" name="advanced_search" class="ant-advanced-search-form" :model="searchFormState">
-				<a-row :gutter="24">
-					<a-col :span="8">
-						<a-form-item name="searchKey" label="名称关键词">
+			<a-form ref="searchFormRef" :model="searchFormState">
+				<a-row :gutter="10">
+					<a-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
+						<a-form-item name="searchKey" label="关键词">
 							<a-input v-model:value="searchFormState.searchKey" placeholder="请输入文件名称关键词" />
 						</a-form-item>
 					</a-col>
-					<a-col :span="8">
+					<a-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
 						<a-form-item name="engine" label="存储位置">
 							<a-select
 								v-model:value="searchFormState.engine"
@@ -18,15 +18,23 @@
 							/>
 						</a-form-item>
 					</a-col>
-					<a-col :span="8">
-						<a-button type="primary" @click="tableRef.refresh(true)">
-							<template #icon><SearchOutlined /></template>
-							查询
-						</a-button>
-						<a-button class="snowy-button-left" @click="reset">
-							<template #icon><redo-outlined /></template>
-							重置
-						</a-button>
+					<a-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
+						<a-form-item>
+							<a-space>
+								<a-button type="primary" @click="tableRef.refresh(true)">
+									<template #icon>
+										<SearchOutlined/>
+									</template>
+									查询
+								</a-button>
+								<a-button @click="reset">
+									<template #icon>
+										<redo-outlined/>
+									</template>
+									重置
+								</a-button>
+							</a-space>
+						</a-form-item>
 					</a-col>
 				</a-row>
 			</a-form>
@@ -41,6 +49,7 @@
 				bordered
 				:row-key="(record) => record.id"
 				:row-selection="options.rowSelection"
+				:scroll="{ x: 'max-content' }"
 			>
 				<template #operator class="table-operator">
 					<a-space>
@@ -167,6 +176,7 @@
 			title: '操作',
 			dataIndex: 'action',
 			align: 'center',
+			fixed: 'right',
 			width: 220
 		}
 	]
@@ -256,10 +266,4 @@
 		width: 40px;
 		height: 40px;
 	}
-	.ant-form-item {
-		margin-bottom: 0 !important;
-	}
-	.snowy-button-left {
-		margin-left: 8px;
-	}
 </style>
diff --git a/snowy-admin-web/src/views/dev/job/index.vue b/snowy-admin-web/src/views/dev/job/index.vue
index b31a314c..6d7a54be 100644
--- a/snowy-admin-web/src/views/dev/job/index.vue
+++ b/snowy-admin-web/src/views/dev/job/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<a-card :bordered="false" :body-style="{ 'padding-bottom': '0px' }" class="mb-2">
-		<a-form ref="searchFormRef" name="advanced_search" :model="searchFormState" class="ant-advanced-search-form">
+		<a-form ref="searchFormRef" :model="searchFormState">
 			<a-row :gutter="24">
 				<a-col :span="6">
 					<a-form-item label="关键词" name="searchKey">
diff --git a/snowy-admin-web/src/views/dev/log/oplog/index.vue b/snowy-admin-web/src/views/dev/log/oplog/index.vue
index b7c1bd12..b89c88e3 100644
--- a/snowy-admin-web/src/views/dev/log/oplog/index.vue
+++ b/snowy-admin-web/src/views/dev/log/oplog/index.vue
@@ -15,7 +15,7 @@
 	<a-card :bordered="false">
 		<s-table ref="tableRef" :columns="columns" :data="loadData" bordered :row-key="(record) => record.id">
 			<template #operator class="table-operator">
-				<a-form ref="formRef" name="advanced_search" :model="searchFormState" class="ant-advanced-search-form">
+				<a-form ref="formRef" :model="searchFormState">
 					<a-space>
 						<a-radio-group v-model:value="opLogType" button-style="solid">
 							<a-radio-button
diff --git a/snowy-admin-web/src/views/dev/log/vislog/index.vue b/snowy-admin-web/src/views/dev/log/vislog/index.vue
index 33bc370e..8c118228 100644
--- a/snowy-admin-web/src/views/dev/log/vislog/index.vue
+++ b/snowy-admin-web/src/views/dev/log/vislog/index.vue
@@ -15,7 +15,7 @@
 	<a-card :bordered="false">
 		<s-table ref="tableRef" :columns="columns" :data="loadData" bordered :row-key="(record) => record.id">
 			<template #operator class="table-operator">
-				<a-form ref="formRef" name="advanced_search" :model="searchFormState" class="ant-advanced-search-form">
+				<a-form ref="formRef" :model="searchFormState">
 					<a-space>
 						<a-radio-group v-model:value="visLogType" button-style="solid">
 							<a-radio-button
diff --git a/snowy-admin-web/src/views/dev/message/index.vue b/snowy-admin-web/src/views/dev/message/index.vue
index af643058..5fe62284 100644
--- a/snowy-admin-web/src/views/dev/message/index.vue
+++ b/snowy-admin-web/src/views/dev/message/index.vue
@@ -1,21 +1,29 @@
 <template>
 	<a-card :bordered="false" class="xn-mb10">
-		<a-form ref="searchFormRef" name="advanced_search" class="ant-advanced-search-form" :model="searchFormState">
-			<a-row :gutter="24">
-				<a-col :span="8">
-					<a-form-item name="searchKey" label="主题关键词">
+		<a-form ref="searchFormRef" :model="searchFormState">
+			<a-row :gutter="10">
+				<a-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
+					<a-form-item name="searchKey" label="关键词">
 						<a-input v-model:value="searchFormState.searchKey" placeholder="请输入站内信主题关键词" />
 					</a-form-item>
 				</a-col>
-				<a-col :span="8">
-					<a-button type="primary" @click="tableRef.refresh(true)">
-						<template #icon><SearchOutlined /></template>
-						查询
-					</a-button>
-					<a-button class="snowy-button-left" @click="reset">
-						<template #icon><redo-outlined /></template>
-						重置
-					</a-button>
+				<a-col :xs="24" :sm="16" :md="16" :lg="16" :xl="16">
+					<a-form-item>
+						<a-space>
+							<a-button type="primary" @click="tableRef.refresh(true)">
+								<template #icon>
+									<SearchOutlined/>
+								</template>
+								查询
+							</a-button>
+							<a-button @click="reset">
+								<template #icon>
+									<redo-outlined/>
+								</template>
+								重置
+							</a-button>
+						</a-space>
+					</a-form-item>
 				</a-col>
 			</a-row>
 		</a-form>
@@ -30,6 +38,7 @@
 			bordered
 			:row-key="(record) => record.id"
 			:row-selection="options.rowSelection"
+			:scroll="{ x: 'max-content' }"
 		>
 			<template #operator class="table-operator">
 				<a-space>
@@ -85,6 +94,7 @@
 			title: '操作',
 			dataIndex: 'action',
 			align: 'center',
+			fixed: 'right',
 			width: '150px'
 		}
 	]
@@ -140,10 +150,5 @@
 </script>
 
 <style lang="less" scoped>
-	.ant-form-item {
-		margin-bottom: 0 !important;
-	}
-	.snowy-button-left {
-		margin-left: 8px;
-	}
+
 </style>
diff --git a/snowy-admin-web/src/views/dev/push/index.vue b/snowy-admin-web/src/views/dev/push/index.vue
index 5ef20f83..d01de5b6 100644
--- a/snowy-admin-web/src/views/dev/push/index.vue
+++ b/snowy-admin-web/src/views/dev/push/index.vue
@@ -1,8 +1,8 @@
 <template>
 	<a-card :bordered="false" class="xn-mb10">
-		<a-form ref="searchFormRef" name="advanced_search" class="ant-advanced-search-form" :model="searchFormState">
-			<a-row :gutter="24">
-				<a-col :span="8">
+		<a-form ref="searchFormRef" :model="searchFormState">
+			<a-row :gutter="10">
+				<a-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
 					<a-form-item name="engine" label="消息引擎">
 						<a-select
 							v-model:value="searchFormState.engine"
@@ -13,20 +13,28 @@
 						></a-select>
 					</a-form-item>
 				</a-col>
-				<a-col :span="8">
-					<a-form-item name="searchKey" label="消息标题关键词">
+				<a-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
+					<a-form-item name="searchKey" label="关键词">
 						<a-input v-model:value="searchFormState.searchKey" placeholder="请输入消息标题关键词"></a-input>
 					</a-form-item>
 				</a-col>
-				<a-col :span="8">
-					<a-button type="primary" @click="tableRef.refresh(true)">
-						<template #icon><SearchOutlined /></template>
-						查询
-					</a-button>
-					<a-button class="snowy-button-left" @click="reset">
-						<template #icon><redo-outlined /></template>
-						重置
-					</a-button>
+				<a-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
+					<a-form-item>
+						<a-space>
+							<a-button type="primary" @click="tableRef.refresh(true)">
+								<template #icon>
+									<SearchOutlined/>
+								</template>
+								查询
+							</a-button>
+							<a-button @click="reset">
+								<template #icon>
+									<redo-outlined/>
+								</template>
+								重置
+							</a-button>
+						</a-space>
+					</a-form-item>
 				</a-col>
 			</a-row>
 		</a-form>
@@ -41,6 +49,7 @@
 			bordered
 			:row-key="(record) => record.id"
 			:row-selection="options.rowSelection"
+			:scroll="{ x: 'max-content' }"
 		>
 			<template #operator class="table-operator">
 				<a-space>
@@ -116,6 +125,7 @@
 			title: '操作',
 			dataIndex: 'action',
 			align: 'center',
+			fixed: 'right',
 			width: '150px'
 		}
 	]
@@ -166,10 +176,5 @@
 </script>
 
 <style lang="less" scoped>
-	.ant-form-item {
-		margin-bottom: 0 !important;
-	}
-	.snowy-button-left {
-		margin-left: 8px;
-	}
+
 </style>
diff --git a/snowy-admin-web/src/views/dev/slideshow/index.vue b/snowy-admin-web/src/views/dev/slideshow/index.vue
index 93afc624..836f75ba 100644
--- a/snowy-admin-web/src/views/dev/slideshow/index.vue
+++ b/snowy-admin-web/src/views/dev/slideshow/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<a-card :bordered="false">
-		<a-form ref="searchFormRef" name="advanced_search" :model="searchFormState" class="ant-advanced-search-form">
+		<a-form ref="searchFormRef" :model="searchFormState">
 			<a-row :gutter="24">
 				<a-col :span="6">
 					<a-form-item label="标题" name="title">
diff --git a/snowy-admin-web/src/views/dev/sms/index.vue b/snowy-admin-web/src/views/dev/sms/index.vue
index 66cab0e3..8fd33b7c 100644
--- a/snowy-admin-web/src/views/dev/sms/index.vue
+++ b/snowy-admin-web/src/views/dev/sms/index.vue
@@ -1,8 +1,8 @@
 <template>
 	<a-card :bordered="false" class="xn-mb10">
-		<a-form ref="searchFormRef" name="advanced_search" class="ant-advanced-search-form" :model="searchFormState">
-			<a-row :gutter="24">
-				<a-col :span="8">
+		<a-form ref="searchFormRef" :model="searchFormState">
+			<a-row :gutter="10">
+				<a-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
 					<a-form-item name="engine" label="短信引擎">
 						<a-select
 							v-model:value="searchFormState.engine"
@@ -13,20 +13,28 @@
 						></a-select>
 					</a-form-item>
 				</a-col>
-				<a-col :span="8">
-					<a-form-item name="searchKey" label="手机号关键词">
+				<a-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
+					<a-form-item name="searchKey" label="关键词">
 						<a-input v-model:value="searchFormState.searchKey" placeholder="请输入手机号关键词"></a-input>
 					</a-form-item>
 				</a-col>
-				<a-col :span="8">
-					<a-button type="primary" @click="tableRef.refresh(true)">
-						<template #icon><SearchOutlined /></template>
-						查询
-					</a-button>
-					<a-button class="snowy-button-left" @click="reset">
-						<template #icon><redo-outlined /></template>
-						重置
-					</a-button>
+				<a-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
+					<a-form-item>
+						<a-space>
+							<a-button type="primary" @click="tableRef.refresh(true)">
+								<template #icon>
+									<SearchOutlined/>
+								</template>
+								查询
+							</a-button>
+							<a-button @click="reset">
+								<template #icon>
+									<redo-outlined/>
+								</template>
+								重置
+							</a-button>
+						</a-space>
+					</a-form-item>
 				</a-col>
 			</a-row>
 		</a-form>
@@ -41,6 +49,7 @@
 			bordered
 			:row-key="(record) => record.id"
 			:row-selection="options.rowSelection"
+			:scroll="{ x: 'max-content' }"
 		>
 			<template #operator class="table-operator">
 				<a-space>
@@ -121,6 +130,7 @@
 			title: '操作',
 			dataIndex: 'action',
 			align: 'center',
+			fixed: 'right',
 			width: '150px'
 		}
 	]
@@ -171,10 +181,5 @@
 </script>
 
 <style scoped>
-	.ant-form-item {
-		margin-bottom: 0 !important;
-	}
-	.snowy-button-left {
-		margin-left: 8px;
-	}
+
 </style>
diff --git a/snowy-admin-web/src/views/mobile/resource/menu/index.vue b/snowy-admin-web/src/views/mobile/resource/menu/index.vue
index 8516c950..277ff26a 100644
--- a/snowy-admin-web/src/views/mobile/resource/menu/index.vue
+++ b/snowy-admin-web/src/views/mobile/resource/menu/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<a-card :bordered="false" :body-style="{ 'padding-bottom': '0px' }" class="mb-2">
-		<a-form ref="searchFormRef" name="advanced_search" :model="searchFormState" class="ant-advanced-search-form">
+		<a-form ref="searchFormRef" :model="searchFormState">
 			<a-space style="align-items: normal">
 				<a-radio-group v-model:value="module" button-style="solid">
 					<a-radio-button
diff --git a/snowy-admin-web/src/views/mobile/resource/module/index.vue b/snowy-admin-web/src/views/mobile/resource/module/index.vue
index 79966672..1824a471 100644
--- a/snowy-admin-web/src/views/mobile/resource/module/index.vue
+++ b/snowy-admin-web/src/views/mobile/resource/module/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<a-card :bordered="false" :body-style="{ 'padding-bottom': '0px' }" class="mb-2">
-		<a-form ref="searchFormRef" name="advanced_search" :model="searchFormState" class="ant-advanced-search-form">
+		<a-form ref="searchFormRef" :model="searchFormState">
 			<a-row :gutter="24">
 				<a-col :span="8">
 					<a-form-item label="名称关键词" name="searchKey">
diff --git a/snowy-admin-web/src/views/sys/group/index.vue b/snowy-admin-web/src/views/sys/group/index.vue
index f3eeda68..735a51ab 100644
--- a/snowy-admin-web/src/views/sys/group/index.vue
+++ b/snowy-admin-web/src/views/sys/group/index.vue
@@ -10,8 +10,18 @@
 				<a-col :xs="24" :sm="16" :md="16" :lg="16" :xl="16">
 					<a-form-item>
 						<a-space>
-							<a-button type="primary" @click="tableRef.refresh()">查询</a-button>
-							<a-button style="margin: 0 8px" @click="reset">重置</a-button>
+							<a-button type="primary" @click="tableRef.refresh(true)">
+								<template #icon>
+									<SearchOutlined/>
+								</template>
+								查询
+							</a-button>
+							<a-button @click="reset">
+								<template #icon>
+									<redo-outlined/>
+								</template>
+								重置
+							</a-button>
 						</a-space>
 					</a-form-item>
 				</a-col>
diff --git a/snowy-admin-web/src/views/sys/org/index.vue b/snowy-admin-web/src/views/sys/org/index.vue
index 7a4f94f6..dbd2339a 100644
--- a/snowy-admin-web/src/views/sys/org/index.vue
+++ b/snowy-admin-web/src/views/sys/org/index.vue
@@ -49,7 +49,7 @@
 										</template>
 										查询
 									</a-button>
-									<a-button class="snowy-button-left" @click="reset">
+									<a-button @click="reset">
 										<template #icon>
 											<redo-outlined/>
 										</template>
diff --git a/snowy-admin-web/src/views/sys/position/index.vue b/snowy-admin-web/src/views/sys/position/index.vue
index 365ca275..c7665305 100644
--- a/snowy-admin-web/src/views/sys/position/index.vue
+++ b/snowy-admin-web/src/views/sys/position/index.vue
@@ -49,7 +49,7 @@
 										</template>
 										查询
 									</a-button>
-									<a-button class="snowy-button-left" @click="reset">
+									<a-button @click="reset">
 										<template #icon>
 											<redo-outlined/>
 										</template>
diff --git a/snowy-admin-web/src/views/sys/resource/menu/form.vue b/snowy-admin-web/src/views/sys/resource/menu/form.vue
index 5852a82a..f0f21371 100644
--- a/snowy-admin-web/src/views/sys/resource/menu/form.vue
+++ b/snowy-admin-web/src/views/sys/resource/menu/form.vue
@@ -9,12 +9,12 @@
 		<a-alert class="mb-3" message="温馨提示：排序第一为首页！若有多个模块根据授权可见情况而变化。" type="warning" />
 		<a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
 			<a-row :gutter="16">
-				<a-col :span="12">
+				<a-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 					<a-form-item label="显示名称：" name="title">
 						<a-input v-model:value="formData.title" placeholder="请输入显示名称" allow-clear />
 					</a-form-item>
 				</a-col>
-				<a-col :span="12">
+				<a-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 					<a-form-item label="菜单类型：" name="menuType">
 						<a-radio-group
 							v-model:value="formData.menuType"
@@ -24,7 +24,7 @@
 						/>
 					</a-form-item>
 				</a-col>
-				<a-col :span="12">
+				<a-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 					<a-form-item label="上级菜单：" name="parentId">
 						<a-tree-select
 							v-model:value="formData.parentId"
@@ -46,7 +46,7 @@
 						/>
 					</a-form-item>
 				</a-col>
-				<a-col :span="12" v-if="formData.menuType !== 'CATALOG'">
+				<a-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" v-if="formData.menuType !== 'CATALOG'">
 					<a-form-item name="path">
 						<template #label>
 							<a-tooltip>
@@ -61,7 +61,7 @@
 						<a-input v-model:value="formData.path" placeholder="请输入路由地址" allow-clear />
 					</a-form-item>
 				</a-col>
-				<a-col :span="12" v-if="formData.menuType === 'MENU'">
+				<a-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" v-if="formData.menuType === 'MENU'">
 					<a-form-item name="component">
 						<template #label>
 							<a-tooltip>
@@ -78,7 +78,7 @@
 						/>
 					</a-form-item>
 				</a-col>
-				<a-col :span="12" v-if="formData.menuType === 'MENU'">
+				<a-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" v-if="formData.menuType === 'MENU'">
 					<a-form-item name="name">
 						<template #label>
 							<a-tooltip>
@@ -95,13 +95,13 @@
 						/>
 					</a-form-item>
 				</a-col>
-				<a-col :span="12">
+				<a-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 					<a-form-item label="图标：" name="icon">
 						<a-input v-model:value="formData.icon" class="xn-wdcalc-70" placeholder="请选择图标" allow-clear disabled />
 						<a-button type="primary" @click="iconSelector.showIconModal(formData.icon)">选择</a-button>
 					</a-form-item>
 				</a-col>
-				<a-col :span="12">
+				<a-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 					<a-form-item label="排序:" name="sortCode">
 						<a-input-number class="xn-wd" v-model:value="formData.sortCode" :max="100" />
 					</a-form-item>
@@ -110,17 +110,17 @@
 			<a-collapse ghost>
 				<a-collapse-panel key="def" header="展开更多">
 					<a-row :gutter="16">
-						<a-col :span="8">
+						<a-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
 							<a-form-item label="是否可见:" name="visible">
 								<a-radio-group optionType="button" v-model:value="formData.visible" :options="visibleOptions" />
 							</a-form-item>
 						</a-col>
-						<a-col :span="8" v-if="formData.menuType !== 'CATALOG'">
+						<a-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8" v-if="formData.menuType !== 'CATALOG'">
 							<a-form-item label="是否缓存:" name="keepLive">
 								<a-radio-group optionType="button" v-model:value="formData.keepLive" :options="keepLiveOptions" />
 							</a-form-item>
 						</a-col>
-						<a-col :span="8" v-if="formData.menuType !== 'CATALOG'">
+						<a-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8" v-if="formData.menuType !== 'CATALOG'">
 							<a-form-item label="布局可见:" name="displayLayout">
 								<a-radio-group
 									optionType="button"
diff --git a/snowy-admin-web/src/views/sys/resource/menu/index.vue b/snowy-admin-web/src/views/sys/resource/menu/index.vue
index cae4644b..41613d2d 100644
--- a/snowy-admin-web/src/views/sys/resource/menu/index.vue
+++ b/snowy-admin-web/src/views/sys/resource/menu/index.vue
@@ -1,25 +1,33 @@
 <template>
 	<a-card :bordered="false">
-		<a-space>
-			<a-radio-group v-model:value="moduleType" button-style="solid">
-				<a-radio-button
-					v-for="module in moduleTypeList"
-					:key="module.id"
-					:value="module.id"
-					@click="moduleClock(module.id)"
-				>
-					<component :is="module.icon" />
-					{{ module.title }}</a-radio-button
-				>
-			</a-radio-group>
-			<a-input-search
-				v-model:value="searchFormState.searchKey"
-				placeholder="请输入菜单名称关键词"
-				enter-button
-				allowClear
-				@search="onSearch"
-			/>
-		</a-space>
+		<a-form>
+			<a-row :gutter="10">
+				<a-col :xs="24" :sm="16" :md="16" :lg="16" :xl="16">
+					<a-form-item>
+						<a-radio-group v-model:value="moduleType" button-style="solid">
+							<a-radio-button v-for="module in moduleTypeList"
+											:key="module.id"
+											:value="module.id"
+											@click="moduleClock(module.id)">
+								<component :is="module.icon" />
+								{{ module.title }}
+							</a-radio-button>
+						</a-radio-group>
+					</a-form-item>
+				</a-col>
+				<a-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
+					<a-form-item>
+						<a-input-search
+							v-model:value="searchFormState.searchKey"
+							placeholder="请输入菜单名称关键词"
+							enter-button
+							allowClear
+							@search="onSearch"
+						/>
+					</a-form-item>
+				</a-col>
+			</a-row>
+		</a-form>
 	</a-card>
 	<a-card :bordered="false" class="mt-2">
 		<s-table
@@ -180,6 +188,7 @@
 			title: '操作',
 			dataIndex: 'action',
 			width: '200px',
+			fixed: 'right',
 			scopedSlots: { customRender: 'action' }
 		}
 	]
diff --git a/snowy-admin-web/src/views/sys/resource/module/index.vue b/snowy-admin-web/src/views/sys/resource/module/index.vue
index 881068cd..d683cebd 100644
--- a/snowy-admin-web/src/views/sys/resource/module/index.vue
+++ b/snowy-admin-web/src/views/sys/resource/module/index.vue
@@ -1,15 +1,29 @@
 <template>
 	<a-card :bordered="false" :body-style="{ 'padding-bottom': '0px' }" class="mb-2">
-		<a-form ref="searchFormRef" name="advanced_search" :model="searchFormState" class="ant-advanced-search-form">
-			<a-row :gutter="24">
-				<a-col :span="8">
-					<a-form-item label="名称关键词" name="searchKey">
+		<a-form ref="searchFormRef" :model="searchFormState">
+			<a-row :gutter="10">
+				<a-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
+					<a-form-item label="关键词" name="searchKey">
 						<a-input v-model:value="searchFormState.searchKey" placeholder="请输入模块名称关键词" />
 					</a-form-item>
 				</a-col>
-				<a-col :span="8">
-					<a-button type="primary" @click="tableRef.refresh(true)">查询</a-button>
-					<a-button class="xn-mg08" @click="reset">重置</a-button>
+				<a-col :xs="24" :sm="16" :md="16" :lg="16" :xl="16">
+					<a-form-item>
+						<a-space>
+							<a-button type="primary" @click="tableRef.refresh(true)">
+								<template #icon>
+									<SearchOutlined/>
+								</template>
+								查询
+							</a-button>
+							<a-button @click="reset">
+								<template #icon>
+									<redo-outlined/>
+								</template>
+								重置
+							</a-button>
+						</a-space>
+					</a-form-item>
 				</a-col>
 			</a-row>
 		</a-form>
@@ -93,6 +107,7 @@
 			title: '操作',
 			dataIndex: 'action',
 			align: 'center',
+			fixed: 'right',
 			width: '200px'
 		}
 	]
diff --git a/snowy-admin-web/src/views/sys/role/index.vue b/snowy-admin-web/src/views/sys/role/index.vue
index 8b8d4bd6..97b3fc1c 100644
--- a/snowy-admin-web/src/views/sys/role/index.vue
+++ b/snowy-admin-web/src/views/sys/role/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<a-row :gutter="10">
-		<a-col :xs="24" :sm="24" :md="24" :lg="5" :xl="5">
+		<a-col :xs="0" :sm="0" :md="0" :lg="4" :xl="4">
 			<a-card :bordered="false" :loading="cardLoading" class="left-tree-container">
 				<a-tree
 					v-if="treeData.length > 0"
@@ -13,24 +13,52 @@
 				<a-empty v-else :image="Empty.PRESENTED_IMAGE_SIMPLE" />
 			</a-card>
 		</a-col>
-		<a-col :xs="24" :sm="24" :md="24" :lg="19" :xl="19">
+		<a-col :xs="24" :sm="24" :md="24" :lg="20" :xl="20">
 			<a-card :bordered="false" class="xn-mb10">
-				<a-form ref="searchFormRef" name="advanced_search" class="ant-advanced-search-form" :model="searchFormState">
-					<a-row :gutter="24">
-						<a-col :span="8">
-							<a-form-item name="searchKey" label="名称关键词">
+				<a-form ref="searchFormRef" :model="searchFormState">
+					<a-row :gutter="10">
+						<a-col :xs="24" :sm="8" :md="8" :lg="0" :xl="0">
+							<a-form-item label="组织：" name="categoryOrOrgId">
+								<a-tree-select
+									v-model:value="searchFormState.categoryOrOrgId"
+									class="xn-wd"
+									:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+									placeholder="请选择组织"
+									allow-clear
+									:tree-data="treeData"
+									:field-names="{
+											children: 'children',
+											label: 'name',
+											value: 'id'
+										}"
+									selectable="false"
+									tree-line
+									@change="onCategoryOrOrgIdSelect"
+								/>
+							</a-form-item>
+						</a-col>
+						<a-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
+							<a-form-item name="searchKey" label="关键词">
 								<a-input v-model:value="searchFormState.searchKey" placeholder="请输入角色名称关键词"></a-input>
 							</a-form-item>
 						</a-col>
-						<a-col :span="8">
-							<a-button type="primary" @click="tableRef.refresh(true)">
-								<template #icon><SearchOutlined /></template>
-								查询
-							</a-button>
-							<a-button class="snowy-button-left" @click="reset">
-								<template #icon><redo-outlined /></template>
-								重置
-							</a-button>
+						<a-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
+							<a-form-item>
+								<a-space>
+									<a-button type="primary" @click="tableRef.refresh(true)">
+										<template #icon>
+											<SearchOutlined/>
+										</template>
+										查询
+									</a-button>
+									<a-button @click="reset">
+										<template #icon>
+											<redo-outlined/>
+										</template>
+										重置
+									</a-button>
+								</a-space>
+							</a-form-item>
 						</a-col>
 					</a-row>
 				</a-form>
@@ -45,7 +73,7 @@
 					bordered
 					:row-key="(record) => record.id"
 					:row-selection="options.rowSelection"
-					@resizeColumn="handleResizeColumn"
+					:scroll="{ x: 'max-content' }"
 				>
 					<template #operator class="table-operator">
 						<a-space>
@@ -132,7 +160,6 @@
 		{
 			title: '角色名称',
 			dataIndex: 'name',
-			resizable: true,
 			width: 150
 		},
 		{
@@ -148,6 +175,7 @@
 			title: '操作',
 			dataIndex: 'action',
 			align: 'center',
+			fixed: 'right',
 			width: '200px'
 		}
 	]
@@ -194,6 +222,9 @@
 	// 重置
 	const reset = () => {
 		searchFormRef.value.resetFields()
+		delete searchFormState.value.categoryOrOrgId
+		delete searchFormState.value.orgId
+		delete searchFormState.value.category
 		tableRef.value.refresh(true)
 	}
 	// 加载左侧的树
@@ -242,6 +273,17 @@
 		}
 		tableRef.value.refresh(true)
 	}
+	// 下拉树点击的情况
+	const onCategoryOrOrgIdSelect = (selectedId) => {
+		searchFormState.value.current = 0
+		if (selectedId === 'GLOBAL') {
+			searchFormState.value.category = selectedId
+			delete searchFormState.value.orgId
+		} else {
+			searchFormState.value.orgId = selectedId
+			delete searchFormState.value.category
+		}
+	}
 	// 可伸缩列
 	const handleResizeColumn = (w, col) => {
 		col.width = w
@@ -299,10 +341,5 @@
 </script>
 
 <style scoped>
-	.ant-form-item {
-		margin-bottom: 0 !important;
-	}
-	.snowy-button-left {
-		margin-left: 8px;
-	}
+
 </style>
diff --git a/snowy-admin-web/src/views/sys/user/index.vue b/snowy-admin-web/src/views/sys/user/index.vue
index 566a8d3c..7a57327b 100644
--- a/snowy-admin-web/src/views/sys/user/index.vue
+++ b/snowy-admin-web/src/views/sys/user/index.vue
@@ -12,7 +12,7 @@
 				<a-empty v-else :image="Empty.PRESENTED_IMAGE_SIMPLE"/>
 			</a-card>
 		</a-col>
-		<a-col :xs="24" :sm="20" :md="20" :lg="20" :xl="20">
+		<a-col :xs="24" :sm="24" :md="24" :lg="20" :xl="20">
 			<a-card :bordered="false" class="xn-mb10">
 				<a-form ref="searchFormRef" :model="searchFormState">
 					<a-row :gutter="10">
@@ -65,7 +65,7 @@
 										</template>
 										{{ $t('common.searchButton') }}
 									</a-button>
-									<a-button class="snowy-button-left" @click="reset">
+									<a-button @click="reset">
 										<template #icon>
 											<redo-outlined/>
 										</template>