Merge remote-tracking branch 'origin/feature/feature-20250331-h5' into feature/feature-20250331-h5

# Conflicts:
#	src/views/Design/components/Questions/MatrixCheckbox.vue
#	src/views/Survey/views/Preview/components/questions/PreviewNPS.vue
#	src/views/Survey/views/Preview/components/questions/PreviewRate.vue
This commit is contained in:
陈昱达
2025-03-23 17:57:06 +08:00
22 changed files with 73 additions and 160 deletions

View File

@@ -28,7 +28,7 @@ const rows = defineModel<_questionOptionType[]>('rows', { required: false, defau
// 列标签
const cols = defineModel<_questionOptionType[]>('cols', { required: false, default: () => [] });
// 题的序号
const index = defineModel<number>('index', { required: false, default: 0 });
const index = defineModel<number|string>('index', { required: false, default: 0 });
// 是否是编辑状态
const active = defineModel<boolean>('active', { required: false, default: false });