feat(north): the group of gewu plugin supports multiple selection

emqx · Aug 16, 2023 · 0cb1274 · 0cb1274
1 parent 6922a2e
commit 0cb1274
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 25 deletions.
diff --git a/src/composables/config/useSubscription.ts b/src/composables/config/useSubscription.ts
@@ -187,30 +187,37 @@ export const useAddSubscription = (props: AddSubscriptionProps) => {
     }
   }
 
+  // MQTT | Gewu
   const batchAddSubscriptions = async () => {
     try {
       const data: SubscriptionsData = {
         app: props.currentNode,
         groups: [],
       }
-      const { driverGroups = {}, topic } = subscriptionForm.value
+
+      const { driverGroups = {}, topic, productKey } = subscriptionForm.value
       const nodeGroups = Object.entries(driverGroups)
       nodeGroups.forEach(([key, value]) => {
         const driver = key
         const groupLen = value.length
         if (groupLen) {
           value.forEach((group) => {
-            const item = {
+            let item: Omit<SubscriptionData, 'app'> = {
               driver,
               group,
-              params: {
-                topic,
-              },
             }
+            if (isMQTTPugin.value) {
+              item = { ...item, params: { topic } }
+            }
+            if (isGewuPugin.value) {
+              item = { ...item, params: { productKey } }
+            }
+
             data.groups.push(item)
           })
         }
       })
+
       await addSubscriptions(data)
       return Promise.resolve()
     } catch (error) {
@@ -224,19 +231,10 @@ export const useAddSubscription = (props: AddSubscriptionProps) => {
       await formCom.value.validate()
       isSubmitting.value = true
 
-      const { driver, group, productKey } = subscriptionForm.value
-      let data: SubscriptionData = { app: props.currentNode, driver, group }
-
-      if (isGewuPugin.value) {
-        data = {
-          ...data,
-          params: {
-            productKey,
-          },
-        }
-      }
+      const { driver, group } = subscriptionForm.value
+      const data: SubscriptionData = { app: props.currentNode, driver, group }
 
-      if (isMQTTPugin.value) {
+      if (isMQTTPugin.value || isGewuPugin.value) {
         await batchAddSubscriptions()
       } else {
         await addSubscription(data)

diff --git a/src/views/config/components/SouthGroupsCheckbox.vue b/src/views/config/components/SouthGroupsCheckbox.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="collapse-all">
     <el-radio-group v-model="isCollapseAll" size="mini" @change="switchCollapseAll">
-      <el-radio-button class="item" label="expand">{{ $t('common.expandAll') }}</el-radio-button>
-      <el-radio-button class="item" label="collapse">{{ $t('common.collapseAll') }}</el-radio-button>
+      <el-radio-button class="item" label="expand" border>{{ $t('common.expandAll') }}</el-radio-button>
+      <el-radio-button class="item" label="collapse" border>{{ $t('common.collapseAll') }}</el-radio-button>
     </el-radio-group>
   </div>
 

diff --git a/src/views/config/northDriver/components/AddSubscriptionDialog.vue b/src/views/config/northDriver/components/AddSubscriptionDialog.vue
@@ -9,7 +9,7 @@
     <el-alert v-if="topicWarning" :title="topicWarning" type="warning" show-icon :closable="false" />
 
     <emqx-form ref="formCom" :model="subscriptionForm" :rules="rules">
-      <section v-if="!isMQTTPugin">
+      <section v-if="!(isMQTTPugin || isGewuPugin)">
         <emqx-form-item prop="driver" :label="$t('config.southDevice')">
           <emqx-select
             v-model="subscriptionForm.driver"
@@ -32,15 +32,19 @@
         <emqx-input v-model="subscriptionForm.topic" />
       </emqx-form-item>
 
-      <!-- mqtt -->
-      <emqx-form-item v-if="isMQTTPugin" prop="driverGroups" :label="$t('config.subscribeSouthDriverData')">
-        <SouthGroupsCheckbox v-model="subscriptionForm.driverGroups" />
-      </emqx-form-item>
-
       <!-- gewu -->
       <emqx-form-item v-if="isGewuPugin" prop="productKey" label="productKey">
         <emqx-input v-model="subscriptionForm.productKey" />
       </emqx-form-item>
+
+      <!-- mqtt | gewu -->
+      <emqx-form-item
+        v-if="isMQTTPugin || isGewuPugin"
+        prop="driverGroups"
+        :label="$t('config.subscribeSouthDriverData')"
+      >
+        <SouthGroupsCheckbox v-model="subscriptionForm.driverGroups" />
+      </emqx-form-item>
     </emqx-form>
 
     <template #footer>