From 8da28a3ca520a8df958052b58174519fcc462300 Mon Sep 17 00:00:00 2001
From: dengyu <3233891353@qq.com>
Date: Tue, 19 Dec 2023 17:18:30 +0800
Subject: [PATCH] =?UTF-8?q?refractor(message):=20=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=85=A8=E9=83=A8=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deliver-front/vue/components.d.ts             |  4 ++
 .../vue/src/components/Drawer/index.vue       | 27 +++++---
 .../vue/src/components/List/index.vue         | 22 ++++---
 .../vue/src/components/SearchForm/index.vue   |  6 +-
 .../Table/components/TableHeader/index.vue    | 13 ++--
 .../vue/src/components/Table/index.vue        | 49 +++++++--------
 deliver-front/vue/src/config/table.ts         | 15 ++++-
 deliver-front/vue/src/types/mitt/index.d.ts   |  1 +
 deliver-front/vue/src/types/table/index.d.ts  |  2 +-
 deliver-front/vue/src/utils/request.ts        |  2 +-
 .../src/views/Channel/components/addApp.vue   | 23 ++++---
 deliver-front/vue/src/views/Channel/index.vue | 23 +++----
 deliver-front/vue/src/views/Message/index.vue | 63 ++++++++++++++-----
 13 files changed, 152 insertions(+), 98 deletions(-)

diff --git a/deliver-front/vue/components.d.ts b/deliver-front/vue/components.d.ts
index c1a0491a..9c81a5d5 100644
--- a/deliver-front/vue/components.d.ts
+++ b/deliver-front/vue/components.d.ts
@@ -13,6 +13,7 @@ declare module 'vue' {
     ACard: typeof import('ant-design-vue/es')['Card']
     ACardMeta: typeof import('ant-design-vue/es')['CardMeta']
     ACol: typeof import('ant-design-vue/es')['Col']
+    ADivider: typeof import('ant-design-vue/es')['Divider']
     ADrawer: typeof import('ant-design-vue/es')['Drawer']
     AForm: typeof import('ant-design-vue/es')['Form']
     AFormItem: typeof import('ant-design-vue/es')['FormItem']
@@ -29,18 +30,21 @@ declare module 'vue' {
     AMenu: typeof import('ant-design-vue/es')['Menu']
     AMenuItem: typeof import('ant-design-vue/es')['MenuItem']
     AModal: typeof import('ant-design-vue/es')['Modal']
+    APagination: typeof import('ant-design-vue/es')['Pagination']
     APopconfirm: typeof import('ant-design-vue/es')['Popconfirm']
     ARadioButton: typeof import('ant-design-vue/es')['RadioButton']
     ARadioGroup: typeof import('ant-design-vue/es')['RadioGroup']
     ARangePicker: typeof import('ant-design-vue/es')['RangePicker']
     ARow: typeof import('ant-design-vue/es')['Row']
     ASelect: typeof import('ant-design-vue/es')['Select']
+    ASelectOption: typeof import('ant-design-vue/es')['SelectOption']
     AStatistic: typeof import('ant-design-vue/es')['Statistic']
     ASubMenu: typeof import('ant-design-vue/es')['SubMenu']
     ASwitch: typeof import('ant-design-vue/es')['Switch']
     ATable: typeof import('ant-design-vue/es')['Table']
     ATag: typeof import('ant-design-vue/es')['Tag']
     ATooltip: typeof import('ant-design-vue/es')['Tooltip']
+    AUploadDragger: typeof import('ant-design-vue/es')['UploadDragger']
     Banner: typeof import('./src/components/Banner/index.vue')['default']
     Code: typeof import('./src/components/Code/index.vue')['default']
     Drawer: typeof import('./src/components/Drawer/index.vue')['default']
diff --git a/deliver-front/vue/src/components/Drawer/index.vue b/deliver-front/vue/src/components/Drawer/index.vue
index ffda1569..ea504273 100644
--- a/deliver-front/vue/src/components/Drawer/index.vue
+++ b/deliver-front/vue/src/components/Drawer/index.vue
@@ -9,7 +9,7 @@ interface Props {
 	_options: any
 }
 interface EmitEvent {
-	(e: 'submit', params: any): void
+	(e: 'submit', params: any, callback: (err: boolean) => void): void
 }
 const props = defineProps<Props>()
 const emit = defineEmits<EmitEvent>()
@@ -109,9 +109,12 @@ const submit = () => {
 	formRef.value
 		.validate()
 		.then(() => {
-			emit('submit', drawerModel.value)
-			resetForm()
-			open.value = false
+			const callback = (err: boolean) => {
+				if (err) return
+				resetForm()
+				open.value = false
+			}
+			emit('submit', drawerModel.value, callback)
 		})
 		.catch((err: any) => {
 			console.log('errot', err)
@@ -123,11 +126,17 @@ const submit = () => {
 		<slot name="button" :openModel="openModel">
 			<a-button @click="openModel" type="primary">{{ config.title }}</a-button>
 		</slot>
-		<a-drawer v-model:open="open" :title="config.title" width="650px" :footer="null" @close="resetForm">
-			<a-form ref="formRef" :model="drawerModel" :rules="config.rules" :label-col="{ span: 5 }" :wrapper-col="{ span: 20 }" class="centerForm">
+		<a-drawer v-model:open="open" :title="config.title" width="660px" :footer="null" @close="resetForm">
+			<a-form
+				ref="formRef"
+				:model="drawerModel"
+				:rules="config.rules"
+				:label-col="{ style: { width: '90px' } }"
+				:wrapper-col="{ span: 20 }"
+				class="centerForm">
 				<template v-for="item in config.formData" :key="item.field">
 					<a-form-item :label="item.label" :name="item.field" class="center-item" v-if="item.type === 'input'">
-						<a-input :maxlength="20" v-model:value="drawerModel[item.field]" :placeholder="item.placeholder" style="width: 70%" />
+						<a-input :maxlength="20" v-model:value="drawerModel[item.field]" :placeholder="item.placeholder" />
 					</a-form-item>
 					<a-form-item :label="item.label" :name="item.field" class="center-item" v-if="item.type === 'inputNumber'">
 						<a-input-number v-model:value="drawerModel[item.field]" :min="0" :max="3" />
@@ -141,8 +150,7 @@ const submit = () => {
 						<a-select
 							v-model:value="drawerModel[item.field]"
 							:options="item.options === 'function' ? requestOptions[item.field] : item.options"
-							:disabled="item.options === 'function' ? !requestOptions[item.field] || !requestOptions[item.field].length : !item.options.lengh"
-							style="width: 70%" />
+							:disabled="item.options === 'function' ? !requestOptions[item.field] || !requestOptions[item.field].length : !item.options.lengh" />
 					</a-form-item>
 					<a-form-item :label="item.label" :name="item.field" class="center-item" v-else-if="item.type === 'list'">
 						<List v-model:value="drawerModel[item.field]" :options="item.options"></List>
@@ -155,7 +163,6 @@ const submit = () => {
 							<a-select
 								v-model:value="drawerModel[option.field]"
 								:options="index === 0 ? option.options : Array.isArray(options[index]) ? options[index] : []"
-								style="width: 70%"
 								:disabled="index !== 0 && (!Array.isArray(options[index]) || !options[index].length)"
 								@change="selectChange(item.options, index)" />
 						</a-form-item>
diff --git a/deliver-front/vue/src/components/List/index.vue b/deliver-front/vue/src/components/List/index.vue
index 4dffd01e..4920e803 100644
--- a/deliver-front/vue/src/components/List/index.vue
+++ b/deliver-front/vue/src/components/List/index.vue
@@ -8,13 +8,13 @@ interface Props {
 }
 const props = defineProps<Props>()
 const emit = defineEmits(['update:value'])
-const list = ref<Array<string>>([])
+const users = ref<Array<string>>([])
 const input = ref<string>('')
 const show = ref<boolean>(false)
 watch(
-	list,
+	users.value,
 	() => {
-		emit('update:value', list.value)
+		emit('update:value', users.value)
 	},
 	{
 		immediate: true
@@ -23,20 +23,19 @@ watch(
 watch(
 	props,
 	() => {
-		list.value = props.value
+		users.value = props.value
 	},
 	{
 		immediate: true
 	}
 )
 const addItem = () => {
-	if (list.value.includes(input.value)) {
+	if (users.value.includes(input.value)) {
 		message.error('已存在相同 ID')
 		return
 	}
 	if (input.value !== '') {
-		list.value.push(input.value)
-
+		users.value.push(input.value)
 		input.value = ''
 		show.value = false
 	} else {
@@ -44,11 +43,14 @@ const addItem = () => {
 	}
 }
 const deleteItem = (item: string) => {
-	list.value = list.value.filter((s) => s != item)
+	users.value = users.value.filter((s) => s != item)
+}
+const onBlur = () => {
+	console.log('blur')
 }
 </script>
 <template>
-	<a-list :data-source="list" :locale="{ emptyText: ' ' }" bordered>
+	<a-list :data-source="users" :locale="{ emptyText: ' ' }" bordered>
 		<template #header>
 			<span style="color: #3883fa">{{ options.header }}</span>
 		</template>
@@ -69,7 +71,7 @@ const deleteItem = (item: string) => {
 				</a-tooltip>
 			</div>
 			<a-input-group compact v-show="show">
-				<a-input v-model:value="input" :maxlength="100" :placeholder="options.placeholder" style="width: 250px; text-align: left" />
+				<a-input v-model:value="input" :maxlength="100" :placeholder="options.placeholder" style="width: 250px; text-align: left" @blur="onBlur" />
 				<a-button @click="show = !show">取消</a-button>
 				<a-button type="primary" @click="addItem">确认</a-button>
 			</a-input-group>
diff --git a/deliver-front/vue/src/components/SearchForm/index.vue b/deliver-front/vue/src/components/SearchForm/index.vue
index ed9fba06..78bc7ae5 100644
--- a/deliver-front/vue/src/components/SearchForm/index.vue
+++ b/deliver-front/vue/src/components/SearchForm/index.vue
@@ -41,8 +41,8 @@ watch(
  * @param dateString
  */
 const onRangeChange = (_value: [Dayjs, Dayjs] | [string, string], dateString: [string, string]): void => {
-	searchModel.value.startTime = dateString[0]
-	searchModel.value.endTime = dateString[1]
+	searchModel.value.startTime = dateString[0] + ' 00:00:00'
+	searchModel.value.endTime = dateString[1] + ' 23:59:59'
 }
 
 /**
@@ -69,6 +69,8 @@ const onSubmit = (): void => {
 const resetForm = () => {
 	if (!formRef.value) return
 	formRef.value.resetFields()
+	emitter.emit('loading', true)
+	emit('submit', undefined, '')
 }
 
 onMounted(() => {
diff --git a/deliver-front/vue/src/components/Table/components/TableHeader/index.vue b/deliver-front/vue/src/components/Table/components/TableHeader/index.vue
index af962297..c21d1d22 100644
--- a/deliver-front/vue/src/components/Table/components/TableHeader/index.vue
+++ b/deliver-front/vue/src/components/Table/components/TableHeader/index.vue
@@ -2,10 +2,9 @@
 import { h } from 'vue'
 import { ReloadOutlined } from '@ant-design/icons-vue'
 import Form from '@/types/form'
-import emitter from '@/utils/mitt'
 interface EmitEvent {
 	(e: 'reflash'): void
-	(e: 'submit', param: any): void
+	(e: 'submit', param: any, callback: (err: boolean) => void): void
 }
 interface Props {
 	config: Form.Feedback
@@ -19,16 +18,14 @@ defineProps<Props>()
  * 重新加载表格
  */
 const reflash = () => {
-	emitter.emit('loading', true)
 	emit('reflash')
 }
 
 /**
  * 提交表格
  */
-const submit = (params: any) => {
-	emitter.emit('loading', true)
-	emit('submit', params)
+const submit = (params: any, callback: (err: boolean) => void) => {
+	emit('submit', params, callback)
 }
 </script>
 <template>
@@ -39,8 +36,8 @@ const submit = (params: any) => {
 			</a-tooltip>
 		</span>
 		<span>
-			<Modal :_options="options" :config="config" @submit="submit" :model="model" v-if="config.type === 'modal'" />
-			<Drawer :_options="options" :config="config" @submit="submit" :model="model" v-else />
+			<Drawer :_options="options" :config="config" @submit="submit" :model="model" />
+			<!-- <Modal :_options="options" :config="config" @submit="submit" :model="model" v-if="config.type === 'modal'" /> -->
 		</span>
 	</div>
 </template>
diff --git a/deliver-front/vue/src/components/Table/index.vue b/deliver-front/vue/src/components/Table/index.vue
index 942c2e9e..15fdd626 100644
--- a/deliver-front/vue/src/components/Table/index.vue
+++ b/deliver-front/vue/src/components/Table/index.vue
@@ -26,27 +26,10 @@ const state = reactive<State>({
 	loading: true,
 	collapsed: false
 })
-const pagination = ref<Table.Pagination>({
-	current: 1,
-	pageSize: 10,
-	total: 0,
-	pageSizeOptions: ['10', '20', '50', '100'],
-	showQuickJumper: true,
-	showSizeChanger: true,
-	locale: {
-		items_per_page: '条/页', // 每页显示条数的文字描述
-		jump_to: '跳至', // 跳转到某页的文字描述
-		page: '页', // 页的文字描述
-		prev_page: '上一页', // 上一页按钮文字描述
-		next_page: '下一页' // 下一页按钮文字描述
-	},
-	showTotal: (total: number) => `共 ${total} 条数据`
-})
 watch(
 	props,
 	() => {
 		state.selectedRowKeys = []
-		pagination.value.total = props.options.paginationConfig.total
 	},
 	{
 		immediate: true
@@ -85,12 +68,11 @@ const toggleExpand = (expand: boolean, record: any) => {
 		expandedRowKeys.value.push(record[props.options.rowKey])
 	}
 }
-const change = (page: any) => {
-	pagination.value.current = page.current
-	pagination.value.pageSize = page.pageSize
-	pagination.value.total = page.pageSize
+const change = (page: number, pageSize: number) => {
+	console.log(props.options.paginationConfig)
+
 	emitter.emit('loading', true)
-	emit('actions', 'search', { currentPage: page.current, pageSize: page.pageSize })
+	emit('actions', 'search', { currentPage: page, pageSize: pageSize })
 }
 const changeStatus = (name1: string, val1: any, name2: string, val2: string) => {
 	const obj = {}
@@ -122,15 +104,14 @@ onUnmounted(() => {
 		<a-table
 			:columns="columns"
 			:data-source="model"
-			:pagination="pagination"
+			:pagination="false"
 			:scroll="{ x: 1200, y: undefined, scrollToFirstRowOnChange: true }"
 			:expandedRowKeys="expandedRowKeys"
 			:expandIconAsCell="false"
 			:expandIconColumnIndex="-1"
 			:loading="state.loading"
 			:row-key="(record: any) => record[props.options.rowKey]"
-			:row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
-			@change="change">
+			:row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
 			<template #headerCell="{ column }">
 				<template v-if="column.head === 'icon'">
 					<span>
@@ -246,6 +227,18 @@ onUnmounted(() => {
 				</a-row>
 			</template>
 		</a-table>
+		<div class="pagination">
+			<a-pagination
+				v-model:current="options.paginationConfig.current"
+				v-model:pageSize="options.paginationConfig.pageSize"
+				:total="options.paginationConfig.total"
+				:pageSizeOptions="options.paginationConfig.pageSizeOptions"
+				:show-total="options.paginationConfig.showTotal"
+				:showQuickJumper="options.paginationConfig.showQuickJumper"
+				:showSizeChanger="options.paginationConfig.showSizeChanger"
+				:locale="options.paginationConfig.locale"
+				@change="change" />
+		</div>
 		<div class="showDelete" v-show="state.selectedRowKeys.length" :style="{ left: state.collapsed ? '80px' : '200px' }">
 			<div class="box">{{ `已选择 ${state.selectedRowKeys.length} 项` }}</div>
 			<div class="del">
@@ -281,4 +274,10 @@ onUnmounted(() => {
 	right: 0;
 	transition: 0.2s;
 }
+.pagination {
+	height: 60px;
+	display: flex;
+	justify-content: end;
+	align-items: end;
+}
 </style>
diff --git a/deliver-front/vue/src/config/table.ts b/deliver-front/vue/src/config/table.ts
index ccc0a25f..2ae6653e 100644
--- a/deliver-front/vue/src/config/table.ts
+++ b/deliver-front/vue/src/config/table.ts
@@ -209,7 +209,7 @@ const sendTest: Form.Feedback = {
 			}
 		}
 	],
-	rules: { users: [{ required: true, message: '请至少添加一名用户' }] },
+	rules: {},
 	formData: [
 		{
 			type: 'list',
@@ -364,7 +364,18 @@ export const tableOptions: Record<string, Table.Options> = {
 		paginationConfig: {
 			current: 1,
 			pageSize: 10,
-			total: 0
+			total: 0,
+			pageSizeOptions: ['10', '20', '50', '100'],
+			showQuickJumper: true,
+			showSizeChanger: true,
+			locale: {
+				items_per_page: '条/页', // 每页显示条数的文字描述
+				jump_to: '跳至', // 跳转到某页的文字描述
+				page: '页', // 页的文字描述
+				prev_page: '上一页', // 上一页按钮文字描述
+				next_page: '下一页' // 下一页按钮文字描述
+			},
+			showTotal: (total: number) => `共 ${total} 条数据`
 		}
 	}
 }
diff --git a/deliver-front/vue/src/types/mitt/index.d.ts b/deliver-front/vue/src/types/mitt/index.d.ts
index 7972ec5a..7e3c476e 100644
--- a/deliver-front/vue/src/types/mitt/index.d.ts
+++ b/deliver-front/vue/src/types/mitt/index.d.ts
@@ -4,4 +4,5 @@ declare type MittType = {
 	data?: object
 	collapsed: boolean
 	total: number
+	// err: boolean
 }
diff --git a/deliver-front/vue/src/types/table/index.d.ts b/deliver-front/vue/src/types/table/index.d.ts
index ff40e981..f68c97ad 100644
--- a/deliver-front/vue/src/types/table/index.d.ts
+++ b/deliver-front/vue/src/types/table/index.d.ts
@@ -63,7 +63,7 @@ declare namespace Table {
 	interface Pagination {
 		total?: number // 总条目数
 		current: number // 当前页数，支持 v-model 双向绑定
-		pageSize?: number // 每页显示条目个数，支持 v-model 双向绑定
+		pageSize: number // 每页显示条目个数，支持 v-model 双向绑定
 		defaultPageSize?: number // 每页显示个数选择器的选项设置
 		layout?: string // 组件布局，子组件名用逗号分隔
 		background?: boolean // 是否为分页按钮添加背景色
diff --git a/deliver-front/vue/src/utils/request.ts b/deliver-front/vue/src/utils/request.ts
index a5eada62..e2c39bb8 100644
--- a/deliver-front/vue/src/utils/request.ts
+++ b/deliver-front/vue/src/utils/request.ts
@@ -2,7 +2,7 @@ import axios from 'axios'
 
 const service = axios.create({
 	baseURL: '/backend',
-	timeout: 5000
+	timeout: 20000
 })
 
 service.interceptors.request.use(
diff --git a/deliver-front/vue/src/views/Channel/components/addApp.vue b/deliver-front/vue/src/views/Channel/components/addApp.vue
index 1d134f17..b2317b50 100644
--- a/deliver-front/vue/src/views/Channel/components/addApp.vue
+++ b/deliver-front/vue/src/views/Channel/components/addApp.vue
@@ -130,19 +130,19 @@ defineExpose({
 
 <template>
 	<a-button type="primary" class="addModule" @click="addModules">新增 APP</a-button>
-	<a-modal v-model:open="open" title="新增 APP" width="650px" :footer="null" @cancel="handleCancel">
+	<a-drawer v-model:open="open" title="新增 APP" width="650px" :footer="null" @cancel="handleCancel">
 		<a-form ref="templateForm" :model="templateItem" :rules="rules" :label-col="labelCol" :wrapper-col="wrapperCol" class="temform">
 			<a-form-item ref="templateName" label="APP 名称" name="appName" class="tem-item">
-				<a-input :maxlength="20" v-model:value="templateItem.appName" placeholder="请填写长度在 3 到 20 个字符的 APP 名" style="width: 70%" />
+				<a-input :maxlength="20" v-model:value="templateItem.appName" placeholder="请填写长度在 3 到 20 个字符的 APP 名" />
 			</a-form-item>
 			<a-form-item label="渠道选择" name="channelType" class="tem-item">
 				<a-select
+					placeholder="请选择渠道"
 					v-model:value="templateItem.channelType"
 					:options="channelData.map((pro) => ({ value: pro.value, label: pro.label }))"
-					@select="channelTypeSelect"
-					style="width: 70%" />
+					@select="channelTypeSelect" />
 			</a-form-item>
-			<a-form-item label="APP 配置" name="appConfig" class="tem-item" :wrapper-col="{ span: 16 }">
+			<a-form-item label="APP 配置" name="appConfig" class="tem-item">
 				<json-editor-vue
 					class="editor"
 					v-model="jsonobj"
@@ -155,14 +155,13 @@ defineExpose({
 			<a-form-item label="APP 状态" name="appStatus" class="tem-item">
 				<a-switch v-model:checked="templateItem.appStatus" checked-children="启用" un-checked-children="禁用" :checkedValue="1" :unCheckedValue="0" />
 			</a-form-item>
-			<a-form-item :wrapper-col="{ span: 20, offset: 17 }" class="tem-item">
-				<div class="between">
-					<a-button @click="handleCancel">重置</a-button>
-					<a-button type="primary" @click="handleOk" :loading="iconLoading">确认新建</a-button>
-				</div>
-			</a-form-item>
 		</a-form>
-	</a-modal>
+
+		<template #extra>
+			<a-button @click="handleCancel">重置</a-button>
+			<a-button type="primary" style="margin-left: 10px" @click="handleOk" :loading="iconLoading">确认新建</a-button>
+		</template>
+	</a-drawer>
 </template>
 
 <style scoped>
diff --git a/deliver-front/vue/src/views/Channel/index.vue b/deliver-front/vue/src/views/Channel/index.vue
index 004d0ecd..eee0d0da 100644
--- a/deliver-front/vue/src/views/Channel/index.vue
+++ b/deliver-front/vue/src/views/Channel/index.vue
@@ -432,7 +432,7 @@ const a = computed(() => {
 	<!-- 搜索部分 -->
 	<searchForm ref="searchform" @mes="searchTemplate({ page: 1, pageSize, opt: 1 })" />
 	<!-- 表格部分 -->
-	<div id="message-container" :style="{ height: hasSelected ? 'calc(100% + 940px)' : 'auto' }">
+	<div id="message-container" :style="{ height: hasSelected ? 'calc(100% + 94px)' : 'auto' }">
 		<div class="message-section">
 			<div class="splitter">
 				<a-tooltip title="刷新">
@@ -559,20 +559,19 @@ const a = computed(() => {
 			</div>
 		</div>
 	</div>
-	<a-modal v-model:open="open" title="修改 APP " width="650px" :footer="null" @cancel="handleCancel">
+	<a-drawer v-model:open="open" title="修改 APP " width="660px" :footer="null" @cancel="handleCancel">
 		<a-form ref="templateForm" :model="updateDate" :label-col="labelCol" :wrapper-col="wrapperCol" class="temform" :rules="rules">
 			<a-form-item ref="appName" label="APP 名称" name="appName" class="tem-item">
-				<a-input :maxlength="20" v-model:value="updateDate.appName" placeholder="请填写长度在 3 到 20 个字符的 APP 名" style="width: 70%" />
+				<a-input :maxlength="20" v-model:value="updateDate.appName" placeholder="请填写长度在 3 到 20 个字符的 APP 名" />
 			</a-form-item>
 
 			<a-form-item label="渠道选择" name="channelType" class="tem-item">
 				<a-select
 					v-model:value="updateDate.channelType"
 					:options="channelData.map((pro) => ({ value: pro.value, label: pro.label }))"
-					@select="channelTypeSelect"
-					style="width: 70%" />
+					@select="channelTypeSelect" />
 			</a-form-item>
-			<a-form-item label="APP 配置" name="appConfig" class="tem-item" :wrapper-col="{ span: 16 }">
+			<a-form-item label="APP 配置" name="appConfig" class="tem-item">
 				<json-editor-vue
 					class="editor"
 					v-model="jsonobj"
@@ -585,14 +584,12 @@ const a = computed(() => {
 			<a-form-item label="APP 状态" name="appStatus" class="tem-item">
 				<a-switch v-model:checked="updateDate.appStatus" checked-children="启用" un-checked-children="禁用" :checkedValue="1" :unCheckedValue="0" />
 			</a-form-item>
-			<a-form-item :wrapper-col="{ span: 20, offset: 17 }" class="tem-item">
-				<div class="between">
-					<a-button @click="handleCancel">取消</a-button>
-					<a-button type="primary" @click="handleOk" :loading="iconLoading">确认修改</a-button>
-				</div>
-			</a-form-item>
 		</a-form>
-	</a-modal>
+		<template #extra>
+			<a-button @click="handleCancel">取消</a-button>
+			<a-button style="margin-left: 10px" type="primary" @click="handleOk" :loading="iconLoading">确认修改</a-button>
+		</template>
+	</a-drawer>
 </template>
 
 <style lang="scss" scoped>
diff --git a/deliver-front/vue/src/views/Message/index.vue b/deliver-front/vue/src/views/Message/index.vue
index 0e761304..a9526b0d 100644
--- a/deliver-front/vue/src/views/Message/index.vue
+++ b/deliver-front/vue/src/views/Message/index.vue
@@ -13,29 +13,38 @@ const messageStore = useMessageStore()
 const fieldList = searchForm.messageSearchForm
 //搜索框数据
 const searchModel = ref<SearchModel>({
-	templateName: '',
+	templateName: undefined,
 	pushRange: undefined,
 	usersType: undefined,
 	period: undefined,
 	startTime: undefined,
 	endTime: undefined
 })
-
+const searchSubmit = (val: any, msg: string) => {
+	searchTemplate(val, msg, {
+		currentPage: tableOptions.templateOption.paginationConfig.current,
+		pageSize: tableOptions.templateOption.paginationConfig.pageSize
+	})
+}
 /**
  * 搜索请求表单数据
  * @param data
  */
 const searchTemplate = async (data: SearchModel | undefined, msg: string, page?: { currentPage: number; pageSize: number }): Promise<void> => {
+	console.log(data)
+
 	try {
 		const { records, total } = await messageStore.getTemplatePages(data !== undefined ? data : searchModel.value, page)
 		tableOptions.templateOption.paginationConfig.total = total
-		emitter.emit('loading', false)
-		emitter.emit('iconLoading', false)
+
 		tableModel.value = records
 		if (msg !== '') message.success(msg)
 	} catch (error) {
 		console.error('An error occurred:', error)
 		message.error(error)
+	} finally {
+		emitter.emit('loading', false)
+		emitter.emit('iconLoading', false)
 	}
 }
 
@@ -54,17 +63,32 @@ const tableHeaderData = ref<AddTemp>({
  * 添加模板
  * @param param
  */
-const addTemp = async (param: AddTemp) => {
+const addTemp = async (param: AddTemp, callback: (err: boolean) => void) => {
 	try {
 		await messageStore.addTemplatePages(param)
-		searchTemplate(undefined, '')
+		tableOptions.templateOption.paginationConfig.current = 1
+		emitter.emit('loading', true)
+		callback(false)
+		searchTemplate(undefined, '', {
+			currentPage: tableOptions.templateOption.paginationConfig.current,
+			pageSize: tableOptions.templateOption.paginationConfig.pageSize
+		})
 		message.success('添加成功')
 	} catch (error) {
+		callback(true)
 		console.error('An error occurred:', error)
 		message.error(error)
 	}
 }
 
+const reflash = () => {
+	emitter.emit('loading', true)
+	searchTemplate(undefined, '', {
+		currentPage: tableOptions.templateOption.paginationConfig.current,
+		pageSize: tableOptions.templateOption.paginationConfig.pageSize
+	})
+}
+
 //表格数据
 const tableModel = ref<MessageTemplate[]>([])
 
@@ -72,13 +96,18 @@ const tableModel = ref<MessageTemplate[]>([])
  * 修改表格数据
  * @param param
  */
-const updatetemplate = async (param: AddTemp) => {
+const updatetemplate = async (param: AddTemp, callback: (err: boolean) => void) => {
 	try {
 		await messageStore.updatetemplate(param)
+		callback(false)
 		emitter.emit('loading', true)
-		searchTemplate(undefined, '')
+		searchTemplate(undefined, '', {
+			currentPage: tableOptions.templateOption.paginationConfig.current,
+			pageSize: tableOptions.templateOption.paginationConfig.pageSize
+		})
 		message.success('修改成功')
 	} catch (error) {
+		callback(true)
 		console.error('An error occurred:', error)
 		message.error(error)
 	}
@@ -92,7 +121,11 @@ const deleteTemp = async (ids: Array<number>) => {
 	try {
 		await deleteTemplate({ ids })
 		emitter.emit('loading', true)
-		searchTemplate(undefined, '')
+		tableOptions.templateOption.paginationConfig.current = 1
+		searchTemplate(undefined, '', {
+			currentPage: tableOptions.templateOption.paginationConfig.current,
+			pageSize: tableOptions.templateOption.paginationConfig.pageSize
+		})
 		message.success('删除成功')
 	} catch (error) {
 		console.error('An error occurred:', error)
@@ -103,11 +136,13 @@ const deleteTemp = async (ids: Array<number>) => {
 /**
  * 发送测试消息
  */
-const sendTestMessage = async (data: SendTestMessage) => {
+const sendTestMessage = async (data: SendTestMessage, callback: (err: boolean) => void) => {
 	try {
 		await messageStore.sendTestMes(data)
 		message.success('发送成功')
+		callback(false)
 	} catch (error) {
+		callback(true)
 		console.error('An error occurred:', error)
 		message.error(error)
 	}
@@ -132,10 +167,10 @@ const updateStatu = async (obj: TemplateItem) => {
  * @param callback
  */
 const handleAction = (command: string, val: any, callback: any) => {
-	console.log(val)
-
 	switch (command) {
 		case 'search':
+			tableOptions.templateOption.paginationConfig.current = val.currentPage
+			tableOptions.templateOption.paginationConfig.pageSize = val.pageSize
 			searchTemplate(undefined, '', val)
 			break
 		case 'status':
@@ -162,13 +197,13 @@ onBeforeMount(() => {
 
 <template>
 	<div id="message-container">
-		<SearchForm :fieldList="fieldList" :model="searchModel" @submit="searchTemplate"></SearchForm>
+		<SearchForm :fieldList="fieldList" :model="searchModel" @submit="searchSubmit"></SearchForm>
 		<section>
 			<TableHeader
 				:options="tableHeaderOptions.templateOption"
 				:config="tableHeader.editTemplateField"
 				:model="tableHeaderData"
-				@reflash="searchTemplate(undefined, '')"
+				@reflash="reflash"
 				@submit="addTemp" />
 			<Table :options="tableOptions.templateOption" :model="tableModel" :columns="tableColumns" @actions="handleAction"></Table>
 		</section>
-- 
Gitee