fix(worker-platform): 拼单取消后可重入,大厅置顶始终优先
This commit is contained in:
@@ -163,17 +163,63 @@ export function patchWorkerWorkOrderListEnvelope(
|
||||
}
|
||||
}
|
||||
|
||||
/** 无限下拉(大厅):第 1 页允许插入,其余页只做就地更新。 */
|
||||
function readWorkOrderId(item: unknown): number {
|
||||
return isRecord(item) ? toNumber(item.workOrderId) : 0
|
||||
}
|
||||
|
||||
function readPinnedAtMs(item: unknown): number | null {
|
||||
if (!isRecord(item)) return null
|
||||
const pinnedAt = String(item.pinnedAt || '').trim()
|
||||
if (!pinnedAt) return null
|
||||
const parsed = Date.parse(pinnedAt)
|
||||
// 有置顶标记但时间不可解析时仍算置顶,宁可排前面也不能被普通单挤下去。
|
||||
return Number.isFinite(parsed) ? parsed : 0
|
||||
}
|
||||
|
||||
/**
|
||||
* 大厅排序必须与服务端一致:置顶单永远在最前(pinned_at DESC),其余按 id DESC。
|
||||
* 实时事件把新单插入第 1 页后必须重排,否则新单会插到置顶单上面。
|
||||
*/
|
||||
export function sortWorkerHallItems(items: unknown[]): unknown[] {
|
||||
return items.slice().sort((left, right) => {
|
||||
const leftPinnedAt = readPinnedAtMs(left)
|
||||
const rightPinnedAt = readPinnedAtMs(right)
|
||||
if (leftPinnedAt !== null && rightPinnedAt === null) return -1
|
||||
if (leftPinnedAt === null && rightPinnedAt !== null) return 1
|
||||
if (leftPinnedAt !== null && rightPinnedAt !== null && leftPinnedAt !== rightPinnedAt) {
|
||||
return rightPinnedAt - leftPinnedAt
|
||||
}
|
||||
return readWorkOrderId(right) - readWorkOrderId(left)
|
||||
})
|
||||
}
|
||||
|
||||
/** 无限下拉(大厅):第 1 页允许插入,其余页只做就地更新;最终按置顶优先重排。 */
|
||||
export function patchWorkerWorkOrderInfiniteEnvelope(
|
||||
current: unknown,
|
||||
event: WorkerListEvent,
|
||||
insert = false,
|
||||
): unknown {
|
||||
if (!isRecord(current) || !Array.isArray(current.pages)) return current
|
||||
return {
|
||||
...current,
|
||||
pages: current.pages.map((page: unknown, index: number) =>
|
||||
patchWorkerWorkOrderListEnvelope(page, event, insert && index === 0),
|
||||
),
|
||||
const pages = current.pages.map((page: unknown, index: number) =>
|
||||
patchWorkerWorkOrderListEnvelope(page, event, insert && index === 0),
|
||||
)
|
||||
|
||||
const lists: unknown[][] = []
|
||||
for (const page of pages) {
|
||||
if (!isRecord(page) || !isRecord(page.data) || !Array.isArray(page.data.items)) {
|
||||
return { ...current, pages }
|
||||
}
|
||||
lists.push(page.data.items)
|
||||
}
|
||||
|
||||
// 第 2 页之后被置顶的单也要提到第 1 页最前,所以跨页统一排序再按原页长度切回。
|
||||
const sorted = sortWorkerHallItems(lists.flat())
|
||||
let cursor = 0
|
||||
const sortedPages = pages.map((page, index) => {
|
||||
const length = lists[index]?.length || 0
|
||||
const items = sorted.slice(cursor, cursor + length)
|
||||
cursor += length
|
||||
return isRecord(page) && isRecord(page.data) ? { ...page, data: { ...page.data, items } } : page
|
||||
})
|
||||
return { ...current, pages: sortedPages }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user