shumengya/cloud-mail
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
eoao
2025-06-05 23:09:05 +08:00
parent cdcd22962f
commit 1c40dc8338
13 changed files with 74 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
mail-worker/dist/assets/index-CT6Gv1uc.js → mail-worker/dist/assets/index-DWsyDqKg.js vendored
View File

File diff suppressed because one or more lines are too long

2
mail-worker/dist/assets/index-3kOBVh6Q.css → mail-worker/dist/assets/index-DeM-iAnI.css vendored
View File

File diff suppressed because one or more lines are too long

4
mail-worker/dist/index.html vendored
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">

3
mail-worker/src/email/email.js
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) {

4
mail-worker/src/service/account-service.js
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)) {

7
mail-worker/src/service/att-service.js
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();
}
};

13
mail-worker/src/service/star-service.js
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) {