From 360f1bb233036f89cbcbd218b00479663a24e23a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com>
Date: Wed, 22 Mar 2023 21:44:43 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8D=87=E7=BA=A7=E3=80=91=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E6=95=B4=E4=BD=93=E5=8D=87=E7=BA=A7=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E6=8A=BD=E5=B1=89=E9=87=87=E7=94=A8=E7=BB=9F=E4=B8=80=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E5=8F=AF=E6=A0=B9=E6=8D=AE=E5=96=9C=E5=A5=BD?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E5=9C=A8=E6=8A=BD=E5=B1=89=E8=B7=9F=E5=AF=B9?=
 =?UTF-8?q?=E8=AF=9D=E6=A1=86=E9=9A=8F=E6=84=8F=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 snowy-admin-web/.env.development              |   3 +
 snowy-admin-web/.env.production               |   3 +
 .../src/components/XnFormContainer/demo.vue   |  84 --------
 .../src/components/XnFormContainer/index.vue  |   8 +-
 .../src/components/XnSignName/index.vue       |   8 +-
 snowy-admin-web/src/config/index.js           |   5 +
 .../src/layout/components/setting.vue         |  86 +++++---
 .../src/layout/components/userbar.vue         |  16 +-
 snowy-admin-web/src/store/modules/global.js   |   5 +
 snowy-admin-web/src/style/index.less          |   1 +
 .../src/views/auth/monitor/tokenInfoList.vue  |   6 +-
 snowy-admin-web/src/views/biz/org/form.vue    |  15 +-
 .../src/views/biz/position/form.vue           |   8 +-
 snowy-admin-web/src/views/biz/user/form.vue   |   9 +-
 snowy-admin-web/src/views/biz/user/index.vue  |   8 +-
 .../src/views/dev/config/otherConfig/form.vue |  10 +-
 .../src/views/dev/dict/category/bizIndex.vue  |   2 +-
 .../src/views/dev/dict/category/form.vue      |   8 +-
 .../src/views/dev/dict/category/frmIndex.vue  |   2 +-
 .../src/views/dev/email/detail.vue            |   7 +-
 snowy-admin-web/src/views/dev/email/form.vue  |   5 +-
 snowy-admin-web/src/views/dev/email/index.vue |   2 +-
 snowy-admin-web/src/views/dev/file/detail.vue |   7 +-
 snowy-admin-web/src/views/dev/file/index.vue  |   2 +-
 .../src/views/dev/file/uploadForm.vue         |   8 +-
 snowy-admin-web/src/views/dev/job/form.vue    |   8 +-
 snowy-admin-web/src/views/dev/job/index.vue   |   2 +-
 .../src/views/dev/log/oplog/detail.vue        |   7 +-
 .../src/views/dev/log/vislog/detail.vue       |   7 +-
 .../src/views/dev/message/detail.vue          |   8 +-
 .../src/views/dev/message/form.vue            |   8 +-
 .../src/views/dev/message/index.vue           |   2 +-
 snowy-admin-web/src/views/dev/sms/detail.vue  |   7 +-
 snowy-admin-web/src/views/dev/sms/form.vue    |   7 +-
 snowy-admin-web/src/views/dev/sms/index.vue   |   2 +-
 snowy-admin-web/src/views/gen/preview.vue     |   4 +-
 .../views/index/components/miniMessage.vue    |   9 +-
 .../src/views/index/components/schedule.vue   |   8 +-
 .../src/views/mobile/resource/button/form.vue |   2 +-
 .../views/mobile/resource/button/index.vue    |   7 +-
 .../mobile/resource/menu/changeModuleForm.vue |   8 +-
 .../src/views/mobile/resource/menu/form.vue   | 156 ++++++++------
 .../src/views/mobile/resource/menu/index.vue  |   2 +-
 .../src/views/mobile/resource/module/form.vue |   8 +-
 .../views/mobile/resource/module/index.vue    |   2 +-
 snowy-admin-web/src/views/sys/org/form.vue    |   8 +-
 snowy-admin-web/src/views/sys/org/index.vue   |   2 +-
 .../src/views/sys/position/form.vue           |   8 +-
 .../src/views/sys/position/index.vue          |   2 +-
 .../src/views/sys/resource/button/form.vue    |   2 +-
 .../src/views/sys/resource/button/index.vue   |   8 +-
 .../src/views/sys/resource/field/form.vue     |   2 +-
 .../src/views/sys/resource/field/index.vue    |   2 -
 .../sys/resource/menu/changeModuleForm.vue    |   8 +-
 .../src/views/sys/resource/menu/form.vue      | 190 ++++++++++--------
 .../src/views/sys/resource/module/form.vue    |   8 +-
 .../src/views/sys/resource/module/index.vue   |   2 +-
 .../src/views/sys/resource/spa/form.vue       | 150 ++++++++------
 .../src/views/sys/resource/spa/index.vue      |   3 +-
 snowy-admin-web/src/views/sys/role/form.vue   |   8 +-
 .../sys/role/grantMobileResourceForm.vue      |   6 +-
 .../views/sys/role/grantPermissionForm.vue    |   6 +-
 .../src/views/sys/role/grantResourceForm.vue  |   7 +-
 snowy-admin-web/src/views/sys/role/index.vue  |   2 +-
 snowy-admin-web/src/views/sys/user/form.vue   |   9 +-
 .../views/sys/user/grantPermissionForm.vue    |   6 +-
 .../src/views/sys/user/grantResourceForm.vue  |   6 +-
 snowy-admin-web/src/views/sys/user/impExp.vue |   7 +-
 snowy-admin-web/src/views/sys/user/index.vue  |   8 +-
 .../src/views/sys/user/scopeDefineOrg.vue     |   2 +-
 .../user/userTab/bindForm/updatePassword.vue  |   8 +-
 .../sys/user/userTab/userMessage/detail.vue   |   8 +-
 .../src/main/resources/frontend/form.vue.btl  |   7 +-
 73 files changed, 515 insertions(+), 552 deletions(-)
 delete mode 100644 snowy-admin-web/src/components/XnFormContainer/demo.vue

diff --git a/snowy-admin-web/.env.development b/snowy-admin-web/.env.development
index 75bd9e0d..4f5f665a 100644
--- a/snowy-admin-web/.env.development
+++ b/snowy-admin-web/.env.development
@@ -9,3 +9,6 @@ VITE_API_BASEURL = http://127.0.0.1:82
 
 # 本地端口
 VITE_PORT = 81
+
+# 开启设置抽屉
+VITE_SET_DRAWER = true
diff --git a/snowy-admin-web/.env.production b/snowy-admin-web/.env.production
index ace0d813..cc8d8d42 100644
--- a/snowy-admin-web/.env.production
+++ b/snowy-admin-web/.env.production
@@ -9,3 +9,6 @@ VITE_API_BASEURL = http://127.0.0.1:82
 
 # 本地端口
 VITE_PORT = 81
+
+# 开启设置抽屉
+VITE_SET_DRAWER = false
diff --git a/snowy-admin-web/src/components/XnFormContainer/demo.vue b/snowy-admin-web/src/components/XnFormContainer/demo.vue
deleted file mode 100644
index 60293bd9..00000000
--- a/snowy-admin-web/src/components/XnFormContainer/demo.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<template>
-	<div>
-		<button @click="showDrawer">Show Drawer</button>
-		<button @click="showModal">Show Modal</button>
-		<xn-form-container
-			v-model:visible="drawerVisible"
-			:type="drawerType"
-			title="Drawer Title"
-			placement="right"
-			width="300px"
-			:destroyOnClose="false"
-			@ok="onOkDrawer"
-			@close="onCloseDrawer"
-		>
-			<p>Drawer Content</p>
-			<template #footer>
-				<div>Drawer footer</div>
-			</template>
-			<template #title>
-				<div>Drawer title</div>
-			</template>
-		</xn-form-container>
-		<xn-form-container
-			v-model:visible="modalVisible"
-			:type="modalType"
-			title="Modal Title"
-			:width="800"
-			:destroyOnClose="false"
-			@ok="onOkModal"
-			@close="onCloseModal"
-		>
-			<p>Modal Content</p>
-			<template #footer>
-				<div>Modal footer</div>
-			</template>
-			<template #title>
-				<div>Modal title</div>
-			</template>
-		</xn-form-container>
-	</div>
-</template>
-
-<script>
-	import XnFormContainer from './XnFormContainer'
-
-	export default {
-		name: 'Example',
-		components: {
-			XnFormContainer
-		},
-		data() {
-			return {
-				drawerVisible: false,
-				drawerType: 'drawer',
-				modalVisible: false,
-				modalType: 'modal'
-			}
-		},
-		methods: {
-			showDrawer() {
-				this.drawerVisible = true
-			},
-			showModal() {
-				this.modalVisible = true
-			},
-			onOkDrawer() {
-				this.$message.success('onOkDrawer')
-				this.drawerVisible = false
-			},
-			onCloseModal() {
-				this.$message.success('onCloseModal')
-				this.modalVisible = false
-			},
-			onCloseDrawer() {
-				this.$message.success('onCloseDrawer')
-				this.drawerVisible = false
-			},
-			onOkModal() {
-				this.$message.success('onOkModal')
-				this.modalVisible = false
-			}
-		}
-	}
-</script>
diff --git a/snowy-admin-web/src/components/XnFormContainer/index.vue b/snowy-admin-web/src/components/XnFormContainer/index.vue
index 2ee63841..e975f98c 100644
--- a/snowy-admin-web/src/components/XnFormContainer/index.vue
+++ b/snowy-admin-web/src/components/XnFormContainer/index.vue
@@ -4,7 +4,7 @@
 			<slot :name="slotKey" />
 		</template>
 	</Modal>
-	<Drawer v-else :visible="visible" v-bind="$attrs">
+	<Drawer v-else :visible="visible" v-bind="$attrs" :footer-style="{ textAlign: 'right' }">
 		<template v-for="slotKey in slotKeys" #[slotKey]>
 			<slot :name="slotKey" />
 		</template>
@@ -28,10 +28,6 @@
 		},
 		inheritAttrs: false,
 		props: {
-			type: {
-				type: String,
-				default: FormContainerTypeEnum.MODAL
-			},
 			visible: {
 				type: Boolean,
 				default: false,
@@ -45,7 +41,7 @@
 				return Object.keys(this.$slots)
 			},
 			isModal() {
-				return this.type === FormContainerTypeEnum.MODAL
+				return FormContainerTypeEnum.MODAL === this.$store.state.global.formStyle
 			}
 		},
 		methods: {
diff --git a/snowy-admin-web/src/components/XnSignName/index.vue b/snowy-admin-web/src/components/XnSignName/index.vue
index 77130c40..15fac2a2 100644
--- a/snowy-admin-web/src/components/XnSignName/index.vue
+++ b/snowy-admin-web/src/components/XnSignName/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<a-modal ref="signModel" v-model:visible="visible" :width="600" title="电子签名" @cancel="handleClear" @ok="handleOk">
+	<xn-form-container ref="signModel" v-model:visible="visible" :width="700" title="电子签名" @close="handleClear" @ok="handleOk">
 		<a-row :gutter="5">
 			<a-col :span="15">
 				<div style="border: 1px solid rgb(236 236 236)">
@@ -40,7 +40,11 @@
 				<a-button @click="handleReset">清屏</a-button>
 			</a-space>
 		</div>
-	</a-modal>
+		<template #footer>
+			<a-button style="margin-right: 8px" @click="handleClear">取消</a-button>
+			<a-button type="primary" @click="handleOk">确定</a-button>
+		</template>
+	</xn-form-container>
 </template>
 
 <script setup>
diff --git a/snowy-admin-web/src/config/index.js b/snowy-admin-web/src/config/index.js
index 94638817..f1d0e49d 100644
--- a/snowy-admin-web/src/config/index.js
+++ b/snowy-admin-web/src/config/index.js
@@ -63,10 +63,15 @@ const DEFAULT_CONFIG = {
 	// 默认整体主题
 	SNOWY_THEME: 'dark',
 
+	// 整体表单风格
+	SNOWY_FORM_STYLE: 'drawer',
+
 	// 成功色
 	success: '#52c41a',
+
 	// 警告色
 	warning: '#faad14',
+
 	// 错误色
 	error: '#f5222f',
 
diff --git a/snowy-admin-web/src/layout/components/setting.vue b/snowy-admin-web/src/layout/components/setting.vue
index 66b60eb7..4b21dee2 100644
--- a/snowy-admin-web/src/layout/components/setting.vue
+++ b/snowy-admin-web/src/layout/components/setting.vue
@@ -70,6 +70,15 @@
 				<a-form-item label="菜单排他展开">
 					<a-switch v-model:checked="sideUniqueOpen" />
 				</a-form-item>
+				<a-form-item label="表单风格">
+					<a-select
+						v-model:value="formStyle"
+						style="width: 80px"
+						size="small"
+						:options="xnFormStyleOptions"
+						@change="formStyleChange"
+					/>
+				</a-form-item>
 			</a-form>
 			<a-alert
 				message="以上配置可实时预览，开发者可在 config/index.js 中配置默认值，不建议在生产环境下开放布局设置"
@@ -80,14 +89,15 @@
 </template>
 
 <script>
-	import { colorList } from '../../config/settingConfig'
-	import { ThemeModeEnum } from '../../utils/enum'
+	import { colorList } from '@/config/settingConfig'
+	import { ThemeModeEnum } from '@/utils/enum'
+	import tool from '@/utils/tool'
 
 	export default defineComponent({
 		data() {
 			return {
 				// 整体风格
-				sideStyle: this.$TOOL.data.get('SNOWY_THEME') || this.$store.state.global.theme,
+				sideStyle: tool.data.get('SNOWY_THEME') || this.$store.state.global.theme,
 				sideStyleList: [
 					{
 						tips: '暗色主题风格',
@@ -105,7 +115,7 @@
 						style: 'snowy-setting-checkbox-item-realdark'
 					}
 				],
-				layout: this.$TOOL.data.get('SNOWY_LAYOUT') || this.$store.state.global.layout,
+				layout: tool.data.get('SNOWY_LAYOUT') || this.$store.state.global.layout,
 				layoutList: [
 					{
 						tips: '经典',
@@ -118,18 +128,29 @@
 						style: 'snowy-setting-layout-menu-doublerow'
 					}
 				],
+				xnFormStyleOptions: [
+					{
+						label: '抽屉',
+						value: 'drawer'
+					},
+					{
+						label: '对话框',
+						value: 'modal'
+					}
+				],
 				topHanderThemeColorOpen:
-					this.$TOOL.data.get('SNOWY_TOP_HANDER_THEME_COLOR_OPEN') || this.$store.state.global.topHanderThemeColorOpen,
+					tool.data.get('SNOWY_TOP_HANDER_THEME_COLOR_OPEN') || this.$store.state.global.topHanderThemeColorOpen,
 				topHanderThemeColorSpread:
-					this.$TOOL.data.get('SNOWY_TOP_HANDER_THEME_COLOR_SPREAD') ||
+					tool.data.get('SNOWY_TOP_HANDER_THEME_COLOR_SPREAD') ||
 					this.$store.state.global.topHanderThemeColorSpread,
-				menuIsCollapse: this.$TOOL.data.get('SNOWY_MENU_COLLAPSE') || this.$store.state.global.menuIsCollapse,
-				sideUniqueOpen: this.$TOOL.data.get('SNOWY_SIDE_UNIQUE_OPEN') || this.$store.state.global.sideUniqueOpen,
-				layoutTagsOpen: this.$TOOL.data.get('SNOWY_LAYOUT_TAGS_OPEN') || this.$store.state.global.layoutTagsOpen,
-				breadcrumbOpen: this.$TOOL.data.get('SNOWY_BREADCRUMD_OPEN') || this.$store.state.global.breadcrumbOpen,
-				moduleUnfoldOpen: this.$TOOL.data.get('SNOWY_MODULE_UNFOLD_OPEN') || this.$store.state.global.moduleUnfoldOpen,
-				theme: this.$TOOL.data.get('APP_THEME') || this.$store.state.global.theme,
-				themeColor: this.$TOOL.data.get('SNOWY_THEME_COLOR') || this.$store.state.global.themeColor,
+				menuIsCollapse: tool.data.get('SNOWY_MENU_COLLAPSE') || this.$store.state.global.menuIsCollapse,
+				sideUniqueOpen: tool.data.get('SNOWY_SIDE_UNIQUE_OPEN') || this.$store.state.global.sideUniqueOpen,
+				layoutTagsOpen: tool.data.get('SNOWY_LAYOUT_TAGS_OPEN') || this.$store.state.global.layoutTagsOpen,
+				breadcrumbOpen: tool.data.get('SNOWY_BREADCRUMD_OPEN') || this.$store.state.global.breadcrumbOpen,
+				moduleUnfoldOpen: tool.data.get('SNOWY_MODULE_UNFOLD_OPEN') || this.$store.state.global.moduleUnfoldOpen,
+				theme: tool.data.get('APP_THEME') || this.$store.state.global.theme,
+				themeColor: tool.data.get('SNOWY_THEME_COLOR') || this.$store.state.global.themeColor,
+				formStyle: tool.data.get('SNOWY_FORM_STYLE') || this.$store.state.global.formStyle,
 				colorList
 			}
 		},
@@ -137,42 +158,42 @@
 			menuIsCollapse() {
 				this.$store.commit('TOGGLE_menuIsCollapse')
 				if (this.$store.state.global.menuIsCollapse) {
-					this.$TOOL.data.set('SNOWY_MENU_COLLAPSE', true)
+					tool.data.set('SNOWY_MENU_COLLAPSE', true)
 				} else {
-					this.$TOOL.data.set('SNOWY_MENU_COLLAPSE', false)
+					tool.data.set('SNOWY_MENU_COLLAPSE', false)
 				}
 			},
 			sideUniqueOpen() {
 				this.$store.commit('TOGGLE_sideUniqueOpen')
 				if (this.$store.state.global.sideUniqueOpen) {
-					this.$TOOL.data.set('SNOWY_SIDE_UNIQUE_OPEN', true)
+					tool.data.set('SNOWY_SIDE_UNIQUE_OPEN', true)
 				} else {
-					this.$TOOL.data.set('SNOWY_SIDE_UNIQUE_OPEN', false)
+					tool.data.set('SNOWY_SIDE_UNIQUE_OPEN', false)
 				}
 			},
 			layoutTagsOpen() {
 				this.$store.commit('TOGGLE_layoutTagsOpen')
 				if (this.$store.state.global.layoutTagsOpen) {
-					this.$TOOL.data.set('SNOWY_LAYOUT_TAGS_OPEN', true)
+					tool.data.set('SNOWY_LAYOUT_TAGS_OPEN', true)
 				} else {
-					this.$TOOL.data.set('SNOWY_LAYOUT_TAGS_OPEN', false)
+					tool.data.set('SNOWY_LAYOUT_TAGS_OPEN', false)
 				}
 			},
 			breadcrumbOpen() {
 				this.$store.commit('TOGGLE_breadcrumbOpen')
 				if (this.$store.state.global.breadcrumbOpen) {
-					this.$TOOL.data.set('SNOWY_BREADCRUMD_OPEN', true)
+					tool.data.set('SNOWY_BREADCRUMD_OPEN', true)
 				} else {
-					this.$TOOL.data.set('SNOWY_BREADCRUMD_OPEN', false)
+					tool.data.set('SNOWY_BREADCRUMD_OPEN', false)
 				}
 			},
 			topHanderThemeColorOpen() {
 				this.$store.commit('TOGGLE_topHanderThemeColorOpen')
 				if (this.$store.state.global.topHanderThemeColorOpen) {
-					this.$TOOL.data.set('SNOWY_TOP_HANDER_THEME_COLOR_OPEN', true)
+					tool.data.set('SNOWY_TOP_HANDER_THEME_COLOR_OPEN', true)
 				} else {
 					// 关闭顶栏主题色
-					this.$TOOL.data.set('SNOWY_TOP_HANDER_THEME_COLOR_OPEN', false)
+					tool.data.set('SNOWY_TOP_HANDER_THEME_COLOR_OPEN', false)
 					// 这个时候我们吧通栏的设置也给搞为false
 					this.topHanderThemeColorSpread = false
 				}
@@ -180,17 +201,17 @@
 			topHanderThemeColorSpread() {
 				this.$store.commit('TOGGLE_topHanderThemeColorSpread')
 				if (this.$store.state.global.topHanderThemeColorSpread) {
-					this.$TOOL.data.set('SNOWY_TOP_HANDER_THEME_COLOR_SPREAD', true)
+					tool.data.set('SNOWY_TOP_HANDER_THEME_COLOR_SPREAD', true)
 				} else {
-					this.$TOOL.data.set('SNOWY_TOP_HANDER_THEME_COLOR_SPREAD', false)
+					tool.data.set('SNOWY_TOP_HANDER_THEME_COLOR_SPREAD', false)
 				}
 			},
 			moduleUnfoldOpen() {
 				this.$store.commit('TOGGLE_moduleUnfoldOpen')
 				if (this.$store.state.global.moduleUnfoldOpen) {
-					this.$TOOL.data.set('SNOWY_MODULE_UNFOLD_OPEN', true)
+					tool.data.set('SNOWY_MODULE_UNFOLD_OPEN', true)
 				} else {
-					this.$TOOL.data.set('SNOWY_MODULE_UNFOLD_OPEN', false)
+					tool.data.set('SNOWY_MODULE_UNFOLD_OPEN', false)
 				}
 			},
 		},
@@ -199,19 +220,24 @@
 			setSideStyle(value) {
 				this.$store.commit('SET_theme', value)
 				this.sideStyle = value
-				this.$TOOL.data.set('SNOWY_THEME', value)
+				tool.data.set('SNOWY_THEME', value)
 			},
 			// 设置整体界面布局
 			layoutStyle(value) {
 				this.$store.commit('SET_layout', value)
-				this.$TOOL.data.set('SNOWY_LAYOUT', value)
+				tool.data.set('SNOWY_LAYOUT', value)
 				this.layout = value
 			},
 			// 切换颜色
 			tagColor(value) {
 				this.themeColor = value
-				this.$TOOL.data.set('SNOWY_THEME_COLOR', value)
+				tool.data.set('SNOWY_THEME_COLOR', value)
 				this.$store.commit('SET_themeColor', value)
+			},
+			// 切换表单风格
+			formStyleChange(value) {
+				tool.data.set('SNOWY_FORM_STYLE', value)
+				this.$store.commit('SET_formStyle', value)
 			}
 		}
 	})
diff --git a/snowy-admin-web/src/layout/components/userbar.vue b/snowy-admin-web/src/layout/components/userbar.vue
index f5750a91..ef820090 100644
--- a/snowy-admin-web/src/layout/components/userbar.vue
+++ b/snowy-admin-web/src/layout/components/userbar.vue
@@ -43,29 +43,30 @@
 				</a-menu>
 			</template>
 		</a-dropdown>
-		<div class="setting panel-item" @click="openSetting">
+		<div v-if="setDeawer === 'true'" class="setting panel-item" @click="openSetting">
 			<layout-outlined />
 		</div>
 	</div>
 
 	<!-- 整体风格设置抽屉 -->
 	<a-drawer v-model:visible="settingDialog" :closable="false" width="300">
-		<setting></setting>
+		<setting />
 	</a-drawer>
 	<!-- 搜索面板 -->
-	<a-modal
+	<xn-form-container
+		title="搜索"
 		:visible="searchActive"
 		:closable="false"
 		:footer="null"
-		width="600px"
+		:width="600"
 		style="overflow: hidden"
 		destroyOnClose
 		dialogClass="searchModal"
 		:bodyStyle="{ maxHeight: '520px', overflow: 'auto', padding: '14px' }"
-		@cancel="searchPanelClose"
+		@close="searchPanelClose"
 	>
 		<panel-search ref="panelSearch" @close="searchPanelClose" />
-	</a-modal>
+	</xn-form-container>
 </template>
 
 <script>
@@ -93,7 +94,8 @@
 				settingDialog: false,
 				userInfo: {},
 				userName: '',
-				userNameF: ''
+				userNameF: '',
+				setDeawer: import.meta.env.VITE_SET_DRAWER
 			}
 		},
 		computed: {
diff --git a/snowy-admin-web/src/store/modules/global.js b/snowy-admin-web/src/store/modules/global.js
index f011020a..713a7fc3 100644
--- a/snowy-admin-web/src/store/modules/global.js
+++ b/snowy-admin-web/src/store/modules/global.js
@@ -50,6 +50,8 @@ export default {
 		theme: getCacheConfig('SNOWY_THEME'),
 		// 主题颜色
 		themeColor: toolDataGet('SNOWY_THEME_COLOR') || config.COLOR,
+		// 整体表单风格
+		formStyle: getCacheConfig('SNOWY_FORM_STYLE'),
 		// 用户信息
 		userInfo: toolDataGet('USER_INFO') || {},
 		// 系统配置
@@ -97,6 +99,9 @@ export default {
 		TOGGLE_moduleUnfoldOpen(state) {
 			state.moduleUnfoldOpen = !state.moduleUnfoldOpen
 		},
+		SET_formStyle(state, key) {
+			state.formStyle = key
+		},
 		SET_userInfo(state, key) {
 			state.userInfo = key
 		},
diff --git a/snowy-admin-web/src/style/index.less b/snowy-admin-web/src/style/index.less
index edd79e11..d8c16f5f 100644
--- a/snowy-admin-web/src/style/index.less
+++ b/snowy-admin-web/src/style/index.less
@@ -413,6 +413,7 @@ body,
 .ant-picker-time-panel-column,
 .timeline-div,
 .gen-preview-content,
+.ant-menu,
 
 .adminui-main{
 	&::-webkit-scrollbar {
diff --git a/snowy-admin-web/src/views/auth/monitor/tokenInfoList.vue b/snowy-admin-web/src/views/auth/monitor/tokenInfoList.vue
index f71b0554..b8db8673 100644
--- a/snowy-admin-web/src/views/auth/monitor/tokenInfoList.vue
+++ b/snowy-admin-web/src/views/auth/monitor/tokenInfoList.vue
@@ -1,11 +1,9 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		title="令牌列表"
 		:width="650"
 		:visible="visible"
 		:destroy-on-close="true"
-		:body-style="{ paddingBottom: '80px' }"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<a-button
@@ -71,7 +69,7 @@
 				</template>
 			</template>
 		</a-table>
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup>
diff --git a/snowy-admin-web/src/views/biz/org/form.vue b/snowy-admin-web/src/views/biz/org/form.vue
index 29c849aa..f0f8a904 100644
--- a/snowy-admin-web/src/views/biz/org/form.vue
+++ b/snowy-admin-web/src/views/biz/org/form.vue
@@ -1,11 +1,9 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		:title="formData.id ? '编辑机构' : '增加机构'"
-		:width="500"
+		:width="550"
 		:visible="visible"
 		:destroy-on-close="true"
-		:body-style="{ paddingBottom: '80px' }"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
@@ -25,7 +23,7 @@
 					}"
 					selectable="false"
 					tree-line
-				></a-tree-select>
+				/>
 			</a-form-item>
 			<a-form-item label="机构名称：" name="name">
 				<a-input v-model:value="formData.name" placeholder="请输入机构名称" allow-clear />
@@ -36,8 +34,7 @@
 					:options="orgCategoryOptions"
 					style="width: 100%"
 					placeholder="请选择机构分类"
-				>
-				</a-select>
+				/>
 			</a-form-item>
 			<a-form-item label="排序：" name="sortCode">
 				<a-input-number style="width: 100%" v-model:value="formData.sortCode" :max="100" />
@@ -61,7 +58,7 @@
 			:radio-model="true"
 			@onBack="userBack"
 		/>
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup name="bizOrgForm">
@@ -170,5 +167,3 @@
 		onOpen
 	})
 </script>
-
-<style scoped></style>
diff --git a/snowy-admin-web/src/views/biz/position/form.vue b/snowy-admin-web/src/views/biz/position/form.vue
index 57eade07..67164cdf 100644
--- a/snowy-admin-web/src/views/biz/position/form.vue
+++ b/snowy-admin-web/src/views/biz/position/form.vue
@@ -1,11 +1,9 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		:title="formData.id ? '编辑岗位' : '增加岗位'"
-		:width="500"
+		:width="550"
 		:visible="visible"
 		:destroy-on-close="true"
-		:body-style="{ paddingBottom: '80px' }"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
@@ -47,7 +45,7 @@
 			<a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
 			<a-button type="primary" :loading="submitLoading" @click="onSubmit">保存</a-button>
 		</template>
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup name="bizPositionForm">
diff --git a/snowy-admin-web/src/views/biz/user/form.vue b/snowy-admin-web/src/views/biz/user/form.vue
index b6e75509..9990207c 100644
--- a/snowy-admin-web/src/views/biz/user/form.vue
+++ b/snowy-admin-web/src/views/biz/user/form.vue
@@ -1,11 +1,10 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		:title="formData.id ? '编辑人员' : '增加人员'"
-		:width="620"
+		:width="800"
 		:visible="visible"
 		:destroy-on-close="true"
-		:body-style="{ paddingBottom: '80px', 'padding-top': '0px' }"
-		:footer-style="{ textAlign: 'right' }"
+		:body-style="{ 'padding-top': '0px' }"
 		@close="onClose"
 	>
 		<a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
@@ -325,7 +324,7 @@
 			<a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
 			<a-button type="primary" :loading="formLoading" @click="onSubmit">保存</a-button>
 		</template>
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup>
diff --git a/snowy-admin-web/src/views/biz/user/index.vue b/snowy-admin-web/src/views/biz/user/index.vue
index b0a48ae2..dbfafcc7 100644
--- a/snowy-admin-web/src/views/biz/user/index.vue
+++ b/snowy-admin-web/src/views/biz/user/index.vue
@@ -323,9 +323,11 @@
 		}
 		if (selectedRowKeys.value.length > 0) {
 			const params = {
-				userIds: selectedRowKeys.value.map((m) => {
-					return m
-				}).join()
+				userIds: selectedRowKeys.value
+					.map((m) => {
+						return m
+					})
+					.join()
 			}
 			exportBatchUser(params)
 			return
diff --git a/snowy-admin-web/src/views/dev/config/otherConfig/form.vue b/snowy-admin-web/src/views/dev/config/otherConfig/form.vue
index a430b352..79485d1f 100644
--- a/snowy-admin-web/src/views/dev/config/otherConfig/form.vue
+++ b/snowy-admin-web/src/views/dev/config/otherConfig/form.vue
@@ -1,11 +1,9 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		:title="formData.id ? '编辑配置' : '增加配置'"
-		:width="500"
+		:width="550"
 		:visible="visible"
 		:destroy-on-close="true"
-		:body-style="{ paddingBottom: '80px' }"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
@@ -23,14 +21,14 @@
 				<a-input v-model:value="formData.remark" placeholder="请输入备注" allow-clear />
 			</a-form-item>
 			<a-form-item label="排序:" name="sortCode">
-				<a-input-munber style="width: 100%" v-model:value="formData.sortCode" :max="100" />
+				<a-input-number style="width: 100%" v-model:value="formData.sortCode" :max="1000" />
 			</a-form-item>
 		</a-form>
 		<template #footer>
 			<a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
 			<a-button type="primary" @click="onSubmit" :loading="submitLoading">保存</a-button>
 		</template>
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup>
diff --git a/snowy-admin-web/src/views/dev/dict/category/bizIndex.vue b/snowy-admin-web/src/views/dev/dict/category/bizIndex.vue
index ae830db7..097ca5ee 100644
--- a/snowy-admin-web/src/views/dev/dict/category/bizIndex.vue
+++ b/snowy-admin-web/src/views/dev/dict/category/bizIndex.vue
@@ -108,7 +108,7 @@
 	}
 	// 重置
 	const reset = () => {
-		searchFormRef.value.resetFields();
+		searchFormRef.value.resetFields()
 		table.value.refresh(true)
 	}
 	// 加载左侧的树
diff --git a/snowy-admin-web/src/views/dev/dict/category/form.vue b/snowy-admin-web/src/views/dev/dict/category/form.vue
index e64b873d..b0579ab5 100644
--- a/snowy-admin-web/src/views/dev/dict/category/form.vue
+++ b/snowy-admin-web/src/views/dev/dict/category/form.vue
@@ -1,11 +1,9 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		:title="formData.id ? '编辑字典' : '增加字典'"
-		:width="500"
+		:width="550"
 		:visible="visible"
 		:destroy-on-close="true"
-		:body-style="{ paddingBottom: '80px' }"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical" :label-col="labelCol">
@@ -46,7 +44,7 @@
 			<a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
 			<a-button type="primary" @click="onSubmit">保存</a-button>
 		</template>
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup name="dictForm">
diff --git a/snowy-admin-web/src/views/dev/dict/category/frmIndex.vue b/snowy-admin-web/src/views/dev/dict/category/frmIndex.vue
index 53dc8d30..0e356c2f 100644
--- a/snowy-admin-web/src/views/dev/dict/category/frmIndex.vue
+++ b/snowy-admin-web/src/views/dev/dict/category/frmIndex.vue
@@ -107,7 +107,7 @@
 	}
 	// 重置
 	const reset = () => {
-		searchFormRef.value.resetFields();
+		searchFormRef.value.resetFields()
 		table.value.refresh(true)
 	}
 	// 加载左侧的树
diff --git a/snowy-admin-web/src/views/dev/email/detail.vue b/snowy-admin-web/src/views/dev/email/detail.vue
index d71cbb96..e3767e9b 100644
--- a/snowy-admin-web/src/views/dev/email/detail.vue
+++ b/snowy-admin-web/src/views/dev/email/detail.vue
@@ -1,10 +1,9 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		title="详情"
-		:width="600"
+		:width="700"
 		:visible="visible"
 		:destroy-on-close="true"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<a-descriptions :column="1" size="middle" bordered class="mb-2">
@@ -38,7 +37,7 @@
 				<span>{{ formData.receiptInfo }}</span>
 			</a-form-item>
 		</a-form>
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup name="emailDetail">
diff --git a/snowy-admin-web/src/views/dev/email/form.vue b/snowy-admin-web/src/views/dev/email/form.vue
index b26c54f0..c266b9a9 100644
--- a/snowy-admin-web/src/views/dev/email/form.vue
+++ b/snowy-admin-web/src/views/dev/email/form.vue
@@ -1,10 +1,9 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		title="发送邮件"
 		:width="1000"
 		:visible="visible"
 		:destroy-on-close="true"
-		:footer-style="{ textAlign: 'right' }"
 		:bodyStyle="{ 'padding-top': '0px' }"
 		@close="onClose"
 	>
@@ -23,7 +22,7 @@
 			<a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
 			<a-button type="primary" @click="onSubmit" :loading="sendLoading">发送</a-button>
 		</template>
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup name="emailForm">
diff --git a/snowy-admin-web/src/views/dev/email/index.vue b/snowy-admin-web/src/views/dev/email/index.vue
index f485a1dd..641da7ff 100644
--- a/snowy-admin-web/src/views/dev/email/index.vue
+++ b/snowy-admin-web/src/views/dev/email/index.vue
@@ -139,7 +139,7 @@
 	}
 	// 重置
 	const reset = () => {
-		searchFormRef.value.resetFields();
+		searchFormRef.value.resetFields()
 		table.value.refresh(true)
 	}
 	const engineOptions = tool.dictList('EMAIL_ENGINE')
diff --git a/snowy-admin-web/src/views/dev/file/detail.vue b/snowy-admin-web/src/views/dev/file/detail.vue
index c40ccefb..8a7e0b11 100644
--- a/snowy-admin-web/src/views/dev/file/detail.vue
+++ b/snowy-admin-web/src/views/dev/file/detail.vue
@@ -1,10 +1,9 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		title="详情"
-		:width="600"
+		:width="700"
 		:visible="visible"
 		:destroy-on-close="true"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<a-descriptions :column="1" size="middle" bordered class="mb-2">
@@ -24,7 +23,7 @@
 				<span>{{ formData.downloadPath }}</span>
 			</a-form-item>
 		</a-form>
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup name="fileDetail">
diff --git a/snowy-admin-web/src/views/dev/file/index.vue b/snowy-admin-web/src/views/dev/file/index.vue
index a56807e4..cd8957bc 100644
--- a/snowy-admin-web/src/views/dev/file/index.vue
+++ b/snowy-admin-web/src/views/dev/file/index.vue
@@ -170,7 +170,7 @@
 	}
 	// 重置
 	const reset = () => {
-		searchFormRef.value.resetFields();
+		searchFormRef.value.resetFields()
 		table.value.refresh(true)
 	}
 	// 删除
diff --git a/snowy-admin-web/src/views/dev/file/uploadForm.vue b/snowy-admin-web/src/views/dev/file/uploadForm.vue
index dd25cf73..905f0dc9 100644
--- a/snowy-admin-web/src/views/dev/file/uploadForm.vue
+++ b/snowy-admin-web/src/views/dev/file/uploadForm.vue
@@ -1,10 +1,9 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		title="文件上传"
-		:width="500"
+		:width="550"
 		:visible="visible"
 		:destroy-on-close="true"
-		:footer-style="{ textAlign: 'right' }"
 		:bodyStyle="{ 'padding-top': '0px' }"
 		@close="onClose"
 	>
@@ -54,11 +53,10 @@
 				</a-spin>
 			</a-tab-pane>
 		</a-tabs>
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup name="uploadForm">
-	import { message } from 'ant-design-vue'
 	import fileApi from '@/api/dev/fileApi'
 	// 定义emit事件
 	const emit = defineEmits({ successful: null })
diff --git a/snowy-admin-web/src/views/dev/job/form.vue b/snowy-admin-web/src/views/dev/job/form.vue
index 6301edb4..c3052c53 100644
--- a/snowy-admin-web/src/views/dev/job/form.vue
+++ b/snowy-admin-web/src/views/dev/job/form.vue
@@ -1,11 +1,9 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		:title="formData.id ? '编辑定时任务' : '增加定时任务'"
-		:width="500"
+		:width="550"
 		:visible="visible"
 		:destroy-on-close="true"
-		:body-style="{ paddingBottom: '80px' }"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
@@ -29,7 +27,7 @@
 			<a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
 			<a-button type="primary" @click="onSubmit" :loading="submitLoading">保存</a-button>
 		</template>
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup name="devJobForm">
diff --git a/snowy-admin-web/src/views/dev/job/index.vue b/snowy-admin-web/src/views/dev/job/index.vue
index e83b1933..dd0491c6 100644
--- a/snowy-admin-web/src/views/dev/job/index.vue
+++ b/snowy-admin-web/src/views/dev/job/index.vue
@@ -147,7 +147,7 @@
 	}
 	// 重置
 	const reset = () => {
-		searchFormRef.value.resetFields();
+		searchFormRef.value.resetFields()
 		table.value.refresh(true)
 	}
 	// 启停
diff --git a/snowy-admin-web/src/views/dev/log/oplog/detail.vue b/snowy-admin-web/src/views/dev/log/oplog/detail.vue
index 9450f10b..faaa3ba1 100644
--- a/snowy-admin-web/src/views/dev/log/oplog/detail.vue
+++ b/snowy-admin-web/src/views/dev/log/oplog/detail.vue
@@ -1,10 +1,9 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		title="详情"
-		:width="600"
+		:width="700"
 		:visible="visible"
 		:destroy-on-close="true"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<a-descriptions :column="1" size="middle" bordered class="mb-2">
@@ -26,7 +25,7 @@
 			返回结果：
 			<XnHighlightjs autodetect :code="resultJson"></XnHighlightjs>
 		</a-space>
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup name="oplogDetail">
diff --git a/snowy-admin-web/src/views/dev/log/vislog/detail.vue b/snowy-admin-web/src/views/dev/log/vislog/detail.vue
index c46ec493..bb91ff0d 100644
--- a/snowy-admin-web/src/views/dev/log/vislog/detail.vue
+++ b/snowy-admin-web/src/views/dev/log/vislog/detail.vue
@@ -1,10 +1,9 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		title="详情"
-		:width="600"
+		:width="700"
 		:visible="visible"
 		:destroy-on-close="true"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<a-descriptions :column="1" size="middle" bordered class="mb-2">
@@ -16,7 +15,7 @@
 			<a-descriptions-item label="时间">{{ formData.opTime }}</a-descriptions-item>
 			<a-descriptions-item label="用户">{{ formData.opUser }}</a-descriptions-item>
 		</a-descriptions>
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup name="vislogDetail">
diff --git a/snowy-admin-web/src/views/dev/message/detail.vue b/snowy-admin-web/src/views/dev/message/detail.vue
index 2447c898..6383e4b1 100644
--- a/snowy-admin-web/src/views/dev/message/detail.vue
+++ b/snowy-admin-web/src/views/dev/message/detail.vue
@@ -1,11 +1,9 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		title="详情"
-		:width="600"
+		:width="700"
 		:visible="visible"
 		:destroy-on-close="true"
-		:body-style="{ paddingBottom: '80px' }"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<a-descriptions :column="1" size="middle" bordered class="mb-2">
@@ -35,7 +33,7 @@
 				</s-table>
 			</a-form-item>
 		</a-form>
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup name="messageDetail">
diff --git a/snowy-admin-web/src/views/dev/message/form.vue b/snowy-admin-web/src/views/dev/message/form.vue
index c2359d27..674f62a9 100644
--- a/snowy-admin-web/src/views/dev/message/form.vue
+++ b/snowy-admin-web/src/views/dev/message/form.vue
@@ -1,11 +1,9 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		title="发送站内信"
-		:width="500"
+		:width="550"
 		:visible="visible"
 		:destroy-on-close="true"
-		:body-style="{ paddingBottom: '80px' }"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
@@ -35,7 +33,7 @@
 			<a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
 			<a-button type="primary" @click="onSubmit" :loading="sendLoading">发送</a-button>
 		</template>
-	</a-drawer>
+	</xn-form-container>
 	<user-selector-plus
 		ref="UserSelectorPlus"
 		page-url="/sys/org/userSelector"
diff --git a/snowy-admin-web/src/views/dev/message/index.vue b/snowy-admin-web/src/views/dev/message/index.vue
index 16c68cd0..772ca1b6 100644
--- a/snowy-admin-web/src/views/dev/message/index.vue
+++ b/snowy-admin-web/src/views/dev/message/index.vue
@@ -111,7 +111,7 @@
 	}
 	// 重置
 	const reset = () => {
-		searchFormRef.value.resetFields();
+		searchFormRef.value.resetFields()
 		table.value.refresh(true)
 	}
 	// 删除
diff --git a/snowy-admin-web/src/views/dev/sms/detail.vue b/snowy-admin-web/src/views/dev/sms/detail.vue
index 5fa2e90f..1b22289d 100644
--- a/snowy-admin-web/src/views/dev/sms/detail.vue
+++ b/snowy-admin-web/src/views/dev/sms/detail.vue
@@ -1,10 +1,9 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		title="详情"
-		:width="600"
+		:width="700"
 		:visible="visible"
 		:destroy-on-close="true"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<a-descriptions :column="1" size="middle" bordered class="mb-2">
@@ -23,7 +22,7 @@
 			回执信息：
 			<XnHighlightjs language="JSON" :code="receiptInfo"></XnHighlightjs>
 		</a-space>
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup name="smsDetail">
diff --git a/snowy-admin-web/src/views/dev/sms/form.vue b/snowy-admin-web/src/views/dev/sms/form.vue
index 4556e26d..2fc1d6e1 100644
--- a/snowy-admin-web/src/views/dev/sms/form.vue
+++ b/snowy-admin-web/src/views/dev/sms/form.vue
@@ -1,10 +1,9 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		title="发送短信"
-		:width="500"
+		:width="550"
 		:visible="visible"
 		:destroy-on-close="true"
-		:footer-style="{ textAlign: 'right' }"
 		:bodyStyle="{ 'padding-top': '0px' }"
 		@close="onClose"
 	>
@@ -20,7 +19,7 @@
 			<a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
 			<a-button type="primary" @click="onSubmit" :loading="sendLoading">发送</a-button>
 		</template>
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup name="smsForm">
diff --git a/snowy-admin-web/src/views/dev/sms/index.vue b/snowy-admin-web/src/views/dev/sms/index.vue
index a4228a6b..fc0e942e 100644
--- a/snowy-admin-web/src/views/dev/sms/index.vue
+++ b/snowy-admin-web/src/views/dev/sms/index.vue
@@ -140,7 +140,7 @@
 	}
 	// 重置
 	const reset = () => {
-		searchFormRef.value.resetFields();
+		searchFormRef.value.resetFields()
 		table.value.refresh(true)
 	}
 	const engineOptions = tool.dictList('SMS_ENGINE')
diff --git a/snowy-admin-web/src/views/gen/preview.vue b/snowy-admin-web/src/views/gen/preview.vue
index 209dcc85..e72dd8a5 100644
--- a/snowy-admin-web/src/views/gen/preview.vue
+++ b/snowy-admin-web/src/views/gen/preview.vue
@@ -1,5 +1,5 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		title="预览"
 		:width="1200"
 		:visible="visible"
@@ -25,7 +25,7 @@
 				</a-tab-pane>
 			</a-tabs>
 		</a-spin>
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup name="genPreview">
diff --git a/snowy-admin-web/src/views/index/components/miniMessage.vue b/snowy-admin-web/src/views/index/components/miniMessage.vue
index 60fb2146..e9b076c4 100644
--- a/snowy-admin-web/src/views/index/components/miniMessage.vue
+++ b/snowy-admin-web/src/views/index/components/miniMessage.vue
@@ -14,14 +14,11 @@
 				</template>
 			</a-list>
 		</div>
-
-		<a-drawer
+		<xn-form-container
 			title="详情"
-			:width="600"
+			:width="700"
 			:visible="visible"
 			:destroy-on-close="true"
-			:body-style="{ paddingBottom: '80px' }"
-			:footer-style="{ textAlign: 'right' }"
 			@close="onClose"
 		>
 			<a-form ref="formRef" :model="formData" layout="vertical">
@@ -53,7 +50,7 @@
 					</s-table>
 				</a-form-item>
 			</a-form>
-		</a-drawer>
+		</xn-form-container>
 	</a-card>
 </template>
 
diff --git a/snowy-admin-web/src/views/index/components/schedule.vue b/snowy-admin-web/src/views/index/components/schedule.vue
index c48f6ece..a8e95d54 100644
--- a/snowy-admin-web/src/views/index/components/schedule.vue
+++ b/snowy-admin-web/src/views/index/components/schedule.vue
@@ -10,13 +10,11 @@
 			</a-timeline>
 			<div class="add-schedule" @click="addSchedule"><plus-circle-two-tone /> 新增日程</div>
 		</a-card>
-		<a-drawer
+		<xn-form-container
 			title="增加日程"
-			:width="600"
+			:width="700"
 			:visible="visible"
 			:destroy-on-close="true"
-			:body-style="{ paddingBottom: '80px' }"
-			:footer-style="{ textAlign: 'right' }"
 			@close="onClose"
 		>
 			<a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
@@ -36,7 +34,7 @@
 				<a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
 				<a-button type="primary" :loading="submitLoading" @click="onSubmit">保存</a-button>
 			</template>
-		</a-drawer>
+		</xn-form-container>
 	</div>
 </template>
 
diff --git a/snowy-admin-web/src/views/mobile/resource/button/form.vue b/snowy-admin-web/src/views/mobile/resource/button/form.vue
index b49b597b..badea218 100644
--- a/snowy-admin-web/src/views/mobile/resource/button/form.vue
+++ b/snowy-admin-web/src/views/mobile/resource/button/form.vue
@@ -2,7 +2,7 @@
 	<a-modal
 		v-model:visible="visible"
 		:title="formData.id ? '编辑按钮' : '增加按钮'"
-		:width="500"
+		:width="550"
 		:mask-closable="false"
 		:destroy-on-close="true"
 		@ok="onSubmit"
diff --git a/snowy-admin-web/src/views/mobile/resource/button/index.vue b/snowy-admin-web/src/views/mobile/resource/button/index.vue
index 22b6803b..f595ed8f 100644
--- a/snowy-admin-web/src/views/mobile/resource/button/index.vue
+++ b/snowy-admin-web/src/views/mobile/resource/button/index.vue
@@ -1,11 +1,10 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		title="按钮权限"
-		:width="650"
+		:width="700"
 		:visible="visible"
 		:destroy-on-close="true"
 		:body-style="{ paddingBottom: '80px' }"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<s-table
@@ -34,7 +33,7 @@
 				</template>
 			</template>
 		</s-table>
-	</a-drawer>
+	</xn-form-container>
 	<Form ref="buttonForm" @successful="table.refresh(true)" />
 </template>
 
diff --git a/snowy-admin-web/src/views/mobile/resource/menu/changeModuleForm.vue b/snowy-admin-web/src/views/mobile/resource/menu/changeModuleForm.vue
index 967d6137..def25e07 100644
--- a/snowy-admin-web/src/views/mobile/resource/menu/changeModuleForm.vue
+++ b/snowy-admin-web/src/views/mobile/resource/menu/changeModuleForm.vue
@@ -1,11 +1,9 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		title="更改模块"
-		:width="500"
+		:width="550"
 		:visible="visible"
 		:destroy-on-close="true"
-		:body-style="{ paddingBottom: '80px' }"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
@@ -25,7 +23,7 @@
 			<a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
 			<a-button type="primary" :loading="submitLoading" @click="onSubmit">保存</a-button>
 		</template>
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup>
diff --git a/snowy-admin-web/src/views/mobile/resource/menu/form.vue b/snowy-admin-web/src/views/mobile/resource/menu/form.vue
index 6f9f934a..837bb960 100644
--- a/snowy-admin-web/src/views/mobile/resource/menu/form.vue
+++ b/snowy-admin-web/src/views/mobile/resource/menu/form.vue
@@ -1,78 +1,107 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		:title="formData.id ? '编辑移动端菜单' : '增加移动端菜单'"
-		:width="600"
+		:width="700"
 		:visible="visible"
 		:destroy-on-close="true"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
-			<a-form-item label="上级菜单：" name="parentId">
-				<a-tree-select
-					v-model:value="formData.parentId"
-					v-model:treeExpandedKeys="defaultExpandedKeys"
-					style="width: 100%"
-					:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-					placeholder="请选择上级菜单"
-					allow-clear
-					tree-default-expand-all
-					:tree-data="treeData"
-					:field-names="{
-						children: 'children',
-						label: 'title',
-						value: 'id'
-					}"
-					selectable="false"
-					tree-line
-					@change="parentChange(formData.parentId)"
-				></a-tree-select>
-			</a-form-item>
-			<a-form-item label="名称：" name="title">
-				<a-input v-model:value="formData.title" placeholder="请输入名称" allow-clear />
-			</a-form-item>
-			<a-form-item label="菜单类型：" name="menuType">
-				<a-radio-group
-					v-model:value="formData.menuType"
-					button-style="solid"
-					:options="menuTypeOptions"
-					option-type="button"
-				>
-				</a-radio-group>
-			</a-form-item>
-			<a-form-item v-if="formData.menuType !== 'CATALOG'" name="path">
-				<template #label>
-					<a-tooltip>
-						<template #title> 类型为内外链条时，输入https开头的链接即可（例：https://xiaonuo.vip） </template>
-						<question-circle-outlined />
-					</a-tooltip>
-					&nbsp {{ formData.menuType === 'MENU' || formData.menuType === 'CATALOG' ? '界面地址' : 'https链接地址' }}：
-				</template>
-				<a-input v-model:value="formData.path" placeholder="请输入" allow-clear />
-			</a-form-item>
-			<a-form-item label="图标：" name="icon">
-				<a-input v-model:value="formData.icon" style="width: calc(100% - 70px)" placeholder="请选择图标" allow-clear />
-				<a-button type="primary" @click="iconSelector.showIconModal(formData.icon)">选择</a-button>
-			</a-form-item>
-			<a-form-item label="颜色：" name="color">
-				<color-picker v-model:value="formData.color" />
-			</a-form-item>
-			<a-form-item label="是否正规则：" name="regType">
-				<a-radio-group v-model:value="formData.regType" placeholder="请选择正规则" :options="regTypeOptions" />
-			</a-form-item>
-			<a-form-item label="可用状态：" name="status">
-				<a-radio-group v-model:value="formData.status" placeholder="请选择可用状态" :options="statusOptions" />
-			</a-form-item>
-			<a-form-item label="排序码：" name="sortCode">
-				<a-input-number style="width: 100%" v-model:value="formData.sortCode" :max="1000" />
-			</a-form-item>
+			<a-row :gutter="16">
+				<a-col :span="12">
+					<a-form-item label="上级菜单：" name="parentId">
+						<a-tree-select
+							v-model:value="formData.parentId"
+							v-model:treeExpandedKeys="defaultExpandedKeys"
+							style="width: 100%"
+							:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+							placeholder="请选择上级菜单"
+							allow-clear
+							tree-default-expand-all
+							:tree-data="treeData"
+							:field-names="{
+								children: 'children',
+								label: 'title',
+								value: 'id'
+							}"
+							selectable="false"
+							tree-line
+							@change="parentChange(formData.parentId)"
+						/>
+					</a-form-item>
+				</a-col>
+				<a-col :span="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-form-item label="菜单类型：" name="menuType">
+						<a-radio-group
+							v-model:value="formData.menuType"
+							button-style="solid"
+							:options="menuTypeOptions"
+							option-type="button"
+						/>
+					</a-form-item>
+				</a-col>
+				<a-col :span="12" v-if="formData.menuType !== 'CATALOG'">
+					<a-form-item name="path">
+						<template #label>
+							<a-tooltip>
+								<template #title> 类型为内外链时，输入https开头的链接即可（例：https://xiaonuo.vip） </template>
+								<question-circle-outlined />
+							</a-tooltip>
+							&nbsp
+							{{ formData.menuType === 'MENU' || formData.menuType === 'CATALOG' ? '界面地址' : 'https链接地址' }}：
+						</template>
+						<a-input v-model:value="formData.path" placeholder="请输入" allow-clear />
+					</a-form-item>
+				</a-col>
+				<a-col :span="12">
+					<a-form-item label="图标：" name="icon">
+						<a-input
+							v-model:value="formData.icon"
+							style="width: calc(100% - 70px)"
+							placeholder="请选择图标"
+							allow-clear
+						/>
+						<a-button type="primary" @click="iconSelector.showIconModal(formData.icon)">选择</a-button>
+					</a-form-item>
+				</a-col>
+				<a-col :span="12">
+					<a-form-item label="颜色：" name="color">
+						<color-picker v-model:value="formData.color" />
+					</a-form-item>
+				</a-col>
+				<a-col :span="12">
+					<a-form-item label="是否正规则：" name="regType">
+						<a-radio-group v-model:value="formData.regType" placeholder="请选择正规则" :options="regTypeOptions" />
+					</a-form-item>
+				</a-col>
+				<a-col :span="12">
+					<a-form-item label="可用状态：" name="status">
+						<a-radio-group v-model:value="formData.status" placeholder="请选择可用状态" :options="statusOptions" />
+					</a-form-item>
+				</a-col>
+				<a-col :span="12">
+					<a-form-item label="排序码：" name="sortCode">
+						<a-input-number
+							style="width: 100%"
+							v-model:value="formData.sortCode"
+							placeholder="请输入排序码"
+							:max="1000"
+						/>
+					</a-form-item>
+				</a-col>
+			</a-row>
 		</a-form>
 		<template #footer>
 			<a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
 			<a-button type="primary" @click="onSubmit" :loading="submitLoading">保存</a-button>
 		</template>
 		<icon-mobile-selector ref="iconSelector" @iconCallBack="iconCallBack" />
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup name="mobileMenuForm">
@@ -130,7 +159,8 @@
 			regType: 'YES',
 			status: 'ENABLE',
 			category: 'MENU',
-			menuType: 'MENU'
+			menuType: 'MENU',
+			sortCode: 99
 		}
 		if (record) {
 			let recordData = cloneDeep(record)
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 57104ba3..e17ed39b 100644
--- a/snowy-admin-web/src/views/mobile/resource/menu/index.vue
+++ b/snowy-admin-web/src/views/mobile/resource/menu/index.vue
@@ -185,7 +185,7 @@
 	}
 	// 重置
 	const reset = () => {
-		searchFormRef.value.resetFields();
+		searchFormRef.value.resetFields()
 		table.value.refresh(true)
 	}
 	// 切换模块标签查询菜单列表
diff --git a/snowy-admin-web/src/views/mobile/resource/module/form.vue b/snowy-admin-web/src/views/mobile/resource/module/form.vue
index 4a88f5f4..29248527 100644
--- a/snowy-admin-web/src/views/mobile/resource/module/form.vue
+++ b/snowy-admin-web/src/views/mobile/resource/module/form.vue
@@ -1,11 +1,9 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		:title="formData.id ? '编辑菜单模块' : '增加菜单模块'"
-		:width="600"
+		:width="550"
 		:visible="visible"
 		:destroy-on-close="true"
-		:body-style="{ paddingBottom: '80px' }"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
@@ -28,7 +26,7 @@
 			<a-button type="primary" @click="onSubmit">保存</a-button>
 		</template>
 		<icon-mobile-selector ref="iconSelector" @iconCallBack="iconCallBack" />
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup>
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 79d43e3f..5bee55e5 100644
--- a/snowy-admin-web/src/views/mobile/resource/module/index.vue
+++ b/snowy-admin-web/src/views/mobile/resource/module/index.vue
@@ -111,7 +111,7 @@
 	}
 	// 重置
 	const reset = () => {
-		formRef.value.resetFields();
+		formRef.value.resetFields()
 		table.value.refresh(true)
 	}
 	// 删除
diff --git a/snowy-admin-web/src/views/sys/org/form.vue b/snowy-admin-web/src/views/sys/org/form.vue
index 354c38e5..2596567e 100644
--- a/snowy-admin-web/src/views/sys/org/form.vue
+++ b/snowy-admin-web/src/views/sys/org/form.vue
@@ -1,11 +1,9 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		:title="formData.id ? '编辑组织' : '增加组织'"
-		:width="500"
+		:width="550"
 		:visible="visible"
 		:destroy-on-close="true"
-		:body-style="{ paddingBottom: '80px' }"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
@@ -60,7 +58,7 @@
 			:radio-model="true"
 			@onBack="userBack"
 		/>
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup name="orgForm">
diff --git a/snowy-admin-web/src/views/sys/org/index.vue b/snowy-admin-web/src/views/sys/org/index.vue
index 900ea317..40d1865a 100644
--- a/snowy-admin-web/src/views/sys/org/index.vue
+++ b/snowy-admin-web/src/views/sys/org/index.vue
@@ -134,7 +134,7 @@
 	}
 	// 重置
 	const reset = () => {
-		searchFormRef.value.resetFields();
+		searchFormRef.value.resetFields()
 		table.value.refresh(true)
 	}
 	// 加载左侧的树
diff --git a/snowy-admin-web/src/views/sys/position/form.vue b/snowy-admin-web/src/views/sys/position/form.vue
index e25f1041..37abaaf1 100644
--- a/snowy-admin-web/src/views/sys/position/form.vue
+++ b/snowy-admin-web/src/views/sys/position/form.vue
@@ -1,11 +1,9 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		:title="formData.id ? '编辑职位' : '增加职位'"
-		:width="500"
+		:width="550"
 		:visible="visible"
 		:destroy-on-close="true"
-		:body-style="{ paddingBottom: '80px' }"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
@@ -46,7 +44,7 @@
 			<a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
 			<a-button type="primary" :loading="submitLoading" @click="onSubmit">保存</a-button>
 		</template>
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup name="positionForm">
diff --git a/snowy-admin-web/src/views/sys/position/index.vue b/snowy-admin-web/src/views/sys/position/index.vue
index 76647c56..ad00e546 100644
--- a/snowy-admin-web/src/views/sys/position/index.vue
+++ b/snowy-admin-web/src/views/sys/position/index.vue
@@ -135,7 +135,7 @@
 	}
 	// 重置
 	const reset = () => {
-		searchFormRef.value.resetFields();
+		searchFormRef.value.resetFields()
 		table.value.refresh(true)
 	}
 	// 加载左侧的树
diff --git a/snowy-admin-web/src/views/sys/resource/button/form.vue b/snowy-admin-web/src/views/sys/resource/button/form.vue
index aebd6788..19e3b82d 100644
--- a/snowy-admin-web/src/views/sys/resource/button/form.vue
+++ b/snowy-admin-web/src/views/sys/resource/button/form.vue
@@ -2,7 +2,7 @@
 	<a-modal
 		v-model:visible="visible"
 		:title="formData.id ? '编辑按钮' : '增加按钮'"
-		:width="500"
+		:width="550"
 		:mask-closable="false"
 		:destroy-on-close="true"
 		@ok="onSubmit"
diff --git a/snowy-admin-web/src/views/sys/resource/button/index.vue b/snowy-admin-web/src/views/sys/resource/button/index.vue
index 6ddafa15..05680deb 100644
--- a/snowy-admin-web/src/views/sys/resource/button/index.vue
+++ b/snowy-admin-web/src/views/sys/resource/button/index.vue
@@ -1,11 +1,9 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		title="按钮权限"
-		:width="650"
+		:width="700"
 		:visible="visible"
 		:destroy-on-close="true"
-		:body-style="{ paddingBottom: '80px' }"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<s-table
@@ -34,7 +32,7 @@
 				</template>
 			</template>
 		</s-table>
-	</a-drawer>
+	</xn-form-container>
 	<Form ref="buttonForm" @successful="table.refresh(true)" />
 </template>
 
diff --git a/snowy-admin-web/src/views/sys/resource/field/form.vue b/snowy-admin-web/src/views/sys/resource/field/form.vue
index 0fbd7703..3ae9b60c 100644
--- a/snowy-admin-web/src/views/sys/resource/field/form.vue
+++ b/snowy-admin-web/src/views/sys/resource/field/form.vue
@@ -2,7 +2,7 @@
 	<a-modal
 		v-model:visible="visible"
 		:title="formData.id ? '编辑字段' : '增加字段'"
-		:width="500"
+		:width="550"
 		:mask-closable="false"
 		:destroy-on-close="true"
 		@ok="onSubmit"
diff --git a/snowy-admin-web/src/views/sys/resource/field/index.vue b/snowy-admin-web/src/views/sys/resource/field/index.vue
index ee509da0..a28820d3 100644
--- a/snowy-admin-web/src/views/sys/resource/field/index.vue
+++ b/snowy-admin-web/src/views/sys/resource/field/index.vue
@@ -4,8 +4,6 @@
 		:width="650"
 		:visible="visible"
 		:destroy-on-close="true"
-		:body-style="{ paddingBottom: '80px' }"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<s-table
diff --git a/snowy-admin-web/src/views/sys/resource/menu/changeModuleForm.vue b/snowy-admin-web/src/views/sys/resource/menu/changeModuleForm.vue
index 88d86972..1602b40c 100644
--- a/snowy-admin-web/src/views/sys/resource/menu/changeModuleForm.vue
+++ b/snowy-admin-web/src/views/sys/resource/menu/changeModuleForm.vue
@@ -1,11 +1,9 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		title="更改模块"
-		:width="500"
+		:width="550"
 		:visible="visible"
 		:destroy-on-close="true"
-		:body-style="{ paddingBottom: '80px' }"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
@@ -25,7 +23,7 @@
 			<a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
 			<a-button type="primary" :loading="submitLoading" @click="onSubmit">保存</a-button>
 		</template>
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup>
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 f90bf527..58899a48 100644
--- a/snowy-admin-web/src/views/sys/resource/menu/form.vue
+++ b/snowy-admin-web/src/views/sys/resource/menu/form.vue
@@ -1,101 +1,123 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		:title="formData.id ? '编辑菜单' : '增加菜单'"
-		:width="500"
+		:width="700"
 		:visible="visible"
 		:destroy-on-close="true"
-		:body-style="{ paddingBottom: '80px' }"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
-			<a-form-item label="显示名称：" name="title">
-				<a-input v-model:value="formData.title" placeholder="请输入显示名称" allow-clear />
-			</a-form-item>
-			<a-form-item label="菜单类型：" name="menuType">
-				<a-radio-group
-					v-model:value="formData.menuType"
-					button-style="solid"
-					:options="categoryOptions"
-					option-type="button"
-				/>
-			</a-form-item>
-			<a-form-item label="上级菜单：" name="parentId">
-				<a-tree-select
-					v-model:value="formData.parentId"
-					v-model:treeExpandedKeys="defaultExpandedKeys"
-					style="width: 100%"
-					:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-					placeholder="请选择上级菜单"
-					allow-clear
-					tree-default-expand-all
-					:tree-data="treeData"
-					:field-names="{
-						children: 'children',
-						label: 'title',
-						value: 'id'
-					}"
-					selectable="false"
-					tree-line
-					@change="parentChange(formData.parentId)"
-				/>
-			</a-form-item>
-			<a-form-item v-if="formData.menuType !== 'CATALOG'" name="path">
-				<template #label>
-					<a-tooltip>
-						<template #title>
-							类型为内外链条时，输入https开头的链接即可（例：https://xiaonuo.vip）,正常路由前面必须有反斜杠！
+			<a-row :gutter="16">
+				<a-col :span="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-form-item label="菜单类型：" name="menuType">
+						<a-radio-group
+							v-model:value="formData.menuType"
+							button-style="solid"
+							:options="categoryOptions"
+							option-type="button"
+						/>
+					</a-form-item>
+				</a-col>
+				<a-col :span="12">
+					<a-form-item label="上级菜单：" name="parentId">
+						<a-tree-select
+							v-model:value="formData.parentId"
+							v-model:treeExpandedKeys="defaultExpandedKeys"
+							style="width: 100%"
+							:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+							placeholder="请选择上级菜单"
+							allow-clear
+							tree-default-expand-all
+							:tree-data="treeData"
+							:field-names="{
+								children: 'children',
+								label: 'title',
+								value: 'id'
+							}"
+							selectable="false"
+							tree-line
+							@change="parentChange(formData.parentId)"
+						/>
+					</a-form-item>
+				</a-col>
+				<a-col :span="12" v-if="formData.menuType !== 'CATALOG'">
+					<a-form-item name="path">
+						<template #label>
+							<a-tooltip>
+								<template #title>
+									类型为内外链条时，输入https开头的链接即可（例：https://xiaonuo.vip）,正常路由前面必须有反斜杠！
+								</template>
+								<question-circle-outlined />
+							</a-tooltip>
+							&nbsp
+							{{ formData.menuType === 'MENU' || formData.menuType === 'CATALOG' ? '路由地址' : 'https链接地址' }}：
 						</template>
-						<question-circle-outlined />
-					</a-tooltip>
-					&nbsp {{ formData.menuType === 'MENU' || formData.menuType === 'CATALOG' ? '路由地址' : 'https链接地址' }}：
-				</template>
-				<a-input v-model:value="formData.path" placeholder="请输入路由地址" allow-clear />
-			</a-form-item>
-			<a-form-item v-if="formData.menuType === 'MENU'" name="component">
-				<template #label>
-					<a-tooltip>
-						<template #title> 按规范可设置为代码组件文件夹名称,注：首字母无反斜杠哦！ </template>
-						<question-circle-outlined />
-					</a-tooltip>
-					&nbsp 组件地址：
-				</template>
-				<a-input
-					v-model:value="formData.component"
-					addon-before="src/views/"
-					placeholder="请输入组件地址"
-					allow-clear
-				/>
-			</a-form-item>
-			<a-form-item v-if="formData.menuType === 'MENU'" name="name">
-				<template #label>
-					<a-tooltip>
-						<template #title> 按规范可设置为代码组件文件夹名称,注：首字母无反斜杠哦！ </template>
-						<question-circle-outlined />
-					</a-tooltip>
-					&nbsp 别名：
-				</template>
-				<a-input
-					v-model:value="formData.name"
-					addon-before="setup name="
-					placeholder="请输入组件组件中name属性"
-					allow-clear
-				/>
-			</a-form-item>
-			<a-form-item label="图标：" name="icon">
-				<a-input v-model:value="formData.icon" style="width: calc(100% - 70px)" placeholder="请选择图标" allow-clear />
-				<a-button type="primary" @click="iconSelector.showIconModal(formData.icon)">选择</a-button>
-			</a-form-item>
-			<a-form-item label="排序:" name="sortCode">
-				<a-input-number style="width: 100%" v-model:value="formData.sortCode" :max="100" />
-			</a-form-item>
+						<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-form-item name="component">
+						<template #label>
+							<a-tooltip>
+								<template #title> 按规范可设置为代码组件文件夹名称,注：首字母无反斜杠哦！ </template>
+								<question-circle-outlined />
+							</a-tooltip>
+							&nbsp 组件地址：
+						</template>
+						<a-input
+							v-model:value="formData.component"
+							addon-before="src/views/"
+							placeholder="请输入组件地址"
+							allow-clear
+						/>
+					</a-form-item>
+				</a-col>
+				<a-col :span="12" v-if="formData.menuType === 'MENU'">
+					<a-form-item name="name">
+						<template #label>
+							<a-tooltip>
+								<template #title> 按规范可设置为代码组件文件夹名称,注：首字母无反斜杠哦！ </template>
+								<question-circle-outlined />
+							</a-tooltip>
+							&nbsp 别名：
+						</template>
+						<a-input
+							v-model:value="formData.name"
+							addon-before="setup name="
+							placeholder="请输入组件组件中name属性"
+							allow-clear
+						/>
+					</a-form-item>
+				</a-col>
+				<a-col :span="12">
+					<a-form-item label="图标：" name="icon">
+						<a-input
+							v-model:value="formData.icon"
+							style="width: calc(100% - 70px)"
+							placeholder="请选择图标"
+							allow-clear
+						/>
+						<a-button type="primary" @click="iconSelector.showIconModal(formData.icon)">选择</a-button>
+					</a-form-item>
+				</a-col>
+				<a-col :span="12">
+					<a-form-item label="排序:" name="sortCode">
+						<a-input-number style="width: 100%" v-model:value="formData.sortCode" :max="100" />
+					</a-form-item>
+				</a-col>
+			</a-row>
 		</a-form>
 		<template #footer>
 			<a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
 			<a-button type="primary" :loading="submitLoading" @click="onSubmit">保存</a-button>
 		</template>
 		<Icon-selector ref="iconSelector" @iconCallBack="iconCallBack" />
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup>
diff --git a/snowy-admin-web/src/views/sys/resource/module/form.vue b/snowy-admin-web/src/views/sys/resource/module/form.vue
index 449e75dc..8e22a1b7 100644
--- a/snowy-admin-web/src/views/sys/resource/module/form.vue
+++ b/snowy-admin-web/src/views/sys/resource/module/form.vue
@@ -1,11 +1,9 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		:title="formData.id ? '编辑模块' : '增加模块'"
-		:width="600"
+		:width="550"
 		:visible="visible"
 		:destroy-on-close="true"
-		:body-style="{ paddingBottom: '80px' }"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
@@ -28,7 +26,7 @@
 			<a-button type="primary" @click="onSubmit">保存</a-button>
 		</template>
 		<Icon-selector ref="iconSelector" @iconCallBack="iconCallBack" />
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup>
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 30ec2c6a..4e127280 100644
--- a/snowy-admin-web/src/views/sys/resource/module/index.vue
+++ b/snowy-admin-web/src/views/sys/resource/module/index.vue
@@ -111,7 +111,7 @@
 	}
 	// 重置
 	const reset = () => {
-		formRef.value.resetFields();
+		formRef.value.resetFields()
 		table.value.refresh(true)
 	}
 	// 删除
diff --git a/snowy-admin-web/src/views/sys/resource/spa/form.vue b/snowy-admin-web/src/views/sys/resource/spa/form.vue
index 6f2f7f20..3deb293c 100644
--- a/snowy-admin-web/src/views/sys/resource/spa/form.vue
+++ b/snowy-admin-web/src/views/sys/resource/spa/form.vue
@@ -1,83 +1,101 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		:title="formData.id ? '编辑单页' : '增加单页'"
-		:width="500"
+		:width="700"
 		:visible="visible"
 		:destroy-on-close="true"
-		:body-style="{ paddingBottom: '80px' }"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
-			<a-form-item label="单页名称：" name="title">
-				<a-input v-model:value="formData.title" placeholder="请输入单页名称" allow-clear />
-			</a-form-item>
-			<a-form-item label="单页类型：" name="menuType">
-				<a-radio-group
-					v-model:value="formData.menuType"
-					button-style="solid"
-					:options="categoryOptions"
-					option-type="button"
-				/>
-			</a-form-item>
-
-			<a-form-item name="path">
-				<template #label>
-					<a-tooltip>
-						<template #title>
-							类型为内外链条时，输入https开头的链接即可（例：https://www.xiaonuo.vip）,正常路由前面必须有反斜杠！
-						</template>
-						<question-circle-outlined />
-					</a-tooltip>
-					&nbsp {{ formData.menuType === 'MENU' ? '路由地址' : 'https链接地址' }}：
-				</template>
-				<a-input v-model:value="formData.path" placeholder="请输入路由地址" allow-clear />
-			</a-form-item>
-			<a-form-item v-if="formData.menuType === 'MENU'" name="component">
-				<template #label>
-					<a-tooltip>
-						<template #title> 按规范可设置为代码组件文件夹名称,注：首字母无反斜杠哦！ </template>
-						<question-circle-outlined />
-					</a-tooltip>
-					&nbsp 组件地址：
-				</template>
-				<a-input
-					v-model:value="formData.component"
-					addon-before="src/views/"
-					placeholder="请输入组件地址"
-					allow-clear
-				/>
-			</a-form-item>
-			<a-form-item name="name" v-if="formData.menuType === 'MENU'">
-				<template #label>
-					<a-tooltip>
-						<template #title> 按规范可设置为代码组件文件夹名称,注：首字母无反斜杠哦！ </template>
-						<question-circle-outlined />
-					</a-tooltip>
-					&nbsp 别名：
-				</template>
-				<a-input
-					v-model:value="formData.name"
-					addon-before="setup name="
-					placeholder="请输入组件组件中name属性"
-					allow-clear
-				/>
-			</a-form-item>
 			<a-alert style="margin-bottom: 10px" message="温馨提示：排序第一条为首页页面！" type="warning" closable />
-			<a-form-item label="图标：" name="icon">
-				<a-input v-model:value="formData.icon" style="width: calc(100% - 70px)" placeholder="请选择图标" allow-clear />
-				<a-button type="primary" @click="iconSelector.showIconModal(formData.icon)">选择</a-button>
-			</a-form-item>
-			<a-form-item label="排序:" name="sortCode">
-				<a-input-number style="width: 100%" v-model:value="formData.sortCode" :max="100" />
-			</a-form-item>
+			<a-row :gutter="16">
+				<a-col :span="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-form-item label="单页类型：" name="menuType">
+						<a-radio-group
+							v-model:value="formData.menuType"
+							button-style="solid"
+							:options="categoryOptions"
+							option-type="button"
+						/>
+					</a-form-item>
+				</a-col>
+				<a-col :span="12">
+					<a-form-item name="path">
+						<template #label>
+							<a-tooltip>
+								<template #title>
+									类型为内外链条时，输入https开头的链接即可（例：https://www.xiaonuo.vip）,正常路由前面必须有反斜杠！
+								</template>
+								<question-circle-outlined />
+							</a-tooltip>
+							&nbsp {{ formData.menuType === 'MENU' ? '路由地址' : 'https链接地址' }}：
+						</template>
+						<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-form-item name="component">
+						<template #label>
+							<a-tooltip>
+								<template #title> 按规范可设置为代码组件文件夹名称,注：首字母无反斜杠哦！ </template>
+								<question-circle-outlined />
+							</a-tooltip>
+							&nbsp 组件地址：
+						</template>
+						<a-input
+							v-model:value="formData.component"
+							addon-before="src/views/"
+							placeholder="请输入组件地址"
+							allow-clear
+						/>
+					</a-form-item>
+				</a-col>
+				<a-col :span="12" v-if="formData.menuType === 'MENU'">
+					<a-form-item name="name">
+						<template #label>
+							<a-tooltip>
+								<template #title> 按规范可设置为代码组件文件夹名称,注：首字母无反斜杠哦！ </template>
+								<question-circle-outlined />
+							</a-tooltip>
+							&nbsp 别名：
+						</template>
+						<a-input
+							v-model:value="formData.name"
+							addon-before="setup name="
+							placeholder="请输入组件组件中name属性"
+							allow-clear
+						/>
+					</a-form-item>
+				</a-col>
+				<a-col :span="12">
+					<a-form-item label="图标：" name="icon">
+						<a-input
+							v-model:value="formData.icon"
+							style="width: calc(100% - 70px)"
+							placeholder="请选择图标"
+							allow-clear
+						/>
+						<a-button type="primary" @click="iconSelector.showIconModal(formData.icon)">选择</a-button>
+					</a-form-item>
+				</a-col>
+				<a-col :span="12">
+					<a-form-item label="排序:" name="sortCode">
+						<a-input-number style="width: 100%" v-model:value="formData.sortCode" :max="100" />
+					</a-form-item>
+				</a-col>
+			</a-row>
 		</a-form>
 		<template #footer>
 			<a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
 			<a-button type="primary" :loading="submitLoading" @click="onSubmit">保存</a-button>
 		</template>
 		<Icon-selector ref="iconSelector" @iconCallBack="iconCallBack" />
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup name="spaForm">
diff --git a/snowy-admin-web/src/views/sys/resource/spa/index.vue b/snowy-admin-web/src/views/sys/resource/spa/index.vue
index 500a6e78..ff937119 100644
--- a/snowy-admin-web/src/views/sys/resource/spa/index.vue
+++ b/snowy-admin-web/src/views/sys/resource/spa/index.vue
@@ -1,5 +1,4 @@
 <template>
-	<a-alert style="margin-bottom: 10px" message="温馨提示：排序第一条为首页页面！" show-icon type="warning" closable />
 	<a-card :bordered="false" :body-style="{ 'padding-bottom': '0px' }" class="mb-2">
 		<a-form ref="formRef" name="advanced_search" :model="searchFormState" class="ant-advanced-search-form">
 			<a-row :gutter="24">
@@ -166,7 +165,7 @@
 	}
 	// 重置
 	const reset = () => {
-		formRef.value.resetFields();
+		formRef.value.resetFields()
 		table.value.refresh(true)
 	}
 	// 删除
diff --git a/snowy-admin-web/src/views/sys/role/form.vue b/snowy-admin-web/src/views/sys/role/form.vue
index 62fb13f3..288ee24a 100644
--- a/snowy-admin-web/src/views/sys/role/form.vue
+++ b/snowy-admin-web/src/views/sys/role/form.vue
@@ -1,11 +1,9 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		:title="formData.id ? '编辑角色' : '增加角色'"
-		:width="500"
+		:width="550"
 		:visible="visible"
 		:destroy-on-close="true"
-		:body-style="{ paddingBottom: '80px' }"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
@@ -46,7 +44,7 @@
 			<a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
 			<a-button type="primary" :loading="submitLoading" @click="onSubmit">保存</a-button>
 		</template>
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup name="roleForm">
diff --git a/snowy-admin-web/src/views/sys/role/grantMobileResourceForm.vue b/snowy-admin-web/src/views/sys/role/grantMobileResourceForm.vue
index 47012330..0bad68dc 100644
--- a/snowy-admin-web/src/views/sys/role/grantMobileResourceForm.vue
+++ b/snowy-admin-web/src/views/sys/role/grantMobileResourceForm.vue
@@ -1,12 +1,10 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		title="授权移动端资源"
 		:width="drawerWidth"
 		:visible="visible"
 		:destroy-on-close="true"
 		:show-pagination="false"
-		:body-style="{ paddingBottom: '80px' }"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<a-spin :spinning="spinningLoading">
@@ -53,7 +51,7 @@
 			<a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
 			<a-button type="primary" :loading="submitLoading" @click="onSubmit">保存</a-button>
 		</template>
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup name="grantMobileResourceForm">
diff --git a/snowy-admin-web/src/views/sys/role/grantPermissionForm.vue b/snowy-admin-web/src/views/sys/role/grantPermissionForm.vue
index b8f3fcca..be562db4 100644
--- a/snowy-admin-web/src/views/sys/role/grantPermissionForm.vue
+++ b/snowy-admin-web/src/views/sys/role/grantPermissionForm.vue
@@ -1,12 +1,10 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		title="授权权限"
 		:width="drawerWidth"
 		:visible="visible"
 		:destroy-on-close="true"
 		:show-pagination="false"
-		:body-style="{ paddingBottom: '80px' }"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<a-alert
@@ -69,7 +67,7 @@
 			<a-button type="primary" :loading="submitLoading" @click="onSubmit">保存</a-button>
 		</template>
 		<ScopeDefineOrg ref="scopeDefineOrgModal" @click="scopeDefineOrgClick" />
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup name="grantResourceForm">
diff --git a/snowy-admin-web/src/views/sys/role/grantResourceForm.vue b/snowy-admin-web/src/views/sys/role/grantResourceForm.vue
index ff24eb50..9e154d8a 100644
--- a/snowy-admin-web/src/views/sys/role/grantResourceForm.vue
+++ b/snowy-admin-web/src/views/sys/role/grantResourceForm.vue
@@ -1,12 +1,10 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		title="授权资源"
 		:width="drawerWidth"
 		:visible="visible"
 		:destroy-on-close="true"
 		:show-pagination="false"
-		:body-style="{ paddingBottom: '80px' }"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<a-spin :spinning="spinningLoading">
@@ -53,7 +51,7 @@
 			<a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
 			<a-button type="primary" :loading="submitLoading" @click="onSubmit">保存</a-button>
 		</template>
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup name="grantResourceForm">
@@ -61,7 +59,6 @@
 	import tool from '@/utils/tool'
 	import roleApi from '@/api/sys/roleApi'
 	import userCenterApi from '@/api/sys/userCenterApi'
-	import { remove } from 'lodash-es'
 	const spinningLoading = ref(false)
 	let firstShowMap = $ref({})
 	const emit = defineEmits({ successful: null })
diff --git a/snowy-admin-web/src/views/sys/role/index.vue b/snowy-admin-web/src/views/sys/role/index.vue
index b7130776..a28d33c5 100644
--- a/snowy-admin-web/src/views/sys/role/index.vue
+++ b/snowy-admin-web/src/views/sys/role/index.vue
@@ -181,7 +181,7 @@
 	}
 	// 重置
 	const reset = () => {
-		searchFormRef.value.resetFields();
+		searchFormRef.value.resetFields()
 		table.value.refresh(true)
 	}
 	// 加载左侧的树
diff --git a/snowy-admin-web/src/views/sys/user/form.vue b/snowy-admin-web/src/views/sys/user/form.vue
index 05724726..d228dfb8 100644
--- a/snowy-admin-web/src/views/sys/user/form.vue
+++ b/snowy-admin-web/src/views/sys/user/form.vue
@@ -1,11 +1,10 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		:title="formData.id ? '编辑用户' : '增加用户'"
-		:width="620"
+		:width="800"
 		:visible="visible"
 		:destroy-on-close="true"
-		:body-style="{ paddingBottom: '80px', 'padding-top': '0px' }"
-		:footer-style="{ textAlign: 'right' }"
+		:body-style="{ 'padding-top': '0px' }"
 		@close="onClose"
 	>
 		<a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
@@ -323,7 +322,7 @@
 			<a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
 			<a-button type="primary" :loading="formLoading" @click="onSubmit">保存</a-button>
 		</template>
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup>
diff --git a/snowy-admin-web/src/views/sys/user/grantPermissionForm.vue b/snowy-admin-web/src/views/sys/user/grantPermissionForm.vue
index 86c6e05d..101f1788 100644
--- a/snowy-admin-web/src/views/sys/user/grantPermissionForm.vue
+++ b/snowy-admin-web/src/views/sys/user/grantPermissionForm.vue
@@ -1,12 +1,10 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		title="授权权限"
 		:width="drawerWidth"
 		:visible="visible"
 		:destroy-on-close="true"
 		:show-pagination="false"
-		:body-style="{ paddingBottom: '80px' }"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<a-alert
@@ -69,7 +67,7 @@
 			<a-button type="primary" :loading="submitLoading" @click="onSubmit">保存</a-button>
 		</template>
 		<ScopeDefineOrg ref="scopeDefineOrgModal" @click="scopeDefineOrgClick" />
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup name="grantResourceForm">
diff --git a/snowy-admin-web/src/views/sys/user/grantResourceForm.vue b/snowy-admin-web/src/views/sys/user/grantResourceForm.vue
index 6b33c056..52f915f1 100644
--- a/snowy-admin-web/src/views/sys/user/grantResourceForm.vue
+++ b/snowy-admin-web/src/views/sys/user/grantResourceForm.vue
@@ -1,12 +1,10 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		title="授权资源"
 		:width="drawerWidth"
 		:visible="visible"
 		:destroy-on-close="true"
 		:show-pagination="false"
-		:body-style="{ paddingBottom: '80px' }"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<a-spin :spinning="spinningLoading">
@@ -53,7 +51,7 @@
 			<a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
 			<a-button type="primary" :loading="submitLoading" @click="onSubmit">保存</a-button>
 		</template>
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup name="grantResourceForm">
diff --git a/snowy-admin-web/src/views/sys/user/impExp.vue b/snowy-admin-web/src/views/sys/user/impExp.vue
index 0fccc049..6e706ea0 100644
--- a/snowy-admin-web/src/views/sys/user/impExp.vue
+++ b/snowy-admin-web/src/views/sys/user/impExp.vue
@@ -1,10 +1,9 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		title="导入导出"
-		:width="620"
+		:width="700"
 		:visible="visible"
 		:destroy-on-close="true"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<span
@@ -33,7 +32,7 @@
 				</div>
 			</template>
 		</a-alert>
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup name="userImpExp">
diff --git a/snowy-admin-web/src/views/sys/user/index.vue b/snowy-admin-web/src/views/sys/user/index.vue
index 8e7f27f2..9b879119 100644
--- a/snowy-admin-web/src/views/sys/user/index.vue
+++ b/snowy-admin-web/src/views/sys/user/index.vue
@@ -317,9 +317,11 @@
 		}
 		if (selectedRowKeys.value.length > 0) {
 			const params = {
-				userIds: selectedRowKeys.value.map((m) => {
-					return m
-				}).join()
+				userIds: selectedRowKeys.value
+					.map((m) => {
+						return m
+					})
+					.join()
 			}
 			exportBatchUser(params)
 			return
diff --git a/snowy-admin-web/src/views/sys/user/scopeDefineOrg.vue b/snowy-admin-web/src/views/sys/user/scopeDefineOrg.vue
index f3c64f6c..4a8bcd74 100644
--- a/snowy-admin-web/src/views/sys/user/scopeDefineOrg.vue
+++ b/snowy-admin-web/src/views/sys/user/scopeDefineOrg.vue
@@ -2,7 +2,7 @@
 	<a-modal
 		v-model:visible="visible"
 		title="选择机构"
-		:width="400"
+		:width="500"
 		:mask-closable="false"
 		:destroy-on-close="true"
 		@ok="handleOk"
diff --git a/snowy-admin-web/src/views/sys/user/userTab/bindForm/updatePassword.vue b/snowy-admin-web/src/views/sys/user/userTab/bindForm/updatePassword.vue
index c5f282c9..68d58ee8 100644
--- a/snowy-admin-web/src/views/sys/user/userTab/bindForm/updatePassword.vue
+++ b/snowy-admin-web/src/views/sys/user/userTab/bindForm/updatePassword.vue
@@ -1,11 +1,9 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		title="修改密码"
-		:width="600"
+		:width="550"
 		:visible="visible"
 		:destroy-on-close="true"
-		:body-style="{ paddingBottom: '80px' }"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<a-form ref="formRef" :model="formState" :rules="rules" layout="vertical">
@@ -32,7 +30,7 @@
 			<a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
 			<a-button type="primary" :loading="submitLoading" @click="onSubmit">保存</a-button>
 		</template>
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup name="updatePassword">
diff --git a/snowy-admin-web/src/views/sys/user/userTab/userMessage/detail.vue b/snowy-admin-web/src/views/sys/user/userTab/userMessage/detail.vue
index eac4dc9e..26c4c6a8 100644
--- a/snowy-admin-web/src/views/sys/user/userTab/userMessage/detail.vue
+++ b/snowy-admin-web/src/views/sys/user/userTab/userMessage/detail.vue
@@ -1,11 +1,9 @@
 <template>
-	<a-drawer
+	<xn-form-container
 		title="详情"
-		:width="600"
+		:width="700"
 		:visible="visible"
 		:destroy-on-close="true"
-		:body-style="{ paddingBottom: '80px' }"
-		:footer-style="{ textAlign: 'right' }"
 		@close="onClose"
 	>
 		<a-descriptions :column="1" size="middle" bordered class="mb-2">
@@ -35,7 +33,7 @@
 				</s-table>
 			</a-form-item>
 		</a-form>
-	</a-drawer>
+	</xn-form-container>
 </template>
 
 <script setup name="messageDetail">
diff --git a/snowy-plugin/snowy-plugin-gen/src/main/resources/frontend/form.vue.btl b/snowy-plugin/snowy-plugin-gen/src/main/resources/frontend/form.vue.btl
index a7600641..f43e25cc 100644
--- a/snowy-plugin/snowy-plugin-gen/src/main/resources/frontend/form.vue.btl
+++ b/snowy-plugin/snowy-plugin-gen/src/main/resources/frontend/form.vue.btl
@@ -1,14 +1,13 @@
 <template>
-    <a-drawer
+    <xn-form-container
         <% for(var i = 0; i < configList.~size; i++) { %>
         <% if(configList[i].needTableId) { %>
         :title="formData.${configList[i].fieldNameCamelCase} ? '编辑${functionName}' : '增加${functionName}'"
         <% } %>
         <% } %>
-        :width="600"
+        :width="700"
         :visible="visible"
         :destroy-on-close="true"
-        :footer-style="{ textAlign: 'right' }"
         @close="onClose"
     >
         <a-form ref="formRef" :model="formData" :rules="formRules" layout="${formLayout}">
@@ -74,7 +73,7 @@
             <a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
             <a-button type="primary" @click="onSubmit" :loading="submitLoading">保存</a-button>
         </template>
-    </a-drawer>
+    </xn-form-container>
 </template>
 
 <script setup name="${classNameFirstLower}Form">