Przeglądaj źródła

feat: 小组列表增加全部选项

chenhao 2 lat temu
rodzic
commit
2c1ae202bf

+ 3 - 1
src/hooks/useOptions.ts

@@ -74,7 +74,7 @@ const useOptions = (types: (keyof DataModel)[], initModel?: DataModel | Ref<Data
   })
 
   const groupList = computed<Group[]>(() => {
-    return mainQuestionInfo.value?.groupNumber
+    const groupList = mainQuestionInfo.value?.groupNumber
       ? Array.from({ length: mainQuestionInfo.value.groupNumber }).map((_, i) => {
           return {
             value: i + 1,
@@ -82,6 +82,8 @@ const useOptions = (types: (keyof DataModel)[], initModel?: DataModel | Ref<Data
           }
         })
       : []
+
+    return groupList?.length ? groupList.concat({ label: '全部', value: void 0 } as unknown as Group) : []
   })
 
   watch(

+ 1 - 1
src/modules/analysis/personnel-statistics/hooks/useStatisticsFilter.ts

@@ -86,7 +86,7 @@ const useStatisticsFilter = () => {
       label: '小组',
       slotType: 'select',
       slot: {
-        options: groupList.value.concat({ label: '全部', value: '' }),
+        options: groupList.value,
         onChange: changeModelValue('group'),
       },
     }),