优化

src/modules/overseas-warehouse/useDispatchCandidates.ts

@@ -6,17 +6,18 @@ import { DispatchInputError, assertSelectionGroupVersions, type Candidate, type
 /** One visible server page; selected cargo remains owned by the caller or server draft. */
 export function useDispatchCandidates(error: Ref<ApiErrorDetails | null>, fetchCandidates = listDispatchCandidates) {
   const candidates = ref<Candidate[]>([]), page = ref(1), size = ref(20), total = ref(0), loading = ref(false)
-  let generation = 0, warehouse = ''
+  let generation = 0, warehouse = '', current = false
   let pending: { key: string; promise: Promise<void> } | undefined
   const groupVersions = new Map<string, string>()
   const sourceGroups = new Map<string, { groupKey: string; sourceVersion: string }>()
 
   function reset() {
-    generation++; pending = undefined; warehouse = ''
+    generation++; pending = undefined; warehouse = ''; current = false
     candidates.value = []; page.value = 1; total.value = 0; loading.value = false
     groupVersions.clear(); sourceGroups.clear()
   }
   function assertCurrent(rows: Candidate[]) {
+    if (rows.length && (loading.value || !current)) throw new DispatchInputError('货物候选尚未读取完成，请刷新后重试')
     assertSelectionGroupVersions(rows, candidates.value)
     for (const row of rows) {
       const group = row.selectionGroup
@@ -34,8 +35,9 @@ export function useDispatchCandidates(error: Ref<ApiErrorDetails | null>, fetchC
     const key = JSON.stringify(request)
     if (pending?.key === key) return pending.promise
     const sequence = ++generation
-    // Preserve the last total while loading: zero would make the pager emit page 1.
-    loading.value = true; error.value = null; candidates.value = []
+    // Keep the previous page visible but non-actionable until its replacement is validated.
+    // Preserve the total too: zero would make the pager emit page 1.
+    loading.value = true; current = false; error.value = null
     const promise = (async () => {
       try {
         const result = await fetchCandidates(request)
@@ -46,9 +48,13 @@ export function useDispatchCandidates(error: Ref<ApiErrorDetails | null>, fetchC
           groupVersions.set(row.selectionGroup.groupKey, row.selectionGroup.groupVersion)
           for (const source of row.selectionGroup.sources) sourceGroups.set(source.sourceKey, { groupKey: row.selectionGroup.groupKey, sourceVersion: source.selection.sourceVersion })
         }
+        current = true
         candidates.value = result.candidates; page.value = result.page; size.value = result.size; total.value = result.total
       } catch (cause) {
-        if (sequence === generation) error.value = getApiErrorDetails(cause, cause instanceof DispatchInputError ? cause.message : '货物候选读取失败')
+        if (sequence === generation) {
+          candidates.value = []; current = false
+          error.value = getApiErrorDetails(cause, cause instanceof DispatchInputError ? cause.message : '货物候选读取失败')
+        }
       } finally {
         if (sequence === generation) { loading.value = false; pending = undefined }
       }