🐛 Fix: correct inputbox value && remove listener

Kuingsmile · Feb 25, 2020 · 32334e9 · 32334e9
1 parent 96544f5
commit 32334e9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/renderer/components/InputBoxDialog.vue b/src/renderer/components/InputBoxDialog.vue
@@ -3,14 +3,13 @@
     :title="inputBoxOptions.title || '输入框'"
     :visible.sync="showInputBoxVisible"
     :modal-append-to-body="false"
-    @close="handleInputBoxClose"
   >
     <el-input
       v-model="inputBoxValue"
       :placeholder="inputBoxOptions.placeholder"></el-input>
     <span slot="footer">
-      <el-button @click="showInputBoxVisible = false" round>取消</el-button>
-      <el-button type="primary" @click="showInputBoxVisible = false" round>确定</el-button>
+      <el-button @click="handleInputBoxCancel" round>取消</el-button>
+      <el-button type="primary" @click="handleInputBoxConfirm" round>确定</el-button>
     </span>
   </el-dialog>
 </template>
@@ -44,11 +43,17 @@ export default class extends Vue {
     this.inputBoxOptions.placeholder = options.placeholder || ''
     this.showInputBoxVisible = true
   }
-  handleInputBoxClose () {
+  handleInputBoxCancel () {
     // TODO: RPCServer
+    this.showInputBoxVisible = false
     ipcRenderer.send(SHOW_INPUT_BOX, '')
     this.$bus.$emit(SHOW_INPUT_BOX_RESPONSE, '')
   }
+  handleInputBoxConfirm () {
+    this.showInputBoxVisible = false
+    ipcRenderer.send(SHOW_INPUT_BOX, this.inputBoxValue)
+    this.$bus.$emit(SHOW_INPUT_BOX_RESPONSE, this.inputBoxValue)
+  }
   beforeDestroy () {
     ipcRenderer.removeListener(SHOW_INPUT_BOX, this.ipcEventHandler)
     this.$bus.$off(SHOW_INPUT_BOX)

diff --git a/src/renderer/pages/Upload.vue b/src/renderer/pages/Upload.vue
@@ -115,6 +115,7 @@ export default class extends Vue {
     }
   }
   beforeDestroy () {
+    this.$bus.$off(SHOW_INPUT_BOX_RESPONSE)
     ipcRenderer.removeAllListeners('uploadProgress')
     ipcRenderer.removeAllListeners('syncPicBed')
     ipcRenderer.removeListener('getPicBeds', this.getPicBeds)