Merge pull request #2662 from emqx/dev/1.9.0

Sync code from refs/heads/dev/1.9.0 to enterprise
emqx · May 15, 2024 · 639c09e · 639c09e
2 parents f6fc86e + 7e26d24
commit 639c09e
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 12 deletions.
diff --git a/src/style/schemaForm.scss b/src/style/schemaForm.scss
@@ -143,7 +143,7 @@
       }
     }
     .el-table {
-      width: 50%;
+      width: 70%;
     }
   }
 }

diff --git a/src/views/RuleEngine/components/FromSelect.vue b/src/views/RuleEngine/components/FromSelect.vue
@@ -37,7 +37,7 @@
         </div>
       </el-option>
     </el-option-group>
-    <el-option-group
+    <!-- <el-option-group
       v-if="bridgeOptions && bridgeOptions.length"
       :key="tl('action')"
       :label="tl('action')"
@@ -54,7 +54,7 @@
           <span class="item-id">{{ item.idForRuleFrom }}</span>
         </div>
       </el-option>
-    </el-option-group>
+    </el-option-group> -->
   </el-select>
 </template>
 

diff --git a/src/views/RuleEngine/components/MockDataDrawer.vue b/src/views/RuleEngine/components/MockDataDrawer.vue
@@ -11,15 +11,21 @@
         {{ tl('dataSource') }}
         <InfoTooltip :content="tl('dataSourceDesc')" />
       </label>
-      <p v-if="isDataTypeNoMatchSQL" class="no-match-tip">
-        {{ tl('dataTypeSQLNoMatch') }}
-      </p>
-      <FromSelect
-        v-model="dataType"
-        :ingress-bridge-list="ingressBridgeList"
-        :event-list="eventList"
-        for-test
-      />
+      <el-row :gutter="26">
+        <el-col :span="12">
+          <FromSelect
+            v-model="dataType"
+            :ingress-bridge-list="ingressBridgeList"
+            :event-list="eventList"
+            for-test
+          />
+        </el-col>
+        <el-col :span="12" v-if="isDataTypeNoMatchSQL">
+          <p class="no-match-tip">
+            {{ tl('dataTypeSQLNoMatch') }}
+          </p>
+        </el-col>
+      </el-row>
     </div>
     <div>
       <label class="test-label">
@@ -111,5 +117,13 @@ const submit = () => {
   .test-sql-context-form {
     margin-top: 12px;
   }
+  .test-header {
+    .from-select {
+      width: 100%;
+    }
+    .no-match-tip {
+      position: static;
+    }
+  }
 }
 </style>