From 188a4f50b381b74b1026f22a72395d75953fd766 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E5=86=A0=E5=AD=A6?= <1109935898@qq.com> Date: Thu, 23 May 2024 18:24:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E7=AD=94=EF=BC=8C=E7=9F=A9=E9=98=B5?= =?UTF-8?q?=E9=A2=98=E5=8D=95=E9=80=89=E3=80=81=E5=A4=9A=E9=80=89=EF=BC=8C?= =?UTF-8?q?=E9=80=89=E9=A1=B9=E9=9A=8F=E6=9C=BA=20bug=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Answer/questions/QMatrix/MatrixCheck.vue | 15 ++++++++++++--- .../Answer/questions/QMatrix/MatrixRadio.vue | 15 ++++++++++++--- 2 files changed, 24 insertions(+), 6 deletions(-) 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 + )); } // 排序(其他项,排他项不参与随机)