diff --git a/src/views/DataCollect/Collector/Tree/Save/index.vue b/src/views/DataCollect/Collector/Tree/Save/index.vue
index 33403240..9f05d88c 100644
--- a/src/views/DataCollect/Collector/Tree/Save/index.vue
+++ b/src/views/DataCollect/Collector/Tree/Save/index.vue
@@ -133,13 +133,13 @@
(false);
const modalForm = reactive({
host: '0.0.0.0',
});
-
+const regDomain = new RegExp(
+ // /^https?:\/\/(([a-zA-Z0-9_-])+(\.)?)*(:\d+)?(\/((\.)?(\?)?=?&?[a-zA-Z0-9_-](\?)?)*)*$/i,
+ /^[a-zA-Z0-9]+([\-\.]{1}[a-zA-Z0-9]+)*\.[a-zA-Z]{2,}$/
+ )
/**
* 校验官网地址
*/
@@ -153,7 +156,7 @@ const validateUrl = async (_rule: Rule, value: string) => {
if (!value) {
return Promise.reject('请输入公网地址');
} else {
- if (!testIpv4_6(value)) {
+ if (!testIpv4_6(value) && !regDomain.test(value)) {
return Promise.reject('请输入正确的公网地址');
}
return Promise.resolve();
diff --git a/src/views/link/Certificate/Detail/index.vue b/src/views/link/Certificate/Detail/index.vue
index 889a9985..073d7179 100644
--- a/src/views/link/Certificate/Detail/index.vue
+++ b/src/views/link/Certificate/Detail/index.vue
@@ -4,91 +4,56 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
- 客户端
+ 客户端
服务端
-
+
+
+
-
-
-
-
-
+
+
- 保存
+ 保存
@@ -131,8 +96,9 @@ const route = useRoute();
const view = route.query.view as string;
const id = route.params.id as string;
-const useForm = Form.useForm;
+// const useForm = Form.useForm;
+const formRef = ref()
const fileLoading = ref(false);
const loading = ref(false);
@@ -144,49 +110,46 @@ const formData = ref({
key: '',
},
description: '',
- mode:'server',
- authenticationMethod:'single'
+ mode: 'server',
+ authenticationMethod: 'single'
});
-const { resetFields, validate, validateInfos } = useForm(
- formData,
- reactive({
- type: [{ required: true, message: '请选择证书标准', trigger: 'blur' }],
- name: [
- { required: true, message: '请输入证书名称', trigger: 'blur' },
- { max: 64, message: '最多可输入64个字符' },
- ],
- 'configs.cert': [
- { required: true, message: '请输入或上传文件', trigger: 'blur' },
- ],
- 'configs.key': [
- { required: true, message: '请输入或上传文件', trigger: 'blur' },
- ],
- description: [{ max: 200, message: '最多可输入200个字符' }],
- mode:[{ required: true, message: '请选择证书类型', trigger: 'blur' }],
- authenticationMethod:[{ required: true, message: '请选择认证方式', trigger: 'blur' }]
- }),
-);
+// const rules = {
+// type: [{ required: true, message: '请选择证书标准', trigger: 'blur' }],
+// name: [
+// { required: true, message: '请输入证书名称', trigger: 'blur' },
+// { max: 64, message: '最多可输入64个字符' },
+// ],
+// 'configs.cert': [
+// { required: true, message: '请输入或上传文件', trigger: 'blur' },
+// ],
+// 'configs.key': [
+// { required: true, message: '请输入或上传文件', trigger: 'blur' },
+// ],
+// description: [{ max: 200, message: '最多可输入200个字符' }],
+// mode:[{ required: true, message: '请选择证书类型', trigger: 'blur' }],
+// authenticationMethod:[{ required: true, message: '请选择认证方式', trigger: 'blur' }]
+// );
const onSubmit = () => {
- validate()
+ formRef.value.validate()
.then(async (res) => {
- let params:any = toRaw(formData.value);
- if(formData.value.mode === 'client'){
- if(formData.value.authenticationMethod === 'binomial'){
+ let params: any = toRaw(formData.value);
+ if (formData.value.mode === 'client') {
+ if (formData.value.authenticationMethod === 'binomial') {
params.configs.trust = params.configs.cert
- }else{
+ } else {
params.configs = {
- key:formData.value.configs.key,
- trust:formData.value.configs.cert
+ // key:formData.value.configs.key,
+ trust: formData.value.configs.cert
}
}
}
loading.value = true;
const response =
id === ':id'
- ? await save(params).catch(() => {})
- : await update({ ...params, id }).catch(() => {});
+ ? await save(params).catch(() => { })
+ : await update({ ...params, id }).catch(() => { });
if (response?.status === 200) {
onlyMessage('操作成功', 'success');
router.push('/iot/link/certificate');
@@ -217,9 +180,9 @@ const detail = async (id: string) => {
const type = result.type.value as TypeObjType;
formData.value = {
...result,
- configs:{
- key:result.configs.key,
- cert:result.configs?.cert ? result.configs?.cert : result.configs?.trust
+ configs: {
+ key: result.configs.key,
+ cert: result.configs?.cert ? result.configs?.cert : result.configs?.trust
},
mode: result.mode.value,
authenticationMethod: result.authenticationMethod.value,
@@ -239,6 +202,7 @@ detail(id);
width: 148px;
height: 80px;
padding: 0;
+
img {
width: 100%;
height: 100%;