From 634d76f04a5c0fc7bce7290526ae902b8873fb38 Mon Sep 17 00:00:00 2001
From: lhiro <lhiro@MacBook-Pro.local>
Date: Mon, 31 Aug 2026 10:15:54 +0800
Subject: [PATCH] fix: support account backend search

---
 mail-view/src/layout/account/index.vue     | 63 +++++++++++++-------
 mail-view/src/request/account.js           |  6 +-
 mail-view/src/views/transfer/index.vue     | 67 ++++++++++++++++++----
 mail-worker/src/service/account-service.js | 35 ++++++-----
 mail-worker/src/service/user-service.js    | 55 ++++++++++++++++--
 5 files changed, 173 insertions(+), 53 deletions(-)

diff --git a/mail-view/src/layout/account/index.vue b/mail-view/src/layout/account/index.vue
index b53ac82..4bf889e 100644
--- a/mail-view/src/layout/account/index.vue
+++ b/mail-view/src/layout/account/index.vue
@@ -8,6 +8,8 @@
         class="search-input"
         size="small"
         clearable
+        @input="handleSearchInput"
+        @clear="handleSearchClear"
       >
         <template #prefix>
           <Icon icon="mingcute:search-line" width="14" height="14" />
@@ -20,7 +22,7 @@
       <div v-infinite-scroll="getAccountList" :infinite-scroll-distance="400" :infinite-scroll-immediate="false">
         <!-- Account rows -->
         <div
-          v-for="(item, index) in filteredAccounts"
+          v-for="(item, index) in accounts"
           :key="item.accountId"
           class="account-row"
           :class="{ 'row-active': accountStore.currentAccountId === item.accountId }"
@@ -75,7 +77,7 @@
         </div>
 
         <!-- No search results -->
-        <div v-if="searchKeyword && filteredAccounts.length === 0 && !loading" class="empty-search">
+        <div v-if="searchKeyword.trim() && accounts.length === 0 && !loading" class="empty-search">
           <Icon icon="mingcute:search-line" width="22" height="22" />
           <span>{{ $t('noMessagesFound') }}</span>
         </div>
@@ -95,7 +97,7 @@
         </template>
 
         <!-- Follow Loading Skeleton -->
-        <template v-if="accounts.length > 0 && !noLoading && !searchKeyword">
+        <template v-if="accounts.length > 0 && !noLoading">
           <div class="skeleton-row">
             <el-skeleton animated>
               <template #template>
@@ -108,10 +110,10 @@
           </div>
         </template>
 
-        <div class="foot-tip" v-if="noLoading && accounts.length > 0 && !searchKeyword">
+        <div class="foot-tip" v-if="noLoading && accounts.length > 0">
           {{ accounts.length }} {{ $t('accountTotal') }}
         </div>
-        <div class="empty" v-if="noLoading && accounts.length === 0">
+        <div class="empty" v-if="!searchKeyword.trim() && noLoading && accounts.length === 0">
           <el-empty :image-size="40" :description="$t('noMessagesFound')"/>
         </div>
       </div>
@@ -186,7 +188,7 @@
 
 <script setup>
 import { Icon } from "@iconify/vue";
-import { nextTick, reactive, ref, computed, watch } from "vue";
+import { nextTick, reactive, ref, watch, onUnmounted } from "vue";
 import {
   accountList,
   accountAdd,
@@ -231,7 +233,6 @@ let turnstileId = null;
 const botJsError = ref(false);
 let verifyToken = '';
 let verifyErrorCount = 0;
-let first = true;
 const addForm = reactive({
   email: '',
   suffix: settingStore.domainList[0]
@@ -243,16 +244,8 @@ const transferShow = ref(false);
 const transferLoading = ref(false);
 const transferAccount = ref(null);
 const transferTargetId = ref('');
-
-// Filtered accounts based on search keyword
-const filteredAccounts = computed(() => {
-  if (!searchKeyword.value) return accounts;
-  const kw = searchKeyword.value.toLowerCase();
-  return accounts.filter(a =>
-    a.email.toLowerCase().includes(kw) ||
-    (a.name && a.name.toLowerCase().includes(kw))
-  );
-});
+let accountQuerySeq = 0;
+let accountSearchTimer = null;
 
 if (hasPerm('account:query')) {
   getAccountList();
@@ -262,6 +255,10 @@ watch(() => accountStore.changeUserAccountName, () => {
   if (accounts[0]) accounts[0].name = accountStore.changeUserAccountName;
 });
 
+onUnmounted(() => {
+  if (accountSearchTimer) clearTimeout(accountSearchTimer);
+});
+
 
 window.onTurnstileError = (e) => {
   if (verifyErrorCount >= 4) return;
@@ -341,18 +338,39 @@ function remove(acc) {
 }
 
 function refresh() {
-  if (loading.value) return;
+  accountQuerySeq++;
+  if (accountSearchTimer) {
+    clearTimeout(accountSearchTimer);
+    accountSearchTimer = null;
+  }
   loading.value = false;
   followLoading.value = false;
   noLoading.value = false;
   queryParams.accountId = 0;
   queryParams.lastSort = null;
   getSkeletonRows();
-  scrollbarRef.value.setScrollTop(0);
+  scrollbarRef.value?.setScrollTop?.(0);
   accounts.splice(0, accounts.length);
   getAccountList();
 }
 
+function handleSearchInput() {
+  accountQuerySeq++;
+  loading.value = true;
+  followLoading.value = false;
+  noLoading.value = false;
+  if (accountSearchTimer) clearTimeout(accountSearchTimer);
+  accountSearchTimer = setTimeout(refresh, 300);
+}
+
+function handleSearchClear() {
+  if (accountSearchTimer) {
+    clearTimeout(accountSearchTimer);
+    accountSearchTimer = null;
+  }
+  refresh();
+}
+
 function changeAccount(acc) {
   accountStore.currentAccountId = acc.accountId;
   accountStore.currentAccount = acc;
@@ -385,18 +403,21 @@ function getAccountList() {
   if (accounts.length === 0) { loading.value = true; }
   else { followLoading.value = true; }
   let start = Date.now();
+  const seq = accountQuerySeq;
+  const keyword = searchKeyword.value.trim();
   const accountId = accounts.length > 0 ? accounts.at(-1).accountId : 0;
   const lastSort = accounts.length > 0 ? accounts.at(-1).sort : null;
-  accountList(accountId, queryParams.size, lastSort).then(async list => {
+  accountList(accountId, queryParams.size, lastSort, keyword).then(async list => {
     let duration = Date.now() - start;
     if (duration < 200) await sleep(200 - duration);
+    if (seq !== accountQuerySeq) return;
     if (list.length < queryParams.size) noLoading.value = true;
     if (accounts.length === 0 && list[0]) accountStore.currentAccount = list[0];
     accounts.push(...list);
     loading.value = false;
     followLoading.value = false;
-    first = false;
   }).catch(() => {
+    if (seq !== accountQuerySeq) return;
     loading.value = false;
     followLoading.value = false;
   });
diff --git a/mail-view/src/request/account.js b/mail-view/src/request/account.js
index 08b1fba..d89b9fb 100644
--- a/mail-view/src/request/account.js
+++ b/mail-view/src/request/account.js
@@ -1,7 +1,7 @@
 import http from '@/axios/index.js'
 
-export function accountList(accountId, size, lastSort) {
-    return http.get('/account/list', {params: {accountId, size, lastSort}});
+export function accountList(accountId, size, lastSort, email) {
+    return http.get('/account/list', {params: {accountId, size, lastSort, email}});
 }
 
 export function accountAdd(email,token) {
@@ -22,4 +22,4 @@ export function accountSetAllReceive(accountId) {
 
 export function accountSetAsTop(accountId) {
     return http.put('/account/setAsTop', {accountId})
-}
\ No newline at end of file
+}
diff --git a/mail-view/src/views/transfer/index.vue b/mail-view/src/views/transfer/index.vue
index b4effbb..1caefe1 100644
--- a/mail-view/src/views/transfer/index.vue
+++ b/mail-view/src/views/transfer/index.vue
@@ -20,8 +20,11 @@
               v-model="createForm.accountId"
               :placeholder="$t('selectAccount')"
               filterable
+              remote
               style="width:100%"
               :loading="accountsLoading"
+              :remote-method="searchMyAccounts"
+              @change="handleAccountChange"
             >
               <el-option
                 v-for="acc in myAccounts"
@@ -152,7 +155,7 @@
 </template>
 
 <script setup>
-import { ref, reactive, onMounted, defineOptions } from 'vue'
+import { ref, reactive, onMounted, onUnmounted, defineOptions } from 'vue'
 import { Icon } from '@iconify/vue'
 import { useI18n } from 'vue-i18n'
 import {
@@ -182,20 +185,61 @@ const myAccounts = ref([])
 const accountsLoading = ref(false)
 const createLoading = ref(false)
 const createForm = reactive({ accountId: null, toDisplayId: '' })
+const selectedAccount = ref(null)
+const accountPageSize = 100
+let accountSearchSeq = 0
+let accountSearchTimer = null
+
+function isTransferableAccount(account) {
+  const primaryAccountId = userStore.user.account?.accountId
+  const primaryEmail = userStore.user.email?.toLowerCase()
+  return account.accountId !== primaryAccountId && account.email?.toLowerCase() !== primaryEmail
+}
 
-async function loadMyAccounts() {
+async function loadMyAccounts(keyword = '') {
+  const query = typeof keyword === 'string' ? keyword.trim() : ''
+  const seq = ++accountSearchSeq
   accountsLoading.value = true
   try {
-    const list = await accountList(0, 200, null)
-    const primaryAccountId = userStore.user.account?.accountId
-    const primaryEmail = userStore.user.email?.toLowerCase()
-    myAccounts.value = list.filter(account =>
-      account.accountId !== primaryAccountId && account.email?.toLowerCase() !== primaryEmail
-    )
-    if (!myAccounts.value.some(account => account.accountId === createForm.accountId)) {
+    const list = await accountList(0, accountPageSize, null, query)
+    if (seq !== accountSearchSeq) return
+    const nextAccounts = list.filter(isTransferableAccount)
+    const selectedInResult = createForm.accountId
+      ? nextAccounts.some(account => account.accountId === createForm.accountId)
+      : false
+
+    if (query && createForm.accountId && !selectedInResult) {
+      createForm.accountId = null
+      selectedAccount.value = null
+    } else if (selectedAccount.value && !selectedInResult) {
+      nextAccounts.unshift(selectedAccount.value)
+    }
+
+    myAccounts.value = nextAccounts
+
+    if (!query && !createForm.accountId) {
       createForm.accountId = myAccounts.value[0]?.accountId ?? null
+      selectedAccount.value = myAccounts.value[0] ?? null
+    } else if (createForm.accountId) {
+      selectedAccount.value = myAccounts.value.find(account => account.accountId === createForm.accountId) ?? selectedAccount.value
     }
-  } finally { accountsLoading.value = false }
+  } finally {
+    if (seq === accountSearchSeq) accountsLoading.value = false
+  }
+}
+
+function searchMyAccounts(keyword) {
+  accountSearchSeq++
+  accountsLoading.value = true
+  if (accountSearchTimer) clearTimeout(accountSearchTimer)
+  accountSearchTimer = setTimeout(() => {
+    accountSearchTimer = null
+    loadMyAccounts(keyword)
+  }, 300)
+}
+
+function handleAccountChange(accountId) {
+  selectedAccount.value = myAccounts.value.find(account => account.accountId === accountId) ?? null
 }
 
 async function doCreate() {
@@ -249,6 +293,9 @@ async function doReject(item) {
 }
 
 onMounted(() => { loadAll(); loadMyAccounts() })
+onUnmounted(() => {
+  if (accountSearchTimer) clearTimeout(accountSearchTimer)
+})
 </script>
 
 <style lang="scss" scoped>
diff --git a/mail-worker/src/service/account-service.js b/mail-worker/src/service/account-service.js
index 8b30eaa..15d26ad 100644
--- a/mail-worker/src/service/account-service.js
+++ b/mail-worker/src/service/account-service.js
@@ -130,11 +130,12 @@ const accountService = {
 
 	list(c, params, userId) {
 
-		let { accountId, size, lastSort } = params;
+		let { accountId, size, lastSort, email } = params;
 
 		accountId = Number(accountId);
 		size = Number(size);
 		lastSort = Number(lastSort);
+		email = typeof email === 'string' ? email.trim() : '';
 
 		if (size > 100) {
 			size = 100;
@@ -148,18 +149,27 @@ const accountService = {
 			lastSort = 9999999999;
 		}
 
-		return orm(c).select().from(account).where(
-			and(
-				eq(account.userId, userId),
-				eq(account.isDel, isDel.NORMAL),
-					or(
-						lt(account.sort, lastSort),
-						and(
-							eq(account.sort, lastSort),
-							gt(account.accountId, accountId)
-						)
-					))
+		const conditions = [
+			eq(account.userId, userId),
+			eq(account.isDel, isDel.NORMAL),
+			or(
+				lt(account.sort, lastSort),
+				and(
+					eq(account.sort, lastSort),
+					gt(account.accountId, accountId)
 				)
+			)
+		];
+
+		if (email) {
+			const keyword = '%' + email + '%';
+			conditions.push(or(
+				sql`${account.email} COLLATE NOCASE LIKE ${keyword}`,
+				sql`${account.name} COLLATE NOCASE LIKE ${keyword}`
+			));
+		}
+
+		return orm(c).select().from(account).where(and(...conditions))
 			.orderBy(desc(account.sort), asc(account.accountId))
 			.limit(size)
 			.all();
@@ -284,7 +294,6 @@ const accountService = {
 
 	async setAsTop(c, params, userId) {
 		const { accountId } = params;
-		console.log(accountId);
 		const userRow = await userService.selectById(c, userId);
 		const mainAccountRow = await accountService.selectByEmailIncludeDel(c, userRow.email);
 		let mainSort = mainAccountRow.sort === 0 ? 2 : mainAccountRow.sort + 1;
diff --git a/mail-worker/src/service/user-service.js b/mail-worker/src/service/user-service.js
index 7fe46d8..ce1c96c 100644
--- a/mail-worker/src/service/user-service.js
+++ b/mail-worker/src/service/user-service.js
@@ -22,6 +22,26 @@ import {oauth} from "../entity/oauth";
 import oauthService from "./oauth-service";
 import accountTransfer from '../entity/account-transfer';
 
+let ensureUserLangColumnPromise;
+
+async function ensureUserLangColumn(c) {
+	if (!ensureUserLangColumnPromise) {
+		ensureUserLangColumnPromise = c.env.db
+			.prepare(`ALTER TABLE user ADD COLUMN lang TEXT NOT NULL DEFAULT '';`)
+			.run()
+			.catch((e) => {
+				const message = String(e?.message || e);
+				if (message.includes('duplicate column name')) {
+					return;
+				}
+				ensureUserLangColumnPromise = undefined;
+				throw e;
+			});
+	}
+
+	await ensureUserLangColumnPromise;
+}
+
 const userService = {
 
 	async loginUserInfo(c, userId) {
@@ -78,10 +98,12 @@ const userService = {
 
 
 	async updateLang(c, userId, lang) {
+		await ensureUserLangColumn(c);
 		await orm(c).update(user).set({ lang }).where(eq(user.userId, userId)).run();
 	},
 
 	async resetPassword(c, params, userId) {
+		await ensureUserLangColumn(c);
 
 		const { password } = params;
 
@@ -92,7 +114,8 @@ const userService = {
 		await orm(c).update(user).set({ password: hash, salt: salt }).where(eq(user.userId, userId)).run();
 	},
 
-	selectByEmail(c, email) {
+	async selectByEmail(c, email) {
+		await ensureUserLangColumn(c);
 		return orm(c).select().from(user).where(
 			and(
 				eq(user.email, email),
@@ -107,6 +130,7 @@ const userService = {
 	},
 
 	async insert(c, params) {
+		await ensureUserLangColumn(c);
 		if (!params.displayId) {
 			params.displayId = this.generateDisplayId();
 		}
@@ -114,15 +138,18 @@ const userService = {
 		return userId;
 	},
 
-	selectByEmailIncludeDel(c, email) {
+	async selectByEmailIncludeDel(c, email) {
+		await ensureUserLangColumn(c);
 		return orm(c).select().from(user).where(sql`${user.email} COLLATE NOCASE = ${email}`).get();
 	},
 
-	selectByIdIncludeDel(c, userId) {
+	async selectByIdIncludeDel(c, userId) {
+		await ensureUserLangColumn(c);
 		return orm(c).select().from(user).where(eq(user.userId, userId)).get();
 	},
 
-	selectById(c, userId) {
+	async selectById(c, userId) {
+		await ensureUserLangColumn(c);
 		return orm(c).select().from(user).where(
 			and(
 				eq(user.userId, userId),
@@ -130,7 +157,8 @@ const userService = {
 			.get();
 	},
 
-	selectByDisplayId(c, displayId) {
+	async selectByDisplayId(c, displayId) {
+		await ensureUserLangColumn(c);
 		return orm(c).select().from(user).where(
 			and(
 				eq(user.displayId, String(displayId)),
@@ -140,11 +168,13 @@ const userService = {
 	},
 
 	async delete(c, userId) {
+		await ensureUserLangColumn(c);
 		await orm(c).update(user).set({ isDel: isDel.DELETE }).where(eq(user.userId, userId)).run();
 		await c.env.kv.delete(kvConst.AUTH_INFO + userId)
 	},
 
 	async physicsDelete(c, params) {
+		await ensureUserLangColumn(c);
 		let { userIds } = params;
 		userIds = userIds.split(',').map(Number);
 		await accountService.physicsDeleteByUserIds(c, userIds);
@@ -153,6 +183,7 @@ const userService = {
 	},
 
 	async list(c, params) {
+		await ensureUserLangColumn(c);
 
 		let { num, size, email, timeSort, loginSort, status } = params;
 
@@ -283,6 +314,7 @@ const userService = {
 	},
 
 	async updateUserInfo(c, userId, recordCreateIp = false) {
+		await ensureUserLangColumn(c);
 
 
 
@@ -317,6 +349,7 @@ const userService = {
 	},
 
 	async setStatus(c, params) {
+		await ensureUserLangColumn(c);
 
 		const { status, userId } = params;
 
@@ -332,6 +365,7 @@ const userService = {
 	},
 
 	async batchSetStatus(c, params) {
+		await ensureUserLangColumn(c);
 		const { userIds, status } = params;
 		const ids = (typeof userIds === 'string' ? userIds.split(',') : userIds).map(Number);
 		await orm(c).update(user).set({ status }).where(inArray(user.userId, ids)).run();
@@ -341,12 +375,14 @@ const userService = {
 	},
 
 	async batchRestore(c, params) {
+		await ensureUserLangColumn(c);
 		const { userIds } = params;
 		const ids = (typeof userIds === 'string' ? userIds.split(',') : userIds).map(Number);
 		await orm(c).update(user).set({ isDel: isDel.NORMAL, status: 0 }).where(inArray(user.userId, ids)).run();
 	},
 
 	async setType(c, params) {
+		await ensureUserLangColumn(c);
 
 		const { type, userId } = params;
 
@@ -365,6 +401,7 @@ const userService = {
 	},
 
 	async incrUserSendCount(c, quantity, userId) {
+		await ensureUserLangColumn(c);
 		await orm(c).update(user).set({
 			sendCount: sql`${user.sendCount}
 	  +
@@ -373,6 +410,7 @@ const userService = {
 	},
 
 	async updateAllUserType(c, type, curType) {
+		await ensureUserLangColumn(c);
 		await orm(c)
 			.update(user)
 			.set({ type })
@@ -419,16 +457,19 @@ const userService = {
 	},
 
 	async resetDaySendCount(c) {
+		await ensureUserLangColumn(c);
 		const roleList = await roleService.selectByIdsAndSendType(c, 'email:send', roleConst.sendType.DAY);
 		const roleIds = roleList.map(action => action.roleId);
 		await orm(c).update(user).set({ sendCount: 0 }).where(inArray(user.type, roleIds)).run();
 	},
 
 	async resetSendCount(c, params) {
+		await ensureUserLangColumn(c);
 		await orm(c).update(user).set({ sendCount: 0 }).where(eq(user.userId, params.userId)).run();
 	},
 
 	async restore(c, params) {
+		await ensureUserLangColumn(c);
 		const { userId, type } = params
 		await orm(c)
 			.update(user)
@@ -445,7 +486,8 @@ const userService = {
 
 	},
 
-	listByRegKeyId(c, regKeyId) {
+	async listByRegKeyId(c, regKeyId) {
+		await ensureUserLangColumn(c);
 		return orm(c)
 			.select({email: user.email,createTime: user.createTime})
 			.from(user)
@@ -455,6 +497,7 @@ const userService = {
 	},
 
 	async autoBanInactiveUsers(c) {
+		await ensureUserLangColumn(c);
 		const settings = await settingService.query(c);
 		if (!settings.autoBanMonths || settings.autoBanMonths <= 0) return;