chore: merge src and src-next

This commit is contained in:
chenjiahan
2020-07-15 20:02:00 +08:00
parent 6672b34618
commit 0304fcb6fa
382 changed files with 464 additions and 24746 deletions
+3 -3
View File
@@ -1,6 +1,6 @@
import Vue from 'vue';
// import Vue from 'vue';
import VanDialog from './Dialog';
import { isServer } from '../utils';
import { inBrowser } from '../utils';
let instance;
@@ -28,7 +28,7 @@ function initInstance() {
function Dialog(options) {
/* istanbul ignore if */
if (isServer) {
if (!inBrowser) {
return Promise.resolve();
}