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

Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev

This commit is contained in:
leiqiaochu 2023-03-31 17:44:04 +08:00
parent d7198a7ad1 f6f99efe2b
commit 7f0625fbca
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/media/Device/index.vue
View File

@ -66,7 +66,7 @@
<div class="card-item-content-text">
型号
</div>
<div>{{ slotProps.model }}</div>
<Ellipsis>{{ slotProps.model }}</Ellipsis>
</j-col>
<j-col :span="12">
<div class="card-item-content-text">

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

@ -1236,8 +1236,11 @@ const handleSubmit = () => {
formData.value.variableDefinitions.some((s: any) => !s.name)
)
return;
// 邮件没有配置字段
if (formData.value.type === 'email') delete formData.value.configId;
if (formData.value.type === 'email') {
formData.value.template.text = formData.value.template.message;
// 邮件没有配置字段
delete formData.value.configId;
}
if (formData.value.template.messageType === 'markdown')
delete formData.value.template.link;
if (formData.value.template.messageType === 'link')

3
src/views/rule-engine/Scene/Save/util.ts
View File

@ -123,6 +123,7 @@ export const EventEmitter = {
}
export const isActionChange = (_metadata: any, _message: any) => {
console.log(_metadata, _message)
const _properties = _metadata?.properties || [];
const _functions = _metadata?.functions || [];
if (
@ -144,7 +145,7 @@ export const isActionChange = (_metadata: any, _message: any) => {
} else if (_message?.messageType === 'WRITE_PROPERTY') {
const _data = Object.keys(_message?.properties)?.[0]
if (_data) {
const _item = _functions.find((i: any) => i.id === _data);
const _item = _properties.find((i: any) => i.id === _data);
return _item?.id;
}
return false;