Merge pull request #2989 from emqx/dev/1.10.1

Sync code from refs/heads/dev/1.10.1 to enterprise
emqx · Sep 29, 2024 · f8f9893 · f8f9893
2 parents 068ed3b + f7f4ea6
commit f8f9893
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/src/components/OverflowTooltip.vue b/src/components/OverflowTooltip.vue
@@ -66,7 +66,7 @@ const detectContentOverflow = (ele: HTMLElement) => {
   if (
     isGreaterThan(rangeWidth + horizontalPadding, cellChildWidth) ||
     isGreaterThan(rangeHeight + verticalPadding, cellChildHeight) ||
-    isGreaterThan(ele.scrollWidth, cellChildWidth)
+    isGreaterThan(ele.scrollWidth, cellChildWidth, 1)
   ) {
     return true
   }

diff --git a/src/hooks/Rule/rule/useRuleForm.ts b/src/hooks/Rule/rule/useRuleForm.ts
@@ -16,6 +16,7 @@ export default (): {
     sql: transSQLFormDataToSQL(DEFAULT_SELECT, [from]),
     actions: [],
     description: '',
+    enable: true
   })
 
   const getRuleDataForUpdate = ({

diff --git a/src/types/rule.d.ts b/src/types/rule.d.ts
@@ -45,11 +45,11 @@ export interface BasicRule {
   sql: string
   actions: Array<OutputItem>
   description: string
+  enable: boolean
 }
 
 export interface RuleForm extends BasicRule {
   created_at: string
-  enable: boolean
   from: FromData
 }
 

diff --git a/src/views/RuleEngine/Connector/ConnectorDetail.vue b/src/views/RuleEngine/Connector/ConnectorDetail.vue
@@ -5,7 +5,9 @@
         <template #content>
           <div class="vertical-align-center">
             <img :src="getBridgeIcon(connectorData.type)" />
-            <p class="block-title">{{ connectorName }}</p>
+            <div class="block-title">
+              <CommonOverflowTooltip :content="connectorName" />
+            </div>
             <TargetItemStatus type="connector" :target="connectorData" is-tag />
             <el-tag type="info" class="section-status">
               {{ getTypeStr(connectorData.type) }}
@@ -123,6 +125,7 @@
 
 <script setup lang="ts">
 import { customValidate } from '@/common/tools'
+import CommonOverflowTooltip from '@/components/CommonOverflowTooltip.vue'
 import DetailHeader from '@/components/DetailHeader.vue'
 import useBridgeTypeValue, {
   useBridgeTypeIcon,
@@ -289,5 +292,11 @@ const submit = async () => {
   .form-container {
     width: 75%;
   }
+  .block-title {
+    max-width: 200px;
+  }
+  .el-page-header__content {
+    max-width: 700px;
+  }
 }
 </style>
diff --git a/src/views/RuleEngine/components/RuleForm.vue b/src/views/RuleEngine/components/RuleForm.vue
@@ -188,6 +188,7 @@ const ruleValueDefault = {
   sql: transSQLFormDataToSQL(DEFAULT_SELECT, [DEFAULT_FROM]),
   actions: [],
   description: '',
+  enable: true,
 }
 
 let modelValueCache = ''