Accept Merge Request #21613: (bugfix/20240523 -> master)

Merge Request: 作答,矩阵题单选、多选,选项随机 bug;

Created By: @郝震-深圳维码
Accepted By: @郝震-深圳维码
URL: https://yldc.coding.yili.com/p/ylst/d/ylst-survey-web/git/merge/21613?initial=true
This commit is contained in:
郝震-深圳维码
2024-05-24 09:54:32 +08:00
committed by Coding
2 changed files with 24 additions and 6 deletions

View File

@@ -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
));
}
// 排序(其他项,排他项不参与随机)

View File

@@ -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
));
}
// 排序(其他项,排他项不参与随机)