Skip to content

Commit 0b17783

Browse files
committed
v2.4.0
新增 1、单个弹框功能 修改 1、components目录结构(方便二次开发) 2、body最小宽度1024px 修复 1、拖拽边界bug(弹框高度大于屏幕高度时出现的bug)
1 parent 0616fd6 commit 0b17783

File tree

24 files changed

+128
-19
lines changed

24 files changed

+128
-19
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
- 拖拽弹框
7979
- 拖拽表格
8080
- 拖拽列表
81+
- 单个弹框
8182
8283
```
8384

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-blog",
3-
"version": "2.3.0",
3+
"version": "2.4.0",
44
"private": true,
55
"scripts": {
66
"dev": "vue-cli-service serve",
@@ -12,7 +12,7 @@
1212
"dependencies": {
1313
"axios": "^0.18.0",
1414
"driver.js": "^0.9.5",
15-
"element-ui": "^2.7.0",
15+
"element-ui": "^2.12.0",
1616
"file-saver": "^2.0.1",
1717
"js-cookie": "^2.2.0",
1818
"jszip": "^3.2.0",

src/assets/css/global.styl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
html, body {
77
width: 100%;
88
height: 100%;
9+
min-width: 1024px;
910
min-height: 100%;
1011
background: #f4f5f6;
1112
}
@@ -35,6 +36,9 @@ a {
3536
a {
3637
margin-left: 5px;
3738
}
39+
p {
40+
margin: 1em 0 0 0;
41+
}
3842
}
3943
// hover
4044
.ishover {

src/assets/icons/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Vue from 'vue'
2-
import SvgIcon from '@/components/SvgIcon'
2+
import SvgIcon from '@/components/Base/SvgIcon'
33

44
Vue.component('svg-icon', SvgIcon)
55

src/directive/dragDialog/drag.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ export default {
2929
const maxDragDomLeft = screenWidth - dragDom.offsetLeft - dragDomWidth
3030

3131
const minDragDomTop = dragDom.offsetTop
32-
const maxDragDomTop = screenHeight - dragDom.offsetTop - dragDomHeight
32+
let maxDragDomTop = screenHeight - dragDom.offsetTop - dragDomHeight
33+
maxDragDomTop = maxDragDomTop >= 0 ? maxDragDomTop : 'unLimit' // // 修复弹框高度大于可视区域的问题
3334

3435
// 获取到的值带px 正则匹配替换
3536
let styL = getStyle(dragDom, 'left')
@@ -57,8 +58,10 @@ export default {
5758

5859
if (-(top) > minDragDomTop) {
5960
top = -minDragDomTop
60-
} else if (top > maxDragDomTop) {
61-
top = maxDragDomTop
61+
} else if (maxDragDomTop !== 'unLimit') { // 修复弹框高度大于可视区域的问题
62+
if (top > maxDragDomTop) {
63+
top = maxDragDomTop
64+
}
6265
}
6366

6467
// 移动当前元素

src/directive/permission/permission.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ export default {
1111
}
1212

1313
export function checkPermission(permissionRole) {
14+
// 不能作为通用方案,判断权限的方法需自行实现
15+
// 当前采用登录角色是否包含被验证的permissionRole
1416
let currentRole = (store.state.login.user && store.state.login.user.roles) || 'visitor'
1517
if (typeof currentRole === 'string') {
1618
currentRole = [currentRole]

src/language/en.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ export default {
2929
'401': '401',
3030
'404': '404',
3131
errorLog: 'ErrorLog',
32-
i18n: 'I18n'
32+
i18n: 'I18n',
33+
singleMessage: 'SingleMessage'
3334
},
3435
header: {
3536
logout: 'Log Out',
@@ -161,5 +162,9 @@ export default {
161162
dialog: {
162163
update: 'Change',
163164
cancle: 'Cancle'
165+
},
166+
singleMessage: {
167+
description: 'SingleMessage base on el-message',
168+
tip: 'Please keep click to see example'
164169
}
165170
}

src/language/zh.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ export default {
2929
'401': '401',
3030
'404': '404',
3131
errorLog: '错误日志',
32-
i18n: '国际化'
32+
i18n: '国际化',
33+
singleMessage: '单个弹框'
3334
},
3435
header: {
3536
logout: '退出',
@@ -163,5 +164,9 @@ export default {
163164
dialog: {
164165
update: '修 改',
165166
cancle: '取 消'
167+
},
168+
singleMessage: {
169+
description: '单个弹框基于 el-message 实现',
170+
tip: '连续点击弹框查看效果'
166171
}
167172
}

0 commit comments

Comments
 (0)