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:
wangshuaiswim 2023-03-31 17:57:18 +08:00
parent 09e56c4d0c 7f0625fbca
commit 767501ec11
4 changed files with 10 additions and 5 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 class="card-item-content-text">
型号 型号
</div> </div>
<div>{{ slotProps.model }}</div> <Ellipsis>{{ slotProps.model }}</Ellipsis>
</j-col> </j-col>
<j-col :span="12"> <j-col :span="12">
<div class="card-item-content-text"> <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) formData.value.variableDefinitions.some((s: any) => !s.name)
) )
return; return;
// 邮件没有配置字段 if (formData.value.type === 'email') {
if (formData.value.type === 'email') delete formData.value.configId; formData.value.template.text = formData.value.template.message;
// 邮件没有配置字段
delete formData.value.configId;
}
if (formData.value.template.messageType === 'markdown') if (formData.value.template.messageType === 'markdown')
delete formData.value.template.link; delete formData.value.template.link;
if (formData.value.template.messageType === '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) => { export const isActionChange = (_metadata: any, _message: any) => {
console.log(_metadata, _message)
const _properties = _metadata?.properties || []; const _properties = _metadata?.properties || [];
const _functions = _metadata?.functions || []; const _functions = _metadata?.functions || [];
if ( if (
@ -144,7 +145,7 @@ export const isActionChange = (_metadata: any, _message: any) => {
} else if (_message?.messageType === 'WRITE_PROPERTY') { } else if (_message?.messageType === 'WRITE_PROPERTY') {
const _data = Object.keys(_message?.properties)?.[0] const _data = Object.keys(_message?.properties)?.[0]
if (_data) { if (_data) {
const _item = _functions.find((i: any) => i.id === _data); const _item = _properties.find((i: any) => i.id === _data);
return _item?.id; return _item?.id;
} }
return false; return false;

3
src/views/system/Menu/components/PermissChoose.vue
View File

@ -131,7 +131,6 @@ const permission = reactive({
const newProp = props.value.filter( const newProp = props.value.filter(
(item) => item.permission !== row.id, (item) => item.permission !== row.id,
); );
if (newValue.length === row.options.length) { if (newValue.length === row.options.length) {
row.checkAll = true; row.checkAll = true;
row.indeterminate = false; row.indeterminate = false;
@ -146,6 +145,8 @@ const permission = reactive({
permission: row.id, permission: row.id,
actions: newValue, actions: newValue,
}); });
}else{
row.indeterminate = false
} }
emits('update:value', newProp); emits('update:value', newProp);