fix: 修复 transaction 表名与 Dexie 内置方法冲突(导出 JSON 与记账失效)
This commit is contained in:
@@ -360,23 +360,23 @@ export interface TransactionInput {
|
||||
}
|
||||
|
||||
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> {
|
||||
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> {
|
||||
await db.transaction.update(id, { ...input })
|
||||
await db.table('transaction').update(id, { ...input })
|
||||
}
|
||||
|
||||
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> {
|
||||
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.memo.toArray(),
|
||||
db.credential.toArray(),
|
||||
db.transaction.toArray()
|
||||
db.table('transaction').toArray()
|
||||
])
|
||||
return JSON.stringify({
|
||||
schema_version: SCHEMA_VERSION,
|
||||
@@ -421,11 +421,11 @@ export async function importAll(jsonText: string): Promise<void> {
|
||||
throw new Error('文件格式或 schema 版本不匹配')
|
||||
}
|
||||
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([
|
||||
db.project.clear(), db.work_log.clear(), db.log_item.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.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.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.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[])
|
||||
})
|
||||
}
|
||||
|
||||
@@ -103,7 +103,8 @@ export class WorklogDB extends Dexie {
|
||||
setting!: Table<{ key: string; value: string }, string>
|
||||
memo!: Table<Memo, number>
|
||||
credential!: Table<Credential, number>
|
||||
transaction!: Table<Transaction, number>
|
||||
// 注意:transaction 表通过 db.table('transaction') 访问,
|
||||
// 因为 db.transaction 会与 Dexie 内置的 transaction() 方法冲突
|
||||
sync_mirror!: Table<SyncMirror, number>
|
||||
tombstone!: Table<SyncTombstone, number>
|
||||
|
||||
|
||||
@@ -35,13 +35,13 @@ function rowHash(row: AnyRow): string {
|
||||
}
|
||||
|
||||
async function getTable(name: string): Promise<AnyRow[]> {
|
||||
return (db as unknown as AnyRow)[name].toArray()
|
||||
return db.table(name).toArray()
|
||||
}
|
||||
|
||||
// 一次性补齐 uuid 与 updated_at,缺失时回填
|
||||
async function ensureSyncFields(): Promise<void> {
|
||||
for (const t of TABLES) {
|
||||
const table = (db as unknown as AnyRow)[t]
|
||||
const table = db.table(t)
|
||||
const rows: AnyRow[] = await table.toArray()
|
||||
for (const row of rows) {
|
||||
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 }[] = []
|
||||
|
||||
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 byUuid = new Map<string, AnyRow>()
|
||||
for (const row of localRows) byUuid.set(row.uuid, row)
|
||||
|
||||
@@ -43,7 +43,11 @@ const title = computed(() => Number(monthRef.value.slice(0, 4)) + ' 年 ' + Numb
|
||||
|
||||
async function load() {
|
||||
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
|
||||
}
|
||||
onMounted(load)
|
||||
@@ -124,15 +128,21 @@ async function submit() {
|
||||
}
|
||||
if (submitting.value) return
|
||||
submitting.value = true
|
||||
await addTransaction({
|
||||
type: fType.value,
|
||||
category: fCategory.value,
|
||||
amount: Math.round(v * 100),
|
||||
date: fDate.value,
|
||||
note: fNote.value.trim(),
|
||||
reimbursable: fType.value === 'expense' && fReimb.value ? 1 : 0,
|
||||
reimbursed: 0
|
||||
})
|
||||
try {
|
||||
await addTransaction({
|
||||
type: fType.value,
|
||||
category: fCategory.value,
|
||||
amount: Math.round(v * 100),
|
||||
date: fDate.value,
|
||||
note: fNote.value.trim(),
|
||||
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 = ''
|
||||
fNote.value = ''
|
||||
fReimb.value = false
|
||||
|
||||
@@ -219,9 +219,13 @@ async function toggleArchive(p: Project) {
|
||||
}
|
||||
|
||||
async function doExport() {
|
||||
const text = await exportAll()
|
||||
const p = await downloadText('实习日志备份_' + todayStr().replace(/-/g, '') + '.json', text)
|
||||
showToast(p ? '备份已导出到:' + p : '备份已导出到系统下载目录')
|
||||
try {
|
||||
const text = await exportAll()
|
||||
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) {
|
||||
|
||||
Reference in New Issue
Block a user