fix: 修复 transaction 表名与 Dexie 内置方法冲突(导出 JSON 与记账失效)

This commit is contained in:
root
2026-10-16 13:19:54 +08:00
parent f0d30e2c29
commit 5a67b2f59a
10 changed files with 57 additions and 42 deletions
File diff suppressed because one or more lines are too long
@@ -1,2 +1,2 @@
const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["./web-CP24IQDG.js","./index-DS0rgMh0.js","./index-DXlhKHmS.css"])))=>i.map(i=>d[i]); const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["./web-D50Vc2g1.js","./index-y5cGVWNn.js","./index-DWsZ3Bb0.css"])))=>i.map(i=>d[i]);
import{r as s,_ as i}from"./index-DS0rgMh0.js";var t;(function(e){e.Documents="DOCUMENTS",e.Data="DATA",e.Library="LIBRARY",e.Cache="CACHE",e.External="EXTERNAL",e.ExternalStorage="EXTERNAL_STORAGE"})(t||(t={}));var a;(function(e){e.UTF8="utf8",e.ASCII="ascii",e.UTF16="utf16"})(a||(a={}));const E=s("Filesystem",{web:()=>i(()=>import("./web-CP24IQDG.js"),__vite__mapDeps([0,1,2]),import.meta.url).then(e=>new e.FilesystemWeb)});export{t as Directory,a as Encoding,E as Filesystem}; import{r as s,_ as i}from"./index-y5cGVWNn.js";var t;(function(e){e.Documents="DOCUMENTS",e.Data="DATA",e.Library="LIBRARY",e.Cache="CACHE",e.External="EXTERNAL",e.ExternalStorage="EXTERNAL_STORAGE"})(t||(t={}));var a;(function(e){e.UTF8="utf8",e.ASCII="ascii",e.UTF16="utf16"})(a||(a={}));const E=s("Filesystem",{web:()=>i(()=>import("./web-D50Vc2g1.js"),__vite__mapDeps([0,1,2]),import.meta.url).then(e=>new e.FilesystemWeb)});export{t as Directory,a as Encoding,E as Filesystem};
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+2 -2
View File
@@ -8,8 +8,8 @@
<link rel="icon" href="./icons/icon.svg" type="image/svg+xml" /> <link rel="icon" href="./icons/icon.svg" type="image/svg+xml" />
<link rel="apple-touch-icon" href="./icons/icon-192.png" /> <link rel="apple-touch-icon" href="./icons/icon-192.png" />
<title>实习工作日志</title> <title>实习工作日志</title>
<script type="module" crossorigin src="./assets/index-DS0rgMh0.js"></script> <script type="module" crossorigin src="./assets/index-y5cGVWNn.js"></script>
<link rel="stylesheet" crossorigin href="./assets/index-DXlhKHmS.css"> <link rel="stylesheet" crossorigin href="./assets/index-DWsZ3Bb0.css">
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>
+9 -9
View File
@@ -360,23 +360,23 @@ export interface TransactionInput {
} }
export async function listTransactionsBetween(start: string, end: string): Promise<Transaction[]> { export async function listTransactionsBetween(start: string, end: string): Promise<Transaction[]> {
return db.transaction.where('date').between(start, end, true, true).toArray() return db.table('transaction').where('date').between(start, end, true, true).toArray()
} }
export async function addTransaction(input: TransactionInput): Promise<void> { export async function addTransaction(input: TransactionInput): Promise<void> {
await db.transaction.add({ ...input, created_at: nowLocalISO() }) await db.table('transaction').add({ ...input, created_at: nowLocalISO() })
} }
export async function updateTransaction(id: number, input: TransactionInput): Promise<void> { export async function updateTransaction(id: number, input: TransactionInput): Promise<void> {
await db.transaction.update(id, { ...input }) await db.table('transaction').update(id, { ...input })
} }
export async function deleteTransaction(id: number): Promise<void> { export async function deleteTransaction(id: number): Promise<void> {
await db.transaction.delete(id) await db.table('transaction').delete(id)
} }
export async function setTransactionReimbursed(id: number, done: boolean): Promise<void> { export async function setTransactionReimbursed(id: number, done: boolean): Promise<void> {
await db.transaction.update(id, { reimbursed: done ? 1 : 0 }) await db.table('transaction').update(id, { reimbursed: done ? 1 : 0 })
} }
// ---------- 备份 ---------- // ---------- 备份 ----------
@@ -391,7 +391,7 @@ export async function exportAll(): Promise<string> {
db.setting.toArray(), db.setting.toArray(),
db.memo.toArray(), db.memo.toArray(),
db.credential.toArray(), db.credential.toArray(),
db.transaction.toArray() db.table('transaction').toArray()
]) ])
return JSON.stringify({ return JSON.stringify({
schema_version: SCHEMA_VERSION, schema_version: SCHEMA_VERSION,
@@ -421,11 +421,11 @@ export async function importAll(jsonText: string): Promise<void> {
throw new Error('文件格式或 schema 版本不匹配') throw new Error('文件格式或 schema 版本不匹配')
} }
const d = parsed.data const d = parsed.data
await db.transaction('rw', [db.project, db.work_log, db.log_item, db.attendance, db.weekly_note, db.setting, db.memo, db.credential, db.transaction], async () => { await db.transaction('rw', [db.project, db.work_log, db.log_item, db.attendance, db.weekly_note, db.setting, db.memo, db.credential, db.table('transaction')], async () => {
await Promise.all([ await Promise.all([
db.project.clear(), db.work_log.clear(), db.log_item.clear(), db.project.clear(), db.work_log.clear(), db.log_item.clear(),
db.attendance.clear(), db.weekly_note.clear(), db.setting.clear(), db.attendance.clear(), db.weekly_note.clear(), db.setting.clear(),
db.memo.clear(), db.credential.clear(), db.transaction.clear() db.memo.clear(), db.credential.clear(), db.table('transaction').clear()
]) ])
if (d.project && d.project.length) await db.project.bulkAdd(d.project as never[]) if (d.project && d.project.length) await db.project.bulkAdd(d.project as never[])
if (d.work_log && d.work_log.length) await db.work_log.bulkAdd(d.work_log as never[]) if (d.work_log && d.work_log.length) await db.work_log.bulkAdd(d.work_log as never[])
@@ -435,6 +435,6 @@ export async function importAll(jsonText: string): Promise<void> {
if (d.setting && d.setting.length) await db.setting.bulkAdd(d.setting as never[]) if (d.setting && d.setting.length) await db.setting.bulkAdd(d.setting as never[])
if (d.memo && d.memo.length) await db.memo.bulkAdd(d.memo as never[]) if (d.memo && d.memo.length) await db.memo.bulkAdd(d.memo as never[])
if (d.credential && d.credential.length) await db.credential.bulkAdd(d.credential as never[]) if (d.credential && d.credential.length) await db.credential.bulkAdd(d.credential as never[])
if (d.transaction && d.transaction.length) await db.transaction.bulkAdd(d.transaction as never[]) if (d.transaction && d.transaction.length) await db.table('transaction').bulkAdd(d.transaction as never[])
}) })
} }
+2 -1
View File
@@ -103,7 +103,8 @@ export class WorklogDB extends Dexie {
setting!: Table<{ key: string; value: string }, string> setting!: Table<{ key: string; value: string }, string>
memo!: Table<Memo, number> memo!: Table<Memo, number>
credential!: Table<Credential, number> credential!: Table<Credential, number>
transaction!: Table<Transaction, number> // 注意:transaction 表通过 db.table('transaction') 访问,
// 因为 db.transaction 会与 Dexie 内置的 transaction() 方法冲突
sync_mirror!: Table<SyncMirror, number> sync_mirror!: Table<SyncMirror, number>
tombstone!: Table<SyncTombstone, number> tombstone!: Table<SyncTombstone, number>
+3 -3
View File
@@ -35,13 +35,13 @@ function rowHash(row: AnyRow): string {
} }
async function getTable(name: string): Promise<AnyRow[]> { async function getTable(name: string): Promise<AnyRow[]> {
return (db as unknown as AnyRow)[name].toArray() return db.table(name).toArray()
} }
// 一次性补齐 uuid 与 updated_at,缺失时回填 // 一次性补齐 uuid 与 updated_at,缺失时回填
async function ensureSyncFields(): Promise<void> { async function ensureSyncFields(): Promise<void> {
for (const t of TABLES) { for (const t of TABLES) {
const table = (db as unknown as AnyRow)[t] const table = db.table(t)
const rows: AnyRow[] = await table.toArray() const rows: AnyRow[] = await table.toArray()
for (const row of rows) { for (const row of rows) {
if (t === 'setting' && EXCLUDE_SETTING_KEYS.has(row.key)) continue if (t === 'setting' && EXCLUDE_SETTING_KEYS.has(row.key)) continue
@@ -287,7 +287,7 @@ async function doRunSync(config: SyncConfig): Promise<SyncResult> {
const finalMirror: { table: string; uuid: string; hash: string }[] = [] const finalMirror: { table: string; uuid: string; hash: string }[] = []
for (const t of TABLES) { for (const t of TABLES) {
const table = (db as unknown as AnyRow)[t] const table = db.table(t)
const localRows: AnyRow[] = await table.toArray() const localRows: AnyRow[] = await table.toArray()
const byUuid = new Map<string, AnyRow>() const byUuid = new Map<string, AnyRow>()
for (const row of localRows) byUuid.set(row.uuid, row) for (const row of localRows) byUuid.set(row.uuid, row)
+20 -10
View File
@@ -43,7 +43,11 @@ const title = computed(() => Number(monthRef.value.slice(0, 4)) + ' 年 ' + Numb
async function load() { async function load() {
loading.value = true loading.value = true
rows.value = await listTransactionsBetween(monthStart.value, monthEnd.value) try {
rows.value = await listTransactionsBetween(monthStart.value, monthEnd.value)
} catch (e) {
showToast('账目加载失败:' + (e instanceof Error ? e.message : String(e)))
}
loading.value = false loading.value = false
} }
onMounted(load) onMounted(load)
@@ -124,15 +128,21 @@ async function submit() {
} }
if (submitting.value) return if (submitting.value) return
submitting.value = true submitting.value = true
await addTransaction({ try {
type: fType.value, await addTransaction({
category: fCategory.value, type: fType.value,
amount: Math.round(v * 100), category: fCategory.value,
date: fDate.value, amount: Math.round(v * 100),
note: fNote.value.trim(), date: fDate.value,
reimbursable: fType.value === 'expense' && fReimb.value ? 1 : 0, note: fNote.value.trim(),
reimbursed: 0 reimbursable: fType.value === 'expense' && fReimb.value ? 1 : 0,
}) reimbursed: 0
})
} catch (e) {
showToast('添加失败:' + (e instanceof Error ? e.message : String(e)))
submitting.value = false
return
}
fAmount.value = '' fAmount.value = ''
fNote.value = '' fNote.value = ''
fReimb.value = false fReimb.value = false
+7 -3
View File
@@ -219,9 +219,13 @@ async function toggleArchive(p: Project) {
} }
async function doExport() { async function doExport() {
const text = await exportAll() try {
const p = await downloadText('实习日志备份_' + todayStr().replace(/-/g, '') + '.json', text) const text = await exportAll()
showToast(p ? '备份已导出到:' + p : '备份已导出到系统下载目录') const p = await downloadText('实习日志备份_' + todayStr().replace(/-/g, '') + '.json', text)
showToast(p ? '备份已导出到:' + p : '备份已导出到系统下载目录')
} catch (e) {
showToast('导出失败:' + (e instanceof Error ? e.message : String(e)))
}
} }
function onFile(e: Event) { function onFile(e: Event) {