From b0b3786bd950153b822dcfc75f6bfdba7a04db5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com>
Date: Sun, 12 Nov 2023 21:30:05 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E7=AA=84=E5=B1=8F=E9=80=82=E9=85=8D=E6=80=A7=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/Table/index.vue            | 43 +++++++++----------
 snowy-admin-web/src/views/biz/dict/index.vue  | 15 +++----
 snowy-admin-web/src/views/biz/org/index.vue   | 11 ++---
 .../src/views/biz/position/index.vue          | 11 ++---
 snowy-admin-web/src/views/biz/user/index.vue  | 11 ++---
 .../src/views/dev/dict/category/bizIndex.vue  |  9 ++--
 .../src/views/dev/dict/category/frmIndex.vue  |  9 ++--
 snowy-admin-web/src/views/sys/org/index.vue   | 11 ++---
 .../src/views/sys/position/index.vue          | 11 ++---
 snowy-admin-web/src/views/sys/role/index.vue  | 11 ++---
 snowy-admin-web/src/views/sys/user/index.vue  |  7 +--
 11 files changed, 59 insertions(+), 90 deletions(-)

diff --git a/snowy-admin-web/src/components/Table/index.vue b/snowy-admin-web/src/components/Table/index.vue
index 5dd5c0cc..db8b3c80 100644
--- a/snowy-admin-web/src/components/Table/index.vue
+++ b/snowy-admin-web/src/components/Table/index.vue
@@ -307,14 +307,6 @@
 						</span>
 					)
 				})
-				// 绘制 清空 按钮
-				const clearItem =
-					typeof this.alert === 'boolean' && this.alert
-						? this.renderClear(this.clearSelected)
-						: typeof this.alert.clear === 'function'
-						? this.renderClear(this.alert.clear)
-						: null
-
 				// 绘制 alert 组件
 				if (alert) {
 					const showAlert =
@@ -323,21 +315,28 @@
 							this.alert.show &&
 							typeof this.rowSelection.selectedRowKeys !== 'undefined') ||
 						this.alert
-					const message = (
-						<div>
-							<span className="mr-3">
-								已选择:{' '}
-								<a className="font-6">
-									{this.rowSelection && this.rowSelection.selectedRowKeys
-										? this.rowSelection.selectedRowKeys.length
-										: 0}
-								</a>
-							</span>
-							{needTotalItems}
-							{clearItem}
-						</div>
-					)
 					if (showAlert) {
+						// 绘制 清空 按钮
+						const clearItem =
+							typeof this.alert === 'boolean' && this.alert
+								? this.renderClear(this.clearSelected)
+								: this.alert.clear && typeof this.alert.clear === 'function'
+								? this.renderClear(this.alert.clear)
+								: null
+						const message = (
+							<div>
+								<span className="mr-3">
+									已选择:{' '}
+									<a className="font-6">
+										{this.rowSelection && this.rowSelection.selectedRowKeys
+											? this.rowSelection.selectedRowKeys.length
+											: 0}
+									</a>
+								</span>
+								{needTotalItems}
+								{clearItem}
+							</div>
+						)
 						return <a-alert showIcon class="mb-4" message={message} />
 					}
 				}
diff --git a/snowy-admin-web/src/views/biz/dict/index.vue b/snowy-admin-web/src/views/biz/dict/index.vue
index a550fb49..5bb23366 100644
--- a/snowy-admin-web/src/views/biz/dict/index.vue
+++ b/snowy-admin-web/src/views/biz/dict/index.vue
@@ -1,7 +1,7 @@
 <template>
-	<a-row>
-		<a-col :span="5">
-			<a-card class="cardImp" :bordered="false" :loading="cardLoading">
+	<a-row :gutter="10">
+		<a-col :xs="24" :sm="24" :md="24" :lg="5" :xl="5">
+			<a-card :bordered="false" :loading="cardLoading">
 				<a-tree
 					v-if="treeData.length > 0"
 					v-model:expandedKeys="defaultExpandedKeys"
@@ -12,7 +12,7 @@
 				<a-empty v-else :image="Empty.PRESENTED_IMAGE_SIMPLE" />
 			</a-card>
 		</a-col>
-		<a-col :span="19">
+		<a-col :xs="24" :sm="24" :md="24" :lg="19" :xl="19">
 			<a-card :bordered="false" style="margin-bottom: 10px">
 				<a-form
 					ref="searchFormRef"
@@ -31,7 +31,7 @@
 								<template #icon><SearchOutlined /></template>
 								查询
 							</a-button>
-							<a-button class="snowy-buttom-left" @click="reset">
+							<a-button class="snowy-button-left" @click="reset">
 								<template #icon><redo-outlined /></template>
 								重置
 							</a-button>
@@ -184,13 +184,10 @@
 </script>
 
 <style lang="less" scoped>
-	.cardImp {
-		margin-right: 10px;
-	}
 	.ant-form-item {
 		margin-bottom: 0 !important;
 	}
-	.snowy-buttom-left {
+	.snowy-button-left {
 		margin-left: 8px;
 	}
 </style>
diff --git a/snowy-admin-web/src/views/biz/org/index.vue b/snowy-admin-web/src/views/biz/org/index.vue
index 41f9aa27..072f0e89 100644
--- a/snowy-admin-web/src/views/biz/org/index.vue
+++ b/snowy-admin-web/src/views/biz/org/index.vue
@@ -1,7 +1,7 @@
 <template>
-	<a-row>
-		<a-col :span="5">
-			<a-card class="cardImp" :bordered="false" :loading="cardLoading">
+	<a-row :gutter="10">
+		<a-col :xs="24" :sm="24" :md="24" :lg="5" :xl="5">
+			<a-card :bordered="false" :loading="cardLoading">
 				<a-tree
 					v-if="treeData.length > 0"
 					v-model:expandedKeys="defaultExpandedKeys"
@@ -13,7 +13,7 @@
 				<a-empty v-else :image="Empty.PRESENTED_IMAGE_SIMPLE" />
 			</a-card>
 		</a-col>
-		<a-col :span="19">
+		<a-col :xs="24" :sm="24" :md="24" :lg="19" :xl="19">
 			<a-card :bordered="false" style="margin-bottom: 10px">
 				<a-form ref="searchFormRef" name="advanced_search" class="ant-advanced-search-form" :model="searchFormState">
 					<a-row :gutter="24">
@@ -210,9 +210,6 @@
 </script>
 
 <style scoped>
-	.cardImp {
-		margin-right: 10px;
-	}
 	.ant-form-item {
 		margin-bottom: 0 !important;
 	}
diff --git a/snowy-admin-web/src/views/biz/position/index.vue b/snowy-admin-web/src/views/biz/position/index.vue
index 5357a836..4c7378f4 100644
--- a/snowy-admin-web/src/views/biz/position/index.vue
+++ b/snowy-admin-web/src/views/biz/position/index.vue
@@ -1,7 +1,7 @@
 <template>
-	<a-row>
-		<a-col :span="5">
-			<a-card class="cardImp" :bordered="false" :loading="cardLoading">
+	<a-row :gutter="10">
+		<a-col :xs="24" :sm="24" :md="24" :lg="5" :xl="5">
+			<a-card :bordered="false" :loading="cardLoading">
 				<a-tree
 					v-if="treeData.length > 0"
 					v-model:expandedKeys="defaultExpandedKeys"
@@ -13,7 +13,7 @@
 				<a-empty v-else :image="Empty.PRESENTED_IMAGE_SIMPLE" />
 			</a-card>
 		</a-col>
-		<a-col :span="19">
+		<a-col :xs="24" :sm="24" :md="24" :lg="19" :xl="19">
 			<a-card :bordered="false" style="margin-bottom: 10px">
 				<a-form ref="searchFormRef" name="advanced_search" class="ant-advanced-search-form" :model="searchFormState">
 					<a-row :gutter="24">
@@ -207,9 +207,6 @@
 </script>
 
 <style scoped>
-	.cardImp {
-		margin-right: 10px;
-	}
 	.ant-form-item {
 		margin-bottom: 0 !important;
 	}
diff --git a/snowy-admin-web/src/views/biz/user/index.vue b/snowy-admin-web/src/views/biz/user/index.vue
index 9cc8564b..a86342b0 100644
--- a/snowy-admin-web/src/views/biz/user/index.vue
+++ b/snowy-admin-web/src/views/biz/user/index.vue
@@ -1,7 +1,7 @@
 <template>
-	<a-row>
-		<a-col :span="5">
-			<a-card class="cardImp" :bordered="false" :loading="cardLoading">
+	<a-row :gutter="10">
+		<a-col :xs="24" :sm="24" :md="24" :lg="5" :xl="5">
+			<a-card :bordered="false" :loading="cardLoading">
 				<a-tree
 					v-if="treeData.length > 0"
 					v-model:expandedKeys="defaultExpandedKeys"
@@ -13,7 +13,7 @@
 				<a-empty v-else :image="Empty.PRESENTED_IMAGE_SIMPLE" />
 			</a-card>
 		</a-col>
-		<a-col :span="19">
+		<a-col :xs="24" :sm="24" :md="24" :lg="19" :xl="19">
 			<a-card :bordered="false" style="margin-bottom: 10px">
 				<a-form ref="searchFormRef" name="advanced_search" class="ant-advanced-search-form" :model="searchFormState">
 					<a-row :gutter="24">
@@ -415,9 +415,6 @@
 </script>
 
 <style scoped>
-	.cardImp {
-		margin-right: 10px;
-	}
 	.ant-form-item {
 		margin-bottom: 0 !important;
 	}
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 58c5d19e..4aa9c3bd 100644
--- a/snowy-admin-web/src/views/dev/dict/category/bizIndex.vue
+++ b/snowy-admin-web/src/views/dev/dict/category/bizIndex.vue
@@ -1,6 +1,6 @@
 <template>
-	<a-row>
-		<a-col :span="5">
+	<a-row :gutter="10">
+		<a-col :xs="24" :sm="24" :md="24" :lg="5" :xl="5">
 			<a-tree
 				v-if="treeData.length > 0"
 				v-model:expandedKeys="defaultExpandedKeys"
@@ -11,7 +11,7 @@
 			</a-tree>
 			<a-empty v-else :image="Empty.PRESENTED_IMAGE_SIMPLE" />
 		</a-col>
-		<a-col :span="19">
+		<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">
@@ -191,9 +191,6 @@
 </script>
 
 <style scoped>
-	.cardImp {
-		margin-right: 10px;
-	}
 	.ant-form-item {
 		margin-bottom: 0 !important;
 	}
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 80eee097..b1dac247 100644
--- a/snowy-admin-web/src/views/dev/dict/category/frmIndex.vue
+++ b/snowy-admin-web/src/views/dev/dict/category/frmIndex.vue
@@ -1,6 +1,6 @@
 <template>
-	<a-row>
-		<a-col :span="5">
+	<a-row :gutter="10">
+		<a-col :xs="24" :sm="24" :md="24" :lg="5" :xl="5">
 			<a-tree
 				v-if="treeData.length > 0"
 				v-model:expandedKeys="defaultExpandedKeys"
@@ -11,7 +11,7 @@
 			</a-tree>
 			<a-empty v-else :image="Empty.PRESENTED_IMAGE_SIMPLE" />
 		</a-col>
-		<a-col :span="19">
+		<a-col :xs="24" :sm="24" :md="24" :lg="19" :xl="19">
 			<a-form ref="searchFormRef" name="advanced_search" class="ant-advanced-search-form" :model="searchFormState">
 				<a-row :gutter="24">
 					<a-col :span="8">
@@ -175,9 +175,6 @@
 </script>
 
 <style scoped>
-	.cardImp {
-		margin-right: 10px;
-	}
 	.ant-form-item {
 		margin-bottom: 0 !important;
 	}
diff --git a/snowy-admin-web/src/views/sys/org/index.vue b/snowy-admin-web/src/views/sys/org/index.vue
index 830aca97..a3d49c1d 100644
--- a/snowy-admin-web/src/views/sys/org/index.vue
+++ b/snowy-admin-web/src/views/sys/org/index.vue
@@ -1,7 +1,7 @@
 <template>
-	<a-row>
-		<a-col :span="5">
-			<a-card class="cardImp" :bordered="false" :loading="cardLoading">
+	<a-row :gutter="10">
+		<a-col :xs="24" :sm="24" :md="24" :lg="5" :xl="5">
+			<a-card :bordered="false" :loading="cardLoading">
 				<a-tree
 					v-if="treeData.length > 0"
 					v-model:expandedKeys="defaultExpandedKeys"
@@ -12,7 +12,7 @@
 				<a-empty v-else :image="Empty.PRESENTED_IMAGE_SIMPLE" />
 			</a-card>
 		</a-col>
-		<a-col :span="19">
+		<a-col :xs="24" :sm="24" :md="24" :lg="19" :xl="19">
 			<a-card :bordered="false" style="margin-bottom: 10px">
 				<a-form ref="searchFormRef" name="advanced_search" class="ant-advanced-search-form" :model="searchFormState">
 					<a-row :gutter="24">
@@ -192,9 +192,6 @@
 </script>
 
 <style scoped>
-	.cardImp {
-		margin-right: 10px;
-	}
 	.ant-form-item {
 		margin-bottom: 0 !important;
 	}
diff --git a/snowy-admin-web/src/views/sys/position/index.vue b/snowy-admin-web/src/views/sys/position/index.vue
index 22b19ccc..62f0a92e 100644
--- a/snowy-admin-web/src/views/sys/position/index.vue
+++ b/snowy-admin-web/src/views/sys/position/index.vue
@@ -1,7 +1,7 @@
 <template>
-	<a-row>
-		<a-col :span="5">
-			<a-card class="cardImp" :bordered="false" :loading="cardLoading">
+	<a-row :gutter="10">
+		<a-col :xs="24" :sm="24" :md="24" :lg="5" :xl="5">
+			<a-card :bordered="false" :loading="cardLoading">
 				<a-tree
 					v-if="treeData.length > 0"
 					v-model:expandedKeys="defaultExpandedKeys"
@@ -13,7 +13,7 @@
 				<a-empty v-else :image="Empty.PRESENTED_IMAGE_SIMPLE" />
 			</a-card>
 		</a-col>
-		<a-col :span="19">
+		<a-col :xs="24" :sm="24" :md="24" :lg="19" :xl="19">
 			<a-card :bordered="false" style="margin-bottom: 10px">
 				<a-form ref="searchFormRef" name="advanced_search" class="ant-advanced-search-form" :model="searchFormState">
 					<a-row :gutter="24">
@@ -191,9 +191,6 @@
 </script>
 
 <style scoped>
-	.cardImp {
-		margin-right: 10px;
-	}
 	.ant-form-item {
 		margin-bottom: 0 !important;
 	}
diff --git a/snowy-admin-web/src/views/sys/role/index.vue b/snowy-admin-web/src/views/sys/role/index.vue
index cda1e569..9520cfab 100644
--- a/snowy-admin-web/src/views/sys/role/index.vue
+++ b/snowy-admin-web/src/views/sys/role/index.vue
@@ -1,7 +1,7 @@
 <template>
-	<a-row>
-		<a-col :span="5">
-			<a-card class="cardImp" :bordered="false" :loading="cardLoading">
+	<a-row :gutter="10">
+		<a-col :xs="24" :sm="24" :md="24" :lg="5" :xl="5">
+			<a-card :bordered="false" :loading="cardLoading">
 				<a-tree
 					v-if="treeData.length > 0"
 					v-model:expandedKeys="defaultExpandedKeys"
@@ -13,7 +13,7 @@
 				<a-empty v-else :image="Empty.PRESENTED_IMAGE_SIMPLE" />
 			</a-card>
 		</a-col>
-		<a-col :span="19">
+		<a-col :xs="24" :sm="24" :md="24" :lg="19" :xl="19">
 			<a-card :bordered="false" style="margin-bottom: 10px">
 				<a-form ref="searchFormRef" name="advanced_search" class="ant-advanced-search-form" :model="searchFormState">
 					<a-row :gutter="24">
@@ -298,9 +298,6 @@
 </script>
 
 <style scoped>
-	.cardImp {
-		margin-right: 10px;
-	}
 	.ant-form-item {
 		margin-bottom: 0 !important;
 	}
diff --git a/snowy-admin-web/src/views/sys/user/index.vue b/snowy-admin-web/src/views/sys/user/index.vue
index 36d862f2..50db76e2 100644
--- a/snowy-admin-web/src/views/sys/user/index.vue
+++ b/snowy-admin-web/src/views/sys/user/index.vue
@@ -1,7 +1,7 @@
 <template>
-	<a-row>
+	<a-row :gutter="10">
 		<a-col :xs="24" :sm="24" :md="24" :lg="5" :xl="5">
-			<a-card class="cardImp mb-3" :bordered="false" :loading="cardLoading">
+			<a-card class="mb-3" :bordered="false" :loading="cardLoading">
 				<a-tree
 					v-if="treeData.length > 0"
 					v-model:expandedKeys="defaultExpandedKeys"
@@ -411,9 +411,6 @@
 </script>
 
 <style scoped>
-	.cardImp {
-		margin-right: 10px;
-	}
 	.ant-form-item {
 		margin-bottom: 0 !important;
 	}