diff --git a/src/views/Survey/hooks/useSurveyData.ts b/src/views/Survey/hooks/useSurveyData.ts index 002770d..4f0cc6b 100644 --- a/src/views/Survey/hooks/useSurveyData.ts +++ b/src/views/Survey/hooks/useSurveyData.ts @@ -81,7 +81,7 @@ async function saveTemplate(item: SurveyItem) { if (!(await validateSurvey(data))) { showDialog({ title: '无法保存模板', - message: '问卷内包含移动端暂未兼容题型,请至PC端编辑后重新保存。' + message: '问卷内包含移动端暂未兼容题型/逻辑设置,请至PC端编辑后重新保存。' }); return; } @@ -98,19 +98,29 @@ async function saveTemplate(item: SurveyItem) { function clearSurveys() { survey.value = []; } + /** * 校验问卷是否可以保存为模板 * @param data */ async function validateSurvey(survey: SurveyItem): Promise { const { data } = await getQuestionList(survey.sn); - const questions = data.data.questions; - return questions.every((question: any) => { + const { questions, logics } = data.data; + const questionValid = questions.every((question: any) => { if (!questionTypeMap.has(question.question_type)) { return false; } return true; }); + // 2 自动填写, 3 是逻辑配额 + const logicValid = logics.every((logic: any) => { + if (![2].includes(logic.skip_type)) { + return false; + } + }); + console.log(questionValid, logicValid); + + return questionValid && logicValid; } export {