diff --git a/src/views/Answer/questions/QMatrix/MatrixCheck.vue b/src/views/Answer/questions/QMatrix/MatrixCheck.vue index 11b26459..8ea1032e 100644 --- a/src/views/Answer/questions/QMatrix/MatrixCheck.vue +++ b/src/views/Answer/questions/QMatrix/MatrixCheck.vue @@ -315,12 +315,21 @@ export default defineComponent({ if(index === -1) return; group.options.push(copyOptions.splice(index, 1)[0]); }); - group.options = sortOptions(group.options, props.question.config.select_random && props.question.config.option_group_random_inside); + group.options = sortOptions(group.options, props.question.config.select_random && props.question.config.option_group_random_inside && ( + optionGroupsKey === 'row_option_groups' && props.question.config.row_random || + optionGroupsKey === 'cell_option_groups' && props.question.config.cell_random + )); optionGroups.value.push(group); }); - optionGroups.value = sortOptions(optionGroups.value, props.question.config.select_random && props.question.config.option_group_random_outside); + optionGroups.value = sortOptions(optionGroups.value, props.question.config.select_random && props.question.config.option_group_random_outside && ( + optionGroupsKey === 'row_option_groups' && props.question.config.row_random || + optionGroupsKey === 'cell_option_groups' && props.question.config.cell_random + )); const group = optionGroups.value.find((group) => !group.title); - group.options = sortOptions(copyOptions, props.question.config.select_random); + group.options = sortOptions(copyOptions, props.question.config.select_random && ( + optionGroupsKey === 'row_option_groups' && props.question.config.row_random || + optionGroupsKey === 'cell_option_groups' && props.question.config.cell_random + )); } // 排序(其他项,排他项不参与随机) diff --git a/src/views/Answer/questions/QMatrix/MatrixRadio.vue b/src/views/Answer/questions/QMatrix/MatrixRadio.vue index a7fd70da..638d4e3d 100644 --- a/src/views/Answer/questions/QMatrix/MatrixRadio.vue +++ b/src/views/Answer/questions/QMatrix/MatrixRadio.vue @@ -346,12 +346,21 @@ export default defineComponent({ if(index === -1) return; group.options.push(copyOptions.splice(index, 1)[0]); }); - group.options = sortOptions(group.options, props.question.config.select_random && props.question.config.option_group_random_inside); + group.options = sortOptions(group.options, props.question.config.select_random && props.question.config.option_group_random_inside && ( + optionGroupsKey === 'row_option_groups' && props.question.config.row_random || + optionGroupsKey === 'cell_option_groups' && props.question.config.cell_random + )); optionGroups.value.push(group); }); - optionGroups.value = sortOptions(optionGroups.value, props.question.config.select_random && props.question.config.option_group_random_outside); + optionGroups.value = sortOptions(optionGroups.value, props.question.config.select_random && props.question.config.option_group_random_outside && ( + optionGroupsKey === 'row_option_groups' && props.question.config.row_random || + optionGroupsKey === 'cell_option_groups' && props.question.config.cell_random + )); const group = optionGroups.value.find((group) => !group.title); - group.options = sortOptions(copyOptions, props.question.config.select_random); + group.options = sortOptions(copyOptions, props.question.config.select_random && ( + optionGroupsKey === 'row_option_groups' && props.question.config.row_random || + optionGroupsKey === 'cell_option_groups' && props.question.config.cell_random + )); } // 排序(其他项,排他项不参与随机)