• R/O
  • SSH
  • HTTPS

opengion: 提交


Commit MetaInfo

修訂1842 (tree)
時間2020-03-10 09:57:14
作者takahashi_m

Log Message

(empty log message)

Change Summary

差異

--- trunk/opengionV5/uap/webapps/gf/build.xml (revision 1841)
+++ trunk/opengionV5/uap/webapps/gf/build.xml (revision 1842)
@@ -4,7 +4,7 @@
44
55 <!-- バージョン番号を指定 -->
66 <property name="release.version" value="5" />
7- <property name="hayabusa.version" value="5.10.20.0" />
7+ <property name="hayabusa.version" value="5.10.20.3" />
88 <property environment="env" />
99
1010 <!-- ソースファイルがあるディレクトリ -->
--- trunk/opengionV5/uap/webapps/gf/doc/RELEASE-NOTES.txt (revision 1841)
+++ trunk/opengionV5/uap/webapps/gf/doc/RELEASE-NOTES.txt (revision 1842)
@@ -1,4 +1,20 @@
1-5.10.20.0 (2020/02/28)
1+5.10.20.3 (2020/03/13)
2+ [ヘッダ固定(Bulk)修正]
3+ 左右分割時のBulkの初期値セットに問題があったので修正しておきます。
4+ common/script/scrollBar2.js
5+
6+5.10.20.2 (2020/03/05)
7+ [RealPathのJava8対応]
8+ Java8でgetRealPathの最後に自動でセパレータが付くようになったため、対応しておく。
9+ hayabusa.common.SystemParameter#loadInitialParameter( final ServletContext context,final String contextName )
10+
11+5.10.20.1 (2020/03/03)
12+ [メール添付ファイルの文字化け対応]
13+ Java8でのメール送信時に添付ファイル名が一定以上の長さになった場合に文字化けする対応として
14+ 送信時プロパティにmail.mime.encodeparameters,splitlongparametersを設定しておきます。
15+ fukurou.mail.MailTX#MailTX(...)
16+
17+5.10.20.0 (2020/02/28)
218 [GE30インデックス変更]
319 Oracle19c上での問題からGE30_SBのindexのカラム順を変更しておきます。
420 SNDTIME,SYSTEM_ID,FGJからSYSTEM_ID,FGJ,SNDTIMEにします。
--- trunk/opengionV5/uap/webapps/gf/jsp/common/scrollBar2.js (revision 1841)
+++ trunk/opengionV5/uap/webapps/gf/jsp/common/scrollBar2.js (revision 1842)
@@ -1 +1 @@
1-function scrollBar2(a){alert("Old Script Error!!\ncustom/query_info.jsp,custom/result_info.jsp Please delete the following part.\n<script>Tag(Header fix and Focus) , BODY onLoad and oncontextmenu Attribute. scrollBar2(...)")}function AdjustScroll2(a){alert("Old Script Error!!\ncustom/query_info.jsp,custom/result_info.jsp Please delete the following part.\n<script>Tag(Header fix and Focus) , BODY onLoad and oncontextmenu Attribute. AdjustScroll2(...)")}function SetScrollHeader(a){}(function(b){b.hgrid=b.hgrid||{};b.hgrid.defaults={sGantBody:"GantBody",sViewTable:"viewTable",sGridList:"GridList",sInAdjusting:"__bInAdjusting"};b.hgrid.load=function(e){var f=b("div > div > div > div > table.viewTable");if(b("body").width()==0){setTimeout(function(){b.hgrid.load(e)},1);return}var g=b("#"+b.hgrid.defaults.sGantBody+":first");b(window).data("gantBody",g);if(g.length>0&&f.length==2){g.heightReset()}f.each(function(h){d(b(this))});f.hybsGrid().adjustSB();if(focus2){focus2()}};b.hgrid.resize=function(e){var f=b(this).data(b.hgrid.defaults.sInAdjusting);if(!f){b(this).data(b.hgrid.defaults.sInAdjusting,true);setTimeout(function(){var g=b.hgrid.defaults.sGridList;var h=b(window).data(g);if(h){b.each(h,function(){b(this.oTab).adjustSB()})}b(window).data(b.hgrid.defaults.sInAdjusting,false)},100)}};b.hgrid.unload=function(e){var f=b.hgrid.defaults.sGridList;var g=b(this).data(f);if(g){b.each(g,function(){this.oTab.grid=this.oTab.p=null});g.length=0}b(this).removeData(f);b.hgrid=null};b(window).unbind("load.hgrid").bind("load.hgrid",b.hgrid.load).unbind("resize.hgrid").bind("resize.hgrid",b.hgrid.resize).unbind("unload.hgrid").bind("unload.hgrid",b.hgrid.unload);var c=function(){return arguments.callee.SBWidth||(arguments.callee.SBWidth=(function(){var g=b('<div style="width:50px;height:50px;overflow:hidden;position:absolute;top:-200px;left:-200px;"><div style="height:100px;"></div>');b("body").append(g);var f=b("div",g).innerWidth();g.css("overflow-y","scroll");var e=b("div",g).innerWidth();if((f-e)==0){e=f-17}b(g).remove();return(f-e)})())};var d=function(j){if(j.data("cache")){return}var i=b.browser.msie?true:false;j.parent().attr("id","divHide2").css({width:"10000em"});var k=[];var n=b("thead:first",j);var m=b("tr th",n);j.data("thead",n);j.data("trTh",m);m.each(function(o){k[o]=i?b(this).innerWidth():b(this).width()});j.data("thw",k);var g=b.hybs.getHybsTr(j.find("tbody tr:first"));j.data("firstTr",g);var e=i?g.outerHeight()||g.innerHeight():g.height();j.data("trh",e);var f=[];var l=[];var h=b("td",g);j.data("firstTrTd",h);h.each(function(o){if(b(this).find(".h_evElm").length>0){if(b(this).attr("wa")=="true"){b(this).css("width","auto")}if(b(this).attr("ha")=="true"){b(this).css("height","auto")}if(b(this).css("width")=="auto"){b(this).attr("wa","true")}if(b(this).css("height")=="auto"){b(this).attr("ha","true")}}f[o]=i?b(this).innerWidth():b(this).width();l[o]=b(this).height()});j.data("tdw",f);j.data("tdh",l);j.data("cache",true)};var a=function(e){e.data("cache",false)};b.fn.heightReset=function(e){p=b.extend(true,{},b.hgrid.defaults,e||{});return this.each(function(){var n=b("table."+p.sViewTable,this);var j=n.get(0);var h=n.get(1);var o=j.rows,l=h.rows;var k,f=j.rows.length;if(f>0){k=Math.max(j.rows[0].offsetHeight,h.rows[0].offsetHeight);o[0].style.height=l[0].style.height=k+"px"}var m=b.browser.msie?true:false;k=0;var g;for(g=1;g<f&&g<6;g++){k=Math.max(k,Math.max(o[g].offsetHeight,l[g].offsetHeight))}for(g=1;g<f;g++){o[g].style.height=l[g].style.height=k+"px"}})};b.fn.hybsGrid=function(e){e=b.extend(true,{selrow:null,multiselect:false,multikey:false,nHoriExtra:16,nVertExtra:10,nMinLimit:50,nWidthScroll:c(),bX1VScroll:false,bX2VScroll:true},b.hgrid.defaults,e||{});var f={scrollGrid:function(){var g=this;var j=g.bDiv.scrollTop;g.hDiv.scrollLeft=g.bDiv.scrollLeft;if(g.oPrev){var i=g.oPrev.grid.bDiv;if(j!=i.scrollTop){i.scrollTop=j}}if(g.oNext){var h=g.oNext.grid.bDiv;if(j!=h.scrollTop){h.scrollTop=j}}}};b.fn.adjustSB=function(g){return this.each(function(){var H=this;if(!H.grid){return}if(typeof g!="boolean"){g=true}var B=b(H);var C,E;E=H.grid.hTable.parentNode;if(E.style.width){E.style.width=H.grid.hTable.offsetWidth+"px"}var L=H.grid.bHide;var v=b("thead:first",H);C=v.outerHeight()+2*v[0].offsetTop;L.style.width=B.outerWidth()+"px";L.style.height=B.outerHeight()-C+"px";L.scrollTop=C;var h=0,q=0;while(true){var O=b(window).width();var t=b(window).height();var k=b(H.grid.bDiv);var i=k.offset();var n,j,J,I,A,m;var z=H.grid.oNext,y=H.grid.oPrev;var r,G;r=Math.max(O-Math.ceil(i.left)-H.p.nHoriExtra,H.p.nMinLimit);G=Math.max(t-Math.ceil(i.top)-H.p.nVertExtra,H.p.nMinLimit);r=(H.p.width)?(H.p.width.indexOf("%")<0?parseInt(H.p.width,10):r*(parseInt(H.p.width,10)/100)):r;G=(H.p.height)?(H.p.height.indexOf("%")<0?parseInt(H.p.height,10):G*(parseInt(H.p.height,10)/100)):G;if((r<=h)&&(G<=q)){break}var N=H.offsetWidth,x=L.offsetHeight;n=r;j=G;var u=(n-N);var o=(j-x);A=(u<0);m=(o<0);var M,F;M=F=false;if(!A&&H.p.nWidthScroll>u){M=m||(H.p.nWidthScroll>o)}if(!m&&H.p.nWidthScroll>o){F=A||(H.p.nWidthScroll>u)}if(y&&y.grid.bHoriScroll){M=false}if(M){A=true}if(F){m=true}if(z&&!H.p.bX1VScroll){m=false}J=A?"scroll":"hidden";I=m?"scroll":"hidden";n=Math.min(n,N+(m?H.p.nWidthScroll:0));j=Math.min(j,x+(A?H.p.nWidthScroll:0));H.grid.bHoriScroll=A;H.grid.bVertScroll=m;H.grid.width=n;H.grid.height=j;if(y){var s=j-(A?H.p.nWidthScroll:0)+(y.grid.bHoriScroll?H.p.nWidthScroll:0);if(s!=y.grid.height){y.grid.height=s;var w=y.grid.hDiv.offsetHeight;var K=b(y.grid.bDiv);K.css("height",s+"px").parent().css({height:s+w+"px"})}}b(H.grid.hDiv).width(n-(m?H.p.nWidthScroll:0));if(H.grid.firstRowHeight){var D=H.grid.firstRowHeight;H.grid.firstRowHeight=null;b(H.grid.hDiv).height(H.grid.hDiv.offsetHeight-D)}var l=H.grid.hDiv.offsetHeight;k.css({width:n+"px",height:j+"px","overflow-x":J,"overflow-y":I}).parent().css({height:j+l+"px",width:n+"px"});if(b.browser.msie&&parseInt(b.browser.version,10)<7&&v[0]){v[0].style.padding=v[0].currentStyle.padding}h=r;q=G}H.grid.scrollGrid()})};return this.each(function(y){if("divHide"!=this.parentNode.id&&"divHide2"!=this.parentNode.id){return}var h=this,n=b(h);var q=b.browser.msie?true:false;var g=b.extend(true,{},f);var s=b.extend(true,{},e);var m=s.colModel=[];d(n);var j=false;n.data("trTh").each(function(A){var B=b(this);var C=B.attr("field")||B.text();if(q&&B.attr("colSpan")>1){j=true}if(q){m[A]={name:C,index:C,width:n.data("thw")[A],colspan:B.attr("colSpan")}}else{m[A]={name:C,index:C,width:n.data("thw")[A]}}});var u=false;var r=n.data("firstTr");var x=b(window).data("gantBody");if(x.length>0){u=true}else{if(j){if(r[0]){n.data("firstTrTd").each(function(A){if(!m[A]||!m[A].colspan||b(this).attr("colSpan")!=m[A].colspan){u=true;return false}})}}}n.addClass("scroll");var t=h.parentNode;g.bHide=h.parentNode;g.bDiv=g.bHide.parentNode;t=n.parents("#divPos")[0];if(t){b.each(["width","height"],function(){if(h.p&&h.p[this]){s[this]=h.p[this]}else{if(t.style[this]){s[this]=t.style[this];t.style[this]="auto"}}})}var k=function(A){return b("table:first",A)};b.each(s.colModel,function(A){if(typeof this.width=="undefined"){this.width=150}});var v=n.data("thead").get(0);n.data("trTh").each(function(A){if(b(this).attr("plusone")=="true"){b(this).css("width",(s.colModel[A].width)+"px")}else{b(this).css("width",(s.colModel[A].width+1)+"px");b(this).attr("plusone","true")}});g.hTable=document.createElement("table");var l=b(g.hTable);l.addClass(n.attr("class")).css({margin:"0px"});b.each(["cellspacing","cellpadding","border","bordercolor","frame","rules"],function(B,A){if(n.attr(A)){l.attr(A,n.attr(A))}});l.attr("id","headerTable");n.data("trTh").find("a,input,select,textarea").each(function(){b(this).attr("tabindex","").removeClass("visihidden")});t=v;var o=b("#header");var i=[];b("input,select,textarea",o).each(function(A){if(b(this).attr("type")=="checkbox"){if(b(this).attr("checked")){i[A]="1"}else{i[A]="0"}}else{i[A]=b(this).val()}});while(t){l.prepend(b(t).clone(true));t=t.previousSibling}var w=b(l).find("#header");b("input,select,textarea",w).each(function(A){if(b(this).attr("type")=="checkbox"){if(i[A]=="1"){b(this).attr("checked",true)}}else{b(this).val(i[A])}});if(u&&r&&r[0]){g.firstRowHeight=n.data("trh")+1;b("td",r).each(function(A){b(this).css("width",n.data("tdw")[A]+"px").css("height",n.data("tdh")[A]+"px")});jTrCl=r.clone();b("td",jTrCl).each(function(A){b(this).html(b(this).text()==""?"":" ").css("backgroundColor","transparent")});jAddTo=(jTrCl.is("tr")?b(document.createElement("tbody")).appendTo(l):l);jAddTo.append(jTrCl)}g.hDiv=document.createElement("div");b(g.hDiv).attr("class","hGrid-header").append(b('<div style="width:10000em;" />').append(g.hTable));n.data("trTh").find("a,input,select,textarea,span").each(function(){b(this).attr("tabindex","999").addClass("visihidden")});if(b(g.bDiv).prev().attr("class")=="hGrid-header"){b(g.bDiv).prev().remove()}b(g.bDiv).before(g.hDiv);b(g.bDiv).scroll(function(B){var A=k(B.target)[0];if(A&&A.grid){A.grid.scrollGrid()}});t=b(window).data(s.sGridList);if(x.length>0&&t){var z=t[t.length-1];if(z.oWrap===x[0]){z.oTab.grid.oNext=h;g.oPrev=z.oTab}}if(!t){t=[]}t.push({oTab:h,oWrap:x[0]});b(window).data(s.sGridList,t);a(n);h.grid=g;h.p=s;g=s=null;t=x=null;h=n=null})}})(jQuery);
\ No newline at end of file
1+function scrollBar2(a){alert("Old Script Error!!\ncustom/query_info.jsp,custom/result_info.jsp Please delete the following part.\n<script>Tag(Header fix and Focus) , BODY onLoad and oncontextmenu Attribute. scrollBar2(...)")}function AdjustScroll2(a){alert("Old Script Error!!\ncustom/query_info.jsp,custom/result_info.jsp Please delete the following part.\n<script>Tag(Header fix and Focus) , BODY onLoad and oncontextmenu Attribute. AdjustScroll2(...)")}function SetScrollHeader(a){}(function(b){b.hgrid=b.hgrid||{};b.hgrid.defaults={sGantBody:"GantBody",sViewTable:"viewTable",sGridList:"GridList",sInAdjusting:"__bInAdjusting"};b.hgrid.load=function(e){var f=b("div > div > div > div > table.viewTable");if(b("body").width()==0||b("body").width()==100){setTimeout(function(){b.hgrid.load(e)},1);return}var g=b("#"+b.hgrid.defaults.sGantBody+":first");b(window).data("gantBody",g);if(g.length>0&&f.length==2){g.heightReset()}f.each(function(h){d(b(this))});f.hybsGrid().adjustSB();if(focus2){focus2()}};b.hgrid.resize=function(e){var f=b(this).data(b.hgrid.defaults.sInAdjusting);if(!f){b(this).data(b.hgrid.defaults.sInAdjusting,true);setTimeout(function(){var g=b.hgrid.defaults.sGridList;var h=b(window).data(g);if(h){b.each(h,function(){b(this.oTab).adjustSB()})}b(window).data(b.hgrid.defaults.sInAdjusting,false)},100)}};b.hgrid.unload=function(e){var f=b.hgrid.defaults.sGridList;var g=b(this).data(f);if(g){b.each(g,function(){this.oTab.grid=this.oTab.p=null});g.length=0}b(this).removeData(f);b.hgrid=null};b(window).unbind("load.hgrid").bind("load.hgrid",b.hgrid.load).unbind("resize.hgrid").bind("resize.hgrid",b.hgrid.resize).unbind("unload.hgrid").bind("unload.hgrid",b.hgrid.unload);var c=function(){return arguments.callee.SBWidth||(arguments.callee.SBWidth=(function(){var g=b('<div style="width:50px;height:50px;overflow:hidden;position:absolute;top:-200px;left:-200px;"><div style="height:100px;"></div>');b("body").append(g);var f=b("div",g).innerWidth();g.css("overflow-y","scroll");var e=b("div",g).innerWidth();if((f-e)==0){e=f-17}b(g).remove();return(f-e)})())};var d=function(j){if(j.data("cache")){return}var i=b.browser.msie?true:false;j.parent().attr("id","divHide2").css({width:"10000em"});var k=[];var n=b("thead:first",j);var m=b("tr th",n);j.data("thead",n);j.data("trTh",m);m.each(function(o){k[o]=i?b(this).innerWidth():b(this).width()});j.data("thw",k);var g=b.hybs.getHybsTr(j.find("tbody tr:first"));j.data("firstTr",g);var e=i?g.outerHeight()||g.innerHeight():g.height();j.data("trh",e);var f=[];var l=[];var h=b("td",g);j.data("firstTrTd",h);h.each(function(o){if(b(this).find(".h_evElm").length>0){if(b(this).attr("wa")=="true"){b(this).css("width","auto")}if(b(this).attr("ha")=="true"){b(this).css("height","auto")}if(b(this).css("width")=="auto"){b(this).attr("wa","true")}if(b(this).css("height")=="auto"){b(this).attr("ha","true")}}f[o]=i?b(this).innerWidth():b(this).width();l[o]=b(this).height()});j.data("tdw",f);j.data("tdh",l);j.data("cache",true)};var a=function(e){e.data("cache",false)};b.fn.heightReset=function(e){p=b.extend(true,{},b.hgrid.defaults,e||{});return this.each(function(){var o=b("table."+p.sViewTable,this);var k=o.get(0);var j=o.get(1);var q=k.rows,n=j.rows;var l,g=k.rows.length;var f=k.tHead.rows.length;for(h=0;h<f;h++){l=Math.max(k.rows[h].offsetHeight,j.rows[h].offsetHeight);q[h].style.height=n[h].style.height=l+"px"}var m=b.browser.msie?true:false;l=0;var h;for(h=f;h<g&&h<f+5;h++){l=Math.max(l,Math.max(q[h].offsetHeight,n[h].offsetHeight))}for(h=f;h<g;h++){q[h].style.height=n[h].style.height=l+"px"}})};b.fn.hybsGrid=function(e){e=b.extend(true,{selrow:null,multiselect:false,multikey:false,nHoriExtra:16,nVertExtra:10,nMinLimit:50,nWidthScroll:c(),bX1VScroll:false,bX2VScroll:true},b.hgrid.defaults,e||{});var f={scrollGrid:function(){var g=this;var j=g.bDiv.scrollTop;g.hDiv.scrollLeft=g.bDiv.scrollLeft;if(g.oPrev){var i=g.oPrev.grid.bDiv;if(j!=i.scrollTop){i.scrollTop=j}}if(g.oNext){var h=g.oNext.grid.bDiv;if(j!=h.scrollTop){h.scrollTop=j}}}};b.fn.adjustSB=function(g){return this.each(function(){var H=this;if(!H.grid){return}if(typeof g!="boolean"){g=true}var B=b(H);var C,E;E=H.grid.hTable.parentNode;if(E.style.width){E.style.width=H.grid.hTable.offsetWidth+"px"}var L=H.grid.bHide;var v=b("thead:first",H);C=v.outerHeight()+2*v[0].offsetTop;L.style.width=B.outerWidth()+"px";L.style.height=B.outerHeight()-C+"px";L.scrollTop=C;var h=0,q=0;while(true){var O=b(window).width();var t=b(window).height();var k=b(H.grid.bDiv);var i=k.offset();var n,j,J,I,A,m;var z=H.grid.oNext,y=H.grid.oPrev;var r,G;r=Math.max(O-Math.ceil(i.left)-H.p.nHoriExtra,H.p.nMinLimit);G=Math.max(t-Math.ceil(i.top)-H.p.nVertExtra,H.p.nMinLimit);r=(H.p.width)?(H.p.width.indexOf("%")<0?parseInt(H.p.width,10):r*(parseInt(H.p.width,10)/100)):r;G=(H.p.height)?(H.p.height.indexOf("%")<0?parseInt(H.p.height,10):G*(parseInt(H.p.height,10)/100)):G;if((r<=h)&&(G<=q)){break}var N=H.offsetWidth,x=L.offsetHeight;n=r;j=G;var u=(n-N);var o=(j-x);A=(u<0);m=(o<0);var M,F;M=F=false;if(!A&&H.p.nWidthScroll>u){M=m||(H.p.nWidthScroll>o)}if(!m&&H.p.nWidthScroll>o){F=A||(H.p.nWidthScroll>u)}if(y&&y.grid.bHoriScroll){M=false}if(M){A=true}if(F){m=true}if(z&&!H.p.bX1VScroll){m=false}J=A?"scroll":"hidden";I=m?"scroll":"hidden";n=Math.min(n,N+(m?H.p.nWidthScroll:0));j=Math.min(j,x+(A?H.p.nWidthScroll:0));H.grid.bHoriScroll=A;H.grid.bVertScroll=m;H.grid.width=n;H.grid.height=j;if(y){var s=j-(A?H.p.nWidthScroll:0)+(y.grid.bHoriScroll?H.p.nWidthScroll:0);if(s!=y.grid.height){y.grid.height=s;var w=y.grid.hDiv.offsetHeight;var K=b(y.grid.bDiv);K.css("height",s+"px").parent().css({height:s+w+"px"})}}b(H.grid.hDiv).width(n-(m?H.p.nWidthScroll:0));if(H.grid.firstRowHeight){var D=H.grid.firstRowHeight;H.grid.firstRowHeight=null;b(H.grid.hDiv).height(H.grid.hDiv.offsetHeight-D)}var l=H.grid.hDiv.offsetHeight;k.css({width:n+"px",height:j+"px","overflow-x":J,"overflow-y":I}).parent().css({height:j+l+"px",width:n+"px"});if(b.browser.msie&&parseInt(b.browser.version,10)<7&&v[0]){v[0].style.padding=v[0].currentStyle.padding}h=r;q=G}H.grid.scrollGrid()})};return this.each(function(y){if("divHide"!=this.parentNode.id&&"divHide2"!=this.parentNode.id){return}var h=this,n=b(h);var q=b.browser.msie?true:false;var g=b.extend(true,{},f);var s=b.extend(true,{},e);var m=s.colModel=[];d(n);var j=false;n.data("trTh").each(function(A){var B=b(this);var C=B.attr("field")||B.text();if(q&&B.attr("colSpan")>1){j=true}if(q){m[A]={name:C,index:C,width:n.data("thw")[A],colspan:B.attr("colSpan")}}else{m[A]={name:C,index:C,width:n.data("thw")[A]}}});var u=false;var r=n.data("firstTr");var x=b(window).data("gantBody");if(x.length>0){u=true}else{if(j){if(r[0]){n.data("firstTrTd").each(function(A){if(!m[A]||!m[A].colspan||b(this).attr("colSpan")!=m[A].colspan){u=true;return false}})}}}n.addClass("scroll");var t=h.parentNode;g.bHide=h.parentNode;g.bDiv=g.bHide.parentNode;t=n.parents("#divPos")[0];if(t){b.each(["width","height"],function(){if(h.p&&h.p[this]){s[this]=h.p[this]}else{if(t.style[this]){s[this]=t.style[this];t.style[this]="auto"}}})}var k=function(A){return b("table:first",A)};b.each(s.colModel,function(A){if(typeof this.width=="undefined"){this.width=150}});var v=n.data("thead").get(0);n.data("trTh").each(function(A){if(b(this).attr("plusone")=="true"){b(this).css("width",(s.colModel[A].width)+"px")}else{b(this).css("width",(s.colModel[A].width+1)+"px");b(this).attr("plusone","true")}});g.hTable=document.createElement("table");var l=b(g.hTable);l.addClass(n.attr("class")).css({margin:"0px"});b.each(["cellspacing","cellpadding","border","bordercolor","frame","rules"],function(B,A){if(n.attr(A)){l.attr(A,n.attr(A))}});l.attr("id","headerTable");n.data("trTh").find("a,input,select,textarea,span,button,img").each(function(){b(this).attr("tabindex","").removeClass("visihidden")});t=v;var o=b("#header",n);var i=[];b("input,select,textarea",o).each(function(A){if(b(this).attr("type")=="checkbox"){if(b(this).attr("checked")){i[A]="1"}else{i[A]="0"}}else{i[A]=b(this).val()}});while(t){l.prepend(b(t).clone(true));t=t.previousSibling}var w=b(l).find("#header");b("input,select,textarea",w).each(function(A){if(b(this).attr("type")=="checkbox"){if(i[A]=="1"){b(this).attr("checked",true)}}else{b(this).val(i[A])}});if(u&&r&&r[0]){g.firstRowHeight=n.data("trh")+1;b("td",r).each(function(A){b(this).css("width",n.data("tdw")[A]+"px").css("height",n.data("tdh")[A]+"px")});jTrCl=r.clone();b("td",jTrCl).each(function(A){b(this).html(b(this).text()==""?"":" ").css("backgroundColor","transparent")});jAddTo=(jTrCl.is("tr")?b(document.createElement("tbody")).appendTo(l):l);jAddTo.append(jTrCl)}g.hDiv=document.createElement("div");b(g.hDiv).attr("class","hGrid-header").append(b('<div style="width:10000em;" />').append(g.hTable));n.data("trTh").find("a,input,select,textarea,span,button,img").each(function(){b(this).attr("tabindex","999").addClass("visihidden")});if(b(g.bDiv).prev().attr("class")=="hGrid-header"){b(g.bDiv).prev().remove()}b(g.bDiv).before(g.hDiv);b(g.bDiv).scroll(function(B){var A=k(B.target)[0];if(A&&A.grid){A.grid.scrollGrid()}});t=b(window).data(s.sGridList);if(x.length>0&&t){var z=t[t.length-1];if(z.oWrap===x[0]){z.oTab.grid.oNext=h;g.oPrev=z.oTab}}if(!t){t=[]}t.push({oTab:h,oWrap:x[0]});b(window).data(s.sGridList,t);a(n);h.grid=g;h.p=s;g=s=null;t=x=null;h=n=null})}})(jQuery);
\ No newline at end of file
--- trunk/opengionV5/uap/webapps/gf/src/org/opengion/fukurou/mail/MailTX.java (revision 1841)
+++ trunk/opengionV5/uap/webapps/gf/src/org/opengion/fukurou/mail/MailTX.java (revision 1842)
@@ -112,6 +112,7 @@
112112 * @og.rev 5.8.1.1 (2014/11/14) 認証ポート追加
113113 * @og.rev 5.8.7.1 (2015/05/22) SMTP Auth対応
114114 * @og.rev 5.9.29.2 (2018/02/16) STARTTLS対応
115+ * @og.rev 5.10.20.1 (2020/03/03) 添付ファイル名文字化け対策
115116 *
116117 * @param host メールサーバー
117118 * @param charset 文字エンコーディング
@@ -142,6 +143,10 @@
142143
143144 mcSet = MailCharsetFactory.newInstance( charset );
144145
146+ // 5.10.20.1 (2020/03/03) 添付ファイル名文字化け対策(暫定)
147+ System.setProperty("mail.mime.splitlongparameters", "false");
148+ System.setProperty("mail.mime.encodeparameters", "false" );
149+
145150 Properties prop = new Properties();
146151 prop.setProperty("mail.mime.charset", charset);
147152 prop.setProperty("mail.mime.decodetext.strict", "false");
@@ -174,6 +179,7 @@
174179 if ( useStarttls ) {
175180 prop.setProperty("mail.smtp.starttls.enable", "true");
176181 prop.setProperty("mail.smtp.starttls.required", "true");
182+ // SSLの場合
177183 //prop.setProperty("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
178184 //prop.setProperty("mail.smtp.socketFactory.fallback", "false");
179185 }
--- trunk/opengionV5/uap/webapps/gf/src/org/opengion/hayabusa/common/SystemParameter.java (revision 1841)
+++ trunk/opengionV5/uap/webapps/gf/src/org/opengion/hayabusa/common/SystemParameter.java (revision 1842)
@@ -286,6 +286,7 @@
286286 * @og.rev 5.6.7.1 (2013/08/09) RESOURCE_DBID の値に、"RESOURCE" を設定しておきます。
287287 * @og.rev 5.6.7.3 (2013/08/23) TOMCAT_HOME を追加
288288 * @og.rev 5.7.3.2 (2014/02/28) Tomcat8 対応。getRealPath( "/" ) の互換性のための修正。
289+ * @og.rev 5.10.20.2 (2020/03/05) RealPathの最後に\が付くJava8対応
289290 *
290291 * @param context Servletコンテキスト
291292 * @param contextName コンテキスト名
@@ -311,7 +312,8 @@
311312
312313 // 各種システム情報を登録しておきます。
313314 // map.put( "REAL_PATH" ,context.getRealPath( "/" ) );
314- map.put( "REAL_PATH" ,context.getRealPath( "" ) + File.separator ); // 5.7.3.2 (2014/02/28) Tomcat8 対応
315+ map.put( "REAL_PATH" ,context.getRealPath( "" ) // 5.7.3.2 (2014/02/28) Tomcat8 対応
316+ + (context.getRealPath( "" ).endsWith(File.separator) ? "" : File.separator) ); // 5.10.20.2 (2020/03/06) Java8
315317 map.put( "CONTEXT_NAME" ,contextName );
316318 map.put( "JSP" ,"/" + contextName + "/jsp" );
317319 map.put( "SERVLET_INFO" ,context.getServerInfo() );
--- trunk/opengionV5/uap/webapps/gf/src/script/common/scrollBar2.js (revision 1841)
+++ trunk/opengionV5/uap/webapps/gf/src/script/common/scrollBar2.js (revision 1842)
@@ -231,6 +231,7 @@
231231 // ++ 元のハヤブサのheightResetを改造して、jQuery対応の形で ++
232232 // ++ 左右分割画面の行の高さを調節する ++
233233 // ++ 5.9.7.0 (2016/04/01) IE7で正しく動作しないので修正 ++
234+// ++ 5.10.16.2 (2019/10/18) tHeadが複数行の場合の対応 ++
234235 // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
235236 $.fn.heightReset = function( opts ) {
236237 p = $.extend(true, {}, $.hgrid.defaults, opts || {});
@@ -248,11 +249,18 @@
248249 var x1Rows = x1Tabs.rows, x2Rows = x2Tabs.rows;
249250
250251 var wkHeight, nRowCnt = x1Tabs.rows.length;
252+ // 2019/10/16 ADD tHeadの行数を取得
253+ var tHeadLen = x1Tabs.tHead.rows.length;
254+
251255 // 3.6.0.7 (2004/11/06) Only the header is separately set.
252- if( nRowCnt > 0 ) {
253- wkHeight = Math.max(x1Tabs.rows[0].offsetHeight, x2Tabs.rows[0].offsetHeight);
256+ // 5.10.16.2 (2019/10/18) theadの行数だけ高さを調整。
257+ //if( nRowCnt > 0 ) {
258+ for( i = 0; i < tHeadLen; i++) {
259+ //wkHeight = Math.max(x1Tabs.rows[0].offsetHeight, x2Tabs.rows[0].offsetHeight);
254260 // One with a large header is adopted.
255- x1Rows[0].style.height = x2Rows[0].style.height = wkHeight + "px";
261+ //x1Rows[0].style.height = x2Rows[0].style.height = wkHeight + "px";
262+ wkHeight = Math.max(x1Tabs.rows[i].offsetHeight, x2Tabs.rows[i].offsetHeight);
263+ x1Rows[i].style.height = x2Rows[i].style.height = wkHeight + "px";
256264 }
257265
258266 var isMSIE = $.browser.msie ? true:false;
@@ -264,7 +272,9 @@
264272 wkHeight = 0;
265273 // The height of the cell is matched to the maximum value of first five rows in the tbody data.
266274 var i;
267- for( i = 1; i < nRowCnt && i < 6; i++) {
275+ // 5.10.16.2 (2019/10/18) tbodyの行から5行を対象するように変更
276+// for( i = 1; i < nRowCnt && i < 6; i++) {
277+ for( i = tHeadLen; i < nRowCnt && i < tHeadLen + 5; i++) {
268278 // if(isMSIE) {
269279 // if("auto" != x1Rows[i].currentStyle.height) {continue;}
270280 // }
@@ -276,10 +286,12 @@
276286 wkHeight = Math.max(wkHeight, Math.max(x1Rows[i].offsetHeight, x2Rows[i].offsetHeight));
277287 }
278288 // The height of the cell is matched to the maximum value data.
279- for( i = 1; i < nRowCnt; i++) {
280-// if(isMSIE) {
281-// if("auto" != x1Rows[i].currentStyle.height) {continue;}
282-// }
289+ // 5.10.16.2 (2019/10/18) tbodyの行から開始
290+ // for( i = 1; i < nRowCnt; i++) {
291+ for( i = tHeadLen; i < nRowCnt; i++) {
292+ //if(isMSIE) {
293+ // if("auto" != x1Rows[i].currentStyle.height) {continue;}
294+ //}
283295 //else if(isMoz) {
284296 // if("auto" != defaultView.getComputedStyle(x1Rows[i], null).getPropertyValue("height")) {continue;}
285297 //}
@@ -752,7 +764,8 @@
752764 oDum = thead;
753765
754766 // 5.9.8.1 (2016/05/13) add コピー前に入力、選択情報を保持
755- var preHeader = $("#header");
767+ // var preHeader = $("#header");
768+ var preHeader = $("#header", jTS); //5.10.20.3 (2020/03/13)
756769 var arr = [];
757770 $("input,select,textarea", preHeader).each(function(i){
758771 if($(this).attr("type") == "checkbox"){ // チェックボックスの場合
Show on old repository browser