Skip to content

Commit

Permalink
AXGrid
Browse files Browse the repository at this point in the history
열 리사이즈 후 컬럼 숨기기 표시 하시 액션 너비 변경 버그픽스
  • Loading branch information
thomasJang committed Mar 6, 2014
1 parent 9155dcf commit 22e87b3
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 5 deletions.
8 changes: 6 additions & 2 deletions _AXJ/lib/AXGrid.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/

var AXGrid = Class.create(AXJ, {
version: "AXGrid v1.52",
version: "AXGrid v1.53",
author: "tom@axisj.com",
logs: [
"2012-12-24 오전 11:51:26",
Expand Down Expand Up @@ -55,7 +55,8 @@ var AXGrid = Class.create(AXJ, {
"2014-02-14 오후 12:42:32 tom : appendList메소드 index를 지정 하지 않으면 맨 마지막으로 추가 되도록 변경",
"2014-02-25 오전 11:24:29 tom : formatter 함수 this에 .value, .key 속성 추가",
"2014-03-05 오후 12:17:26 tom : editor.response 에서 validate 후 editor 사라지도록 기능 변경, editorForm Item 중복되지 않도록 수정",
"2014-03-05 오후 5:13:45 tom : 열 리사이즈했을 때 스크롤 위치 버그픽스"
"2014-03-05 오후 5:13:45 tom : 열 리사이즈했을 때 스크롤 위치 버그픽스",
"2014-03-06 오후 8:22:00 tom : 열 리사이즈 후 컬럼 숨기기 표시 하시 액션 너비 변경 버그픽스"
],
initialize: function (AXJ_super) {
AXJ_super();
Expand Down Expand Up @@ -1547,6 +1548,9 @@ var AXGrid = Class.create(AXJ, {
axdom("#" + cfg.targetID + "_AX_col_AX_" + this.colResizeTarget.colSeq + "_AX_EB").attr("width", newWidth);

cfg.colGroup[this.colResizeTarget.colSeq].width = newWidth;
if(!cfg.colGroup[this.colResizeTarget.colSeq].widthAstric){
cfg.colGroup[this.colResizeTarget.colSeq]._owidth = newWidth;
}

if (this.hasFixed) {
var fixedColSeq = this.fixedColSeq;
Expand Down
8 changes: 5 additions & 3 deletions _AXJ/lib/AXJ.js
Original file line number Diff line number Diff line change
Expand Up @@ -1442,12 +1442,14 @@ var AXMask = Class.create(AXJ, {
AXJ_super();
this.selects = [];
this.config.maskClassName = "AXMask";
this.config.maskContentClassName = "AXMaskContent";
this.config.content = "disable content";
this.config.maskZindex = "2000";
this.config.maskZindex = "5000";
this.blinkTrack = [];
},
init: function () {
this.mask = axdom("<div class=\"" + this.config.maskClassName + "\" style=\"z_index:" + this.config.maskZindex + "\"></div>");
//this.content = axdom("<div class=\"" + this.config.maskClassName + "\" style=\"z_index:" + this.config.maskZindex + "\"></div>");
},
open: function (configs) {
axdom(document.body).append(this.mask);
Expand All @@ -1461,7 +1463,6 @@ var AXMask = Class.create(AXJ, {
}
}
},

close: function (delay) {
if (!delay) {
this.mask.unbind("click.AXMask");
Expand Down Expand Up @@ -1502,7 +1503,8 @@ var AXMask = Class.create(AXJ, {
onblink((blinkIndex + 1) % blinkTrack.length);
});
}
}
},

});
var mask = new AXMask();
mask.setConfig();
Expand Down
4 changes: 4 additions & 0 deletions _AXJ/ui/default/AXJ_desktop.less
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ input::-ms-clear {display: none;}
background:#000;
.Opacity(20);
}
.AXMaskContent{
z-index:5000;
position:fixed;top:0px;left:0px;width:100%;height:100%;
}

.AXLoading{
min-height:50px;
Expand Down

0 comments on commit 22e87b3

Please sign in to comment.