Software/cloud-mail
1
0
Fork 0
mirror of https://github.com/schroinerxy/cloud-mail.git synced 2026-06-21 19:35:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复星标不能查看，附件等多个bug，优化样式

Browse Source
This commit is contained in:
eoao
2025-06-05 23:09:05 +08:00
parent 174d722f40
commit a787ee6404
13 changed files with 74 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mail-vue/src/components/email-scroll/index.vue
+12 -4
View File
@@ -25,7 +25,7 @@
</div>
<div ref="scroll" class="scroll">
<el-scrollbar ref="scrollbarRef" @scroll="handleScroll" >
<el-scrollbar ref="scrollbarRef" @scroll="handleScroll">
<div class="scroll-box" :infinite-scroll-immediate="false" v-infinite-scroll="loadData"
infinite-scroll-distance="600">
<div v-for="item in emailList" :key="item.emailId">
@@ -274,18 +274,26 @@ function htmlToText(email) {
tempDiv.innerHTML = email.content;
const scriptsAndStyles = tempDiv.querySelectorAll('script, style, title');
scriptsAndStyles.forEach(el => el.remove());
const text = tempDiv.textContent || tempDiv.innerText || '';
return text.replace(/\s+/g, ' ').trim();
let text = tempDiv.textContent || tempDiv.innerText || '';
text = text.replace(/\s+/g, ' ').trim();
return cleanSpace(text)
}
if (email.text) {
return email.text
return cleanSpace(email.text)
} else {
return ''
}
}
function cleanSpace(text) {
return text
.replace(/[\u200B-\u200F\uFEFF]/g, '') // 移除零宽空格、ZWNJ、ZWJ、LRM、RLM、BOM
.replace(/\s+/g, ' ') // 多空白合并成一个空格
.trim();
}
function starChange(email) {
mail-vue/src/components/shadow-html/index.vue
+14 -4
View File
@@ -32,8 +32,17 @@ function loadFontInShadow() {
}
function updateContent() {
if (!shadowRoot) return
if (!shadowRoot) return;
// 1. 提取 <body> 的 style 属性（如果存在）
const bodyStyleRegex = /<body[^>]*style="([^"]*)"[^>]*>/i;
const bodyStyleMatch = props.html.match(bodyStyleRegex);
const bodyStyle = bodyStyleMatch ? bodyStyleMatch[1] : '';
// 2. 移除 <body> 标签（保留内容）
const cleanedHtml = props.html.replace(/<\/?body[^>]*>/gi, '');
// 3. 将 body 的 style 应用到 .shadow-content
shadowRoot.innerHTML = `
<style>
:host {
@@ -53,6 +62,7 @@ function updateContent() {
width: fit-content;
height: fit-content;
min-width: 100%;
${bodyStyle ? bodyStyle : ''} /* 注入 body 的 style */
}
img {
@@ -72,12 +82,11 @@ function updateContent() {
a {
color: #409EFF !important;
}
</style>
<div class="shadow-content">
${props.html}
${cleanedHtml}
</div>
`
`;
}
function autoScale() {
@@ -109,6 +118,7 @@ onMounted(() => {
shadowRoot = container.value.attachShadow({ mode: 'open' })
updateContent()
autoScale()
console.log(props.html)
})
watch(() => props.html, () => {
mail-vue/src/layout/main/index.vue
+1 -1
View File
@@ -96,7 +96,7 @@ const handleResize = () => {
.main-box-show {
display: grid;
grid-template-columns: 250px 1fr;
grid-template-columns: 260px 1fr;
height: calc(100% - 60px);
@media (max-width: 1200px) {
grid-template-columns: 250px 1fr;
mail-vue/src/views/login/index.vue
+2 -2
View File
@@ -11,8 +11,8 @@
<div class="form-wrapper">
<div class="container">
<span class="form-title">{{settingStore.settings.title}}</span>
<span class="form-desc" v-if="show === 'login'">请输入你的账号信息以开始使用邮箱系统</span>
<span class="form-desc" v-else>请输入你的账号密码以开始注册邮箱系统</span>
<span class="form-desc" v-if="show === 'login'">请输入账号信息以开始使用邮箱系统</span>
<span class="form-desc" v-else>请输入账号密码以开始注册邮箱系统</span>
<div v-if="show === 'login'">
<el-input class="email-input" v-model="form.email" type="text" placeholder="邮箱" autocomplete="off">
<template #append>
mail-vue/src/views/role/index.vue
+1 -1
View File
@@ -18,7 +18,7 @@
<template #default="props">
<div class="role-name">
<span >{{props.row.name}}</span>
<span v-if="props.row.isDefault"><el-tag class="def-tag" type="success">默认</el-tag></span>
<span v-if="props.row.isDefault"><el-tag class="def-tag" >默认</el-tag></span>
</div>
</template>
</el-table-column>
mail-vue/src/views/user/index.vue
+4 -3
View File
@@ -71,7 +71,7 @@
<div>
<span class="details-item-title">发件次数:</span>
<span>{{ formatSendCount(props.row) }}</span>
<el-tag style="margin-left: 10px" v-if="props.row.sendAction.hasPerm" type="success">
<el-tag style="margin-left: 10px" v-if="props.row.sendAction.hasPerm" >
{{ formatSendType(props.row) }}
</el-tag>
<el-button size="small" style="margin-left: 10px"
@@ -174,10 +174,11 @@
</el-dialog>
<el-dialog class="dialog" v-model="setTypeShow" title="设置权限" @closed="resetUserForm">
<div class="dialog-box">
<el-select v-model="userForm.type" placeholder="Select">
<el-input disabled model-value="超级管理员" v-if="userForm.type === 0" />
<el-select v-else v-model="userForm.type" placeholder="Select" >
<el-option v-for="item in roleList" :label="item.name" :value="item.roleId" :key="item.roleId"/>
</el-select>
<el-button class="btn" :loading="settingLoading" type="primary" @click="setType"
<el-button :disabled="userForm.type === 0" class="btn" :loading="settingLoading" type="primary" @click="setType"
>保存
</el-button>
</div>
mail-worker/dist/assets/index-CT6Gv1uc.js → mail-worker/dist/assets/index-DWsyDqKg.js
Vendored
+17 -17
View File
File diff suppressed because one or more lines are too long
mail-worker/dist/assets/index-3kOBVh6Q.css → mail-worker/dist/assets/index-DeM-iAnI.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
mail-worker/dist/index.html
Vendored
+2 -2
View File
@@ -6,8 +6,8 @@
<title></title>
<link rel="icon" href="/assets/favicon-C5dAZutX.svg" type="image/svg+xml">
<script src="https://challenges.cloudflare.com/turnstile/v0/api.js" async defer></script>
<script type="module" crossorigin src="/assets/index-CT6Gv1uc.js"></script>
<link rel="stylesheet" crossorigin href="/assets/index-3kOBVh6Q.css">
<script type="module" crossorigin src="/assets/index-DWsyDqKg.js"></script>
<link rel="stylesheet" crossorigin href="/assets/index-DeM-iAnI.css">
</head>
<body>
<div id="loading-first">
mail-worker/src/email/email.js
+2 -1
View File
@@ -5,7 +5,7 @@ import settingService from '../service/setting-service';
import attService from '../service/att-service';
import constant from '../const/constant';
import fileUtils from '../utils/file-utils';
import { emailConst, isDel } from '../const/entity-const';
import {attConst, emailConst, isDel} from '../const/entity-const';
export async function email(message, env, ctx) {
@@ -60,6 +60,7 @@ export async function email(message, env, ctx) {
attachment.emailId = emailRow.emailId;
attachment.userId = emailRow.userId;
attachment.accountId = emailRow.accountId;
attachment.type = attachment.contentId ? attConst.type.EMBED : attConst.type.ATT
})
if (attachments.length > 0) {
mail-worker/src/service/account-service.js
+1 -3
View File
@@ -46,11 +46,9 @@ const accountService = {
const userRow = await userService.selectById(c, userId);
const roleRow = await roleService.selectById(c, userRow.type);
if (roleRow.accountCount) {
if (roleRow.accountCount && userRow.email !== c.env.admin) {
const userAccountCount = await accountService.countUserAccount(c, userId)
if(userAccountCount >= roleRow.accountCount) throw new BizError(`添加邮箱数量限制${roleRow.accountCount}个`, 403);
}
if (await settingService.isAddEmailVerify(c)) {
mail-worker/src/service/att-service.js
+6 -1
View File
@@ -154,7 +154,12 @@ const attService = {
},
selectByEmailIds(c, emailIds) {
return orm(c).select().from(att).where(and(inArray(att.emailId,emailIds),eq(att.type, attConst.type.ATT))).all();
return orm(c).select().from(att).where(
and(
inArray(att.emailId,emailIds),
eq(att.type, attConst.type.ATT),
isNull(att.contentId)))
.all();
}
};
mail-worker/src/service/star-service.js
+11 -2
View File
@@ -5,8 +5,7 @@ import BizError from '../error/biz-error';
import { and, desc, eq, lt, sql, inArray } from 'drizzle-orm';
import email from '../entity/email';
import { isDel } from '../const/entity-const';
import { att } from '../entity/att';
import userService from './user-service';
import attService from "./att-service";
const starService = {
@@ -64,6 +63,16 @@ const starService = {
.orderBy(desc(star.emailId))
.limit(size)
.all();
const emailIds = list.map(item => item.emailId);
const attsList = await attService.selectByEmailIds(c, emailIds);
list.forEach(emailRow => {
const atts = attsList.filter(attsRow => attsRow.emailId === emailRow.emailId);
emailRow.attList = atts;
});
return { list };
},
async removeByEmailIds(c, emailIds) {