Jeecg-Boot 2.1.4 版本发布 (升级ant-design-vue版本)

zhangdaiscott
1 parent 8450d3df
Showing 3 changed files with 2663 additions and 2569 deletions
ant-design-vue-jeecg/package.json
ant-design-vue-jeecg/src/components/jeecg/JModal/index.vue
ant-design-vue-jeecg/yarn.lock
@@ -12,7 +12,7 @@
     "@antv/data-set": "^0.10.2",
     "@jeecg/antd-online-214": "^2.1.41",
     "@tinymce/tinymce-vue": "^2.0.0",
-    "ant-design-vue": "^1.4.0",
+    "ant-design-vue": "^1.4.11",
     "apexcharts": "^3.6.5",
     "axios": "^0.18.0",
     "clipboard": "^2.0.4",
@@ -54,8 +54,8 @@
     "html-webpack-plugin": "^4.0.0-beta.11",
     "less": "^3.9.0",
     "less-loader": "^4.1.0",
-    "node-sass": "^4.11.0",
-    "sass-loader": "^7.0.1",
+    "node-sass": "^4.13.1",
+    "sass-loader": "^7.3.1",
     "vue-template-compiler": "^2.6.10"
   },
   "eslintConfig": {
@@ -37,20 +37,13 @@
 </template>
  
 <script>
-  import ACol from 'ant-design-vue/es/grid/Col'
  
   export default {
     name: 'JModal',
-    components: { ACol },
     props: {
       title: String,
       // 可使用 .sync 修饰符
       visible: Boolean,
-      // 是否在弹出时禁止 body 滚动
-      lockScroll: {
-        type: Boolean,
-        default: true
-      },
       // 是否全屏弹窗，当全屏时无论如何都会禁止 body 滚动。可使用 .sync 修饰符
       fullscreen: {
         type: Boolean,
@@ -66,11 +59,8 @@
       return {
         // 内部使用的 slots ，不再处理
         usedSlots: ['title'],
-
-        // 缓存 body 的 overflow
-        bodyOverflowCache: '',
+        // 实际控制是否全屏的参数
         innerFullscreen: this.fullscreen,
-        fullscreenButtonIcon: 'fullscreen-exit',
       }
     },
     computed: {
@@ -98,24 +88,16 @@
       allSlotsKeys() {
         return this.slotsKeys.concat(this.scopedSlotsKeys)
       },
-      // 是否锁定body滚动
-      lockBodyScroll() {
-        return this.lockScroll || this.innerFullscreen
-      }
+      // 切换全屏的按钮图标
+      fullscreenButtonIcon() {
+        return this.innerFullscreen ? 'fullscreen' : 'fullscreen-exit'
+      },
     },
     watch: {
       visible() {
         if (this.visible) {
           this.innerFullscreen = this.fullscreen
         }
-        if (this.lockBodyScroll) {
-          if (this.visible) {
-            this.bodyOverflowCache = document.body.style.overflow
-            document.body.style.overflow = 'hidden'
-          } else {
-            document.body.style.overflow = this.bodyOverflowCache
-          }
-        }
       },
       innerFullscreen(val) {
         this.$emit('update:fullscreen', val)
@@ -134,12 +116,8 @@
         this.close()
       },
  
+      /** 切换全屏 */
       toggleFullscreen() {
-        if (this.innerFullscreen) {
-          this.fullscreenButtonIcon = 'fullscreen'
-        } else {
-          this.fullscreenButtonIcon = 'fullscreen-exit'
-        }
         this.innerFullscreen = !this.innerFullscreen
       },