flyzto 2 هفته پیش
والد
کامیت
5585ed05e9
1فایلهای تغییر یافته به همراه15 افزوده شده و 1 حذف شده
  1. 15 1
      web/apps/web-antd/src/views/match/data-sync/index.vue

+ 15 - 1
web/apps/web-antd/src/views/match/data-sync/index.vue

@@ -193,6 +193,20 @@ const sortGroupEntries = (entries: Array<[string, SyncClient[]]>) => {
   });
   });
 };
 };
 
 
+const sortClientsByGroupSequence = (items: SyncClient[]) => {
+  return [...items].sort((a, b) => {
+    const sequenceA = getGroupKey(a.groupSequence);
+    const sequenceB = getGroupKey(b.groupSequence);
+    if (sequenceA === '__empty__') {
+      return 1;
+    }
+    if (sequenceB === '__empty__') {
+      return -1;
+    }
+    return sequenceA.localeCompare(sequenceB, 'zh-CN', { numeric: true });
+  });
+};
+
 const groupedClients = computed<SyncClientRow[]>(() => {
 const groupedClients = computed<SyncClientRow[]>(() => {
   const marketGroups = groupByField(clients.value, 'marketType');
   const marketGroups = groupByField(clients.value, 'marketType');
 
 
@@ -206,7 +220,7 @@ const groupedClients = computed<SyncClientRow[]>(() => {
           `market:${marketType}:data:${dataType}:platform:${platform}`,
           `market:${marketType}:data:${dataType}:platform:${platform}`,
           getGroupTitle('platform', platform === '__empty__' ? undefined : platform),
           getGroupTitle('platform', platform === '__empty__' ? undefined : platform),
           platformItems,
           platformItems,
-          platformItems.map(createClientRow),
+          sortClientsByGroupSequence(platformItems).map(createClientRow),
         );
         );
       });
       });