Pārlūkot izejas kodu

fix: null指引起的错误

chenhao 2 gadi atpakaļ
vecāks
revīzija
d504ffe443

+ 1 - 1
src/components/element/BaseForm.vue

@@ -118,7 +118,7 @@ interface BaseEpForm extends BaseFormProp {
   transition?: boolean
 }
 
-type RequiredGroup = Required<Required<BaseEpForm>['groups'][0]>
+type RequiredGroup = Required<ExtractArrayValue<Required<BaseEpForm>['groups']>>
 
 type FormatterFormItem = AssignKeys<Required<BaseEpForm>['items'][0], { colIndex: number; colKey: string | number }>
 

+ 17 - 15
src/modules/admin-subject/edit-main-question/index.vue

@@ -82,26 +82,28 @@ const rules = computed<EpFormRules>(() => {
     remarkType: [{ required: true, message: '请选择回评设置' }],
     remarkNumber: [{ required: true, message: '请输入回评设置' }],
     startNumber: [{ required: true, message: '请输入小题起始号' }],
-    systemRate: [{ required: !!model.levelRange.length, message: '请设置系统抽查比例' }],
+    systemRate: [{ required: !!model.levelRange?.length, message: '请设置系统抽查比例' }],
   }
 })
 
 const expand = ref<boolean>(false)
 
-const groups = computed<FormGroup[]>(() => [
-  {
-    rowKeys: Array.from({ length: 10 }).map((_, i) => `row-${i + 1}`),
-  },
-  {
-    rowKeys: ['row-11', 'row-12'],
-    groupTitle: '高级设置',
-    hidden: !expand.value,
-  },
-  {
-    rowKeys: ['expand'],
-    hidden: expand.value,
-  },
-])
+const groups = computed<FormGroup[]>(() => {
+  return [
+    {
+      rowKeys: Array.from({ length: 10 }).map((_, i) => `row-${i + 1}`),
+    },
+    {
+      rowKeys: ['row-11', 'row-12'],
+      groupTitle: '高级设置',
+      hidden: !expand.value,
+    },
+    {
+      rowKeys: ['expand'],
+      hidden: expand.value,
+    },
+  ]
+})
 
 const Span6 = defineColumn(_, _, { span: 6 })