github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Jeecg-Boot 2.1.4 版本发布 (版本问题修复)

pull/1067/merge
zhangdaiscott 2020-02-25 17:14:10 +08:00
parent e2d4bb29db
commit 2b3e157d88
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ant-design-vue-jeecg/src/views/jeecg/SelectDemo.vue
View File

@ -180,7 +180,6 @@
<a-button style="margin-right: 8px;" @click="()=>modal.visible=true">点击弹出JModal</a-button> <a-button style="margin-right: 8px;" @click="()=>modal.visible=true">点击弹出JModal</a-button>
<span style="margin-right: 8px;">全屏化：<a-switch v-model="modal.fullscreen"/></span> <span style="margin-right: 8px;">全屏化：<a-switch v-model="modal.fullscreen"/></span>
<span style="margin-right: 8px;">允许切换全屏：<a-switch v-model="modal.switchFullscreen"/></span> <span style="margin-right: 8px;">允许切换全屏：<a-switch v-model="modal.switchFullscreen"/></span>
<span>锁定Body滚动：<a-switch v-model="modal.lockScroll"/></span>
</a-form-item> </a-form-item>
@ -188,7 +187,6 @@
:visible.sync="modal.visible" :visible.sync="modal.visible"
:width="1200" :width="1200"
:title="modal.title" :title="modal.title"
:lockScroll="modal.lockScroll"
:fullscreen.sync="modal.fullscreen" :fullscreen.sync="modal.fullscreen"
:switchFullscreen="modal.switchFullscreen" :switchFullscreen="modal.switchFullscreen"
> >
@ -390,7 +388,6 @@ sayHi('hello, world!')`
modal: { modal: {
title: '这里是标题', title: '这里是标题',
visible: false, visible: false,
lockScroll: true,
fullscreen: true, fullscreen: true,
switchFullscreen: true, switchFullscreen: true,
}, },

3
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml
View File

@ -52,7 +52,8 @@
where p.id = a.permission_id AND d.username = #{username,jdbcType=VARCHAR} where p.id = a.permission_id AND d.username = #{username,jdbcType=VARCHAR}
) )
<!--update begin Author:taoyan Date:20200225 for：默认授权online的auto动态隐藏路由 --> <!--update begin Author:taoyan Date:20200225 for：默认授权online的auto动态隐藏路由 -->
or (p.url like '%:code' and p.url like '/online%' and p.hidden = 1) ) or (p.url like '%:code' and p.url like '/online%' and p.hidden = 1)
or (p.url = '/online') )
<!--update end Author:taoyan Date:20200213 for：默认授权online的auto动态隐藏路由 --> <!--update end Author:taoyan Date:20200213 for：默认授权online的auto动态隐藏路由 -->
and p.del_flag = 0 and p.del_flag = 0
<!--update begin Author:lvdandan Date:20200225 for：加入部门权限 --> <!--update begin Author:lvdandan Date:20200225 for：加入部门权限 -->