From 714a0d0afb88698b39ceb410db2d650e857acac6 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Sat, 29 Oct 2022 12:30:39 +0800
Subject: [PATCH] =?UTF-8?q?J-modal=E7=BB=84=E4=BB=B6=E5=85=A8=E5=B1=8F?=
 =?UTF-8?q?=E5=90=8E=E6=B5=8F=E8=A7=88=E5=99=A8=E6=8E=A7=E5=88=B6=E5=8F=B0?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/jeecg/JModal/JModal.vue | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/components/jeecg/JModal/JModal.vue b/src/components/jeecg/JModal/JModal.vue
index e282765..bc8936e 100644
--- a/src/components/jeecg/JModal/JModal.vue
+++ b/src/components/jeecg/JModal/JModal.vue
@@ -171,15 +171,18 @@ export default {
       toggleFullscreen() {
         this.innerFullscreen = !this.innerFullscreen
         triggerWindowResizeEvent()
-        // 全屏的时候禁止拖动
-        if (this.innerFullscreen) {
-          // 还原弹窗的位置为0,0
-          this.setModalPosition(0, 0, false)
-          this.dragSettings.headerEl.style.cursor = null
-        } else {
-          // 取消全屏的时候，将弹窗移动到上次记录的位置
-          this.resetModalPosition()
-          this.dragSettings.headerEl.style.cursor = 'move'
+        // 开启拖拽后的特殊处理
+        if (this.draggable) {
+          // 全屏的时候禁止拖动
+          if (this.innerFullscreen) {
+            // 还原弹窗的位置为0,0
+            this.setModalPosition(0, 0, false)
+            this.dragSettings.headerEl.style.cursor = null
+          } else {
+            // 取消全屏的时候，将弹窗移动到上次记录的位置
+            this.resetModalPosition()
+            this.dragSettings.headerEl.style.cursor = 'move'
+          }
         }
       },