fix: 修改地区、物品类型、物品的排序逻辑

Author: Altermoe

src/hooks/useAreaList.ts

@@ -43,8 +43,12 @@ export const useAreaList = (options: AreaListHookOptions = {}) => {
     onRequest: () => Api.area.listArea({}, { isTraverse: true, parentId: -1 }),
   })
 
-  onSuccess((res) => {
-    areaList.value = res.data ?? []
+  onSuccess(({ data = [] }) => {
+    areaList.value = data.sort(({ sortIndex: ia }, { sortIndex: ib }) => {
+      if (ia === undefined || ib === undefined)
+        return 0
+      return ib - ia
+    })
   })
 
   return { areaList, areaTree, areaMap, selectedArea, updateAreaList: refresh, onSuccess, ...rest }

src/hooks/useItemList.ts

@@ -31,8 +31,12 @@ export const useItemList = (options: ItemListHookOptions = {}) => {
     },
   })
 
-  onSuccess((res) => {
-    itemList.value = (res?.data?.record ?? []).sort((a, b) => Number(a.sortIndex) - Number(b.sortIndex))
+  onSuccess(({ data: { record = [] } = {} }) => {
+    itemList.value = record.sort(({ sortIndex: ia }, { sortIndex: ib }) => {
+      if (ia === undefined || ib === undefined)
+        return 0
+      return ib - ia
+    })
   })
 
   const { pause, resume } = pausableWatch(fetchParams, updateItemList, { deep: true })

src/hooks/useTypeList.ts

@@ -22,7 +22,11 @@ export const useTypeList = (options: FetchHookOptions<API.RPageListVoItemTypeVo>
   })
 
   onSuccess(({ data = [] }) => {
-    typeList.value = data
+    typeList.value = data.sort(({ sortIndex: ia }, { sortIndex: ib }) => {
+      if (ia === undefined || ib === undefined)
+        return 0
+      return ib - ia
+    })
   })
 
   return { typeList, typeTree, updateTypeList, onSuccess, ...rest }