From a2c5781120ca664dd42836dddd323438ff04de84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BD=B3?= <wangjia_1919@163.com>
Date: Tue, 20 Aug 2019 18:40:38 +0800
Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9moadl=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=20style=20=E9=AB=98=E5=BA=A6=E4=B8=8E=E6=8B=96?=
 =?UTF-8?q?=E6=8B=BD=E5=90=8E=EF=BC=8C=E7=82=B9=E5=87=BB=E6=8B=96=E6=8B=BD?=
 =?UTF-8?q?=E9=A3=98=E7=A7=BB=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/modal/modal.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/modal/modal.vue b/src/components/modal/modal.vue
index 3c62366d..e07eae89 100644
--- a/src/components/modal/modal.vue
+++ b/src/components/modal/modal.vue
@@ -199,8 +199,9 @@
                 let style = {};
 
                 if (this.draggable) {
+                    let customTop = this.styles.top ?  parseFloat(this.styles.top) : 0
                     if (this.dragData.x !== null) style.left = `${this.dragData.x}px`;
-                    if (this.dragData.y !== null) style.top = `${this.dragData.y}px`;
+                    if (this.dragData.y !== null) style.top = `${this.dragData.y - customTop}px`;
                     const width = parseInt(this.width);
                     const styleWidth = {
                         width: width <= 100 ? `${width}%` : `${width}px`

From 40bf70dd08950341cebf0f689b0cef5e22f86834 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BD=B3?= <wangjia_1919@163.com>
Date: Tue, 20 Aug 2019 19:01:14 +0800
Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9moadl=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E6=8B=96=E6=8B=BD=EF=BC=8C=E5=92=8C=20=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9Astyle=20left=20=E4=B8=8Etop=20=E5=80=BC=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E6=8B=96=E6=8B=BD=E9=A3=98=E7=A7=BB?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/routers/modal.vue     |  7 +++++++
 src/components/modal/modal.vue | 10 +++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/examples/routers/modal.vue b/examples/routers/modal.vue
index 23e6a6d0..a1c95e50 100644
--- a/examples/routers/modal.vue
+++ b/examples/routers/modal.vue
@@ -1,6 +1,12 @@
 <template>
     <div>
         <Button type="primary" @click="modal1 = true">Display dialog box</Button>
+        <Button type="primary" @click="modal2 = true">Display dialog box</Button>
+        <Modal v-model="modal2" draggable title="Common Modal dialog box title"
+               @on-ok="ok"
+               @on-cancel="cancel">
+            <p>2123</p>
+        </Modal>
         <Modal
                 v-model="modal1"
                 title="Common Modal dialog box title"
@@ -52,6 +58,7 @@
         data () {
             return {
                 modal1: false,
+                modal2: false,
                 cityList: [
                     {
                         value: 'New York',
diff --git a/src/components/modal/modal.vue b/src/components/modal/modal.vue
index e07eae89..e2c1c304 100644
--- a/src/components/modal/modal.vue
+++ b/src/components/modal/modal.vue
@@ -80,7 +80,10 @@
                 default: false
             },
             styles: {
-                type: Object
+                type: Object,
+                default() {
+                    return {};
+                }
             },
             className: {
                 type: String
@@ -199,8 +202,9 @@
                 let style = {};
 
                 if (this.draggable) {
-                    let customTop = this.styles.top ?  parseFloat(this.styles.top) : 0
-                    if (this.dragData.x !== null) style.left = `${this.dragData.x}px`;
+                    let customTop = this.styles.top || 0 ?  parseFloat(this.styles.top) : 0
+                    let customLeft = this.styles.left || 0 ?  parseFloat(this.styles.left) : 0
+                    if (this.dragData.x !== null) style.left = `${this.dragData.x - customLeft}px`;
                     if (this.dragData.y !== null) style.top = `${this.dragData.y - customTop}px`;
                     const width = parseInt(this.width);
                     const styleWidth = {

From 16ab12fd826fe61cd73137c6ea03a01ffbe56a76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BD=B3?= <wangjia_1919@163.com>
Date: Tue, 20 Aug 2019 19:05:43 +0800
Subject: [PATCH 3/5] fix: lint some code

---
 src/components/modal/modal.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/modal/modal.vue b/src/components/modal/modal.vue
index e2c1c304..0fec1756 100644
--- a/src/components/modal/modal.vue
+++ b/src/components/modal/modal.vue
@@ -202,8 +202,8 @@
                 let style = {};
 
                 if (this.draggable) {
-                    let customTop = this.styles.top || 0 ?  parseFloat(this.styles.top) : 0
-                    let customLeft = this.styles.left || 0 ?  parseFloat(this.styles.left) : 0
+                    let customTop = this.styles.top ?  parseFloat(this.styles.top) : 0;
+                    let customLeft = this.styles.left ?  parseFloat(this.styles.left) : 0;
                     if (this.dragData.x !== null) style.left = `${this.dragData.x - customLeft}px`;
                     if (this.dragData.y !== null) style.top = `${this.dragData.y - customTop}px`;
                     const width = parseInt(this.width);

From 8819b86780b3fad5b84f57d0475f58c4faa48565 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BD=B3?= <wangjia_1919@163.com>
Date: Tue, 20 Aug 2019 19:07:18 +0800
Subject: [PATCH 4/5] add example

---
 examples/routers/modal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/routers/modal.vue b/examples/routers/modal.vue
index a1c95e50..844ff21b 100644
--- a/examples/routers/modal.vue
+++ b/examples/routers/modal.vue
@@ -4,7 +4,7 @@
         <Button type="primary" @click="modal2 = true">Display dialog box</Button>
         <Modal v-model="modal2" draggable title="Common Modal dialog box title"
                @on-ok="ok"
-               @on-cancel="cancel">
+               @on-cancel="cancel" :styles="{top: '300px', left: '100px'}">
             <p>2123</p>
         </Modal>
         <Modal

From cd4cb6161a9b0f1b052ea984d4f8459f331411e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BD=B3?= <wangjia_1919@163.com>
Date: Tue, 20 Aug 2019 19:08:14 +0800
Subject: [PATCH 5/5] fix: fix lint some code

---
 src/components/modal/modal.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/modal/modal.vue b/src/components/modal/modal.vue
index 0fec1756..db951e88 100644
--- a/src/components/modal/modal.vue
+++ b/src/components/modal/modal.vue
@@ -202,8 +202,8 @@
                 let style = {};
 
                 if (this.draggable) {
-                    let customTop = this.styles.top ?  parseFloat(this.styles.top) : 0;
-                    let customLeft = this.styles.left ?  parseFloat(this.styles.left) : 0;
+                    let customTop = this.styles.top ? parseFloat(this.styles.top) : 0;
+                    let customLeft = this.styles.left ? parseFloat(this.styles.left) : 0;
                     if (this.dragData.x !== null) style.left = `${this.dragData.x - customLeft}px`;
                     if (this.dragData.y !== null) style.top = `${this.dragData.y - customTop}px`;
                     const width = parseInt(this.width);