From dad16bda899d43d628072b4247a9eab9110351b1 Mon Sep 17 00:00:00 2001
From: orangegzx <zuxia.ge@emqx.io>
Date: Wed, 12 Jul 2023 14:57:33 +0800
Subject: [PATCH 1/3] refactor(north): set cursor to pointer when hover table
 row

---
 src/views/config/northDriver/Index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/config/northDriver/Index.vue b/src/views/config/northDriver/Index.vue
index c3ff695e..0d94b774 100644
--- a/src/views/config/northDriver/Index.vue
+++ b/src/views/config/northDriver/Index.vue
@@ -228,7 +228,7 @@ const getNodeValue = (node: DriverItemInList) => {
 
 const rowClassName = (data: { row: DriverItemInList; rowIndex: number }) => {
   const { row: node } = data
-  return isMonitorNode(node.name) ? 'row-disabled' : ''
+  return isMonitorNode(node.name) ? 'row-disabled' : 'table-row-click'
 }
 
 const handleClickOperator = async (command: string, row: DriverItemInList) => {

From 1af5d040400ff7fd0aafa33092e4cf9d288f7048 Mon Sep 17 00:00:00 2001
From: orangegzx <zuxia.ge@emqx.io>
Date: Wed, 12 Jul 2023 15:45:22 +0800
Subject: [PATCH 2/3] fixed(*): triggering validate form when swithing lang

---
 src/views/config/components/DriverDialog.vue     |  5 ++++-
 src/views/config/components/GroupDialog.vue      | 16 +++++++++++-----
 .../southDriver/components/GroupDialog.vue       |  7 +++++--
 .../template/components/TemplateDialog.vue       |  5 ++++-
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/views/config/components/DriverDialog.vue b/src/views/config/components/DriverDialog.vue
index 4fa7ac70..644dcf26 100644
--- a/src/views/config/components/DriverDialog.vue
+++ b/src/views/config/components/DriverDialog.vue
@@ -47,7 +47,7 @@
 
 <script lang="ts" setup>
 import type { PropType } from 'vue'
-import { computed, defineEmits, defineProps, watch } from 'vue'
+import { computed, defineEmits, defineProps, watch, nextTick } from 'vue'
 import { ElDialog } from 'element-plus'
 import useDriverDialog from '@/composables/config/useDriverDialog'
 import type { DriverDirection } from '@/types/enums'
@@ -97,6 +97,9 @@ const showDialog = computed({
 })
 
 watch(showDialog, (val) => {
+  nextTick(() => {
+    formCom.value.form.clearValidate()
+  })
   if (!val) {
     initForm()
   }
diff --git a/src/views/config/components/GroupDialog.vue b/src/views/config/components/GroupDialog.vue
index 8192e856..143e243c 100644
--- a/src/views/config/components/GroupDialog.vue
+++ b/src/views/config/components/GroupDialog.vue
@@ -30,7 +30,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, computed, defineProps, defineEmits } from 'vue'
+import { ref, computed, defineProps, defineEmits, nextTick, watch } from 'vue'
 import type { PropType } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { ElDialog } from 'element-plus'
@@ -122,14 +122,20 @@ const initForm = () => {
 const showDialog = computed({
   get: () => props.dialogVisible,
   set: (val: boolean) => {
-    if (!val) {
-      resetFields()
-      initForm()
-    }
     emit('update:dialogVisible', val)
   },
 })
 
+watch(showDialog, async (val) => {
+  nextTick(() => {
+    formRef.value.form.clearValidate()
+  })
+  if (!val) {
+    resetFields()
+    initForm()
+  }
+})
+
 const submit = async () => {
   await formRef.value.validate()
   emit('submitted')
diff --git a/src/views/config/southDriver/components/GroupDialog.vue b/src/views/config/southDriver/components/GroupDialog.vue
index d9c92fb6..67092230 100644
--- a/src/views/config/southDriver/components/GroupDialog.vue
+++ b/src/views/config/southDriver/components/GroupDialog.vue
@@ -8,7 +8,7 @@
   >
     <emqx-form ref="formCom" :model="groupForm" :rules="groupFormRules">
       <emqx-form-item prop="group" :label="$t('config.groupName')" required>
-        <emqx-input v-model.trim="groupForm.group" :disabled="group" />
+        <emqx-input v-model.trim="groupForm.group" :disabled="!!group" />
       </emqx-form-item>
       <emqx-form-item prop="interval" :label="$t('config.interval')" required>
         <emqx-input v-model.number="groupForm.interval" :disabled="group && !isEdit">
@@ -38,7 +38,7 @@
 
 <script lang="ts" setup>
 import type { PropType } from 'vue'
-import { computed, defineProps, defineEmits, watch } from 'vue'
+import { computed, defineProps, defineEmits, watch, nextTick } from 'vue'
 import { ElDialog } from 'element-plus'
 import useAddGroup from '@/composables/config/useAddGroup'
 import type { GroupForm } from '@/types/config'
@@ -78,6 +78,9 @@ const confirmBtnText = computed(() => {
 })
 
 watch(showDialog, async (val) => {
+  nextTick(() => {
+    formCom.value.form.clearValidate()
+  })
   if (!val) {
     resetFields()
     initForm()
diff --git a/src/views/config/template/components/TemplateDialog.vue b/src/views/config/template/components/TemplateDialog.vue
index 48d1e683..3c643a4c 100644
--- a/src/views/config/template/components/TemplateDialog.vue
+++ b/src/views/config/template/components/TemplateDialog.vue
@@ -27,7 +27,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, defineProps, defineEmits, watch } from 'vue'
+import { computed, defineProps, defineEmits, watch, nextTick } from 'vue'
 import type { PropType } from 'vue'
 import { ElDialog } from 'element-plus'
 import useTemplateDialog from '@/composables/config/useTemplateDialog'
@@ -66,6 +66,9 @@ const showDialog = computed({
 })
 
 watch(showDialog, (val) => {
+  nextTick(() => {
+    formRef.value.form.clearValidate()
+  })
   if (!val) {
     initForm()
     emit('cancel')

From 797259a8da8f8d65753a3652fb87d44db15ae5cc Mon Sep 17 00:00:00 2001
From: orangegzx <zuxia.ge@emqx.io>
Date: Wed, 12 Jul 2023 16:03:45 +0800
Subject: [PATCH 3/3] fixed(north, south): connections status i18n warning

---
 src/composables/config/useDriver.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/composables/config/useDriver.ts b/src/composables/config/useDriver.ts
index 7a47bce8..7295ea82 100644
--- a/src/composables/config/useDriver.ts
+++ b/src/composables/config/useDriver.ts
@@ -14,9 +14,11 @@ import { statusIconClassMap, statusTextMap, connectionStatusTextMap } from '@/ut
 export const useDriverStatus = (props: { data: DriverItemInList }) => {
   const { t } = useI18n()
 
-  const statusIcon = computed(() => statusIconClassMap[props.data.running])
-  const statusText = computed(() => t(`${statusTextMap[props.data.running]}`) || '-')
-  const connectionStatusText = computed(() => t(`${connectionStatusTextMap[props.data.link]}`))
+  const statusIcon = computed(() => (props.data?.running ? statusIconClassMap[props.data.running] : ''))
+  const statusText = computed(() => (props.data?.running ? t(`${statusTextMap[props.data.running]}`) || '-' : ''))
+  const connectionStatusText = computed(() =>
+    Number(props.data?.link) >= 0 ? t(`${connectionStatusTextMap[props.data.link]}`) : '',
+  )
 
   return {
     statusIconClassMap,