0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: bug#11239

This commit is contained in:
JiangQiming 2023-03-30 17:53:20 +08:00
parent 352bcfe98f
commit fff3922717
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/views/notice/Template/Detail/index.vue
View File

@ -783,6 +783,7 @@ import { LocalStore } from '@/utils/comm';
import { TOKEN_KEY } from '@/utils/variable'; import { TOKEN_KEY } from '@/utils/variable';
import { phoneRegEx } from '@/utils/validate'; import { phoneRegEx } from '@/utils/validate';
import type { Rule } from 'ant-design-vue/es/form'; import type { Rule } from 'ant-design-vue/es/form';
import { cloneDeep } from 'lodash-es';
const router = useRouter(); const router = useRouter();
const route = useRoute(); const route = useRoute();
@ -1005,7 +1006,8 @@ const formRules = ref({
trigger: 'change', trigger: 'change',
validator(_rule: Rule, value: string) { validator(_rule: Rule, value: string) {
if (!value) return Promise.resolve(); if (!value) return Promise.resolve();
if (!phoneRegEx(value)) return Promise.reject('该字段不是有效的手机号'); if (!phoneRegEx(value))
return Promise.reject('该字段不是有效的手机号');
return Promise.resolve(); return Promise.resolve();
}, },
}, },
@ -1032,10 +1034,7 @@ const { resetFields, validate, validateInfos, clearValidate } = useForm(
watch( watch(
() => formData.value.template.markdown?.title, () => formData.value.template.markdown?.title,
(val) => { (val) => {
if (!val) { if (!val) return;
formData.value.variableDefinitions = [];
return;
}
variableReg(); variableReg();
}, },
{ deep: true }, { deep: true },
@ -1044,10 +1043,7 @@ watch(
watch( watch(
() => formData.value.template.link?.title, () => formData.value.template.link?.title,
(val) => { (val) => {
if (!val) { if (!val) return;
formData.value.variableDefinitions = [];
return;
}
variableReg(); variableReg();
}, },
{ deep: true }, { deep: true },
@ -1176,7 +1172,7 @@ const handleMessageTypeChange = () => {
content: formData.value.template.message as string, content: formData.value.template.message as string,
}; };
} }
formData.value.variableDefinitions = []; // formData.value.variableDefinitions = [];
}; };
/** /**
@ -1186,7 +1182,10 @@ const getDetail = async () => {
if (route.params.id !== ':id') { if (route.params.id !== ':id') {
const res = await templateApi.detail(route.params.id as string); const res = await templateApi.detail(route.params.id as string);
// formData.value = res.result; // formData.value = res.result;
Object.assign(formData.value, res.result); // Object.assign(formData.value, res.result);
console.log('res.result: ', res.result);
formData.value = cloneDeep(res.result);
console.log('formData.value: ', formData.value);
} }
}; };
getDetail(); getDetail();