fix(ui/dialog picker): 优化close方法

affects: @varlet/ui
varletjs · Feb 3, 2021 · 5b426ab · 5b426ab
1 parent 0c78a72
commit 5b426ab
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/packages/varlet-ui/src/dialog/example/index.vue b/packages/varlet-ui/src/dialog/example/index.vue
@@ -47,16 +47,10 @@ export default defineComponent({
         message: '测试文字测试文字测试文字测试文字测试文字测试文字测试文字',
       })
       await Dialog({
-        title: '测试1',
+        title: '测试2',
         cancelButton: false,
         message: '测试文字测试文字测试文字测试文字测试文字测试文字测试文字',
       })
-      // Dialog.close()
-      // Dialog({
-      //   title: '测试2',
-      //   cancelButton: false,
-      //   message: '测试文字测试文字测试文字测试文字测试文字测试文字测试文字',
-      // })
 
       // setTimeout(() => {
       //   Dialog.close()

diff --git a/packages/varlet-ui/src/dialog/index.ts b/packages/varlet-ui/src/dialog/index.ts
@@ -1,4 +1,4 @@
-import { reactive, App } from 'vue'
+import { reactive, App, nextTick } from 'vue'
 import VarDialog from './Dialog.vue'
 import { isString } from '../utils/shared'
 import { mountInstance } from '../utils/components'
@@ -79,7 +79,10 @@ Dialog.install = function (app: App) {
 
 Dialog.close = () => {
   if (singletonOptions) {
-    singletonOptions.show = false
+    const options = singletonOptions
+    nextTick().then(() => {
+      options.show = false
+    })
     singletonOptions = null
   }
 }

diff --git a/packages/varlet-ui/src/picker/index.ts b/packages/varlet-ui/src/picker/index.ts
@@ -1,4 +1,4 @@
-import { App, reactive } from 'vue'
+import { App, nextTick, reactive } from 'vue'
 import VarPicker from './Picker.vue'
 import { NormalColumn, CascadeColumn } from './props'
 import { isArray } from '../utils/shared'
@@ -97,7 +97,10 @@ Picker.install = function (app: App) {
 
 Picker.close = () => {
   if (singletonOptions) {
-    singletonOptions.show = false
+    const options = singletonOptions
+    nextTick().then(() => {
+      options.show = false
+    })
     singletonOptions = null
   }
 }