|
@@ -25,8 +25,10 @@ export const useProvidePaperQuestionCondition = function (exactMode, handMode) {
|
|
|
// question cart
|
|
// question cart
|
|
|
const cart = ref([])
|
|
const cart = ref([])
|
|
|
const currentSubject = computed(() => {
|
|
const currentSubject = computed(() => {
|
|
|
|
|
+ // 如果组卷条件里没有科目，试题篮就不设当前科目，即可以随意加题
|
|
|
if (!conditionArgs.value.subjectId) return null
|
|
if (!conditionArgs.value.subjectId) return null
|
|
|
if (!cart.value.length) return null
|
|
if (!cart.value.length) return null
|
|
|
|
|
+ // 否则，试题篮里不能跨科目加题
|
|
|
const demoId = cart.value[0].subjectId
|
|
const demoId = cart.value[0].subjectId
|
|
|
return conditionData.value.subjectList.find(s => s.subjectId == demoId)
|
|
return conditionData.value.subjectList.find(s => s.subjectId == demoId)
|
|
|
})
|
|
})
|
