diff --git a/src/components/Metadata/EnumParam/index.vue b/src/components/Metadata/EnumParam/index.vue index 10f63afc..f256f147 100644 --- a/src/components/Metadata/EnumParam/index.vue +++ b/src/components/Metadata/EnumParam/index.vue @@ -5,7 +5,7 @@
- + diff --git a/src/views/device/components/Metadata/Base/Edit/BaseForm.vue b/src/views/device/components/Metadata/Base/Edit/BaseForm.vue index 1d513e24..eb7038ec 100644 --- a/src/views/device/components/Metadata/Base/Edit/BaseForm.vue +++ b/src/views/device/components/Metadata/Base/Edit/BaseForm.vue @@ -31,7 +31,7 @@ diff --git a/src/views/device/components/Metadata/Base/Edit/ValueTypeForm.vue b/src/views/device/components/Metadata/Base/Edit/ValueTypeForm.vue index 05ed7e8f..3c7ae5a5 100644 --- a/src/views/device/components/Metadata/Base/Edit/ValueTypeForm.vue +++ b/src/views/device/components/Metadata/Base/Edit/ValueTypeForm.vue @@ -2,7 +2,7 @@ - @@ -124,7 +124,7 @@ onMounted(() => { } }) -const unit = { +const unit = reactive({ unitOptions: [] as DefaultOptionType[], getUnit: () => { getUnit().then(resp => { @@ -137,7 +137,7 @@ const unit = { unit.unitOptions = _data; }) }, -} +}) unit.getUnit() const _dataTypeList = computed(() => props.isSub ? DataTypeList.filter(item => item.value !== 'array' && item.value !== 'object') : DataTypeList) diff --git a/src/views/device/components/Metadata/Base/Edit/index.vue b/src/views/device/components/Metadata/Base/Edit/index.vue index ff5e08ef..36723e81 100644 --- a/src/views/device/components/Metadata/Base/Edit/index.vue +++ b/src/views/device/components/Metadata/Base/Edit/index.vue @@ -2,7 +2,7 @@ @@ -98,7 +98,7 @@ const save = reactive({ } const _data = updateMetadata(type, [formValue], _detail, updateStore) const result = await asyncUpdateMetadata(props.type, _data) - if (result.status === 200) { + if (result.success) { if ((window as any).onTabSaveSuccess) { if (result) { (window as any).onTabSaveSuccess(result); @@ -113,7 +113,16 @@ const save = reactive({ } // Store.set(SystemConst.REFRESH_METADATA_TABLE, true); if (deploy) { - _deploy(id as string) + const res = await _deploy(id as string) + if (res.success) { + save.resetMetadata(); + message.success({ + key: 'metadata', + content: '操作成功!', + }); + } else { + message.error('操作失败!'); + } // Store.set('product-deploy', deploy); } else { save.resetMetadata(); diff --git a/src/views/device/components/Metadata/Base/Edit/validator.ts b/src/views/device/components/Metadata/Base/Edit/validator.ts index d0ab32fb..557c4cae 100644 --- a/src/views/device/components/Metadata/Base/Edit/validator.ts +++ b/src/views/device/components/Metadata/Base/Edit/validator.ts @@ -17,8 +17,8 @@ export const validateArray = async (_rule: Rule, val: Record) => { return Promise.resolve(); } -export const validateJson = async (_rule: Rule, val: Record[], title = '配置参数') => { - if (!val || val.length === 0) { +export const validateJson = async (_rule: Rule, val: Record[], title = '配置参数', required = true) => { + if (required && (!val || val.length === 0)) { return Promise.reject(new Error(`请输入${title}`)); } for (let item of val) { diff --git a/src/views/device/components/Metadata/Base/index.vue b/src/views/device/components/Metadata/Base/index.vue index cca9dfe4..295ef617 100644 --- a/src/views/device/components/Metadata/Base/index.vue +++ b/src/views/device/components/Metadata/Base/index.vue @@ -39,7 +39,7 @@