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

src/views/media/Device/index.vue

@@ -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">

src/views/notice/Template/Detail/index.vue

@@ -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')

src/views/rule-engine/Scene/Save/util.ts

@@ -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;

src/views/system/Menu/components/PermissChoose.vue

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