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

src/views/device/Instance/Detail/ChildDevice/BindChildDevice/index.vue

@@ -27,7 +27,11 @@
                     terms: [
                         {
                             terms: [
-                                { column: 'parentId$isnull', value: '1' },
+                                {
+                                    column: 'parentId$isnull',
+                                    value: '',
+                                    type: 'or',
+                                },
                                 {
                                     column: 'parentId$not',
                                     value: detail.id,
@@ -43,6 +47,7 @@
                                     type: 'and',
                                 },
                             ],
+                            type: 'and',
                         },
                         {
                             terms: [

src/views/device/Product/Save/index.vue

@@ -85,6 +85,7 @@
                         :value="form.deviceType"
                         :options="deviceList"
                         @change="changeDeviceType"
+                        :disabled="disabled"
                     >
                         <template #title="item">
                             <span>{{ item.title }}</span>
@@ -265,13 +266,6 @@ const dealProductTree = (arr: any) => {
         return element
     });
 };
-watch(
-    () => props.isAdd,
-    () => {
-        // queryProductTree();
-    },
-    { immediate: true, deep: true },
-);
 /**
  * 显示弹窗
  */
@@ -318,7 +312,6 @@ const submitData = () => {
     formRef.value
         .validate()
         .then(async () => {
-            console.log(form);
             // 新增
             if (props.isAdd === 1) {
                 if (form.id === '') {

src/views/rule-engine/Alarm/Configuration/index.vue

@@ -42,6 +42,15 @@
                             enabled: 'processing',
                             disabled: 'error',
                         }"
+                        @click="
+                            () => {
+                                menuStory.jumpPage(
+                                    'rule-engine/Alarm/Configuration/Save',
+                                    {},
+                                    { id: slotProps.id },
+                                );
+                            }
+                        "
                     >
                         <template #img>
                             <slot name="img">