From 269a71532f55643762efce75be927845d7cc3f9a Mon Sep 17 00:00:00 2001
From: bunny <1319900154@qq.com>
Date: Mon, 14 Oct 2024 16:00:14 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=9A=80=20=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=94=A8=E6=88=B7=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/v1/emailTemplate.ts                   |  5 ---
 src/api/v1/emailUsers.ts                      |  5 +++
 src/store/configuration/emailTemplate.ts      | 19 +++++++++-
 .../emailTemplate/email-template-dialog.vue   | 19 ++++++++++
 .../configuration/emailTemplate/index.vue     |  5 +++
 .../emailTemplate/utils/columns.ts            |  4 +++
 .../emailTemplate/utils/hooks.ts              |  4 ++-
 .../emailTemplate/utils/types.ts              |  2 ++
 .../emailUsers/email-users-dialog.vue         | 36 +++++++------------
 .../configuration/emailUsers/utils/hooks.ts   |  2 --
 .../configuration/emailUsers/utils/types.ts   |  2 --
 src/views/monitor/files/files-dialog.vue      |  4 +++
 12 files changed, 72 insertions(+), 35 deletions(-)

diff --git a/src/api/v1/emailTemplate.ts b/src/api/v1/emailTemplate.ts
index 67183a8..900538d 100644
--- a/src/api/v1/emailTemplate.ts
+++ b/src/api/v1/emailTemplate.ts
@@ -6,11 +6,6 @@ export const fetchGetEmailTemplateList = (data: any) => {
 	return http.request<BaseResult<ResultTable>>('get', `emailTemplate/getEmailTemplateList/${data.currentPage}/${data.pageSize}`, { params: data });
 };
 
-/** 邮件模板表---查询所有邮件模板 */
-export const fetchGetAllEmailTemplates = () => {
-	return http.request<BaseResult<any>>('get', 'emailTemplate/getAllEmailTemplates');
-};
-
 /** 邮件模板表---添加邮件模板表 */
 export const fetchAddEmailTemplate = (data: any) => {
 	return http.request<BaseResult<object>>('post', 'emailTemplate/addEmailTemplate', { data });
diff --git a/src/api/v1/emailUsers.ts b/src/api/v1/emailUsers.ts
index 8cccf0c..52ab334 100644
--- a/src/api/v1/emailUsers.ts
+++ b/src/api/v1/emailUsers.ts
@@ -6,6 +6,11 @@ export const fetchGetEmailUsersList = (data: any) => {
 	return http.request<BaseResult<ResultTable>>('get', `emailUsers/getEmailUsersList/${data.currentPage}/${data.pageSize}`, { params: data });
 };
 
+/** 邮箱用户发送配置管理---获取所有邮箱配置用户 */
+export const fetchGetAllMailboxConfigurationUsers = () => {
+	return http.request<BaseResult<any>>('get', 'emailUsers/getAllMailboxConfigurationUsers');
+};
+
 /** 邮箱用户发送配置管理---添加邮箱用户发送配置管理 */
 export const fetchAddEmailUsers = (data: any) => {
 	return http.request<BaseResult<object>>('post', 'emailUsers/addEmailUsers', { data });
diff --git a/src/store/configuration/emailTemplate.ts b/src/store/configuration/emailTemplate.ts
index 8bc322f..6503a32 100644
--- a/src/store/configuration/emailTemplate.ts
+++ b/src/store/configuration/emailTemplate.ts
@@ -3,6 +3,7 @@ import { fetchAddEmailTemplate, fetchDeleteEmailTemplate, fetchGetEmailTemplateL
 import { pageSizes } from '@/enums/baseConstant';
 import { storeMessage } from '@/utils/message';
 import { storePagination } from '@/store/useStorePagination';
+import { fetchGetAllMailboxConfigurationUsers } from '@/api/v1/emailUsers';
 
 /**
  * 邮件模板表 Store
@@ -12,6 +13,8 @@ export const useEmailTemplateStore = defineStore('emailTemplateStore', {
 		return {
 			// 邮件模板表列表
 			datalist: [],
+			// 邮件模板用户列表
+			emailUserList: [],
 			// 查询表单
 			form: {
 				// 模板名称
@@ -34,7 +37,13 @@ export const useEmailTemplateStore = defineStore('emailTemplateStore', {
 			loading: false,
 		};
 	},
-	getters: {},
+	getters: {
+		getMailboxConfigurationUser(state) {
+			const map = {};
+			state.emailUserList.forEach(user => (map[user.value] = user.key));
+			return map;
+		},
+	},
 	actions: {
 		/** 获取邮件模板表 */
 		async getEmailTemplateList() {
@@ -52,6 +61,14 @@ export const useEmailTemplateStore = defineStore('emailTemplateStore', {
 			return pagination(result);
 		},
 
+		/** 获取所有邮箱配置用户 */
+		async getAllMailboxConfigurationUsers() {
+			const result = await fetchGetAllMailboxConfigurationUsers();
+			if (result.code !== 200) return;
+
+			this.emailUserList = result.data;
+		},
+
 		/** 添加邮件模板表 */
 		async addEmailTemplate(data: any) {
 			const result = await fetchAddEmailTemplate(data);
diff --git a/src/views/configuration/emailTemplate/email-template-dialog.vue b/src/views/configuration/emailTemplate/email-template-dialog.vue
index 7dc290e..057545b 100644
--- a/src/views/configuration/emailTemplate/email-template-dialog.vue
+++ b/src/views/configuration/emailTemplate/email-template-dialog.vue
@@ -4,11 +4,14 @@ import { FormInstance } from 'element-plus';
 import { rules } from '@/views/configuration/emailTemplate/utils/columns';
 import { FormProps } from '@/views/configuration/emailTemplate/utils/types';
 import { $t } from '@/plugins/i18n';
+import { useEmailTemplateStore } from '@/store/configuration/emailTemplate';
 
 const props = withDefaults(defineProps<FormProps>(), {
 	formInline: () => ({
 		// 模板名称
 		templateName: undefined,
+		// 模板名称
+		emailUser: undefined,
 		// 主题
 		subject: undefined,
 		// 邮件内容
@@ -20,21 +23,37 @@ const props = withDefaults(defineProps<FormProps>(), {
 
 const formRef = ref<FormInstance>();
 const form = ref(props.formInline);
+const emailUserList = ref();
+const emailTemplateStore = useEmailTemplateStore();
 
 defineExpose({ formRef });
 </script>
 
 <template>
 	<el-form ref="formRef" :model="form" :rules="rules" label-width="auto">
+		<!-- 模板名称 -->
 		<el-form-item :label="$t('emailTemplate_templateName')" prop="templateName">
 			<el-input v-model="form.templateName" autocomplete="off" type="text" />
 		</el-form-item>
+
+		<!-- 配置模板邮件关联用户邮件 -->
+		<el-form-item :label="$t('emailTemplate_emailUser')" prop="emailUser">
+			<el-select v-model="form.emailUser" :placeholder="$t('emailTemplate_emailUser')" clearable filterable>
+				<el-option v-for="(item, index) in emailTemplateStore.emailUserList" :key="index" :label="item.key" :navigationBar="false" :value="item.value" />
+			</el-select>
+		</el-form-item>
+
+		<!-- 配置主题内容 -->
 		<el-form-item :label="$t('emailTemplate_subject')" prop="subject">
 			<el-input v-model="form.subject" autocomplete="off" type="text" />
 		</el-form-item>
+
+		<!-- 配置邮件发送体 -->
 		<el-form-item :label="$t('emailTemplate_body')" prop="body">
 			<el-input v-model="form.body" :autosize="{ minRows: 2, maxRows: 26 }" autocomplete="off" type="textarea" />
 		</el-form-item>
+
+		<!--配置邮件类型-->
 		<el-form-item :label="$t('emailTemplate_type')" prop="type">
 			<el-input v-model="form.type" autocomplete="off" type="text" />
 		</el-form-item>
diff --git a/src/views/configuration/emailTemplate/index.vue b/src/views/configuration/emailTemplate/index.vue
index eecdaa8..2e8db9a 100644
--- a/src/views/configuration/emailTemplate/index.vue
+++ b/src/views/configuration/emailTemplate/index.vue
@@ -50,6 +50,7 @@ const onSelectionChange = (rows: Array<any>) => {
 };
 
 onMounted(() => {
+	emailTemplateStore.getAllMailboxConfigurationUsers();
 	onSearch();
 });
 </script>
@@ -106,6 +107,10 @@ onMounted(() => {
 					@page-size-change="onPageSizeChange"
 					@page-current-change="onCurrentPageChange"
 				>
+					<template #emailUser="{ row }">
+						{{ emailTemplateStore.getMailboxConfigurationUser[row.emailUser] }}
+					</template>
+
 					<template #createUser="{ row }">
 						<el-button link type="primary" @click="selectUserinfo(row.createUser)">{{ $t('table.createUser') }} </el-button>
 					</template>
diff --git a/src/views/configuration/emailTemplate/utils/columns.ts b/src/views/configuration/emailTemplate/utils/columns.ts
index abaacd0..39aff3e 100644
--- a/src/views/configuration/emailTemplate/utils/columns.ts
+++ b/src/views/configuration/emailTemplate/utils/columns.ts
@@ -7,6 +7,8 @@ export const columns: TableColumnList = [
 	{ type: 'index', index: (index: number) => index + 1, label: '序号', width: 60 },
 	// 模板名称
 	{ label: $t('emailTemplate_templateName'), prop: 'templateName' },
+	// 模板名称
+	{ label: $t('emailTemplate_emailUser'), prop: 'emailUser', slot: 'emailUser' },
 	// 主题
 	{ label: $t('emailTemplate_subject'), prop: 'subject' },
 	// 邮件内容
@@ -24,6 +26,8 @@ export const columns: TableColumnList = [
 export const rules = reactive({
 	// 模板名称
 	templateName: [{ required: true, message: `${$t('input')}${$t('emailTemplate_templateName')}`, trigger: 'blur' }],
+	// 模板名称
+	emailUser: [{ required: true, message: `${$t('input')}${$t('emailTemplate_templateName')}`, trigger: 'blur' }],
 	// 主题
 	subject: [{ required: true, message: `${$t('input')}${$t('emailTemplate_subject')}`, trigger: 'blur' }],
 	// 邮件内容
diff --git a/src/views/configuration/emailTemplate/utils/hooks.ts b/src/views/configuration/emailTemplate/utils/hooks.ts
index 5251c24..5101ea6 100644
--- a/src/views/configuration/emailTemplate/utils/hooks.ts
+++ b/src/views/configuration/emailTemplate/utils/hooks.ts
@@ -1,6 +1,6 @@
 import { addDialog } from '@/components/BaseDialog/index';
 import EmailTemplateDialog from '@/views/configuration/emailTemplate/email-template-dialog.vue';
-import { useEmailTemplateStore } from '@/store/configuration/emailTemplate.ts';
+import { useEmailTemplateStore } from '@/store/configuration/emailTemplate';
 import { h, ref } from 'vue';
 import { messageBox } from '@/utils/message';
 import type { FormItemProps } from '@/views/configuration/emailTemplate/utils/types';
@@ -30,6 +30,7 @@ export function onAdd() {
 		props: {
 			formInline: {
 				templateName: undefined,
+				emailUser: undefined,
 				subject: undefined,
 				body: undefined,
 				type: undefined,
@@ -64,6 +65,7 @@ export function onUpdate(row: any) {
 		props: {
 			formInline: {
 				templateName: row.templateName,
+				emailUser: row.emailUser,
 				subject: row.subject,
 				body: row.body,
 				type: row.type,
diff --git a/src/views/configuration/emailTemplate/utils/types.ts b/src/views/configuration/emailTemplate/utils/types.ts
index 7c6292f..f503d8b 100644
--- a/src/views/configuration/emailTemplate/utils/types.ts
+++ b/src/views/configuration/emailTemplate/utils/types.ts
@@ -2,6 +2,8 @@
 export interface FormItemProps {
 	// 模板名称
 	templateName: string;
+	// 模板名称
+	emailUser: string;
 	// 主题
 	subject: string;
 	// 邮件内容
diff --git a/src/views/configuration/emailUsers/email-users-dialog.vue b/src/views/configuration/emailUsers/email-users-dialog.vue
index d040d40..a5be2f0 100644
--- a/src/views/configuration/emailUsers/email-users-dialog.vue
+++ b/src/views/configuration/emailUsers/email-users-dialog.vue
@@ -1,17 +1,15 @@
 <script lang="ts" setup>
-import { onMounted, ref } from 'vue';
+import { ref } from 'vue';
 import { FormInstance } from 'element-plus';
 import { rules } from '@/views/configuration/emailUsers/utils/columns';
 import { FormProps } from '@/views/configuration/emailUsers/utils/types';
 import { $t } from '@/plugins/i18n';
 import { usePublicHooks } from '@/views/hooks';
-import { fetchGetAllEmailTemplates } from '@/api/v1/emailTemplate';
 
 const props = withDefaults(defineProps<FormProps>(), {
 	formInline: () => ({
 		// 邮箱
 		email: undefined,
-		// 邮件模板
 		emailTemplate: undefined,
 		// 密码
 		password: undefined,
@@ -30,48 +28,38 @@ const formRef = ref<FormInstance>();
 const form = ref(props.formInline);
 // 用户是否停用样式
 const { switchStyle } = usePublicHooks();
-// 邮件模板列表
-const emailTemplateList = ref();
-
-/** 查询所有邮件模板 */
-const getAllEmailTemplates = async () => {
-	const result = await fetchGetAllEmailTemplates();
-	if (result.code !== 200) return;
-	emailTemplateList.value = result.data.map(({ id, templateName }) => ({
-		value: id,
-		label: templateName,
-	}));
-};
-
-onMounted(() => {
-	getAllEmailTemplates();
-});
 
 defineExpose({ formRef });
 </script>
 
 <template>
 	<el-form ref="formRef" :model="form" :rules="rules" label-width="auto">
+		<!-- 邮箱账号 -->
 		<el-form-item :label="$t('emailUsers_email')" prop="email">
 			<el-input v-model="form.email" autocomplete="off" type="text" />
 		</el-form-item>
-		<el-form-item :label="$t('emailUsers_emailTemplate')" prop="emailTemplate">
-			<el-select v-model="form.emailTemplate" :placeholder="$t('input') + $t('emailUsers_emailTemplate')" clearable filterable>
-				<el-option v-for="(item, index) in emailTemplateList" :key="index" :label="item.label" :navigationBar="false" :value="item.value" />
-			</el-select>
-		</el-form-item>
+
+		<!-- 邮箱密码 -->
 		<el-form-item :label="$t('emailUsers_password')" prop="password">
 			<el-input v-model="form.password" autocomplete="off" type="text" />
 		</el-form-item>
+
+		<!-- 配置主机 -->
 		<el-form-item :label="$t('emailUsers_host')" prop="host">
 			<el-input v-model="form.host" autocomplete="off" type="text" />
 		</el-form-item>
+
+		<!-- 邮箱端口号 -->
 		<el-form-item :label="$t('emailUsers_port')" prop="port">
 			<el-input v-model="form.port" autocomplete="off" max="9999" type="number" />
 		</el-form-item>
+
+		<!-- smtp协议 -->
 		<el-form-item :label="$t('emailUsers_smtpAgreement')" prop="smtpAgreement">
 			<el-input v-model="form.smtpAgreement" autocomplete="off" maxlength="10" show-word-limit type="text" />
 		</el-form-item>
+
+		<!-- 是否为默认 -->
 		<el-form-item :label="$t('emailUsers_isDefault')" prop="isDefault">
 			<el-switch v-model="form.isDefault" :active-text="$t('default')" :active-value="true" :inactive-text="$t('no_default')" :inactive-value="false" :style="switchStyle" inline-prompt />
 		</el-form-item>
diff --git a/src/views/configuration/emailUsers/utils/hooks.ts b/src/views/configuration/emailUsers/utils/hooks.ts
index bb74938..f6a973c 100644
--- a/src/views/configuration/emailUsers/utils/hooks.ts
+++ b/src/views/configuration/emailUsers/utils/hooks.ts
@@ -32,7 +32,6 @@ export function onAdd() {
 		props: {
 			formInline: {
 				email: undefined,
-				emailTemplate: undefined,
 				password: undefined,
 				host: undefined,
 				port: undefined,
@@ -69,7 +68,6 @@ export function onUpdate(row: any) {
 		props: {
 			formInline: {
 				email: row.email,
-				emailTemplate: row.emailTemplate,
 				password: row.password,
 				host: row.host,
 				port: row.port,
diff --git a/src/views/configuration/emailUsers/utils/types.ts b/src/views/configuration/emailUsers/utils/types.ts
index 93041f8..6585e9c 100644
--- a/src/views/configuration/emailUsers/utils/types.ts
+++ b/src/views/configuration/emailUsers/utils/types.ts
@@ -2,8 +2,6 @@
 export interface FormItemProps {
 	// 邮箱
 	email: string;
-	// 邮件模板
-	emailTemplate: number;
 	// 密码
 	password: string;
 	// Host地址
diff --git a/src/views/monitor/files/files-dialog.vue b/src/views/monitor/files/files-dialog.vue
index fe7cced..159509c 100644
--- a/src/views/monitor/files/files-dialog.vue
+++ b/src/views/monitor/files/files-dialog.vue
@@ -29,6 +29,10 @@ const upload = ref();
 const form = ref(props.formInline);
 const filesStore = useFilesStore();
 
+/**
+ * * 修改时替换之前文件
+ * @param files
+ */
 const handleExceed: UploadProps['onExceed'] = files => {
 	upload.value!.clearFiles();
 	const file = files[0] as UploadRawFile;