From cfab80094e1b31f9f5ce9f485614357b5be2e641 Mon Sep 17 00:00:00 2001 From: JiangQiming <291854119@qq.com> Date: Tue, 14 Mar 2023 16:01:55 +0800 Subject: [PATCH] =?UTF-8?q?update:=20=E7=BB=84=E4=BB=B6=E6=9B=B4=E6=8D=A2?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/notice/Config/Detail/index.vue | 4 --- src/views/notice/Template/Detail/index.vue | 30 +++++----------------- src/views/notice/Template/index.vue | 4 --- 3 files changed, 7 insertions(+), 31 deletions(-) diff --git a/src/views/notice/Config/Detail/index.vue b/src/views/notice/Config/Detail/index.vue index ccd41921..bc7612df 100644 --- a/src/views/notice/Config/Detail/index.vue +++ b/src/views/notice/Config/Detail/index.vue @@ -458,8 +458,6 @@ const getDetail = async () => { const res = await configApi.detail(route.params.id as string); // formData.value = res.result; Object.assign(formData.value, res.result); - // console.log('res.result: ', res.result); - // console.log('formData.value: ', formData.value); }; getDetail(); @@ -537,7 +535,6 @@ const btnLoading = ref(false); const handleSubmit = () => { validate() .then(async () => { - // console.log('formData.value: ', formData.value); btnLoading.value = true; let res; if (!formData.value.id) { @@ -545,7 +542,6 @@ const handleSubmit = () => { } else { res = await configApi.update(formData.value); } - // console.log('res: ', res); if (res?.success) { message.success('保存成功'); router.back(); diff --git a/src/views/notice/Template/Detail/index.vue b/src/views/notice/Template/Detail/index.vue index 734d4c38..f0697501 100644 --- a/src/views/notice/Template/Detail/index.vue +++ b/src/views/notice/Template/Detail/index.vue @@ -1082,7 +1082,7 @@ const spliceStr = () => { variableFieldsStr += formData.value.template.body as string; if (formData.value.provider === 'aliyun') variableFieldsStr += formData.value.template.ttsmessage as string; - // console.log('variableFieldsStr: ', variableFieldsStr); + return variableFieldsStr || ''; }; @@ -1139,7 +1139,6 @@ const handleMessageTypeChange = () => { }; } formData.value.variableDefinitions = []; - // formData.value.template.message = ''; }; /** @@ -1150,7 +1149,6 @@ const getDetail = async () => { const res = await templateApi.detail(route.params.id as string); // formData.value = res.result; Object.assign(formData.value, res.result); - // console.log('formData.value: ', formData.value); } }; getDetail(); @@ -1185,8 +1183,7 @@ const handleTypeChange = () => { const handleProviderChange = () => { formData.value.template = TEMPLATE_FIELD_MAP[formData.value.type][formData.value.provider]; - // console.log('formData.value: ', formData.value); - // console.log('formData.value.template: ', formData.value.template); + getConfigList(); resetPublicFiles(); }; @@ -1254,7 +1251,6 @@ const handleSubmit = () => { delete formData.value.template.link; if (formData.value.template.messageType === 'link') delete formData.value.template.markdown; - // console.log('formData.value: ', formData.value); // 提交必填验证无法通过, 实际已有值, 问题未知, 暂时解决方法: 延迟验证 setTimeout(() => { validate() @@ -1270,13 +1266,11 @@ const handleSubmit = () => { } btnLoading.value = true; - let res; - if (!formData.value.id) { - res = await templateApi.save(formData.value); - } else { - res = await templateApi.update(formData.value); - } - // console.log('res: ', res); + + const res = formData.value.id + ? await templateApi.update(formData.value) + : await templateApi.save(formData.value); + if (res?.success) { message.success('保存成功'); router.back(); @@ -1290,14 +1284,4 @@ const handleSubmit = () => { }); }, 200); }; - -// test -// watch( -// () => formData.value, -// (val) => { -// console.log('formData.value: ', val); -// }, -// { deep: true }, -// ); -// test diff --git a/src/views/notice/Template/index.vue b/src/views/notice/Template/index.vue index 4d7ba5e5..6373ee2d 100644 --- a/src/views/notice/Template/index.vue +++ b/src/views/notice/Template/index.vue @@ -155,12 +155,8 @@