当弹出层的绑定data没有变更，重复打开不会重置form

akebe · Jan 11, 2020 · 5d05792 · 5d05792
1 parent 44fe61b
commit 5d05792
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/packages/components/address-dialog/ElAddressDialog.vue b/packages/components/address-dialog/ElAddressDialog.vue
@@ -90,13 +90,18 @@
     computed: {},
     methods: {
       open(data = {}, options = {}) {
-        this.mData = Object.assign({}, defaultData, data);
+        if (this.baseData !== data) {
+          this.$refs.form && this.$refs.form.clear();
+          this.mData = Object.assign({}, defaultData, data);
+          this.baseData = data;
+        }
         this.mOptions = Object.assign({}, defaultOptions, options);
-        this.visible = true;
+        this.$nextTick(() => {
+          this.visible = true;
+        });
         return new Promise((resolve => {
           this.resolve = resolve;
         }));
-
       },
       confirm() {
         this.$refs.form.validate(valid => {
@@ -123,12 +128,11 @@
         });
       },
       closed() {
-        this.$refs.form.clear();
         this.loadingClose();
       },
       beforeClose(done) {
         if (this.mOptions.beforeClose) {
-          this.mOptions.beforeClose(this.mData, done);
+          this.mOptions.beforeClose({...this.mData}, done);
         } else {
           done();
         }

diff --git a/src/App.vue b/src/App.vue
@@ -29,7 +29,7 @@
 </template>
 
 <script>
-  import ElementAddress from 'element-address';
+  import {ElementAddress} from './main.js';
 
   export default {
     name: 'app',
@@ -49,6 +49,7 @@
           city: '',
           area: '',
         },
+        testData: {},
       };
     },
     methods: {
@@ -90,13 +91,14 @@
         });
       },
       dialog() {
-        ElementAddress.$dialog({}, {
+        ElementAddress.$dialog(this.testData, {
           beforeResolve: (data, done) => {
             setTimeout(() => {
               done();
             }, 1000);
           },
         }).then(result => {
+          this.testData = {};
           this.$alert(JSON.stringify(result, null, 2), {
             title: '结果',
             dangerouslyUseHTMLString: true,

diff --git a/src/main.js b/src/main.js
@@ -4,9 +4,9 @@ import App from './App.vue';
 import ElementUI from 'element-ui';
 import 'element-ui/lib/theme-chalk/index.css';
 
-import ElementAddress from 'element-address';
+//import ElementAddress from 'element-address';
 
-//import ElementAddress from '../packages/index.js';
+import ElementAddress from '../packages/index.js';
 
 //import ElementAddress from '../lib/element-address.umd.js';
 
@@ -19,3 +19,7 @@ Vue.config.productionTip = false;
 new Vue({
   render: h => h(App),
 }).$mount('#app');
+
+export {
+  ElementAddress,
+};