fix(QSelect): exit showPopup if it's not editable quasarframework#7323

pdanpdan · Jul 9, 2020 · 2b013c3 · 2b013c3
1 parent a8be627
commit 2b013c3
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/ui/src/components/select/QSelect.js b/ui/src/components/select/QSelect.js
@@ -1050,11 +1050,14 @@ export default Vue.extend({
 
             this.$nextTick(() => {
               this.innerLoading = false
-              if (this.menu === true) {
-                this.__updateMenu(true)
-              }
-              else {
-                this.menu = true
+
+              if (this.editable === true) {
+                if (this.menu === true) {
+                  this.__updateMenu(true)
+                }
+                else {
+                  this.menu = true
+                }
               }
 
               typeof afterFn === 'function' && this.$nextTick(() => { afterFn(this) })
@@ -1290,6 +1293,10 @@ export default Vue.extend({
     },
 
     showPopup (e) {
+      if (this.editable !== true) {
+        return
+      }
+
       if (this.hasDialog === true) {
         this.__onControlFocusin(e)
         this.dialog = true