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

fix: 修复物模型-规则无法回显

This commit is contained in:
XieYongHong 2023-07-17 11:39:15 +08:00
parent d3149e7ca7
commit e738908b0e
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.sh
View File

@ -1,3 +1,3 @@
#!/usr/bin/env bash
docker build -t registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:2.1.0-TEST .
docker push registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:2.1.0-TEST
docker build -t registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:2.1.0-SNAPSHOT .
docker push registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:2.1.0-SNAPSHOT

14
src/views/device/components/Metadata/Base/components/VirtualRule/index.vue
View File

@ -252,6 +252,13 @@ const options = computed(() => {
return (dataSource?.value || []).filter((item: any) => item?.id !== props.value?.id);
});
const setInitVirtualRule = () => {
formData.virtualRule = {
triggerProperties: props.value?.expands?.virtualRule?.triggerProperties || ['*'],
rule: props.value?.expands?.virtualRule?.rule || initData.rule
}
}
const handleSearch = async () => {
let resp: any = undefined;
try {
@ -272,12 +279,11 @@ const handleSearch = async () => {
triggerProperties: resp.result.triggerProperties,
rule: resp.result.rule,
}
} else {
setInitVirtualRule()
}
} catch (err) {
formData.virtualRule = {
triggerProperties: props.value?.expands?.virtualRule?.triggerProperties || ['*'],
rule: props.value?.expands?.virtualRule?.rule || initData.rule
}
setInitVirtualRule()
}
};

2
src/views/device/components/Metadata/Cat/index.vue
View File

@ -132,7 +132,7 @@ const routeChange = async (id: string) => {
// )
const hideVirtualRule = (metadata: string) => {
const _metadata = JSON.parse(metadata)
const _metadata = JSON.parse(metadata || '{}')
if (_metadata.properties) {
_metadata.properties = _metadata.properties.map((item: any) => {
if (item.expands.virtualRule) {