Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 106 additions & 3 deletions app/(mobile)/bills/page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client'

import { useEffect, useState, useCallback, useMemo } from 'react'
import { useEffect, useState, useCallback, useMemo, useRef } from 'react'
import { format } from 'date-fns'
import {
getCardsWithBillsSummary,
Expand All @@ -19,8 +19,9 @@ import { BillDraftsPanel } from '@/components/mobile/BillDraftsPanel'
import { ManualBillAmountDialog } from '@/components/mobile/ManualBillAmountDialog'
import { PayableForm } from '@/components/mobile/PayableForm'
import {
getRecurringPayables, payRecurringPayable,
getRecurringPayables, payRecurringPayable, getPayablePayments,
type PayableWithStatus,
type PayablePaymentRecord,
} from '@/lib/api/payables'
import {
formatCardTail, compareBillsListCardsByMode, pickDueReference,
Expand Down Expand Up @@ -72,6 +73,15 @@ function tagSummary(
return selectedTag === NO_BANK_TAG ? '非银行' : selectedTag
}

/** 不可变地从 Record 中删除一个 key(无该 key 时返回原对象)。 */
function omitRecordKey<T>(record: Record<string, T>, key: string): Record<string, T> {
// 只判断自有属性:`in` 会沿原型链命中 toString/constructor 等
if (!Object.prototype.hasOwnProperty.call(record, key)) return record
const next = { ...record }
delete next[key]
return next
}
Comment on lines +76 to +83

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bug · low
key in record 会沿原型链查找(如 'toString'、'constructor' 始终返回 true),与该工具函数「判断自有 key」的语义不符:当传入的 key 恰好命中 Object.prototype 上的属性名时,会走删除分支并返回一个新对象而非原对象。当前调用方传入的都是服务端生成的 UUID,实际不可触达,故仅为低风险加固;但这是模块级通用工具函数,建议改用 Object.hasOwn(record, key) 以匹配自身属性的语义。

Suggestion:

Suggested change
/** 不可变地从 Record 中删除一个 key(无该 key 时返回原对象)。 */
function omitRecordKey<T>(record: Record<string, T>, key: string): Record<string, T> {
if (!(key in record)) return record
const next = { ...record }
delete next[key]
return next
}
/** 不可变地从 Record 中删除一个 key(无该 key 时返回原对象)。 */
function omitRecordKey<T>(record: Record<string, T>, key: string): Record<string, T> {
if (!Object.hasOwn(record, key)) return record
const next = { ...record }
delete next[key]
return next
}


export default function BillsPage() {
const { user } = useAuth()
const { displayConfig } = useUserPreferences()
Expand All @@ -92,6 +102,11 @@ export default function BillsPage() {
// 固定支出(房租/贷款等按月应付)
const [payables, setPayables] = useState<PayableWithStatus[]>([])
const [payableFormOpen, setPayableFormOpen] = useState(false)
// 固定支出历史还款:按需加载,展开一次后缓存
const [payablePayments, setPayablePayments] = useState<Record<string, PayablePaymentRecord[]>>({})

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bug · medium
payablePayments 缓存缺少失效机制:用户通过 handlePayPayable 成功登记本期还款后(payRecurringPayable 会向 recurring_payable_payments 插入新记录,随后仅 loadData 刷新 payables 列表),已拉取过的历史列表不会刷新,刚登记的还款不会出现在「历史还款」中,展示与实际账目不一致。建议在 handlePayPayable 成功后删除该 payable 的缓存条目(下次展开自动重拉);另外当前展开无 in-flight 去重,缓存为空期间快速连续点击同一卡片会重复发起相同请求,可用 loading 标记一并防护。

Suggestion:

Suggested change
const [payablePayments, setPayablePayments] = useState<Record<string, PayablePaymentRecord[]>>({})
await payRecurringPayable(payable.id, payable.amount)
// 登记还款后失效历史缓存,下次展开重新拉取
setPayablePayments(prev => {
if (!(payable.id in prev)) return prev
const next = { ...prev }
delete next[payable.id]
return next
})

Comment on lines +105 to +106

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bug · medium
历史还款缓存只有「本机还款成功」(handlePayPayable)这一个失效入口,而页面所有全量刷新路径——loadData(手动重试 onRetry、BillDraftsPanel onChanged、PayableForm onSuccess)与 handleSync(邮件同步)——都不会触碰它。结果:用户展开过某笔固定支出的历史后,若在另一设备/浏览器登记了付款,回到本页点「同步」或触发任意 loadData,已缓存(尤其仍处于展开态)的历史列表依旧显示旧数据,且因缓存命中(payablePayments[payableId] 为真)收起再展开也不会重拉,只能等该笔在本机再次还款才刷新。本 PR 同期新增了 iOS 端 PayablePaymentRecord 客户端,多端读写是常态场景。建议在 loadData 成功后清空 payablePayments(可保留 expandedPayableIds,使展开中的项自动重新拉取)。

Suggestion:

Suggested change
// 固定支出历史还款:按需加载,展开一次后缓存
const [payablePayments, setPayablePayments] = useState<Record<string, PayablePaymentRecord[]>>({})
// 固定支出历史还款:按需加载,展开一次后缓存;
// loadData 全量刷新时整体失效,让展开中的项重新拉取(跨设备产生的还款才能出现在历史里)
const [payablePayments, setPayablePayments] = useState<Record<string, PayablePaymentRecord[]>>({})

const [expandedPayableIds, setExpandedPayableIds] = useState<Set<string>>(new Set())
const [payableHistoryErrors, setPayableHistoryErrors] = useState<Record<string, string>>({})
const [payableHistoryLoading, setPayableHistoryLoading] = useState<Set<string>>(new Set())
const [editingPayable, setEditingPayable] = useState<PayableWithStatus | null>(null)

const [celebrationNotice, setCelebrationNotice] = useState<{ open: boolean; message: string }>({
Expand Down Expand Up @@ -125,6 +140,59 @@ export default function BillsPage() {
// 持卡人 id → name 映射
const [holderMap, setHolderMap] = useState<Record<string, string>>({})

// 展开集合的 ref:异步回调里需要读最新值(state 是渲染快照)
const expandedPayableIdsRef = useRef(expandedPayableIds)
useEffect(() => {
expandedPayableIdsRef.current = expandedPayableIds
}, [expandedPayableIds])

// 同一笔的在途请求:并发点击或还款后重取都复用同一个 Promise,避免重复 RPC
const payableHistoryInFlight = useRef<Map<string, Promise<void>>>(new Map())

// 缓存代次:全量刷新或还款后递增,旧代次发起的请求不再写回
const payableHistoryGeneration = useRef(0)

/** 拉取并写入历史缓存;同一 payableId 复用进行中的请求。 */
const loadPayableHistory = useCallback((payableId: string) => {
const running = payableHistoryInFlight.current.get(payableId)
if (running) return running
const generation = payableHistoryGeneration.current
setPayableHistoryLoading(prev => new Set(prev).add(payableId))
let settle!: () => void
const current = new Promise<void>(resolve => { settle = resolve })
void (async () => {
try {
const records = await getPayablePayments(payableId)
// 代次已变(刷新/还款期间发起):结果作废,不写回旧数据
if (payableHistoryGeneration.current !== generation) return
setPayablePayments(prev => ({ ...prev, [payableId]: records }))
setPayableHistoryErrors(prev => omitRecordKey(prev, payableId))
} catch (err) {
if (payableHistoryGeneration.current !== generation) return
// 保持未加载状态:再次展开会重试;错误就地展示
setPayableHistoryErrors(prev => ({
...prev,
[payableId]: err instanceof Error ? err.message : '历史还款加载失败',
}))
} finally {
// 只清理自己这条:被新任务顶替或代次已变时不能误删(否则新请求期间不显示加载中)
if (
payableHistoryInFlight.current.get(payableId) === current &&
payableHistoryGeneration.current === generation
) {
Comment on lines +179 to +182

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bug · medium
清理条件中的「代次一致」判断会让已落定请求的在途条目永久残留。失败链路:handlePayPayable 先递增代次再 await running,旧请求落定时因代次不匹配跳过本 finally(Map 条目与 loading 标记残留);正常由紧随的 loadData 的 clear() 兜底,但若那次 loadData 失败(Promise.all 抛错走 catch,既不递增代次也不清 Map),此后收起再展开该行时 loadPayableHistory 开头的去重会直接返回这个已落定的 Promise——不发请求、不设错误,历史区永久停在「加载中…」且看不到新登记的还款,只能等下次成功的全量刷新才能恢复。建议清理条件去掉代次约束,只保留「Map 中仍是自己」:被新请求顶替时 get(payableId) !== current 自然跳过,不会误删新请求的 loading 态。

Suggestion:

Suggested change
if (
payableHistoryInFlight.current.get(payableId) === current &&
payableHistoryGeneration.current === generation
) {
// 只要 Map 里仍是自己就清理;被新请求顶替时 get() !== current,自然跳过,
// 不会误清新请求的 loading 态。不再要求代次一致:还款路径递增代次后旧请求
// 落定会残留条目与 loading 态,若随后的 loadData 失败(catch 不作废 Map),
// 去重会一直返回已落定的 Promise,该行历史区将永久卡在「加载中…」。
if (payableHistoryInFlight.current.get(payableId) === current) {
payableHistoryInFlight.current.delete(payableId)
setPayableHistoryLoading(prev => {
const next = new Set(prev)
next.delete(payableId)
return next
})
}

payableHistoryInFlight.current.delete(payableId)
setPayableHistoryLoading(prev => {
const next = new Set(prev)
next.delete(payableId)
return next
})
}
}
Comment on lines +177 to +190

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bug · medium
loading 清理缺少与上方在途 Map 相同的守卫,存在竞态:loadData 会递增代次、clear() 在途 Map 并为展开行立即重发新请求;此时旧请求落定,其 finally 虽因 map.get(id) !== current 跳过 Map 删除,却仍无条件把同一 payableId 从 payableHistoryLoading 中删除,导致新请求仍在途时加载态被提前移除,展开区会短暂显示「展开以加载历史」而非「加载中…」。建议让 loading 清理与 Map 删除共用同一判定,只有自己仍是该 payableId 的在途请求时才清理两种状态。

Suggestion:

Suggested change
} finally {
// 只清理自己这条:被新任务顶替时不能误删
if (payableHistoryInFlight.current.get(payableId) === current) {
payableHistoryInFlight.current.delete(payableId)
}
setPayableHistoryLoading(prev => {
const next = new Set(prev)
next.delete(payableId)
return next
})
}
} finally {
// 只清理自己这条:loading 与在途 Map 用同一判定,被新任务顶替时不误删新请求的加载态
if (payableHistoryInFlight.current.get(payableId) === current) {
payableHistoryInFlight.current.delete(payableId)
setPayableHistoryLoading(prev => {
const next = new Set(prev)
next.delete(payableId)
return next
})
}
}

})().finally(() => settle())
payableHistoryInFlight.current.set(payableId, current)
return current
}, [])

const loadData = useCallback(async () => {
if (!user) return
try {
Expand All @@ -135,6 +203,12 @@ export default function BillsPage() {
getHolders(user.id),
])
setCardsSummary(summaryData)
// 全量刷新:递增代次作废在途响应,清空缓存,并对仍展开的行重拉
payableHistoryGeneration.current += 1
payableHistoryInFlight.current.clear()
setPayablePayments({})
setPayableHistoryErrors({})
expandedPayableIdsRef.current.forEach(id => { void loadPayableHistory(id) })
Comment on lines +209 to +211

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bug · medium
loadData 的缓存失效会被 loadPayableHistory 的在途去重绕过:清空 payablePayments 后,若某展开行的请求是在本次刷新之前发起且仍在途,去重逻辑会复用旧 Promise,其成功回调会把刷新前取到的旧记录写回刚清空的缓存。该旧记录若早于外部变更(如 iOS 端/其他设备登记的还款——本次更新恰好新增了 iOS 端 fetchPayments),展开行会一直展示过期历史:再次展开因缓存已存在(handleTogglePayableHistory 中 !payablePayments[payableId] 不成立)不会重拉,直到下一次无在途请求的 loadData 才自愈。handlePayPayable 已针对同一竞态做了防护(先 await 在途请求再清缓存,注释明确「否则它的成功回调会把不含新还款的记录写回」),loadData 缺少等价处理。建议清缓存前先排干在途请求(它们会在 finally 中自行从 map 删除),或引入刷新代数(epoch)令牌丢弃过期写回。

Suggestion:

Suggested change
setPayablePayments({})
setPayableHistoryErrors({})
expandedPayableIdsRef.current.forEach(id => { void loadPayableHistory(id) })
// 全量刷新:先等在途历史请求落定(否则去重会复用旧请求,其成功回调
// 会把刷新前取到的旧记录写回刚清空的缓存),再清空并重拉
await Promise.allSettled([...payableHistoryInFlight.current.values()])
setPayablePayments({})
setPayableHistoryErrors({})
expandedPayableIdsRef.current.forEach(id => { void loadPayableHistory(id) })

const map: Record<string, string> = {}
for (const h of holders) map[h.id] = h.name
setHolderMap(map)
Expand All @@ -151,7 +225,7 @@ export default function BillsPage() {
} finally {
setLoading(false)
}
}, [user])
}, [user, loadPayableHistory])

useEffect(() => {
loadData()
Expand Down Expand Up @@ -416,6 +490,14 @@ export default function BillsPage() {
const handlePayPayable = async (payable: PayableWithStatus) => {
try {
await payRecurringPayable(payable.id, payable.amount)
// 新还款落库:先等在途旧请求落定(否则它的成功回调会把不含新还款的记录写回),
// 再清缓存并重取
// 递增代次:作废还款前发起的请求;随后清缓存
payableHistoryGeneration.current += 1
const running = payableHistoryInFlight.current.get(payable.id)
if (running) await running
setPayablePayments(prev => omitRecordKey(prev, payable.id))
Comment on lines +496 to +499

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maintainability · low
这里对「紧随其后的 loadData 一定执行且成功」存在隐式依赖:本行缓存清理后,在途条目的作废完全依赖 loadData 内的 clear() + 重拉(loadData 失败路径不会清 Map)。若 loadData 失败,本行的去重 Map 将残留已落定的 Promise,重新展开只会立即返回旧结果,无法重取。当前代码行为正确,但正确性建立在跨函数的执行顺序契约上;建议在 await 落定后显式删除本行条目并清掉该行 loading,消除这条隐性契约(与 finally 清理条件的评审意见互为补充)。

Suggestion:

Suggested change
payableHistoryGeneration.current += 1
const running = payableHistoryInFlight.current.get(payable.id)
if (running) await running
setPayablePayments(prev => omitRecordKey(prev, payable.id))
payableHistoryGeneration.current += 1
const running = payableHistoryInFlight.current.get(payable.id)
if (running) {
await running
// 显式移除已落定条目并清掉该行 loading:不依赖随后的 loadData 必须
// 成功执行 clear(),失败时本行仍可再次展开重取
payableHistoryInFlight.current.delete(payable.id)
setPayableHistoryLoading(prev => {
const next = new Set(prev)
next.delete(payable.id)
return next
})
}
setPayablePayments(prev => omitRecordKey(prev, payable.id))

// 不在此处重取:紧随其后的 loadData 会统一清缓存并重拉展开行
setCelebrationNotice({
open: true,
message: `🎉 已登记「${payable.name}」本期付款 ${currencySymbol(payable.currency)}${payable.amount.toLocaleString()}`,
Expand All @@ -426,6 +508,22 @@ export default function BillsPage() {
}
}

/** 展开/收起固定支出历史:首次展开才拉取该笔记录。 */
const handleTogglePayableHistory = useCallback(
(payableId: string) => {
const willOpen = !expandedPayableIdsRef.current.has(payableId)
setExpandedPayableIds(prev => {
const next = new Set(prev)
if (willOpen) next.add(payableId)
else next.delete(payableId)
return next
})
if (!willOpen || payablePayments[payableId]) return
void loadPayableHistory(payableId)
},
[payablePayments, loadPayableHistory]
)

// 收起态摘要:把当前筛选、分组与排序压成一行可读文本
const filterSummary = useMemo(() => {
const statusText =
Expand Down Expand Up @@ -506,6 +604,11 @@ export default function BillsPage() {
onRetry={() => loadData()}
onEmptySync={handleSync}
payables={filteredPayables}
payablePayments={payablePayments}
payableHistoryErrors={payableHistoryErrors}
payableHistoryLoading={payableHistoryLoading}
expandedPayableIds={expandedPayableIds}
onTogglePayableHistory={handleTogglePayableHistory}
onEditPayable={p => { setEditingPayable(p); setPayableFormOpen(true) }}
onPayPayable={handlePayPayable}
cards={sortedCards}
Expand Down
5 changes: 4 additions & 1 deletion components/__tests__/BillReviewRegressions.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,10 @@ function makeBillsViewFixture(): { props: BillsViewProps; unpaid: BillDashboardI
dimension: "holder", onDimension: vi.fn(), selectedTag: "all", onSelectedTag: vi.fn(),
holderTags: [], bankTags: [],
loading: false, loadError: null, onRetry: vi.fn(), onEmptySync: vi.fn(),
payables: [], onEditPayable: vi.fn(), onPayPayable: vi.fn(), cards: [item],
payables: [], onEditPayable: vi.fn(), onPayPayable: vi.fn(),
payablePayments: {}, payableHistoryErrors: {}, payableHistoryLoading: new Set<string>(),
expandedPayableIds: new Set<string>(),
onTogglePayableHistory: vi.fn(), cards: [item],
allCards: [item], holderMap: {}, bankGroups: [], onOpenPayment: vi.fn(),
onManualAmount: vi.fn(), onAddBill: vi.fn(),
},
Expand Down
96 changes: 94 additions & 2 deletions components/mobile/PayableList.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
'use client'

import { useState } from 'react'
import { categoryLabel, type PayableWithStatus } from '@/lib/api/payables'
import { format } from 'date-fns'
import {
categoryLabel,
PAYABLE_HISTORY_LIMIT,
type PayableWithStatus,
type PayablePaymentRecord,
} from '@/lib/api/payables'
import { payableNextCycleStatus } from '@/lib/utils'
import { badgeToneClass, type BillBadgeTone } from '@/lib/bills-view-model'
import { currencySymbol } from '@/lib/fx'
Expand All @@ -11,10 +17,70 @@ export interface PayableRowProps {
payable: PayableWithStatus
/** 归属持卡人姓名;未指定归属时不显示 */
holderName?: string
/** 历史还款记录(按账期倒序);undefined = 尚未加载 */
payments?: PayablePaymentRecord[]
/** 历史加载失败提示;为空表示无错误 */
historyError?: string
/** 历史请求在途(含重试);优先于错误态展示 */
historyLoading?: boolean
/** 是否展开历史还款 */
historyOpen?: boolean
onToggleHistory?: () => void
onEdit: (payable: PayableWithStatus) => void
onPay: (payable: PayableWithStatus) => void
}

/** 展开按钮文案:达到上限时改称「最近 N 笔」,避免误以为已看全。 */
function historyLabel(payments: PayablePaymentRecord[] | undefined): string {
if (!payments || payments.length === 0) return '历史还款'
if (payments.length >= PAYABLE_HISTORY_LIMIT) return `最近 ${PAYABLE_HISTORY_LIMIT} 笔还款`
return `历史还款 ${payments.length} 笔`
}

/** 历史还款展开区:加载中 / 失败 / 空 / 列表四态,避免嵌套三元。 */
function renderPayableHistory(
Comment on lines +40 to +41

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maintainability · low
新增的 renderPayableHistory 插在了 PayableRow 原有 JSDoc(「单条固定支出卡。从 PayableList 拆出……」)与 PayableRow 函数之间,使该文档注释与其目标函数被隔开、视觉上像是 renderPayableHistory 的说明。建议把 renderPayableHistory 移到 PayableRow 的 JSDoc 之前(或组件之后),保持注释与函数紧邻。

Suggestion:

Suggested change
/** 历史还款展开区:加载中 / 失败 / 空 / 列表四态,避免嵌套三元。 */
function renderPayableHistory(
/** 历史还款展开区:加载中 / 失败 / 空 / 列表四态,避免嵌套三元。 */
function renderPayableHistory(/* ... */) { /* ... */ }
/**
* 单条固定支出卡。从 PayableList 拆出:账单页现在把固定支出混进主列表统一排序。
* ……(原有 JSDoc 保持紧邻 PayableRow)
*/
export function PayableRow({ /* ... */ }: PayableRowProps) { /* ... */ }

payments: PayablePaymentRecord[] | undefined,
historyError: string | undefined,
historyLoading: boolean,
currency: string
) {
// 顺序必须是 在途 → 失败 → 未加载:失败时 payments 仍为 undefined,
// 若把 undefined 并入加载中,错误文案将永远不可达。
if (historyLoading) {
return <p className='mt-1.5 text-[11px] text-d-muted'>加载中…</p>
}
if (historyError) {
return <p className='mt-1.5 text-[11px] text-d-danger-ink'>{historyError}</p>
}
if (payments === undefined) {
// 无在途请求却仍为 undefined:说明缓存被清空但未重取,提示可再次展开
return <p className='mt-1.5 text-[11px] text-d-muted'>展开以加载历史</p>
}
Comment on lines +55 to +58

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bug · medium
payments === undefined 的语义是「尚未加载」,这里却渲染「加载中…」,把两种状态混为一谈。当 historyLoading 为 false 且缓存被清空(例如付款后只清缓存未重取)时,该分支会成为没有任何在途请求支撑的永久假加载态,误导用户。正常交互路径(展开即触发加载)不会走到这里,落到此分支的都是异常残留,建议渲染为空态或不渲染,而不是伪装成加载中。

Suggestion:

Suggested change
if (payments === undefined) {
return <p className='mt-1.5 text-[11px] text-d-muted'>加载中…</p>
}
// 未加载且无在途请求:正常展开路径必然伴随 loading,落到此处多为缓存被清后未重取,
// 不应伪装成「加载中…」误导用户
if (payments === undefined) {
return null
}

Comment on lines +55 to +58

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

other · low
该分支只在 historyOpen === true(面板已展开)时才会渲染,但文案「展开以加载历史」引导的却是一个已生效的动作,用户会困惑;且该状态实际可达——例如登记付款成功后 handlePayPayable 先清掉该行缓存、loadData 尚在 Promise.all 阶段未重拉期间,展开的面板里就会显示这条提示。建议改为准确描述恢复动作的文案,如「收起后重新展开以加载」。

Suggestion:

Suggested change
if (payments === undefined) {
// 无在途请求却仍为 undefined:说明缓存被清空但未重取,提示可再次展开
return <p className='mt-1.5 text-[11px] text-d-muted'>展开以加载历史</p>
}
if (payments === undefined) {
// 无在途请求却仍为 undefined:说明缓存被清空但未重取,提示收起再展开触发重试
return <p className='mt-1.5 text-[11px] text-d-muted'>收起后重新展开以加载历史</p>
}

if (payments.length === 0) {
return <p className='mt-1.5 text-[11px] text-d-muted'>还没有历史还款记录</p>
}
return (
<ul className='mt-1.5 flex flex-col gap-1'>
{payments.map(record => (
<li
key={record.id}
className='flex items-baseline justify-between gap-2 rounded-md bg-d-subtle px-2 py-1'
>
<span className='shrink-0 text-[11px] text-d-muted'>{record.period}</span>
<span className='min-w-0 flex-1 truncate text-[11px] text-d-text'>
{format(new Date(record.paid_at), 'MM-dd')}
{record.note ? ' · ' + record.note : ''}
</span>
Comment on lines +70 to +73

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maintainability · low
record.paid_at.slice(5) 隐式依赖后端返回 'YYYY-MM-DD…' 的 ISO 字符串布局才能截出 'MM-DD',格式一旦变化会静默渲染出错误日期。项目内既有惯例是 date-fns 格式化(如 BillsView.tsx 中下期还款日 format(new Date(x), 'MM-dd')),建议保持一致以获得语义化且抗格式变化的写法。另:historyLabel 以「返回条数 >= PAYABLE_HISTORY_LIMIT」推断被截断的文案已与服务端查询核对(ORDER BY period DESC, created_at DESC LIMIT PAYABLE_HISTORY_LIMIT),推断成立,无需调整。

Suggestion:

Suggested change
<span className='min-w-0 flex-1 truncate text-[11px] text-d-text'>
{record.paid_at.slice(5)}
{record.note ? ' · ' + record.note : ''}
</span>
<span className='min-w-0 flex-1 truncate text-[11px] text-d-text'>
{format(new Date(record.paid_at), 'MM-dd')}
{record.note ? ' · ' + record.note : ''}
</span>

Comment on lines +70 to +73

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bug · medium
paid_at 在服务端以「YYYY-MM-DD」纯日期字符串落库(payables.server.ts 中 INSERT 写入 ${y}-${m}-${d})。new Date('YYYY-MM-DD') 按 ECMAScript 规范会被解析为 UTC 零点,在 UTC 负偏移时区(如美东)本地日期会退回前一天,format(..., 'MM-dd') 展示的还款日期将差一天。同文件细节行对同类纯日期值已有安全的处理约定(p.due_date.slice(5) 字符串切片,不受时区影响),此处建议保持一致;改为 record.paid_at.slice(5, 10) 对未来变成完整 ISO 时间戳也兼容。注意:改后顶部的 import { format } from 'date-fns' 将不再被使用,应一并移除。

Suggestion:

Suggested change
<span className='min-w-0 flex-1 truncate text-[11px] text-d-text'>
{format(new Date(record.paid_at), 'MM-dd')}
{record.note ? ' · ' + record.note : ''}
</span>
<span className='min-w-0 flex-1 truncate text-[11px] text-d-text'>
{record.paid_at.slice(5, 10)}
{record.note ? ' · ' + record.note : ''}
</span>

<span className='shrink-0 text-[11px] font-semibold text-d-text'>
{currencySymbol(currency)}
{Number(record.amount).toLocaleString()}
</span>
</li>
))}
</ul>
)
}

/**
* 单条固定支出卡。从 PayableList 拆出:账单页现在把固定支出混进主列表统一排序。
*
Expand All @@ -26,7 +92,17 @@ export interface PayableRowProps {
* 滚动模型(服务端 resolveDisplayPeriod)保证任一时刻卡片只呈现一期:
* 「已登记」只可能出现在待出账态,待还款态一定是可登记付款的未付期。
*/
export function PayableRow({ payable: p, holderName, onEdit, onPay }: PayableRowProps) {
export function PayableRow({
payable: p,
holderName,
payments,
historyError,
historyLoading = false,
historyOpen = false,
onToggleHistory,
onEdit,
onPay,
}: PayableRowProps) {
const [copiedAccount, setCopiedAccount] = useState(false)
const paid = p.status === 'paid'
const overdue = p.status === 'overdue'
Expand Down Expand Up @@ -162,6 +238,22 @@ export function PayableRow({ payable: p, holderName, onEdit, onPay }: PayableRow
<ClockIcon size={14} />
{detail}
</div>

{onToggleHistory && (
<div className='mt-2.5 border-t border-d-border pt-2'>
<button
type='button'
aria-expanded={historyOpen}
onClick={e => { e.stopPropagation(); onToggleHistory() }}
className='flex w-full items-center justify-between text-[11px] font-semibold text-d-muted'
>
Comment on lines +244 to +249

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

style · low
历史还款的展开/收起按钮缺少 aria-expanded 状态标注。同功能域内 BillCard 的「历史账单明细」折叠按钮(components/obsidian/BillsView.tsx)已设置 aria-expanded={historyOpen},此处新按钮只靠文案「展开/收起」传达状态,读屏用户无法感知该可折叠区块的当前状态。建议对齐补上 aria-expanded。

Suggestion:

Suggested change
<button
type='button'
onClick={e => { e.stopPropagation(); onToggleHistory?.() }}
className='flex w-full items-center justify-between text-[11px] font-semibold text-d-muted'
>
<button
type='button'
aria-expanded={historyOpen}
onClick={e => { e.stopPropagation(); onToggleHistory?.() }}
className='flex w-full items-center justify-between text-[11px] font-semibold text-d-muted'
>

<span>{historyLabel(payments)}</span>
<span className='text-d-accent-light'>{historyOpen ? '收起' : '展开'}</span>
</button>
{historyOpen &&
renderPayableHistory(payments, historyError, historyLoading, p.currency)}
</div>
)}
</div>
)
}
Expand Down
28 changes: 22 additions & 6 deletions components/obsidian/BillsView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import {
type BillsEntityType,
} from '@/lib/bills-view-model'
import { PayableRow } from '@/components/mobile/PayableList'
import type { PayableWithStatus } from '@/lib/api/payables'
import type { PayableWithStatus, PayablePaymentRecord } from '@/lib/api/payables'
import { currencySymbol } from '@/lib/fx'
import {
AlertIcon,
Expand Down Expand Up @@ -93,6 +93,13 @@ export interface BillsViewProps {
onRetry: () => void
onEmptySync: () => void
payables: PayableWithStatus[]
/** 各固定支出的历史还款记录,key = payable id */
payablePayments: Record<string, PayablePaymentRecord[]>
payableHistoryErrors: Record<string, string>
payableHistoryLoading: Set<string>
/** 已展开历史的 payable id */
expandedPayableIds: Set<string>
onTogglePayableHistory: (id: string) => void
onEditPayable: (p: PayableWithStatus) => void
onPayPayable: (p: PayableWithStatus) => void
cards: CardWithBillsSummary[]
Expand Down Expand Up @@ -276,11 +283,6 @@ function BillCard({
<span className='text-d-muted'> · </span>
下期还款日 <span className='font-bold'>{format(new Date(item.nextDueDate), 'MM-dd')}</span>
</p>
{missingStatement && (
<p className='flex items-center gap-1.5 text-[11px] font-semibold leading-4 text-[color:var(--warning)]'>
已过账单日 {missingStatement} 日,未接收到新的账单,请检查
</p>
)}
{isCleared || sortMode === 'max_interest_free' ? (
<p className='flex items-center gap-1.5 text-[11px] font-semibold leading-4 text-d-success-ink'>
今日刷卡免息 {item.graceDays} 天
Expand Down Expand Up @@ -373,6 +375,13 @@ function BillCard({
)}
</div>
)}

{/* 缺账单提醒放在卡片最末:先看账单数据,再看采集异常 */}
{missingStatement && (
<p className='mt-3 flex items-center gap-1.5 rounded-[10px] bg-d-subtle p-2.5 text-[11px] font-semibold leading-4 text-[color:var(--warning)]'>
已过账单日 {missingStatement} 日,未接收到新的账单,请检查
</p>
)}
</div>
)
}
Expand All @@ -386,6 +395,8 @@ export function BillsView(vm: BillsViewProps) {
selectedTag, onSelectedTag, holderTags, bankTags,
loading, loadError, onRetry, onEmptySync, payables, cards, allCards, holderMap,
bankGroups, onOpenPayment, onManualAmount, onAddBill, sortMode, onSortMode,
payablePayments, payableHistoryErrors, payableHistoryLoading,
expandedPayableIds, onTogglePayableHistory,
onEditPayable, onPayPayable,
} = vm

Expand Down Expand Up @@ -444,6 +455,11 @@ export function BillsView(vm: BillsViewProps) {
key={`payable-${p.id}`}
payable={p}
holderName={p.holder_id ? holderMap[p.holder_id] : undefined}
payments={payablePayments[p.id]}
historyError={payableHistoryErrors[p.id]}
historyLoading={payableHistoryLoading.has(p.id)}
historyOpen={expandedPayableIds.has(p.id)}
onToggleHistory={() => onTogglePayableHistory(p.id)}

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

performance · low
每行以内联箭头函数包装 onTogglePayableHistory,且 PayableRow 未做 memo:页面任一状态变化(含历史缓存、加载态更新)都会为所有固定支出行重建回调并触发整列表重渲染。当前数据规模影响有限,属可选优化:可用 React.memo 包裹 PayableRow 并稳定回调引用后再启用。

Suggestion:

Suggested change
onToggleHistory={() => onTogglePayableHistory(p.id)}
onToggleHistory={() => onTogglePayableHistory(p.id)}
{/* 可选优化:PayableRow 以 React.memo 包裹并稳定回调引用,避免整列表重渲染 */}

onEdit={onEditPayable}
onPay={onPayPayable}
/>
Expand Down
Loading
Loading