Permalink
Browse files

fix: pro-IUAPDESIGN-106:友云采:模态框需要支持设置高度

  • Loading branch information...
1 parent 8a9e871 commit 534509d2850129efb501bc79a28aafe282731577 liuyk committed Oct 19, 2016
Showing with 9 additions and 4 deletions.
  1. +7 −1 js/neoui-dialog.js
  2. +2 −3 scss/ui/neoui-dialog.scss
View
@@ -165,6 +165,7 @@ var threeBtnDialog = function() {
* @return {[type]} [description]
*/
var disable_mouseWheel = function () {
+ return;
if (document.addEventListener) {
document.addEventListener('DOMMouseScroll', scrollFunc, false);
}
@@ -245,7 +246,12 @@ var dialogMode = function(options) {
}.bind(this);
this.resizeFun();
- on(window, 'resize', this.resizeFun);
+ if(this.height){
+ //设置高度的情况下不自动计算高度
+ }else{
+ on(window, 'resize', this.resizeFun);
+ }
+
}
dialogMode.prototype.create = function() {
@@ -19,15 +19,14 @@
}
.u-msg-dialog{
- position: fixed;
+ position: absolute;
left: 0;
right: 0;
background-color: #FFFFFF;
padding: 0;
- max-height: 70%;
width: 55%;
margin: auto;
- //overflow-y: auto;
+ margin-bottom: 50px;
border-radius: 2px;
will-change: top, opacity;
display: block;

0 comments on commit 534509d

Please sign in to comment.