From 183ea32be68939f97df5853d0d937922f682b89e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com>
Date: Sun, 26 Mar 2023 15:32:40 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E7=95=8C=E9=9D=A2=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E5=8D=8F=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/dev/dict/category/bizIndex.vue  | 51 ++++++++++---------
 .../src/views/dev/dict/category/frmIndex.vue  | 51 ++++++++++---------
 2 files changed, 52 insertions(+), 50 deletions(-)

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 097ca5ee..8bb02bbd 100644
--- a/snowy-admin-web/src/views/dev/dict/category/bizIndex.vue
+++ b/snowy-admin-web/src/views/dev/dict/category/bizIndex.vue
@@ -12,40 +12,40 @@
 			<a-empty v-else :image="Empty.PRESENTED_IMAGE_SIMPLE" />
 		</a-col>
 		<a-col :span="19">
+			<a-form ref="searchFormRef" name="advanced_search" class="ant-advanced-search-form mb-3" :model="searchFormState">
+				<a-row :gutter="24">
+					<a-col :span="8">
+						<a-form-item name="searchKey" label="字典名称">
+							<a-input v-model:value="searchFormState.searchKey" placeholder="请输入字典名称" />
+						</a-form-item>
+					</a-col>
+					<a-col :span="8">
+						<a-button type="primary" @click="$refs.table.refresh(true)">
+							<template #icon><SearchOutlined /></template>
+							查询
+						</a-button>
+						<a-button class="snowy-buttom-left" @click="reset">
+							<template #icon><redo-outlined /></template>
+							重置
+						</a-button>
+					</a-col>
+				</a-row>
+			</a-form>
+			<a-divider class="m-3 mx-0"/>
 			<s-table
 				ref="table"
 				:columns="columns"
 				:data="loadData"
 				:expand-row-by-click="true"
 				bordered
+				:tool-config="toolConfig"
 				:row-key="(record) => record.id"
 			>
 				<template #operator class="table-operator">
-					<a-form ref="searchFormRef" name="advanced_search" class="ant-advanced-search-form" :model="searchFormState">
-						<a-row :gutter="24">
-							<a-col :span="8">
-								<a-form-item name="searchKey" label="字典名称">
-									<a-input v-model:value="searchFormState.searchKey" placeholder="请输入字典名称"></a-input>
-								</a-form-item>
-							</a-col>
-							<a-col :span="8">
-								<a-button type="primary" @click="$refs.table.refresh(true)">
-									<template #icon><SearchOutlined /></template>
-									查询
-								</a-button>
-								<a-button class="snowy-buttom-left" @click="reset">
-									<template #icon><redo-outlined /></template>
-									重置
-								</a-button>
-							</a-col>
-							<a-col :span="8">
-								<a-button type="primary" @click="form.onOpen(undefined, 'BIZ', searchFormState.parentId)">
-									<template #icon><plus-outlined /></template>
-									新增
-								</a-button>
-							</a-col>
-						</a-row>
-					</a-form>
+					<a-button type="primary" @click="form.onOpen(undefined, 'BIZ', searchFormState.parentId)">
+						<template #icon><plus-outlined /></template>
+						新增
+					</a-button>
 				</template>
 				<template #bodyCell="{ column, record }">
 					<template v-if="column.dataIndex === 'action'">
@@ -97,6 +97,7 @@
 	const treeData = ref([])
 	// 替换treeNode 中 title,key,children
 	const treeFieldNames = { children: 'children', title: 'dictLabel', key: 'id' }
+	const toolConfig = { refresh: true, height: true, columnSetting: true, striped: false }
 
 	// 表格查询 返回 Promise 对象
 	const loadData = (parameter) => {
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 0e356c2f..b62685d0 100644
--- a/snowy-admin-web/src/views/dev/dict/category/frmIndex.vue
+++ b/snowy-admin-web/src/views/dev/dict/category/frmIndex.vue
@@ -12,40 +12,40 @@
 			<a-empty v-else :image="Empty.PRESENTED_IMAGE_SIMPLE" />
 		</a-col>
 		<a-col :span="19">
+			<a-form ref="searchFormRef" name="advanced_search" class="ant-advanced-search-form" :model="searchFormState">
+				<a-row :gutter="24">
+					<a-col :span="8">
+						<a-form-item name="searchKey" label="字典名称">
+							<a-input v-model:value="searchFormState.searchKey" placeholder="请输入字典名称" />
+						</a-form-item>
+					</a-col>
+					<a-col :span="8">
+						<a-button type="primary" @click="$refs.table.refresh(true)">
+							<template #icon><SearchOutlined /></template>
+							查询
+						</a-button>
+						<a-button class="snowy-buttom-left" @click="reset">
+							<template #icon><redo-outlined /></template>
+							重置
+						</a-button>
+					</a-col>
+				</a-row>
+			</a-form>
+			<a-divider class="m-3 mx-0"/>
 			<s-table
 				ref="table"
 				:columns="columns"
 				:data="loadData"
 				:expand-row-by-click="true"
 				bordered
+				:tool-config="toolConfig"
 				:row-key="(record) => record.id"
 			>
 				<template #operator class="table-operator">
-					<a-form ref="searchFormRef" name="advanced_search" class="ant-advanced-search-form" :model="searchFormState">
-						<a-row :gutter="24">
-							<a-col :span="8">
-								<a-form-item name="searchKey" label="字典名称">
-									<a-input v-model:value="searchFormState.searchKey" placeholder="请输入字典名称"></a-input>
-								</a-form-item>
-							</a-col>
-							<a-col :span="8">
-								<a-button type="primary" @click="$refs.table.refresh(true)">
-									<template #icon><SearchOutlined /></template>
-									查询
-								</a-button>
-								<a-button class="snowy-buttom-left" @click="reset">
-									<template #icon><redo-outlined /></template>
-									重置
-								</a-button>
-							</a-col>
-							<a-col :span="8">
-								<a-button type="primary" @click="form.onOpen(undefined, 'FRM', searchFormState.parentId)">
-									<template #icon><plus-outlined /></template>
-									新增
-								</a-button>
-							</a-col>
-						</a-row>
-					</a-form>
+					<a-button type="primary" @click="form.onOpen(undefined, 'FRM', searchFormState.parentId)">
+						<template #icon><plus-outlined /></template>
+						新增
+					</a-button>
 				</template>
 				<template #bodyCell="{ column, record }">
 					<template v-if="column.dataIndex === 'category'">
@@ -96,6 +96,7 @@
 	const treeData = ref([])
 	// 替换treeNode 中 title,key,children
 	const treeFieldNames = { children: 'children', title: 'dictLabel', key: 'id' }
+	const toolConfig = { refresh: true, height: true, columnSetting: true, striped: false }
 
 	// 表格查询 返回 Promise 对象
 	const loadData = (parameter) => {