perf: ♻️ Support interruption during waiting for wireless connection

viarotel-org · Nov 8, 2024 · 344b385 · 344b385
1 parent 0f3d869
commit 344b385
Showing 1 changed file with 28 additions and 10 deletions.
diff --git a/src/components/Device/components/WirelessGroup/index.vue b/src/components/Device/components/WirelessGroup/index.vue
@@ -56,15 +56,27 @@
     >
     </el-input>
 
-    <el-button
-      type="primary"
-      :icon="loading ? '' : 'Connection'"
-      :loading="loading"
-      class="flex-none"
-      @click="handleConnect()"
-    >
-      {{ $t('device.wireless.connect.name') }}
-    </el-button>
+    <el-button-group>
+      <el-button
+        type="primary"
+        :icon="loading ? '' : 'Connection'"
+        :loading="loading"
+        class="flex-none"
+        @click="handleConnect()"
+      >
+        {{ $t('device.wireless.connect.name') }}
+      </el-button>
+
+      <el-button
+        v-if="loading"
+        type="default"
+        plain
+        class="flex-none"
+        @click="handleUnConnect()"
+      >
+        {{ $t('common.cancel') }}
+      </el-button>
+    </el-button-group>
 
     <PairDialog ref="pairDialog" @success="onPairSuccess" />
   </div>
@@ -209,6 +221,10 @@ export default {
       this.$message.warning(this.$t('device.wireless.connect.batch.error'))
     },
 
+    handleUnConnect() {
+      this.loading = false
+    },
+
     async handleConnect(params = this.formData) {
       if (!params.host) {
         this.$message.warning(
@@ -227,7 +243,9 @@ export default {
         this.handleSave(params)
       }
       catch (error) {
-        this.handleError(error?.message || error?.cause?.message || error)
+        if (this.loading) {
+          this.handleError(error?.message || error?.cause?.message || error)
+        }
       }
 
       this.loading = false