feature/2.7.4 (#215)

1、SSL renew过程添加挑战适配器
2、转发邮件保留原始收件人地址
3、支持密送功能
4、升级所有依赖包
This commit is contained in:
Jinnrry authored and GitHub committed 2024-10-05 10:03:46 +08:00
1 parent 9e1a14f6ea
commit 223117283b
12 files changed
+231 -146

No files matched your search

+5 -1
View File
@@ -23,9 +23,11 @@ let lang = {
"date": "Date",
"to": "To",
"cc": "Cc",
"bcc": "Bcc",
"sender_desc": "Sender",
"to_desc": "Recipient's e-mail address",
"cc_desc": "Cc's e-mail address",
"cc_desc": "CC's e-mail address",
"bcc_desc": "BCC's e-mail address",
"send": "send",
"add_att": "Add Attachment",
"attachment": "Attachment",
@@ -135,9 +137,11 @@ const zhCN = {
"date": "时间",
"to": "收件人地址",
"cc": "抄送人地址",
"bcc": "密送人地址",
"sender_desc": "发件人",
"to_desc": "接收人邮件地址",
"cc_desc": "抄送人邮箱地址",
"bcc_desc": "密送人邮箱地址",
"send": "发送",
"add_att": "添加附件",
"attachment": "附件",
+31
View File
@@ -48,6 +48,10 @@
:reserve-keyword="false" :placeholder="lang.cc_desc"></el-select>
</el-form-item>
<el-form-item :label="lang.bcc" prop="bcc">
<el-select v-model="ruleForm.bcc" style="width: 100%;" multiple filterable allow-create
:reserve-keyword="false" :placeholder="lang.bcc_desc"></el-select>
</el-form-item>
<el-form-item :label="lang.title" prop="subject">
<el-input v-model="ruleForm.subject" :placeholder="lang.title"></el-input>
@@ -153,6 +157,7 @@ const ruleForm = reactive({
sender: '',
receivers: '',
cc: '',
bcc: '',
subject: '',
domains: [],
pickDomain: ""
@@ -216,6 +221,19 @@ const validateCc = function (rule, value, callback) {
callback()
}
const validateBcc = function (rule, value, callback) {
for (let index = 0; index < ruleForm.bcc.length; index++) {
let element = ruleForm.bcc[index];
console.log(element)
if (!checkEmail(element)) {
callback(new Error(lang.err_email_format))
return
}
}
callback()
}
const rules = reactive({
sender: [
{validator: validateSender, trigger: 'change'}
@@ -226,6 +244,9 @@ const rules = reactive({
cc: [
{validator: validateCc, trigger: 'change'}
],
bcc: [
{validator: validateBcc, trigger: 'change'}
],
subject: [
{required: true, message: lang.err_title_must, trigger: 'change'},
],
@@ -267,12 +288,22 @@ const send = function (formEl) {
})
}
let objectBccs = []
for (let index = 0; index < ruleForm.bcc.length; index++) {
let element = ruleForm.bcc[index];
objectBccs.push({
name: "",
email: element
})
}
let text = editorRef.value.getText()
http.post("/api/email/send", {
from: {name: ruleForm.nickName, email: ruleForm.sender + "@" + ruleForm.pickDomain},
to: objectTos,
cc: objectCcs,
bcc: objectBccs,
subject: ruleForm.subject,
text: text,
html: valueHtml.value,