• R/O
  • SSH
  • HTTPS

opengion: Commit


Commit MetaInfo

Révision2247 (tree)
l'heure2022-05-26 14:18:43
Auteurleem

Message de Log

(empty log message)

Change Summary

Modification

--- trunk/opengionV8/uap/webapps/gf/doc/RELEASE-NOTES_8.txt (revision 2246)
+++ trunk/opengionV8/uap/webapps/gf/doc/RELEASE-NOTES_8.txt (revision 2247)
@@ -23,8 +23,8 @@
2323 plugin.column.Editor_YMD2#getValue(java.lang.String)
2424 plugin.column.Editor_YMD2#getValue(int,java.lang.String)
2525
26- [JavaScriptでの曖昧アイコンDIRを絶対パスに変更(問合・トラブル 43100-220411-01)]
27- hayabusa.taglib.HeadTag#doEndTag()
26+ [計算式の計算を行う]
27+ fukurou.model.POIUtil#getValue(org.apache.poi.ss.usermodel.Cell)
2828
2929 [オブジェクト文字列の変換で、drawing の null 対応]
3030 fukurou.model.ExcelModel#textConverter(org.opengion.fukurou.model.TextConverter<java.lang.String,java.lang.String>)
@@ -32,13 +32,23 @@
3232 [readerClass が AutoReader の時、readerClass が Text になるバグ修正]
3333 hayabusa.taglib.ReadTableTag#doEndTag()
3434
35+ [YMD2リソースとイベントカラムの競合時の不具合対応(問合・トラブル 43100-220526-01)]
36+ C:\opengionV8\uap\webapps\gf\src\script\common\eventScript.js
37+
38+ [jsp , js , css , tld更新]
39+ C:\opengionV8\uap\webapps\gf\WEB-INF\hybs-taglib.tld
40+ C:\opengionV8\uap\webapps\gf\src\META-INF\hybs-taglib.tld
41+ C:\opengionV8\uap\webapps\gf\src\script\common\eventScript.js
42+
43+8.1.2.3 (2022/04/12)
44+ [JavaScriptでの曖昧アイコンDIRを絶対パスに変更(問合・トラブル 43100-220411-01)]
45+ hayabusa.taglib.HeadTag#doEndTag()
46+
3547 [カラムリソース 修正]
3648 DESCRIPTION(概要説明) 文字種別を XK混在 → 無条件 に変更
3749
3850 [jsp , js , css , tld更新]
3951 C:\opengionV8\uap\webapps\gf\src\script\common\eventScript.js
40- C:\opengionV8\uap\webapps\gf\WEB-INF\hybs-taglib.tld
41- C:\opengionV8\uap\webapps\gf\src\META-INF\hybs-taglib.tld
4252
4353 8.1.2.2 (2022/04/06)
4454 [スレッドグループの中断処理を、一旦削除します]
--- trunk/opengionV8/uap/webapps/gf/jsp/common/eventScript.js (revision 2246)
+++ trunk/opengionV8/uap/webapps/gf/jsp/common/eventScript.js (revision 2247)
@@ -11,13 +11,13 @@
1111 var zen2han=function(a){return a=a.replace(/[\uff21-\uff3a\uff41-\uff5a\uff10-\uff19\uff0e\u2010\uff0d]/g,function(c){return String.fromCharCode(c.charCodeAt(0)-65248)})},colMap,notFireCols,jH_evElm;$(function(){"undefined"!=typeof EC_NAME&&(jH_evElm=$(".h_evElm"),makeColMapping(),setEvent('textarea,select,input[type="text"]',"change",function(){makeColumn(this)},".h_evCol",!0,addEvColCls),setEvent("input[type=checkbox],input[type=radio]","click",function(){makeColumn(this)},".h_evCol",!0))});
1212 function makeColMapping(){var a,c,b;if(!colMap)for(colMap={},a=0;a<EC_EVCOL.length;a++){var d=EC_EVCOL[a].split(",");for(c=0;c<d.length;c++){var e=d[c];"_"==e.charAt(0)&&(e=e.substring(1),null==notFireCols&&(notFireCols=","),notFireCols+=e,notFireCols+=",");(b=colMap[e])||(b=[]);b[b.length]=EC_NAME[a];colMap[e]=b}}}function addEvColCls(){for(var a in colMap)$("#"+a+",[id^="+a+"__]").addClass("h_evCol")}
1313 function makeColumn(a){var c;jH_evElm&&isEndInitEvent()&&(jH_evElm=null);var b=$(a);var d=b.attr("id");var e=d.split("__")[0];if((c=colMap[e])&&!(!isEndInitEvent()&&notFireCols&&0<=notFireCols.indexOf(","+e+","))&&useConvert(a))for(a=0;a<c.length;a++){var f=d==e?"":"__"+d.split("__")[1];var h=c[a]+f;var u=h.split("__")[0];var l=isEndInitEvent()?$(".h_evElm[h_evCid="+h+"]"):jH_evElm.filter("[h_evCid="+h+"]");var v=l.attr("h_evWrtbl");eventColumn(b,l,h,u,f,v)}}
14-function eventColumn(a,c,b,d,e,f){var h,u,l={};if(c&&0!=c.length){if(!isEndInitEvent()){var v=a.get(0).value;if(!v||null==v||""==v)return}try{var n=eval("EC_"+d+"_URL")}catch(p){alert("[SYSTEM_ERROR] : URL that processes the event is not specified. (variable undefinition). ["+d+"]");return}if(n&&""!=n){v="";try{v=f?eval("EC_"+d+"_EDITPARAM"):eval("EC_"+d+"_RENDPARAM")}catch(p){}try{var w=f?eval("EC_"+d+"_EDITPARAMKEYS"):eval("EC_"+d+"_RENDPARAMKEYS")}catch(p){}if("true"===eval("EC_"+d+"_FLGENCRYPT")){if(w){var m=
15-w.split(",");for(h=0;h<m.length;h++){var x=m[h];w=""==e?$("#"+x).get(0).value:$("#"+x+e).get(0).value;l[x]=w}}}else if(null!=v&&""!=v)for(n+="?",h=w=0;-1!=(w=v.indexOf("{@",h));)h=v.indexOf("}",w),m=v.substring(w+2,h),0>m.indexOf(".")&&(h="{@"+m+"}",x=function(p){console.log("noDifined:");console.log(p);return null},x=""==e?$("#"+m)[0]?$("#"+m).get(0).value:x(m):$("#"+m+e)[0]?$("#"+m+e).get(0).value:x(m+e),x=null==x?"":x,v=v.replace(h,x),n+=m+"="+encodeURIComponent(x)+"&"),h=w+1;valsql="";try{valsql=
16-eval("EC_"+d+"_VALSQL")}catch(p){}if(null!=valsql&&""!=valsql)for(h=w=0;-1!=(w=valsql.indexOf("{@",h));)h=valsql.indexOf("}",w),m=valsql.substring(w+2,h),0>m.indexOf(".")&&(h="{@"+m+"}",x=""==e?$("#"+m).get(0).value:$("#"+m+e).get(0).value,x=null==x?"":x,valsql=valsql.replace(h,x)),h=w+1;m=function(){_firstOption=t.children("option").get(0);return null==_firstOption||""!=_firstOption.value?!1:!0};var K=function(){t.attr("isfocus","true")};var t=null!=b&&""!=b?c.find("#"+b):[];0<t.length&&isEndInitEvent()&&
17-t.bind("focus",K);w="";0<t.length&&(w=isEndInitEvent()?null==t.val()?"":t.val():null==c.attr("h_evVal")?"":c.attr("h_evVal"));x="";try{x=eval("EC_"+d+"_RENDERER")}catch(p){}var M="";try{M=eval("EC_"+d+"_EDITOR")}catch(p){}var O="title style tabindex readonly disabled onClick onChange onBlur onFocus ondblClick onMouseDown onMouseUp onMouseMove onMouseOut onMouseOver onSelect onKeydown onKeypress onKeyup eventCallBack multiple".split(" ");var z="";if(0<t.length)for(h=0;h<O.length;h++){var F=t.attr(O[h]);
14+function eventColumn(a,c,b,d,e,f){var h,u,l={};if(c&&0!=c.length){if(!isEndInitEvent()){var v=a.get(0).value;if(!v||null==v||""==v)return}try{var p=eval("EC_"+d+"_URL")}catch(n){alert("[SYSTEM_ERROR] : URL that processes the event is not specified. (variable undefinition). ["+d+"]");return}if(p&&""!=p){v="";try{v=f?eval("EC_"+d+"_EDITPARAM"):eval("EC_"+d+"_RENDPARAM")}catch(n){}try{var w=f?eval("EC_"+d+"_EDITPARAMKEYS"):eval("EC_"+d+"_RENDPARAMKEYS")}catch(n){}if("true"===eval("EC_"+d+"_FLGENCRYPT")){if(w){var m=
15+w.split(",");for(h=0;h<m.length;h++){var x=m[h];w=""==e?$("#"+x).get(0).value:$("#"+x+e).get(0).value;l[x]=w}}}else if(null!=v&&""!=v)for(p+="?",h=w=0;-1!=(w=v.indexOf("{@",h));)h=v.indexOf("}",w),m=v.substring(w+2,h),0>m.indexOf(".")&&(h="{@"+m+"}",x=function(n){console.log("noDifined:");console.log(n);return null},x=""==e?$("#"+m)[0]?$("#"+m).get(0).value:x(m):$("#"+m+e)[0]?$("#"+m+e).get(0).value:x(m+e),x=null==x?"":x,v=v.replace(h,x),p+=m+"="+encodeURIComponent(x)+"&"),h=w+1;valsql="";try{valsql=
16+eval("EC_"+d+"_VALSQL")}catch(n){}if(null!=valsql&&""!=valsql)for(h=w=0;-1!=(w=valsql.indexOf("{@",h));)h=valsql.indexOf("}",w),m=valsql.substring(w+2,h),0>m.indexOf(".")&&(h="{@"+m+"}",x=""==e?$("#"+m).get(0).value:$("#"+m+e).get(0).value,x=null==x?"":x,valsql=valsql.replace(h,x)),h=w+1;m=function(){_firstOption=t.children("option").get(0);return null==_firstOption||""!=_firstOption.value?!1:!0};var K=function(){t.attr("isfocus","true")};var t=null!=b&&""!=b?c.find("#"+b):[];0<t.length&&isEndInitEvent()&&
17+t.bind("focus",K);w="";0<t.length&&(w=isEndInitEvent()?null==t.val()?"":t.val():null==c.attr("h_evVal")?"":c.attr("h_evVal"));x="";try{x=eval("EC_"+d+"_RENDERER")}catch(n){}var M="";try{M=eval("EC_"+d+"_EDITOR")}catch(n){}var O="title style tabindex readonly disabled onClick onChange onBlur onFocus ondblClick onMouseDown onMouseUp onMouseMove onMouseOut onMouseOver onSelect onKeydown onKeypress onKeyup eventCallBack multiple".split(" ");var z="";if(0<t.length)for(h=0;h<O.length;h++){var F=t.attr(O[h]);
1818 if(null!=F){var k=typeof F;var N=!1;"function"==k?(F=F.toString(),N=0<F.length?!0:!1,F="("+F+")()"):N="boolean"==k?F:0<F.length?!0:!1;N&&(z+=O[h]+"='"+F+"' ")}}l.EC_CID=null==b?"":b;l.EC_CNAME=null==d?"":d;l.EC_RENDERER=x;l.EC_EDITOR=M;l.EC_PARAM=v;l.EC_SQL=v;l.EC_VALSQL=valsql;l.EC_WRITABLE=null==f?"":f;l.EC_CVALUE=w;l.EC_NOVALUE=0==t.length?"":m();l.EC_CLASS=0==t.length?"":t.attr("class");l.EC_SIZE=0==t.length?"":t.attr("size");l.EC_MAXLENGTH=0==t.length?"":t.attr("maxlength");l.EC_OPTATTRS=z;l.EC_PNAME=
19-null==a.attr("id")?"":a.attr("id").split("__")[0];l.EC_PVALUE=null==a.get(0).value?"":a.get(0).value;l.EC_USESLBL=null==e||""==e?"false":"true";$.ajax({url:n,data:l,type:"POST",dataType:"html",async:isEndInitEvent(),error:function(p,G,L){0>n.indexOf(".htm")&&alert("EventColumnError:"+p+":"+G+":"+L+":"+d)},success:function(p,G){p=$(p);0<t.length&&(isEndInitEvent()&&t.unbind("focus",K),bindOldEvents(p.get(0),jQuery._data(t.clone(!0).get(0)).events));c.empty().append(p);0<t.length&&(c.find("input,select,textarea").attr("name",
20-b).attr("id",b),isEndInitEvent()&&t.attr("isfocus")&&(p.get(0).focus(),$.browser.msie&&p.get(0).focus()),isEndInitEvent()||p.change(),t.attr("eventCallback")&&(u=function(){eval(t.attr("eventCallback")+"(arguments);")},u(b,p.val(),t.get(0).value)));null!=e&&""!=e&&isEndInitEvent()&&$("table#viewTable").resizeView()}})}else alert("[SYSTEM_ERROR] : URL that processes the event is not specified. ["+d+"]")}else alert("[SYSTEM_ERROR] : jTag is null. The element of the replacement object doesn't exist. ["+
19+null==a.attr("id")?"":a.attr("id").split("__")[0];l.EC_PVALUE=null==a.get(0).value?"":a.get(0).value;l.EC_USESLBL=null==e||""==e?"false":"true";$.ajax({url:p,data:l,type:"POST",dataType:"html",async:isEndInitEvent(),error:function(n,G,L){0>p.indexOf(".htm")&&alert("EventColumnError:"+n+":"+G+":"+L+":"+d)},success:function(n,G){n=$(n);0<t.length&&(isEndInitEvent()&&t.unbind("focus",K),bindOldEvents(n.get(0),jQuery._data(t.clone(!0).get(0)).events));null!=b&&""!=b&&"text"==$("#"+b).attr("type")?$("#"+
20+b).val(n.val()):c.empty().append(n);0<t.length&&(c.find("input,select,textarea").attr("name",b).attr("id",b),isEndInitEvent()&&t.attr("isfocus")&&(n.get(0).focus(),$.browser.msie&&n.get(0).focus()),isEndInitEvent()||n.change(),t.attr("eventCallback")&&(u=function(){eval(t.attr("eventCallback")+"(arguments);")},u(b,n.val(),t.get(0).value)));null!=e&&""!=e&&isEndInitEvent()&&$("table#viewTable").resizeView()}})}else alert("[SYSTEM_ERROR] : URL that processes the event is not specified. ["+d+"]")}else alert("[SYSTEM_ERROR] : jTag is null. The element of the replacement object doesn't exist. ["+
2121 d+"]")}function bindOldEvents(a,c){var b,d;for(b in c)for(d in c[b])0!==c[b][d]&&jQuery.event.add(a,b,c[b][d],c[b][d].data)}var isShowTip=!1;
2222 $(function(){USE_REAL_TIME_CHECK&&(setEvent('textarea:not([realTimeChk="false"]),select:not([realTimeChk="false"]),input[type="text"]:not([realTimeChk="false"])',"focusout",function(){location.pathname.match(RegExp(/jsp/));check(this,RegExp.leftContext+"jsp/common/realtimecheck.jsp")}),$("table#viewTable").parent().parent().scroll(function(){isShowTip&&(isShowTip=!1,$(".tipErr").remove())}))});
2323 function check(a,c){var b,d;var e=a.name;if("undefined"!=typeof jQuery&&0!=e.indexOf("h_")){var f=a.value;"null"!=a.rtOption&&"undefined"!=a.rtOption&&(d=a.getAttribute("rtOption"));var h=e.split("__");var u=2==h.length;e="command=RENEW&checkType="+(u?"ENTRY":"NEW")+(u?"&h_rowSel="+h[1]:"")+"&column="+h[0]+"&"+e+"="+encodeURIComponent(f)+(d?"&"+d:"");c={dataType:"html",type:"POST",url:c,data:e,error:function(){},success:function(l){b=$(a).data("tipId");$("#"+b).remove();0<=$.trim(l).indexOf("row_error")&&
@@ -25,28 +25,28 @@
2525 function showCheckTip(a,c){var b=$(a).offset();if(30<=b.top){c=$("<div class='tipErr'><div id='tipArrowBottom'></div><div>"+c+"</div></div>").appendTo(document.body);var d=b.left;b=b.top+(-11-c[0].offsetHeight)}else c=$("<div class='tipErr'><div id='tipArrowTop'></div><div>"+c+"</div></div>").appendTo(document.body),d=b.left,b=b.top+11+c[0].offsetHeight;var e=(new Date).getTime();$(a).data("tipId",e);c.css({left:d+"px",top:b+"px"}).attr("id",e).click(function(){$(this).remove()}).show()}$(function(){bindEvents()});
2626 $.fn.simpleColorPickerOg=function(a){var c={colorsPerLine:8,colors:"#000000 #444444 #666666 #999999 #cccccc #eeeeee #f3f3f3 #ffffff #ff0000 #ff9900 #ffff00 #00ff00 #00ffff #0000ff #9900ff #ff00ff #f4cccc #fce5cd #fff2cc #d9ead3 #d0e0e3 #cfe2f3 #d9d2e9 #ead1dc #ea9999 #f9cb9c #ffe599 #b6d7a8 #a2c4c9 #9fc5e8 #b4a7d6 #d5a6bd #e06666 #f6b26b #ffd966 #93c47d #76a5af #6fa8dc #8e7cc3 #c27ba0 #cc0000 #e69138 #f1c232 #6aa84f #45818e #3d85c6 #674ea7 #a64d79 #990000 #b45f06 #bf9000 #38761d #134f5c #0b5394 #351c75 #741b47 #660000 #783f04 #7f6000 #274e13 #0c343d #073763 #20124d #4C1130".split(" "),
2727 showEffect:"",hideEffect:"",onChangeColor:!1},b=$.extend(c,a);return this.each(function(){function d(m){"fade"==b.hideEffect?m.fadeOut():"slide"==b.hideEffect?m.slideUp():m.hide()}for(var e=$(this),f="",h=e.attr("id").replace(/-/g,"")+"_",u=0;u<b.colors.length;u++){var l=b.colors[u],v="";0==u%b.colorsPerLine&&(v="clear: both; ");0<u&&v&&$.browser&&$.browser.msie&&7>=$.browser.version&&(v="",f+='<li style="float: none; clear: both; overflow: hidden; background-color: #fff; display: block; height: 1px; line-height: 1px; font-size: 1px; margin-bottom: -2px;"></li>');
28-f+='<li id="'+h+"color-"+u+'" class="color-box" style="'+v+"background-color: "+l+'" title="'+l+'"></li>'}var n=$('<div id="'+h+'color-picker" class="color-picker" style="position: absolute; left: 0px; top: 0px;"><ul>'+(f+('<li id="'+h+'color-default" class="color-box" style="width:80px; text-align:center; clear: both; background-color:white;" title="clear">clear</li></ul><div style="clear: both;"></div></div>')));$("body").append(n);n.hide();n.find("li.color-box").click(function(){var m=isNaN(this.id.substr(this.id.indexOf("-")+
29-1))?"":b.colors[this.id.substr(this.id.indexOf("-")+1)];e.is("input")||(e.val(m),e.blur());$.isFunction(c.onChangeColor)&&c.onChangeColor.call(e,m);d(n)});$("body").on("click",function(){d(n)});n.click(function(m){m.stopPropagation()});var w=function(m){var x=e.offset(),K=x.left+e.outerWidth()-m.outerWidth();K<x.left&&(K=x.left);m.css({left:K,top:x.top+e.outerHeight()});"fade"==b.showEffect?m.fadeIn():"slide"==b.showEffect?m.slideDown():m.show()};e.click(function(m){e=$(this);m.stopPropagation();
30-e.is("input")||w(n)});e.focus(function(){w(n)});e.change(function(m){e.val()!=e.css("background-color")&&e.css("background-color",e.val()).css("color",e.val())})})};$(function(){$.fn.simpleColorPickerOg&&$("input.colorPicker").simpleColorPickerOg({onChangeColor:function(a){$(this).val(a).css("background-color",a).css("color",a).change()}})});
28+f+='<li id="'+h+"color-"+u+'" class="color-box" style="'+v+"background-color: "+l+'" title="'+l+'"></li>'}var p=$('<div id="'+h+'color-picker" class="color-picker" style="position: absolute; left: 0px; top: 0px;"><ul>'+(f+('<li id="'+h+'color-default" class="color-box" style="width:80px; text-align:center; clear: both; background-color:white;" title="clear">clear</li></ul><div style="clear: both;"></div></div>')));$("body").append(p);p.hide();p.find("li.color-box").click(function(){var m=isNaN(this.id.substr(this.id.indexOf("-")+
29+1))?"":b.colors[this.id.substr(this.id.indexOf("-")+1)];e.is("input")||(e.val(m),e.blur());$.isFunction(c.onChangeColor)&&c.onChangeColor.call(e,m);d(p)});$("body").on("click",function(){d(p)});p.click(function(m){m.stopPropagation()});var w=function(m){var x=e.offset(),K=x.left+e.outerWidth()-m.outerWidth();K<x.left&&(K=x.left);m.css({left:K,top:x.top+e.outerHeight()});"fade"==b.showEffect?m.fadeIn():"slide"==b.showEffect?m.slideDown():m.show()};e.click(function(m){e=$(this);m.stopPropagation();
30+e.is("input")||w(p)});e.focus(function(){w(p)});e.change(function(m){e.val()!=e.css("background-color")&&e.css("background-color",e.val()).css("color",e.val())})})};$(function(){$.fn.simpleColorPickerOg&&$("input.colorPicker").simpleColorPickerOg({onChangeColor:function(a){$(this).val(a).css("background-color",a).css("color",a).change()}})});
3131 jQuery.fn.ogClockpicker=function(a,c){function b(f){if(f.starthour>=f.endhour)return alert("Error - start hour must be less than end hour."),!1;if(0!=60%f.minutedivisions)return alert("Error - param minutedivisions must divide evenly into 60."),!1}var d={starthour:6,endhour:20,showminutes:"true",minutedivisions:4,military:!0,event:"click",layout:"vertical",valuefield:null,useBgiframe:!1,hoursopacity:1,minutesopacity:1,second:""};a&&jQuery.extend(d,a);c=c||function(){};var e="vertical"==d.layout;b(d);
3232 jQuery(this)[d.event](function(f){function h(g){return k.military?"":12<=g?" PM":" AM"}function u(g){var q=document.documentElement.clientHeight?document.documentElement.clientHeight:document.body.clientHeight,r=parseInt(g[0].style.top),C=parseInt(g[0].style.left),B=document.documentElement.scrollTop?document.documentElement.scrollTop:document.body.scrollTop;r<=B&&!g.is("#CP_minutecont")?g.css("top",B+10+"px"):r+g.height()-B>q&&g.css("top",B+q-g.height()-10+"px");0>=C&&g.css("left","10px")}function l(g){"function"==
33-typeof jQuery.fn.bgIframe?g.bgIframe():alert("bgIframe plugin not loaded.")}function v(g){"CP_hourcont"==g.attr("id")?g.mouseout(function(q){try{jQuery(q.toElement?q.toElement:q.relatedTarget).is("div[class^=CP], iframe")||t()}catch(r){t()}}):"CP_minutecont"==g.attr("id")?g.mouseout(function(q){try{jQuery(q.toElement?q.toElement:q.relatedTarget).is("div[class^=CP], iframe")||t()}catch(r){t()}}):"CP_hour"==g.attr("class")?(g.mouseover(function(q){n(g,q)}),g.mouseout(function(){w(g)}),g.click(function(){var q=
34-g.attr("id").split("_")[1];h(q);q=g.attr("value");q=-1!=q.indexOf(" ")?q.substring(0,q.indexOf(" ")):q;g.text(q+"00"+k.second);K(g);t()})):"CP_minute"==g.attr("class")&&(g.mouseover(function(){m(g)}),g.mouseout(function(){x(g)}),g.click(function(){g.text(g.attr("value")+k.second);K(g);t()}))}function n(g,q){var r=g.attr("id").split("_")[1],C=g.attr("id").split("_")[2];g.addClass("CP_over");var B=Math.ceil((Math.floor(r/12)-Math.floor(k.starthour/12))/2);if("true"==k.showminutes){E.hide();var H=!k.military&&
35-12<r?r-12:r,y=r;if(k.military||0!=r)k.military||12!=r||(H="0");k.military&&10>r&&(H="0"+H);10>r&&(y="0"+y);E.empty();for(var J=60/k.minutedivisions,P=h(r),A=1,I=0;60>I;I+=J)$md=jQuery("<div class='CP_minute' id='"+r+"_"+I+"' value='"+y+(10>I?"0":"")+I+"'>"+H+":"+(10>I?"0":"")+I+P+"</div>"),e||($md.css("float","left"),6<k.minutedivisions&&A==k.minutedivisions/2+1&&E.append("<div style='clear:left' />")),E.append($md),v($md),A++;e?(q="mouseover"==q.type?q.pageY-15:p.offset().top+2+g.height()*C,g=p.offset().left+
36-2*G[0].width()*B+E.width()*(B-1)+4*B-2):(g="mouseover"==q.type?q.pageX-10:p.offset().left+(g.width()-5)*C,q=p.offset().top+(p.height()-(E.height()+2)*(Math.ceil(G.length/2)-1))/G.length*2*B+E.height()*(B-1)+2*B-1);E.css("left",g+"px").css("top",q+"px");u(E);E.show();k.useBgiframe&&l(E)}return!1}function w(g){g.removeClass("CP_over");return!1}function m(g){g.addClass("CP_over");return!1}function x(g){g.removeClass("CP_over");return!1}function K(g){k.valuefield?jQuery("input[name="+k.valuefield+"]").val(g.text()).change():
37-O.value=g.text();c.apply(z,[g.text()]);z.unbind("keydown",M)}function t(){"true"==k.showminutes&&E.hide();p.slideUp("fast");z.unbind("keydown",M)}function M(g){function q(D){if(D.prev().size())eval(J+"div_out($obj)"),eval(J+"div_over($obj.prev(), e)");else return!1}function r(D){if(D.next().size())eval(J+"div_out($obj)"),eval(J+"div_over($obj.next(), e)");else return!1}function C(D){$newobj=jQuery(".CP_hour[id$=_"+P+"]","#hourcol"+(0==(Math.floor(A/12)-Math.floor(k.starthour/12))%2?String(Math.floor(A/
38-12)-Math.floor(k.starthour/12)+1):String(Math.floor(A/12)-Math.floor(k.starthour/12)-1)));if($newobj.size())w(D),n($newobj,g);else return!1}function B(D){w(D);m($(".CP_minute:first"))}function H(D,Q){x(D);0>Q?0==(Math.floor(A/12)-Math.floor(k.starthour/12))%2?(D=String(Math.floor(A/12)-Math.floor(k.starthour/12)+Q),A=String(Number(A)-12)):D=String(Math.floor(A/12)-Math.floor(k.starthour/12)):0==(Math.floor(A/12)-Math.floor(k.starthour/12))%2?D=String(Math.floor(A/12)-Math.floor(k.starthour/12)):(D=
39-String(Math.floor(A/12)-Math.floor(k.starthour/12)+Q),A=String(Number(A)+12));D="#hourcol"+D;jQuery(".CP_hour[id^=hr_"+A+"]",D);D=jQuery(".CP_hour[id^=hr_"+A+"]",D);n(D,g)}var y=$("div.CP_over").size()?$("div.CP_over"):$("div.CP_hour:first"),J=y.is(".CP_hour")?"hour":"minute",P="hour"==J?y[0].id.split("_")[2]:0,A="minute"==J?y[0].id.split("_")[0]:y[0].id.split("_")[1],I="minute"==J?0==Math.floor(A/12)-Math.floor(k.starthour/12)?"m1":0==Math.floor(A/12)-Math.floor(k.endhour/12)&&0!=(Math.floor(A/12)-
33+typeof jQuery.fn.bgIframe?g.bgIframe():alert("bgIframe plugin not loaded.")}function v(g){"CP_hourcont"==g.attr("id")?g.mouseout(function(q){try{jQuery(q.toElement?q.toElement:q.relatedTarget).is("div[class^=CP], iframe")||t()}catch(r){t()}}):"CP_minutecont"==g.attr("id")?g.mouseout(function(q){try{jQuery(q.toElement?q.toElement:q.relatedTarget).is("div[class^=CP], iframe")||t()}catch(r){t()}}):"CP_hour"==g.attr("class")?(g.mouseover(function(q){p(g,q)}),g.mouseout(function(){w(g)}),g.click(function(){var q=
34+g.attr("id").split("_")[1];h(q);q=g.attr("value");q=-1!=q.indexOf(" ")?q.substring(0,q.indexOf(" ")):q;g.text(q+"00"+k.second);K(g);t()})):"CP_minute"==g.attr("class")&&(g.mouseover(function(){m(g)}),g.mouseout(function(){x(g)}),g.click(function(){g.text(g.attr("value")+k.second);K(g);t()}))}function p(g,q){var r=g.attr("id").split("_")[1],C=g.attr("id").split("_")[2];g.addClass("CP_over");var B=Math.ceil((Math.floor(r/12)-Math.floor(k.starthour/12))/2);if("true"==k.showminutes){E.hide();var H=!k.military&&
35+12<r?r-12:r,y=r;if(k.military||0!=r)k.military||12!=r||(H="0");k.military&&10>r&&(H="0"+H);10>r&&(y="0"+y);E.empty();for(var J=60/k.minutedivisions,P=h(r),A=1,I=0;60>I;I+=J)$md=jQuery("<div class='CP_minute' id='"+r+"_"+I+"' value='"+y+(10>I?"0":"")+I+"'>"+H+":"+(10>I?"0":"")+I+P+"</div>"),e||($md.css("float","left"),6<k.minutedivisions&&A==k.minutedivisions/2+1&&E.append("<div style='clear:left' />")),E.append($md),v($md),A++;e?(q="mouseover"==q.type?q.pageY-15:n.offset().top+2+g.height()*C,g=n.offset().left+
36+2*G[0].width()*B+E.width()*(B-1)+4*B-2):(g="mouseover"==q.type?q.pageX-10:n.offset().left+(g.width()-5)*C,q=n.offset().top+(n.height()-(E.height()+2)*(Math.ceil(G.length/2)-1))/G.length*2*B+E.height()*(B-1)+2*B-1);E.css("left",g+"px").css("top",q+"px");u(E);E.show();k.useBgiframe&&l(E)}return!1}function w(g){g.removeClass("CP_over");return!1}function m(g){g.addClass("CP_over");return!1}function x(g){g.removeClass("CP_over");return!1}function K(g){k.valuefield?jQuery("input[name="+k.valuefield+"]").val(g.text()).change():
37+O.value=g.text();c.apply(z,[g.text()]);z.unbind("keydown",M)}function t(){"true"==k.showminutes&&E.hide();n.slideUp("fast");z.unbind("keydown",M)}function M(g){function q(D){if(D.prev().size())eval(J+"div_out($obj)"),eval(J+"div_over($obj.prev(), e)");else return!1}function r(D){if(D.next().size())eval(J+"div_out($obj)"),eval(J+"div_over($obj.next(), e)");else return!1}function C(D){$newobj=jQuery(".CP_hour[id$=_"+P+"]","#hourcol"+(0==(Math.floor(A/12)-Math.floor(k.starthour/12))%2?String(Math.floor(A/
38+12)-Math.floor(k.starthour/12)+1):String(Math.floor(A/12)-Math.floor(k.starthour/12)-1)));if($newobj.size())w(D),p($newobj,g);else return!1}function B(D){w(D);m($(".CP_minute:first"))}function H(D,Q){x(D);0>Q?0==(Math.floor(A/12)-Math.floor(k.starthour/12))%2?(D=String(Math.floor(A/12)-Math.floor(k.starthour/12)+Q),A=String(Number(A)-12)):D=String(Math.floor(A/12)-Math.floor(k.starthour/12)):0==(Math.floor(A/12)-Math.floor(k.starthour/12))%2?D=String(Math.floor(A/12)-Math.floor(k.starthour/12)):(D=
39+String(Math.floor(A/12)-Math.floor(k.starthour/12)+Q),A=String(Number(A)+12));D="#hourcol"+D;jQuery(".CP_hour[id^=hr_"+A+"]",D);D=jQuery(".CP_hour[id^=hr_"+A+"]",D);p(D,g)}var y=$("div.CP_over").size()?$("div.CP_over"):$("div.CP_hour:first"),J=y.is(".CP_hour")?"hour":"minute",P="hour"==J?y[0].id.split("_")[2]:0,A="minute"==J?y[0].id.split("_")[0]:y[0].id.split("_")[1],I="minute"==J?0==Math.floor(A/12)-Math.floor(k.starthour/12)?"m1":0==Math.floor(A/12)-Math.floor(k.endhour/12)&&0!=(Math.floor(A/12)-
4040 Math.floor(k.starthour/12))%2?"m2":"m3":0==(Math.floor(A/12)-Math.floor(k.starthour/12))%2?"h1":"h2";switch(g.keyCode){case 37:if(e)switch(I){case "m1":return!1;case "m2":H(y,-1);break;case "m3":H(y,-1);break;case "h1":B(y);break;case "h2":C(y)}else q(y);break;case 38:if(e)q(y);else switch(I){case "m1":return!1;case "m2":H(y,-1);break;case "m3":H(y,-1);break;case "h1":B(y);break;case "h2":C(y)}break;case 39:if(e)switch(I){case "m1":H(y,1);break;case "m2":return!1;case "m3":H(y,1);break;case "h1":C(y);
4141 break;case "h2":B(y)}else r(y);break;case 40:if(e)r(y);else switch(I){case "m1":H(y,1);break;case "m2":return!1;case "m3":H(y,1);break;case "h1":C(y);break;case "h2":B(y)}break;case 13:eval(J+"div_click($obj)");break;default:return!0}return!1}var O=this,z=jQuery(this),F=jQuery("body"),k=jQuery.extend(!0,{},d);z.attr("valuefield")&&(k.valuefield=z.attr("valuefield"));z.attr("starthour")&&(k.starthour=parseInt(z.attr("starthour")));z.attr("endhour")&&(k.endhour=parseInt(z.attr("endhour")));z.attr("minutedivisions")&&
4242 (k.minutedivisions=parseInt(z.attr("minutedivisions")));z.attr("military")&&(k.military=z.attr("military"));z.attr("showminutes")&&(k.showminutes=z.attr("showminutes"));"true"==z.attr("usesecond")&&(k.second="00");z.attr("layout")&&(k.layout=z.attr("layout"),d.layout=k.layout,e="vertical"==k.layout);b(k);if(k.valuefield){var N=jQuery("[name="+k.valuefield+"]");N.unbind("keydown").bind("keydown",M)[0].focus();N.bind("click",function(){N.unbind("keydown")})}else z.unbind("keydown").bind("keydown",M);
43-jQuery("#CP_hourcont,#CP_minutecont").remove();var p=jQuery("<div id='CP_hourcont' class='CP' />").appendTo(F);k.useBgiframe||p.css("opacity",k.hoursopacity);v(p);for(var G=[],L=0;L<Math.floor(k.endhour/12)-Math.floor(k.starthour/12)+1;L++)G.push(jQuery("<div class='CP_hourcol' id='hourcol"+L+"' />").appendTo(F));if("true"==k.showminutes){var E=jQuery("<div id='CP_minutecont' class='CP' />").appendTo(F);k.useBgiframe||E.css("opacity",k.minutesopacity);v(E)}if(e)for(L=0;L<G.length;L++)G[L].addClass("floatleft");
44-else p.css("width","auto"),"true"==k.showminutes&&E.css("width","auto");(function(){for(var g=1,q=0,r=k.starthour;r<=k.endhour;r++){0==r%12&&(g=1);var C=!k.military&&12<r?r-12:r,B=r;if(k.military||0!=r)k.military||12!=r||(C="0");k.military&&10>r&&(C="0"+C);10>r&&(B="0"+B);C=jQuery("<div class='CP_hour' id='hr_"+r+"_"+g+"' value='"+B+"' >"+C+h(r)+"</div>");k.military&&C.width(20);v(C);e||C.css("float","left");G[q].append(C);0==(r+1)%12&&q++;g++}for(g=0;g<G.length;g++)e?0!=g&&0==g%2&&G[g].css("margin-left",
45-E.width()+4+"px"):(p.append("<div style='clear:left' />"),0!=g&&0==g%2&&G[g].css("margin-top","19px")),p.append(G[g])})();"focus"!=f.type?(p[0].style.left=f.pageX-5+"px",p[0].style.top=f.pageY-Math.floor(p.height()/2)+"px",u(p)):z.after(p);p.slideDown("fast");k.useBgiframe&&l(p);return!1});return this};$(function(){$.fn.ogClockpicker&&$(document).ready(function(){$(".clockpick").ogClockpicker()})});
43+jQuery("#CP_hourcont,#CP_minutecont").remove();var n=jQuery("<div id='CP_hourcont' class='CP' />").appendTo(F);k.useBgiframe||n.css("opacity",k.hoursopacity);v(n);for(var G=[],L=0;L<Math.floor(k.endhour/12)-Math.floor(k.starthour/12)+1;L++)G.push(jQuery("<div class='CP_hourcol' id='hourcol"+L+"' />").appendTo(F));if("true"==k.showminutes){var E=jQuery("<div id='CP_minutecont' class='CP' />").appendTo(F);k.useBgiframe||E.css("opacity",k.minutesopacity);v(E)}if(e)for(L=0;L<G.length;L++)G[L].addClass("floatleft");
44+else n.css("width","auto"),"true"==k.showminutes&&E.css("width","auto");(function(){for(var g=1,q=0,r=k.starthour;r<=k.endhour;r++){0==r%12&&(g=1);var C=!k.military&&12<r?r-12:r,B=r;if(k.military||0!=r)k.military||12!=r||(C="0");k.military&&10>r&&(C="0"+C);10>r&&(B="0"+B);C=jQuery("<div class='CP_hour' id='hr_"+r+"_"+g+"' value='"+B+"' >"+C+h(r)+"</div>");k.military&&C.width(20);v(C);e||C.css("float","left");G[q].append(C);0==(r+1)%12&&q++;g++}for(g=0;g<G.length;g++)e?0!=g&&0==g%2&&G[g].css("margin-left",
45+E.width()+4+"px"):(n.append("<div style='clear:left' />"),0!=g&&0==g%2&&G[g].css("margin-top","19px")),n.append(G[g])})();"focus"!=f.type?(n[0].style.left=f.pageX-5+"px",n[0].style.top=f.pageY-Math.floor(n.height()/2)+"px",u(n)):z.after(n);n.slideDown("fast");k.useBgiframe&&l(n);return!1});return this};$(function(){$.fn.ogClockpicker&&$(document).ready(function(){$(".clockpick").ogClockpicker()})});
4646 function likeComp(a){var c=a.substring(6);a=$("#"+a).attr("aimaiType");var b=$("#"+c).val();b=b.replace(/^%+|%+$/g,"");var d=$("#"+c).attr("maxlength");if(""!=b&&(null==d||b.length<parseInt(d,10)))switch(a){case "1":b+="%";break;case "2":b="%"+b;break;case "3":b="%"+b+"%"}$("#"+c).val(b)}$(function(){$("form").submit(function(){$("[id^='AIMAI_']").each(function(){likeComp(this.id)})})});
47-$.fn.aimaiPickerOg=function(a){var c=$.extend({iconDir:ICON_ADRS,icons:["aimai0.png","aimai1.png","aimai2.png","aimai3.png"],titls:["\u5b8c\u5168\u4e00\u81f4","\u524d\u65b9\u4e00\u81f4","\u5f8c\u65b9\u4e00\u81f4","\u524d\u5f8c\u66d6\u6627"]},a);return this.each(function(){function b(n){"fade"==c.hideEffect?n.fadeOut():"slide"==c.hideEffect?n.slideUp():n.hide()}for(var d=$(this),e="PIC_"+d.attr("id").replace(/-/g,"")+"_",f="",h=0;h<c.icons.length;h++){var u=c.titls[h];f+='<span id="'+e+"text-"+h+'" class="text-box"" title="'+
48-u+'"> '+('<img src="'+c.iconDir+c.icons[h]+'" alt="'+u+'"> </span>')}var l=$('<div id="'+e+'aimai-picker" class="aimai-picker" style="position: absolute; left: 0px; top: 0px;">'+f+'<div style="clear: both;"></div></div>');$("body").append(l);l.hide();l.find("span.text-box").click(function(){var n=this.id.substr(this.id.indexOf("-")+1);d.attr("aimaiType",n);d.attr("title",c.titls[n]);d.children("img").attr("src",c.iconDir+c.icons[n]);d.blur();b(l)});$("body").live("click",function(){b(l)});l.click(function(n){n.stopPropagation()});
49-var v=function(n){var w=d.offset(),m=w.left+d.outerWidth()-n.outerWidth();m<w.left&&(m=w.left);n.css({left:m,top:w.top+d.outerHeight()});"fade"==c.showEffect?n.fadeIn():"slide"==c.showEffect?n.slideDown():n.show()};d.click(function(n){n.stopPropagation();d.is("input")||v(l)});d.focus(function(){v(l)})})};$(function(){$.fn.aimaiPickerOg&&$(".aimaiClm").aimaiPickerOg()});
47+$.fn.aimaiPickerOg=function(a){var c=$.extend({iconDir:ICON_ADRS,icons:["aimai0.png","aimai1.png","aimai2.png","aimai3.png"],titls:["\u5b8c\u5168\u4e00\u81f4","\u524d\u65b9\u4e00\u81f4","\u5f8c\u65b9\u4e00\u81f4","\u524d\u5f8c\u66d6\u6627"]},a);return this.each(function(){function b(p){"fade"==c.hideEffect?p.fadeOut():"slide"==c.hideEffect?p.slideUp():p.hide()}for(var d=$(this),e="PIC_"+d.attr("id").replace(/-/g,"")+"_",f="",h=0;h<c.icons.length;h++){var u=c.titls[h];f+='<span id="'+e+"text-"+h+'" class="text-box"" title="'+
48+u+'"> '+('<img src="'+c.iconDir+c.icons[h]+'" alt="'+u+'"> </span>')}var l=$('<div id="'+e+'aimai-picker" class="aimai-picker" style="position: absolute; left: 0px; top: 0px;">'+f+'<div style="clear: both;"></div></div>');$("body").append(l);l.hide();l.find("span.text-box").click(function(){var p=this.id.substr(this.id.indexOf("-")+1);d.attr("aimaiType",p);d.attr("title",c.titls[p]);d.children("img").attr("src",c.iconDir+c.icons[p]);d.blur();b(l)});$("body").live("click",function(){b(l)});l.click(function(p){p.stopPropagation()});
49+var v=function(p){var w=d.offset(),m=w.left+d.outerWidth()-p.outerWidth();m<w.left&&(m=w.left);p.css({left:m,top:w.top+d.outerHeight()});"fade"==c.showEffect?p.fadeIn():"slide"==c.showEffect?p.slideDown():p.show()};d.click(function(p){p.stopPropagation();d.is("input")||v(l)});d.focus(function(){v(l)})})};$(function(){$.fn.aimaiPickerOg&&$(".aimaiClm").aimaiPickerOg()});
5050 function selectScroll(a){var c=4;a.getAttribute("size")&&(c=a.getAttribute("size"));for(var b=a.options,d=0;d<b.length;d++)if(b[d].selected){"OPTGROUP"==b[d].parentNode.tagName.toUpperCase()&&(d+=$(b[d].parentNode).prev().length);var e=d*($(a).height()/c);break}$(a).scrollTop(e)}$(function(){$("select[multiple]").each(function(){selectScroll(this)})});
5151 function dateFeedRtn(a,c,b,d,e){var f=parseInt(d.match(/[+-]?\d+/g));if($.isNumeric(f))if(0==f)var h=b?b:_getSysDate(a);else(b=$("#"+c).val().replace(/\//g,""))&&("Y"==a&&4==b.length||"YM"==a&&6==b.length||"YMD"==a&&8==b.length)&&_isDate(a,b)&&(h=_addDate(a,b,d,f));else h=_getSysDate(a);h&&($("#"+c).val(h).change(),"true"==e&&$("#queryButtonSubmit").click())}
5252 var _addDate=function(a,c,b,d){var e;switch(a){case "Y":var f=c;break;case "YM":f=c.replace(/(\d{4})(\d{2})/,"$1/$2")+"/01";break;default:f=c.replace(/(\d{4})(\d{2})(\d{2})/,"$1/$2/$3")}f=new Date(f);var h=f.getFullYear(),u=f.getMonth(),l=f.getDate();if(b.indexOf("SY"))if(b.indexOf("SD"))if(b.indexOf("SW"))if(b.indexOf("EY"))if(b.indexOf("ED"))if(b.indexOf("EW"))if(b.indexOf("Y"))if(b.indexOf("M"))b.indexOf("D")||f.setDate(l+d);else for(b=0<d?1:-1,e=0;e<Math.abs(d);e++)0<e&&(h=f.getFullYear(),u=f.getMonth(),
--- trunk/opengionV8/uap/webapps/gf/pache/jccall.bat (revision 2246)
+++ trunk/opengionV8/uap/webapps/gf/pache/jccall.bat (revision 2247)
@@ -3,8 +3,9 @@
33
44 call %~dp0..\..\..\bin\init.bat
55
6-set CLASSPATH=.;%CLASSPATH%;..\WEB-INF\lib\*;%EXT_DIR%\*;%CATALINA_HOME%\lib\*
6+set CLASSPATH=".;%OG_CLASSPATH%;../WEB-INF/lib/*;"
7+set PROCPATH="%CATALINA_HOME%/lib/websocket-api.jar"
78
8-javac -classpath %CLASSPATH% -encoding UTF-8 -Xlint:all -d classes *.java
9+javac -classpath %CLASSPATH% -processorpath %PROCPATH% -encoding UTF-8 -Xlint:all -d classes *.java
910
1011 pause
--- trunk/opengionV8/uap/webapps/gf/src/META-INF/resources/jsp/common/eventScript.js (revision 2246)
+++ trunk/opengionV8/uap/webapps/gf/src/META-INF/resources/jsp/common/eventScript.js (revision 2247)
@@ -11,13 +11,13 @@
1111 var zen2han=function(a){return a=a.replace(/[\uff21-\uff3a\uff41-\uff5a\uff10-\uff19\uff0e\u2010\uff0d]/g,function(c){return String.fromCharCode(c.charCodeAt(0)-65248)})},colMap,notFireCols,jH_evElm;$(function(){"undefined"!=typeof EC_NAME&&(jH_evElm=$(".h_evElm"),makeColMapping(),setEvent('textarea,select,input[type="text"]',"change",function(){makeColumn(this)},".h_evCol",!0,addEvColCls),setEvent("input[type=checkbox],input[type=radio]","click",function(){makeColumn(this)},".h_evCol",!0))});
1212 function makeColMapping(){var a,c,b;if(!colMap)for(colMap={},a=0;a<EC_EVCOL.length;a++){var d=EC_EVCOL[a].split(",");for(c=0;c<d.length;c++){var e=d[c];"_"==e.charAt(0)&&(e=e.substring(1),null==notFireCols&&(notFireCols=","),notFireCols+=e,notFireCols+=",");(b=colMap[e])||(b=[]);b[b.length]=EC_NAME[a];colMap[e]=b}}}function addEvColCls(){for(var a in colMap)$("#"+a+",[id^="+a+"__]").addClass("h_evCol")}
1313 function makeColumn(a){var c;jH_evElm&&isEndInitEvent()&&(jH_evElm=null);var b=$(a);var d=b.attr("id");var e=d.split("__")[0];if((c=colMap[e])&&!(!isEndInitEvent()&&notFireCols&&0<=notFireCols.indexOf(","+e+","))&&useConvert(a))for(a=0;a<c.length;a++){var f=d==e?"":"__"+d.split("__")[1];var h=c[a]+f;var u=h.split("__")[0];var l=isEndInitEvent()?$(".h_evElm[h_evCid="+h+"]"):jH_evElm.filter("[h_evCid="+h+"]");var v=l.attr("h_evWrtbl");eventColumn(b,l,h,u,f,v)}}
14-function eventColumn(a,c,b,d,e,f){var h,u,l={};if(c&&0!=c.length){if(!isEndInitEvent()){var v=a.get(0).value;if(!v||null==v||""==v)return}try{var n=eval("EC_"+d+"_URL")}catch(p){alert("[SYSTEM_ERROR] : URL that processes the event is not specified. (variable undefinition). ["+d+"]");return}if(n&&""!=n){v="";try{v=f?eval("EC_"+d+"_EDITPARAM"):eval("EC_"+d+"_RENDPARAM")}catch(p){}try{var w=f?eval("EC_"+d+"_EDITPARAMKEYS"):eval("EC_"+d+"_RENDPARAMKEYS")}catch(p){}if("true"===eval("EC_"+d+"_FLGENCRYPT")){if(w){var m=
15-w.split(",");for(h=0;h<m.length;h++){var x=m[h];w=""==e?$("#"+x).get(0).value:$("#"+x+e).get(0).value;l[x]=w}}}else if(null!=v&&""!=v)for(n+="?",h=w=0;-1!=(w=v.indexOf("{@",h));)h=v.indexOf("}",w),m=v.substring(w+2,h),0>m.indexOf(".")&&(h="{@"+m+"}",x=function(p){console.log("noDifined:");console.log(p);return null},x=""==e?$("#"+m)[0]?$("#"+m).get(0).value:x(m):$("#"+m+e)[0]?$("#"+m+e).get(0).value:x(m+e),x=null==x?"":x,v=v.replace(h,x),n+=m+"="+encodeURIComponent(x)+"&"),h=w+1;valsql="";try{valsql=
16-eval("EC_"+d+"_VALSQL")}catch(p){}if(null!=valsql&&""!=valsql)for(h=w=0;-1!=(w=valsql.indexOf("{@",h));)h=valsql.indexOf("}",w),m=valsql.substring(w+2,h),0>m.indexOf(".")&&(h="{@"+m+"}",x=""==e?$("#"+m).get(0).value:$("#"+m+e).get(0).value,x=null==x?"":x,valsql=valsql.replace(h,x)),h=w+1;m=function(){_firstOption=t.children("option").get(0);return null==_firstOption||""!=_firstOption.value?!1:!0};var K=function(){t.attr("isfocus","true")};var t=null!=b&&""!=b?c.find("#"+b):[];0<t.length&&isEndInitEvent()&&
17-t.bind("focus",K);w="";0<t.length&&(w=isEndInitEvent()?null==t.val()?"":t.val():null==c.attr("h_evVal")?"":c.attr("h_evVal"));x="";try{x=eval("EC_"+d+"_RENDERER")}catch(p){}var M="";try{M=eval("EC_"+d+"_EDITOR")}catch(p){}var O="title style tabindex readonly disabled onClick onChange onBlur onFocus ondblClick onMouseDown onMouseUp onMouseMove onMouseOut onMouseOver onSelect onKeydown onKeypress onKeyup eventCallBack multiple".split(" ");var z="";if(0<t.length)for(h=0;h<O.length;h++){var F=t.attr(O[h]);
14+function eventColumn(a,c,b,d,e,f){var h,u,l={};if(c&&0!=c.length){if(!isEndInitEvent()){var v=a.get(0).value;if(!v||null==v||""==v)return}try{var p=eval("EC_"+d+"_URL")}catch(n){alert("[SYSTEM_ERROR] : URL that processes the event is not specified. (variable undefinition). ["+d+"]");return}if(p&&""!=p){v="";try{v=f?eval("EC_"+d+"_EDITPARAM"):eval("EC_"+d+"_RENDPARAM")}catch(n){}try{var w=f?eval("EC_"+d+"_EDITPARAMKEYS"):eval("EC_"+d+"_RENDPARAMKEYS")}catch(n){}if("true"===eval("EC_"+d+"_FLGENCRYPT")){if(w){var m=
15+w.split(",");for(h=0;h<m.length;h++){var x=m[h];w=""==e?$("#"+x).get(0).value:$("#"+x+e).get(0).value;l[x]=w}}}else if(null!=v&&""!=v)for(p+="?",h=w=0;-1!=(w=v.indexOf("{@",h));)h=v.indexOf("}",w),m=v.substring(w+2,h),0>m.indexOf(".")&&(h="{@"+m+"}",x=function(n){console.log("noDifined:");console.log(n);return null},x=""==e?$("#"+m)[0]?$("#"+m).get(0).value:x(m):$("#"+m+e)[0]?$("#"+m+e).get(0).value:x(m+e),x=null==x?"":x,v=v.replace(h,x),p+=m+"="+encodeURIComponent(x)+"&"),h=w+1;valsql="";try{valsql=
16+eval("EC_"+d+"_VALSQL")}catch(n){}if(null!=valsql&&""!=valsql)for(h=w=0;-1!=(w=valsql.indexOf("{@",h));)h=valsql.indexOf("}",w),m=valsql.substring(w+2,h),0>m.indexOf(".")&&(h="{@"+m+"}",x=""==e?$("#"+m).get(0).value:$("#"+m+e).get(0).value,x=null==x?"":x,valsql=valsql.replace(h,x)),h=w+1;m=function(){_firstOption=t.children("option").get(0);return null==_firstOption||""!=_firstOption.value?!1:!0};var K=function(){t.attr("isfocus","true")};var t=null!=b&&""!=b?c.find("#"+b):[];0<t.length&&isEndInitEvent()&&
17+t.bind("focus",K);w="";0<t.length&&(w=isEndInitEvent()?null==t.val()?"":t.val():null==c.attr("h_evVal")?"":c.attr("h_evVal"));x="";try{x=eval("EC_"+d+"_RENDERER")}catch(n){}var M="";try{M=eval("EC_"+d+"_EDITOR")}catch(n){}var O="title style tabindex readonly disabled onClick onChange onBlur onFocus ondblClick onMouseDown onMouseUp onMouseMove onMouseOut onMouseOver onSelect onKeydown onKeypress onKeyup eventCallBack multiple".split(" ");var z="";if(0<t.length)for(h=0;h<O.length;h++){var F=t.attr(O[h]);
1818 if(null!=F){var k=typeof F;var N=!1;"function"==k?(F=F.toString(),N=0<F.length?!0:!1,F="("+F+")()"):N="boolean"==k?F:0<F.length?!0:!1;N&&(z+=O[h]+"='"+F+"' ")}}l.EC_CID=null==b?"":b;l.EC_CNAME=null==d?"":d;l.EC_RENDERER=x;l.EC_EDITOR=M;l.EC_PARAM=v;l.EC_SQL=v;l.EC_VALSQL=valsql;l.EC_WRITABLE=null==f?"":f;l.EC_CVALUE=w;l.EC_NOVALUE=0==t.length?"":m();l.EC_CLASS=0==t.length?"":t.attr("class");l.EC_SIZE=0==t.length?"":t.attr("size");l.EC_MAXLENGTH=0==t.length?"":t.attr("maxlength");l.EC_OPTATTRS=z;l.EC_PNAME=
19-null==a.attr("id")?"":a.attr("id").split("__")[0];l.EC_PVALUE=null==a.get(0).value?"":a.get(0).value;l.EC_USESLBL=null==e||""==e?"false":"true";$.ajax({url:n,data:l,type:"POST",dataType:"html",async:isEndInitEvent(),error:function(p,G,L){0>n.indexOf(".htm")&&alert("EventColumnError:"+p+":"+G+":"+L+":"+d)},success:function(p,G){p=$(p);0<t.length&&(isEndInitEvent()&&t.unbind("focus",K),bindOldEvents(p.get(0),jQuery._data(t.clone(!0).get(0)).events));c.empty().append(p);0<t.length&&(c.find("input,select,textarea").attr("name",
20-b).attr("id",b),isEndInitEvent()&&t.attr("isfocus")&&(p.get(0).focus(),$.browser.msie&&p.get(0).focus()),isEndInitEvent()||p.change(),t.attr("eventCallback")&&(u=function(){eval(t.attr("eventCallback")+"(arguments);")},u(b,p.val(),t.get(0).value)));null!=e&&""!=e&&isEndInitEvent()&&$("table#viewTable").resizeView()}})}else alert("[SYSTEM_ERROR] : URL that processes the event is not specified. ["+d+"]")}else alert("[SYSTEM_ERROR] : jTag is null. The element of the replacement object doesn't exist. ["+
19+null==a.attr("id")?"":a.attr("id").split("__")[0];l.EC_PVALUE=null==a.get(0).value?"":a.get(0).value;l.EC_USESLBL=null==e||""==e?"false":"true";$.ajax({url:p,data:l,type:"POST",dataType:"html",async:isEndInitEvent(),error:function(n,G,L){0>p.indexOf(".htm")&&alert("EventColumnError:"+n+":"+G+":"+L+":"+d)},success:function(n,G){n=$(n);0<t.length&&(isEndInitEvent()&&t.unbind("focus",K),bindOldEvents(n.get(0),jQuery._data(t.clone(!0).get(0)).events));null!=b&&""!=b&&"text"==$("#"+b).attr("type")?$("#"+
20+b).val(n.val()):c.empty().append(n);0<t.length&&(c.find("input,select,textarea").attr("name",b).attr("id",b),isEndInitEvent()&&t.attr("isfocus")&&(n.get(0).focus(),$.browser.msie&&n.get(0).focus()),isEndInitEvent()||n.change(),t.attr("eventCallback")&&(u=function(){eval(t.attr("eventCallback")+"(arguments);")},u(b,n.val(),t.get(0).value)));null!=e&&""!=e&&isEndInitEvent()&&$("table#viewTable").resizeView()}})}else alert("[SYSTEM_ERROR] : URL that processes the event is not specified. ["+d+"]")}else alert("[SYSTEM_ERROR] : jTag is null. The element of the replacement object doesn't exist. ["+
2121 d+"]")}function bindOldEvents(a,c){var b,d;for(b in c)for(d in c[b])0!==c[b][d]&&jQuery.event.add(a,b,c[b][d],c[b][d].data)}var isShowTip=!1;
2222 $(function(){USE_REAL_TIME_CHECK&&(setEvent('textarea:not([realTimeChk="false"]),select:not([realTimeChk="false"]),input[type="text"]:not([realTimeChk="false"])',"focusout",function(){location.pathname.match(RegExp(/jsp/));check(this,RegExp.leftContext+"jsp/common/realtimecheck.jsp")}),$("table#viewTable").parent().parent().scroll(function(){isShowTip&&(isShowTip=!1,$(".tipErr").remove())}))});
2323 function check(a,c){var b,d;var e=a.name;if("undefined"!=typeof jQuery&&0!=e.indexOf("h_")){var f=a.value;"null"!=a.rtOption&&"undefined"!=a.rtOption&&(d=a.getAttribute("rtOption"));var h=e.split("__");var u=2==h.length;e="command=RENEW&checkType="+(u?"ENTRY":"NEW")+(u?"&h_rowSel="+h[1]:"")+"&column="+h[0]+"&"+e+"="+encodeURIComponent(f)+(d?"&"+d:"");c={dataType:"html",type:"POST",url:c,data:e,error:function(){},success:function(l){b=$(a).data("tipId");$("#"+b).remove();0<=$.trim(l).indexOf("row_error")&&
@@ -25,28 +25,28 @@
2525 function showCheckTip(a,c){var b=$(a).offset();if(30<=b.top){c=$("<div class='tipErr'><div id='tipArrowBottom'></div><div>"+c+"</div></div>").appendTo(document.body);var d=b.left;b=b.top+(-11-c[0].offsetHeight)}else c=$("<div class='tipErr'><div id='tipArrowTop'></div><div>"+c+"</div></div>").appendTo(document.body),d=b.left,b=b.top+11+c[0].offsetHeight;var e=(new Date).getTime();$(a).data("tipId",e);c.css({left:d+"px",top:b+"px"}).attr("id",e).click(function(){$(this).remove()}).show()}$(function(){bindEvents()});
2626 $.fn.simpleColorPickerOg=function(a){var c={colorsPerLine:8,colors:"#000000 #444444 #666666 #999999 #cccccc #eeeeee #f3f3f3 #ffffff #ff0000 #ff9900 #ffff00 #00ff00 #00ffff #0000ff #9900ff #ff00ff #f4cccc #fce5cd #fff2cc #d9ead3 #d0e0e3 #cfe2f3 #d9d2e9 #ead1dc #ea9999 #f9cb9c #ffe599 #b6d7a8 #a2c4c9 #9fc5e8 #b4a7d6 #d5a6bd #e06666 #f6b26b #ffd966 #93c47d #76a5af #6fa8dc #8e7cc3 #c27ba0 #cc0000 #e69138 #f1c232 #6aa84f #45818e #3d85c6 #674ea7 #a64d79 #990000 #b45f06 #bf9000 #38761d #134f5c #0b5394 #351c75 #741b47 #660000 #783f04 #7f6000 #274e13 #0c343d #073763 #20124d #4C1130".split(" "),
2727 showEffect:"",hideEffect:"",onChangeColor:!1},b=$.extend(c,a);return this.each(function(){function d(m){"fade"==b.hideEffect?m.fadeOut():"slide"==b.hideEffect?m.slideUp():m.hide()}for(var e=$(this),f="",h=e.attr("id").replace(/-/g,"")+"_",u=0;u<b.colors.length;u++){var l=b.colors[u],v="";0==u%b.colorsPerLine&&(v="clear: both; ");0<u&&v&&$.browser&&$.browser.msie&&7>=$.browser.version&&(v="",f+='<li style="float: none; clear: both; overflow: hidden; background-color: #fff; display: block; height: 1px; line-height: 1px; font-size: 1px; margin-bottom: -2px;"></li>');
28-f+='<li id="'+h+"color-"+u+'" class="color-box" style="'+v+"background-color: "+l+'" title="'+l+'"></li>'}var n=$('<div id="'+h+'color-picker" class="color-picker" style="position: absolute; left: 0px; top: 0px;"><ul>'+(f+('<li id="'+h+'color-default" class="color-box" style="width:80px; text-align:center; clear: both; background-color:white;" title="clear">clear</li></ul><div style="clear: both;"></div></div>')));$("body").append(n);n.hide();n.find("li.color-box").click(function(){var m=isNaN(this.id.substr(this.id.indexOf("-")+
29-1))?"":b.colors[this.id.substr(this.id.indexOf("-")+1)];e.is("input")||(e.val(m),e.blur());$.isFunction(c.onChangeColor)&&c.onChangeColor.call(e,m);d(n)});$("body").on("click",function(){d(n)});n.click(function(m){m.stopPropagation()});var w=function(m){var x=e.offset(),K=x.left+e.outerWidth()-m.outerWidth();K<x.left&&(K=x.left);m.css({left:K,top:x.top+e.outerHeight()});"fade"==b.showEffect?m.fadeIn():"slide"==b.showEffect?m.slideDown():m.show()};e.click(function(m){e=$(this);m.stopPropagation();
30-e.is("input")||w(n)});e.focus(function(){w(n)});e.change(function(m){e.val()!=e.css("background-color")&&e.css("background-color",e.val()).css("color",e.val())})})};$(function(){$.fn.simpleColorPickerOg&&$("input.colorPicker").simpleColorPickerOg({onChangeColor:function(a){$(this).val(a).css("background-color",a).css("color",a).change()}})});
28+f+='<li id="'+h+"color-"+u+'" class="color-box" style="'+v+"background-color: "+l+'" title="'+l+'"></li>'}var p=$('<div id="'+h+'color-picker" class="color-picker" style="position: absolute; left: 0px; top: 0px;"><ul>'+(f+('<li id="'+h+'color-default" class="color-box" style="width:80px; text-align:center; clear: both; background-color:white;" title="clear">clear</li></ul><div style="clear: both;"></div></div>')));$("body").append(p);p.hide();p.find("li.color-box").click(function(){var m=isNaN(this.id.substr(this.id.indexOf("-")+
29+1))?"":b.colors[this.id.substr(this.id.indexOf("-")+1)];e.is("input")||(e.val(m),e.blur());$.isFunction(c.onChangeColor)&&c.onChangeColor.call(e,m);d(p)});$("body").on("click",function(){d(p)});p.click(function(m){m.stopPropagation()});var w=function(m){var x=e.offset(),K=x.left+e.outerWidth()-m.outerWidth();K<x.left&&(K=x.left);m.css({left:K,top:x.top+e.outerHeight()});"fade"==b.showEffect?m.fadeIn():"slide"==b.showEffect?m.slideDown():m.show()};e.click(function(m){e=$(this);m.stopPropagation();
30+e.is("input")||w(p)});e.focus(function(){w(p)});e.change(function(m){e.val()!=e.css("background-color")&&e.css("background-color",e.val()).css("color",e.val())})})};$(function(){$.fn.simpleColorPickerOg&&$("input.colorPicker").simpleColorPickerOg({onChangeColor:function(a){$(this).val(a).css("background-color",a).css("color",a).change()}})});
3131 jQuery.fn.ogClockpicker=function(a,c){function b(f){if(f.starthour>=f.endhour)return alert("Error - start hour must be less than end hour."),!1;if(0!=60%f.minutedivisions)return alert("Error - param minutedivisions must divide evenly into 60."),!1}var d={starthour:6,endhour:20,showminutes:"true",minutedivisions:4,military:!0,event:"click",layout:"vertical",valuefield:null,useBgiframe:!1,hoursopacity:1,minutesopacity:1,second:""};a&&jQuery.extend(d,a);c=c||function(){};var e="vertical"==d.layout;b(d);
3232 jQuery(this)[d.event](function(f){function h(g){return k.military?"":12<=g?" PM":" AM"}function u(g){var q=document.documentElement.clientHeight?document.documentElement.clientHeight:document.body.clientHeight,r=parseInt(g[0].style.top),C=parseInt(g[0].style.left),B=document.documentElement.scrollTop?document.documentElement.scrollTop:document.body.scrollTop;r<=B&&!g.is("#CP_minutecont")?g.css("top",B+10+"px"):r+g.height()-B>q&&g.css("top",B+q-g.height()-10+"px");0>=C&&g.css("left","10px")}function l(g){"function"==
33-typeof jQuery.fn.bgIframe?g.bgIframe():alert("bgIframe plugin not loaded.")}function v(g){"CP_hourcont"==g.attr("id")?g.mouseout(function(q){try{jQuery(q.toElement?q.toElement:q.relatedTarget).is("div[class^=CP], iframe")||t()}catch(r){t()}}):"CP_minutecont"==g.attr("id")?g.mouseout(function(q){try{jQuery(q.toElement?q.toElement:q.relatedTarget).is("div[class^=CP], iframe")||t()}catch(r){t()}}):"CP_hour"==g.attr("class")?(g.mouseover(function(q){n(g,q)}),g.mouseout(function(){w(g)}),g.click(function(){var q=
34-g.attr("id").split("_")[1];h(q);q=g.attr("value");q=-1!=q.indexOf(" ")?q.substring(0,q.indexOf(" ")):q;g.text(q+"00"+k.second);K(g);t()})):"CP_minute"==g.attr("class")&&(g.mouseover(function(){m(g)}),g.mouseout(function(){x(g)}),g.click(function(){g.text(g.attr("value")+k.second);K(g);t()}))}function n(g,q){var r=g.attr("id").split("_")[1],C=g.attr("id").split("_")[2];g.addClass("CP_over");var B=Math.ceil((Math.floor(r/12)-Math.floor(k.starthour/12))/2);if("true"==k.showminutes){E.hide();var H=!k.military&&
35-12<r?r-12:r,y=r;if(k.military||0!=r)k.military||12!=r||(H="0");k.military&&10>r&&(H="0"+H);10>r&&(y="0"+y);E.empty();for(var J=60/k.minutedivisions,P=h(r),A=1,I=0;60>I;I+=J)$md=jQuery("<div class='CP_minute' id='"+r+"_"+I+"' value='"+y+(10>I?"0":"")+I+"'>"+H+":"+(10>I?"0":"")+I+P+"</div>"),e||($md.css("float","left"),6<k.minutedivisions&&A==k.minutedivisions/2+1&&E.append("<div style='clear:left' />")),E.append($md),v($md),A++;e?(q="mouseover"==q.type?q.pageY-15:p.offset().top+2+g.height()*C,g=p.offset().left+
36-2*G[0].width()*B+E.width()*(B-1)+4*B-2):(g="mouseover"==q.type?q.pageX-10:p.offset().left+(g.width()-5)*C,q=p.offset().top+(p.height()-(E.height()+2)*(Math.ceil(G.length/2)-1))/G.length*2*B+E.height()*(B-1)+2*B-1);E.css("left",g+"px").css("top",q+"px");u(E);E.show();k.useBgiframe&&l(E)}return!1}function w(g){g.removeClass("CP_over");return!1}function m(g){g.addClass("CP_over");return!1}function x(g){g.removeClass("CP_over");return!1}function K(g){k.valuefield?jQuery("input[name="+k.valuefield+"]").val(g.text()).change():
37-O.value=g.text();c.apply(z,[g.text()]);z.unbind("keydown",M)}function t(){"true"==k.showminutes&&E.hide();p.slideUp("fast");z.unbind("keydown",M)}function M(g){function q(D){if(D.prev().size())eval(J+"div_out($obj)"),eval(J+"div_over($obj.prev(), e)");else return!1}function r(D){if(D.next().size())eval(J+"div_out($obj)"),eval(J+"div_over($obj.next(), e)");else return!1}function C(D){$newobj=jQuery(".CP_hour[id$=_"+P+"]","#hourcol"+(0==(Math.floor(A/12)-Math.floor(k.starthour/12))%2?String(Math.floor(A/
38-12)-Math.floor(k.starthour/12)+1):String(Math.floor(A/12)-Math.floor(k.starthour/12)-1)));if($newobj.size())w(D),n($newobj,g);else return!1}function B(D){w(D);m($(".CP_minute:first"))}function H(D,Q){x(D);0>Q?0==(Math.floor(A/12)-Math.floor(k.starthour/12))%2?(D=String(Math.floor(A/12)-Math.floor(k.starthour/12)+Q),A=String(Number(A)-12)):D=String(Math.floor(A/12)-Math.floor(k.starthour/12)):0==(Math.floor(A/12)-Math.floor(k.starthour/12))%2?D=String(Math.floor(A/12)-Math.floor(k.starthour/12)):(D=
39-String(Math.floor(A/12)-Math.floor(k.starthour/12)+Q),A=String(Number(A)+12));D="#hourcol"+D;jQuery(".CP_hour[id^=hr_"+A+"]",D);D=jQuery(".CP_hour[id^=hr_"+A+"]",D);n(D,g)}var y=$("div.CP_over").size()?$("div.CP_over"):$("div.CP_hour:first"),J=y.is(".CP_hour")?"hour":"minute",P="hour"==J?y[0].id.split("_")[2]:0,A="minute"==J?y[0].id.split("_")[0]:y[0].id.split("_")[1],I="minute"==J?0==Math.floor(A/12)-Math.floor(k.starthour/12)?"m1":0==Math.floor(A/12)-Math.floor(k.endhour/12)&&0!=(Math.floor(A/12)-
33+typeof jQuery.fn.bgIframe?g.bgIframe():alert("bgIframe plugin not loaded.")}function v(g){"CP_hourcont"==g.attr("id")?g.mouseout(function(q){try{jQuery(q.toElement?q.toElement:q.relatedTarget).is("div[class^=CP], iframe")||t()}catch(r){t()}}):"CP_minutecont"==g.attr("id")?g.mouseout(function(q){try{jQuery(q.toElement?q.toElement:q.relatedTarget).is("div[class^=CP], iframe")||t()}catch(r){t()}}):"CP_hour"==g.attr("class")?(g.mouseover(function(q){p(g,q)}),g.mouseout(function(){w(g)}),g.click(function(){var q=
34+g.attr("id").split("_")[1];h(q);q=g.attr("value");q=-1!=q.indexOf(" ")?q.substring(0,q.indexOf(" ")):q;g.text(q+"00"+k.second);K(g);t()})):"CP_minute"==g.attr("class")&&(g.mouseover(function(){m(g)}),g.mouseout(function(){x(g)}),g.click(function(){g.text(g.attr("value")+k.second);K(g);t()}))}function p(g,q){var r=g.attr("id").split("_")[1],C=g.attr("id").split("_")[2];g.addClass("CP_over");var B=Math.ceil((Math.floor(r/12)-Math.floor(k.starthour/12))/2);if("true"==k.showminutes){E.hide();var H=!k.military&&
35+12<r?r-12:r,y=r;if(k.military||0!=r)k.military||12!=r||(H="0");k.military&&10>r&&(H="0"+H);10>r&&(y="0"+y);E.empty();for(var J=60/k.minutedivisions,P=h(r),A=1,I=0;60>I;I+=J)$md=jQuery("<div class='CP_minute' id='"+r+"_"+I+"' value='"+y+(10>I?"0":"")+I+"'>"+H+":"+(10>I?"0":"")+I+P+"</div>"),e||($md.css("float","left"),6<k.minutedivisions&&A==k.minutedivisions/2+1&&E.append("<div style='clear:left' />")),E.append($md),v($md),A++;e?(q="mouseover"==q.type?q.pageY-15:n.offset().top+2+g.height()*C,g=n.offset().left+
36+2*G[0].width()*B+E.width()*(B-1)+4*B-2):(g="mouseover"==q.type?q.pageX-10:n.offset().left+(g.width()-5)*C,q=n.offset().top+(n.height()-(E.height()+2)*(Math.ceil(G.length/2)-1))/G.length*2*B+E.height()*(B-1)+2*B-1);E.css("left",g+"px").css("top",q+"px");u(E);E.show();k.useBgiframe&&l(E)}return!1}function w(g){g.removeClass("CP_over");return!1}function m(g){g.addClass("CP_over");return!1}function x(g){g.removeClass("CP_over");return!1}function K(g){k.valuefield?jQuery("input[name="+k.valuefield+"]").val(g.text()).change():
37+O.value=g.text();c.apply(z,[g.text()]);z.unbind("keydown",M)}function t(){"true"==k.showminutes&&E.hide();n.slideUp("fast");z.unbind("keydown",M)}function M(g){function q(D){if(D.prev().size())eval(J+"div_out($obj)"),eval(J+"div_over($obj.prev(), e)");else return!1}function r(D){if(D.next().size())eval(J+"div_out($obj)"),eval(J+"div_over($obj.next(), e)");else return!1}function C(D){$newobj=jQuery(".CP_hour[id$=_"+P+"]","#hourcol"+(0==(Math.floor(A/12)-Math.floor(k.starthour/12))%2?String(Math.floor(A/
38+12)-Math.floor(k.starthour/12)+1):String(Math.floor(A/12)-Math.floor(k.starthour/12)-1)));if($newobj.size())w(D),p($newobj,g);else return!1}function B(D){w(D);m($(".CP_minute:first"))}function H(D,Q){x(D);0>Q?0==(Math.floor(A/12)-Math.floor(k.starthour/12))%2?(D=String(Math.floor(A/12)-Math.floor(k.starthour/12)+Q),A=String(Number(A)-12)):D=String(Math.floor(A/12)-Math.floor(k.starthour/12)):0==(Math.floor(A/12)-Math.floor(k.starthour/12))%2?D=String(Math.floor(A/12)-Math.floor(k.starthour/12)):(D=
39+String(Math.floor(A/12)-Math.floor(k.starthour/12)+Q),A=String(Number(A)+12));D="#hourcol"+D;jQuery(".CP_hour[id^=hr_"+A+"]",D);D=jQuery(".CP_hour[id^=hr_"+A+"]",D);p(D,g)}var y=$("div.CP_over").size()?$("div.CP_over"):$("div.CP_hour:first"),J=y.is(".CP_hour")?"hour":"minute",P="hour"==J?y[0].id.split("_")[2]:0,A="minute"==J?y[0].id.split("_")[0]:y[0].id.split("_")[1],I="minute"==J?0==Math.floor(A/12)-Math.floor(k.starthour/12)?"m1":0==Math.floor(A/12)-Math.floor(k.endhour/12)&&0!=(Math.floor(A/12)-
4040 Math.floor(k.starthour/12))%2?"m2":"m3":0==(Math.floor(A/12)-Math.floor(k.starthour/12))%2?"h1":"h2";switch(g.keyCode){case 37:if(e)switch(I){case "m1":return!1;case "m2":H(y,-1);break;case "m3":H(y,-1);break;case "h1":B(y);break;case "h2":C(y)}else q(y);break;case 38:if(e)q(y);else switch(I){case "m1":return!1;case "m2":H(y,-1);break;case "m3":H(y,-1);break;case "h1":B(y);break;case "h2":C(y)}break;case 39:if(e)switch(I){case "m1":H(y,1);break;case "m2":return!1;case "m3":H(y,1);break;case "h1":C(y);
4141 break;case "h2":B(y)}else r(y);break;case 40:if(e)r(y);else switch(I){case "m1":H(y,1);break;case "m2":return!1;case "m3":H(y,1);break;case "h1":C(y);break;case "h2":B(y)}break;case 13:eval(J+"div_click($obj)");break;default:return!0}return!1}var O=this,z=jQuery(this),F=jQuery("body"),k=jQuery.extend(!0,{},d);z.attr("valuefield")&&(k.valuefield=z.attr("valuefield"));z.attr("starthour")&&(k.starthour=parseInt(z.attr("starthour")));z.attr("endhour")&&(k.endhour=parseInt(z.attr("endhour")));z.attr("minutedivisions")&&
4242 (k.minutedivisions=parseInt(z.attr("minutedivisions")));z.attr("military")&&(k.military=z.attr("military"));z.attr("showminutes")&&(k.showminutes=z.attr("showminutes"));"true"==z.attr("usesecond")&&(k.second="00");z.attr("layout")&&(k.layout=z.attr("layout"),d.layout=k.layout,e="vertical"==k.layout);b(k);if(k.valuefield){var N=jQuery("[name="+k.valuefield+"]");N.unbind("keydown").bind("keydown",M)[0].focus();N.bind("click",function(){N.unbind("keydown")})}else z.unbind("keydown").bind("keydown",M);
43-jQuery("#CP_hourcont,#CP_minutecont").remove();var p=jQuery("<div id='CP_hourcont' class='CP' />").appendTo(F);k.useBgiframe||p.css("opacity",k.hoursopacity);v(p);for(var G=[],L=0;L<Math.floor(k.endhour/12)-Math.floor(k.starthour/12)+1;L++)G.push(jQuery("<div class='CP_hourcol' id='hourcol"+L+"' />").appendTo(F));if("true"==k.showminutes){var E=jQuery("<div id='CP_minutecont' class='CP' />").appendTo(F);k.useBgiframe||E.css("opacity",k.minutesopacity);v(E)}if(e)for(L=0;L<G.length;L++)G[L].addClass("floatleft");
44-else p.css("width","auto"),"true"==k.showminutes&&E.css("width","auto");(function(){for(var g=1,q=0,r=k.starthour;r<=k.endhour;r++){0==r%12&&(g=1);var C=!k.military&&12<r?r-12:r,B=r;if(k.military||0!=r)k.military||12!=r||(C="0");k.military&&10>r&&(C="0"+C);10>r&&(B="0"+B);C=jQuery("<div class='CP_hour' id='hr_"+r+"_"+g+"' value='"+B+"' >"+C+h(r)+"</div>");k.military&&C.width(20);v(C);e||C.css("float","left");G[q].append(C);0==(r+1)%12&&q++;g++}for(g=0;g<G.length;g++)e?0!=g&&0==g%2&&G[g].css("margin-left",
45-E.width()+4+"px"):(p.append("<div style='clear:left' />"),0!=g&&0==g%2&&G[g].css("margin-top","19px")),p.append(G[g])})();"focus"!=f.type?(p[0].style.left=f.pageX-5+"px",p[0].style.top=f.pageY-Math.floor(p.height()/2)+"px",u(p)):z.after(p);p.slideDown("fast");k.useBgiframe&&l(p);return!1});return this};$(function(){$.fn.ogClockpicker&&$(document).ready(function(){$(".clockpick").ogClockpicker()})});
43+jQuery("#CP_hourcont,#CP_minutecont").remove();var n=jQuery("<div id='CP_hourcont' class='CP' />").appendTo(F);k.useBgiframe||n.css("opacity",k.hoursopacity);v(n);for(var G=[],L=0;L<Math.floor(k.endhour/12)-Math.floor(k.starthour/12)+1;L++)G.push(jQuery("<div class='CP_hourcol' id='hourcol"+L+"' />").appendTo(F));if("true"==k.showminutes){var E=jQuery("<div id='CP_minutecont' class='CP' />").appendTo(F);k.useBgiframe||E.css("opacity",k.minutesopacity);v(E)}if(e)for(L=0;L<G.length;L++)G[L].addClass("floatleft");
44+else n.css("width","auto"),"true"==k.showminutes&&E.css("width","auto");(function(){for(var g=1,q=0,r=k.starthour;r<=k.endhour;r++){0==r%12&&(g=1);var C=!k.military&&12<r?r-12:r,B=r;if(k.military||0!=r)k.military||12!=r||(C="0");k.military&&10>r&&(C="0"+C);10>r&&(B="0"+B);C=jQuery("<div class='CP_hour' id='hr_"+r+"_"+g+"' value='"+B+"' >"+C+h(r)+"</div>");k.military&&C.width(20);v(C);e||C.css("float","left");G[q].append(C);0==(r+1)%12&&q++;g++}for(g=0;g<G.length;g++)e?0!=g&&0==g%2&&G[g].css("margin-left",
45+E.width()+4+"px"):(n.append("<div style='clear:left' />"),0!=g&&0==g%2&&G[g].css("margin-top","19px")),n.append(G[g])})();"focus"!=f.type?(n[0].style.left=f.pageX-5+"px",n[0].style.top=f.pageY-Math.floor(n.height()/2)+"px",u(n)):z.after(n);n.slideDown("fast");k.useBgiframe&&l(n);return!1});return this};$(function(){$.fn.ogClockpicker&&$(document).ready(function(){$(".clockpick").ogClockpicker()})});
4646 function likeComp(a){var c=a.substring(6);a=$("#"+a).attr("aimaiType");var b=$("#"+c).val();b=b.replace(/^%+|%+$/g,"");var d=$("#"+c).attr("maxlength");if(""!=b&&(null==d||b.length<parseInt(d,10)))switch(a){case "1":b+="%";break;case "2":b="%"+b;break;case "3":b="%"+b+"%"}$("#"+c).val(b)}$(function(){$("form").submit(function(){$("[id^='AIMAI_']").each(function(){likeComp(this.id)})})});
47-$.fn.aimaiPickerOg=function(a){var c=$.extend({iconDir:ICON_ADRS,icons:["aimai0.png","aimai1.png","aimai2.png","aimai3.png"],titls:["\u5b8c\u5168\u4e00\u81f4","\u524d\u65b9\u4e00\u81f4","\u5f8c\u65b9\u4e00\u81f4","\u524d\u5f8c\u66d6\u6627"]},a);return this.each(function(){function b(n){"fade"==c.hideEffect?n.fadeOut():"slide"==c.hideEffect?n.slideUp():n.hide()}for(var d=$(this),e="PIC_"+d.attr("id").replace(/-/g,"")+"_",f="",h=0;h<c.icons.length;h++){var u=c.titls[h];f+='<span id="'+e+"text-"+h+'" class="text-box"" title="'+
48-u+'"> '+('<img src="'+c.iconDir+c.icons[h]+'" alt="'+u+'"> </span>')}var l=$('<div id="'+e+'aimai-picker" class="aimai-picker" style="position: absolute; left: 0px; top: 0px;">'+f+'<div style="clear: both;"></div></div>');$("body").append(l);l.hide();l.find("span.text-box").click(function(){var n=this.id.substr(this.id.indexOf("-")+1);d.attr("aimaiType",n);d.attr("title",c.titls[n]);d.children("img").attr("src",c.iconDir+c.icons[n]);d.blur();b(l)});$("body").live("click",function(){b(l)});l.click(function(n){n.stopPropagation()});
49-var v=function(n){var w=d.offset(),m=w.left+d.outerWidth()-n.outerWidth();m<w.left&&(m=w.left);n.css({left:m,top:w.top+d.outerHeight()});"fade"==c.showEffect?n.fadeIn():"slide"==c.showEffect?n.slideDown():n.show()};d.click(function(n){n.stopPropagation();d.is("input")||v(l)});d.focus(function(){v(l)})})};$(function(){$.fn.aimaiPickerOg&&$(".aimaiClm").aimaiPickerOg()});
47+$.fn.aimaiPickerOg=function(a){var c=$.extend({iconDir:ICON_ADRS,icons:["aimai0.png","aimai1.png","aimai2.png","aimai3.png"],titls:["\u5b8c\u5168\u4e00\u81f4","\u524d\u65b9\u4e00\u81f4","\u5f8c\u65b9\u4e00\u81f4","\u524d\u5f8c\u66d6\u6627"]},a);return this.each(function(){function b(p){"fade"==c.hideEffect?p.fadeOut():"slide"==c.hideEffect?p.slideUp():p.hide()}for(var d=$(this),e="PIC_"+d.attr("id").replace(/-/g,"")+"_",f="",h=0;h<c.icons.length;h++){var u=c.titls[h];f+='<span id="'+e+"text-"+h+'" class="text-box"" title="'+
48+u+'"> '+('<img src="'+c.iconDir+c.icons[h]+'" alt="'+u+'"> </span>')}var l=$('<div id="'+e+'aimai-picker" class="aimai-picker" style="position: absolute; left: 0px; top: 0px;">'+f+'<div style="clear: both;"></div></div>');$("body").append(l);l.hide();l.find("span.text-box").click(function(){var p=this.id.substr(this.id.indexOf("-")+1);d.attr("aimaiType",p);d.attr("title",c.titls[p]);d.children("img").attr("src",c.iconDir+c.icons[p]);d.blur();b(l)});$("body").live("click",function(){b(l)});l.click(function(p){p.stopPropagation()});
49+var v=function(p){var w=d.offset(),m=w.left+d.outerWidth()-p.outerWidth();m<w.left&&(m=w.left);p.css({left:m,top:w.top+d.outerHeight()});"fade"==c.showEffect?p.fadeIn():"slide"==c.showEffect?p.slideDown():p.show()};d.click(function(p){p.stopPropagation();d.is("input")||v(l)});d.focus(function(){v(l)})})};$(function(){$.fn.aimaiPickerOg&&$(".aimaiClm").aimaiPickerOg()});
5050 function selectScroll(a){var c=4;a.getAttribute("size")&&(c=a.getAttribute("size"));for(var b=a.options,d=0;d<b.length;d++)if(b[d].selected){"OPTGROUP"==b[d].parentNode.tagName.toUpperCase()&&(d+=$(b[d].parentNode).prev().length);var e=d*($(a).height()/c);break}$(a).scrollTop(e)}$(function(){$("select[multiple]").each(function(){selectScroll(this)})});
5151 function dateFeedRtn(a,c,b,d,e){var f=parseInt(d.match(/[+-]?\d+/g));if($.isNumeric(f))if(0==f)var h=b?b:_getSysDate(a);else(b=$("#"+c).val().replace(/\//g,""))&&("Y"==a&&4==b.length||"YM"==a&&6==b.length||"YMD"==a&&8==b.length)&&_isDate(a,b)&&(h=_addDate(a,b,d,f));else h=_getSysDate(a);h&&($("#"+c).val(h).change(),"true"==e&&$("#queryButtonSubmit").click())}
5252 var _addDate=function(a,c,b,d){var e;switch(a){case "Y":var f=c;break;case "YM":f=c.replace(/(\d{4})(\d{2})/,"$1/$2")+"/01";break;default:f=c.replace(/(\d{4})(\d{2})(\d{2})/,"$1/$2/$3")}f=new Date(f);var h=f.getFullYear(),u=f.getMonth(),l=f.getDate();if(b.indexOf("SY"))if(b.indexOf("SD"))if(b.indexOf("SW"))if(b.indexOf("EY"))if(b.indexOf("ED"))if(b.indexOf("EW"))if(b.indexOf("Y"))if(b.indexOf("M"))b.indexOf("D")||f.setDate(l+d);else for(b=0<d?1:-1,e=0;e<Math.abs(d);e++)0<e&&(h=f.getFullYear(),u=f.getMonth(),
--- trunk/opengionV8/uap/webapps/gf/src/org/opengion/fukurou/model/POIUtil.java (revision 2246)
+++ trunk/opengionV8/uap/webapps/gf/src/org/opengion/fukurou/model/POIUtil.java (revision 2247)
@@ -63,10 +63,11 @@
6363 import org.apache.poi.ss.usermodel.Row;
6464 import org.apache.poi.ss.usermodel.Cell;
6565 import org.apache.poi.ss.usermodel.CellStyle;
66-// import org.apache.poi.ss.usermodel.CreationHelper;
66+import org.apache.poi.ss.usermodel.CreationHelper; // 8.1.2.3 (2022/05/20) 復活
6767 import org.apache.poi.ss.usermodel.RichTextString;
6868 import org.apache.poi.ss.usermodel.DateUtil;
69-// import org.apache.poi.ss.usermodel.FormulaEvaluator;
69+import org.apache.poi.ss.usermodel.FormulaEvaluator; // 8.1.2.3 (2022/05/20) 復活
70+import org.apache.poi.ss.usermodel.CellValue; // 8.1.2.3 (2022/05/20)
7071 import org.apache.poi.ss.usermodel.Name; // 6.0.2.3 (2014/10/10)
7172 import org.apache.poi.ss.usermodel.CellType; // 6.5.0.0 (2016/09/30) poi-3.15
7273 import org.apache.poi.ss.util.SheetUtil;
@@ -94,7 +95,7 @@
9495 */
9596 public final class POIUtil {
9697 /** このプログラムのVERSION文字列を設定します。 {@value} */
97- private static final String VERSION = "8.1.0.1 (2022/01/07)" ;
98+ private static final String VERSION = "8.1.2.3 (2022/05/20)" ;
9899
99100 // 6.2.3.0 (2015/05/01)
100101 /** 対象サフィックス {@value} */
@@ -619,6 +620,7 @@
619620 * @og.rev 7.0.0.0 (2018/10/01) 警告:[deprecation] CellのgetCellTypeEnum()は推奨されません (POI4.0.0)
620621 * @og.rev 7.3.0.0 (2021/01/06) フォーマットエラー時に、エラーメッセージ取得でもエラーになる。
621622 * @og.rev 8.0.0.0 (2021/07/31) FORMULA処理のエラー対応(出来るだけ…)
623+ * @og.rev 8.1.2.3 (2022/05/20) 計算式の計算を行う。
622624 *
623625 * @param oCell EXCELのセルオブジェクト
624626 *
@@ -652,7 +654,28 @@
652654 // final FormulaEvaluator evaluator = crateHelper.createFormulaEvaluator();
653655
654656 try {
655- strText = oCell.getCellFormula();
657+ // 8.1.2.3 (2022/05/20) 計算式の計算を行う。
658+ final Workbook wb = oCell.getSheet().getWorkbook();
659+ final CreationHelper crateHelper = wb.getCreationHelper();
660+ final FormulaEvaluator evaluator = crateHelper.createFormulaEvaluator();
661+ final CellValue value = evaluator.evaluate(oCell);
662+
663+ switch (value.getCellType()) {
664+ case STRING:
665+ strText = value.getStringValue();
666+ break;
667+ case NUMERIC:
668+ strText = Double.toString(value.getNumberValue());
669+ break;
670+ case BOOLEAN:
671+ strText = Boolean.toString(value.getBooleanValue());
672+ break;
673+ default:
674+ strText = oCell.getCellFormula(); // 計算式のまま
675+ break;
676+ }
677+
678+ // strText = oCell.getCellFormula(); // 8.1.2.3 (2022/05/20) 計算式は返さない
656679 // 8.0.0.0 (2021/07/31) FORMULA処理のエラー対応(出来るだけ…)
657680 // final Cell fCell = evaluator.evaluateInCell(oCell);
658681 // strText = getValue( fCell );
--- trunk/opengionV8/uap/webapps/gf/src/org/opengion/fukurou/system/BuildNumber.java (revision 2246)
+++ trunk/opengionV8/uap/webapps/gf/src/org/opengion/fukurou/system/BuildNumber.java (revision 2247)
@@ -64,9 +64,9 @@
6464 *
6565 * @og.paramLevel 9:自動設定
6666 */
67-// public static final String BUILD_TYPE = "Release8 Builds (2022140)" ; // 20XX+通算日数
68-// public static final String BUILD_TYPE = "Release8 Builds (T1653022870)" ; // 通算秒数
69- public static final String BUILD_TYPE = "Release8 Builds (27550381)" ; // 通算分数
67+// public static final String BUILD_TYPE = "Release8 Builds (2022146)" ; // 20XX+通算日数
68+// public static final String BUILD_TYPE = "Release8 Builds (T1653541627)" ; // 通算秒数
69+ public static final String BUILD_TYPE = "Release8 Builds (27559027)" ; // 通算分数
7070
7171 /**
7272 * エンジンバージョンNo。
@@ -81,7 +81,7 @@
8181 * このエンジンのビルド時刻を設定します。
8282 * @og.paramLevel 9:自動設定
8383 */
84- public static final String TIMESTAMP = "2022/05/20 14:01:10" ;
84+ public static final String TIMESTAMP = "2022/05/26 14:07:07" ;
8585
8686 /**
8787 * 稼動しているサーバーのOS情報。
@@ -126,7 +126,7 @@
126126 *
127127 * @og.paramLevel 9:自動設定
128128 */
129- public static final String BUILD_ID = "20220520140110" ;
129+ public static final String BUILD_ID = "20220526140707" ;
130130
131131 /**
132132 * デフォルトコンストラクターをprivateにして、
--- trunk/opengionV8/uap/webapps/gf/src/org/opengion/hayabusa/common/GE12.xml (revision 2246)
+++ trunk/opengionV8/uap/webapps/gf/src/org/opengion/hayabusa/common/GE12.xml (revision 2247)
@@ -3203,7 +3203,7 @@
32033203 <PARAM_ID>BUILD_TYPE</PARAM_ID>
32043204 <SEQNO>1010</SEQNO>
32053205 <TITLE>エンジンビルドタイプ。</TITLE>
3206- <PARAM>Release8 Builds (27550381)</PARAM>
3206+ <PARAM>Release8 Builds (27559027)</PARAM>
32073207 <CONTENTS>このエンジンのビルドタイプを設定します。
32083208
32093209 ※ たまたまBTIMEは、2018/11/16=25705545 で、既存のyDDD=2018320 より文字列比較で大きくなるため採用
@@ -3218,7 +3218,7 @@
32183218 <PARAM_ID>ENGINE_INFO</PARAM_ID>
32193219 <SEQNO>1020</SEQNO>
32203220 <TITLE>エンジンバージョンNo。</TITLE>
3221- <PARAM>openGion 8.1.2.3 Release8 Builds (27550381)</PARAM>
3221+ <PARAM>openGion 8.1.2.3 Release8 Builds (27559027)</PARAM>
32223222 <CONTENTS>このエンジンのバージョン番号 + ビルドタイプ を設定します。
32233223 [例: 4.0.0.0 Release4 Builds (04273)]</CONTENTS>
32243224 <PARAM_LVL>9</PARAM_LVL>
@@ -3231,7 +3231,7 @@
32313231 <PARAM_ID>TIMESTAMP</PARAM_ID>
32323232 <SEQNO>1030</SEQNO>
32333233 <TITLE>エンジンビルド時刻。</TITLE>
3234- <PARAM>2022/05/20 14:01:10</PARAM>
3234+ <PARAM>2022/05/26 14:07:07</PARAM>
32353235 <CONTENTS>このエンジンのビルド時刻を設定します。</CONTENTS>
32363236 <PARAM_LVL>9</PARAM_LVL>
32373237 <FGCRYPT>0</FGCRYPT>
@@ -3282,7 +3282,7 @@
32823282 <PARAM_ID>BUILD_ID</PARAM_ID>
32833283 <SEQNO>1070</SEQNO>
32843284 <TITLE>エンジンビルドID</TITLE>
3285- <PARAM>20220520140110</PARAM>
3285+ <PARAM>20220526140707</PARAM>
32863286 <CONTENTS>このエンジンのビルドIDを設定します。
32873287 キャッシュコントロールを行う際のキー情報として使用します。</CONTENTS>
32883288 <PARAM_LVL>9</PARAM_LVL>
--- trunk/opengionV8/uap/webapps/gf/src/org/opengion/hayabusa/common/GE12_Param_V8.xml (revision 2246)
+++ trunk/opengionV8/uap/webapps/gf/src/org/opengion/hayabusa/common/GE12_Param_V8.xml (revision 2247)
@@ -2617,7 +2617,7 @@
26172617 <fieldDoc>
26182618 <paramId>BUILD_TYPE</paramId>
26192619 <seq>1010</seq>
2620- <param>Release8 Builds (27550381)</param>
2620+ <param>Release8 Builds (27559027)</param>
26212621 <title>エンジンビルドタイプ。</title>
26222622 <contents>このエンジンのビルドタイプを設定します。
26232623
@@ -2629,7 +2629,7 @@
26292629 <fieldDoc>
26302630 <paramId>ENGINE_INFO</paramId>
26312631 <seq>1020</seq>
2632- <param>openGion 8.1.2.3 Release8 Builds (27550381)</param>
2632+ <param>openGion 8.1.2.3 Release8 Builds (27559027)</param>
26332633 <title>エンジンバージョンNo。</title>
26342634 <contents>このエンジンのバージョン番号 + ビルドタイプ を設定します。
26352635 [例: 4.0.0.0 Release4 Builds (04273)]</contents>
@@ -2639,7 +2639,7 @@
26392639 <fieldDoc>
26402640 <paramId>TIMESTAMP</paramId>
26412641 <seq>1030</seq>
2642- <param>2022/05/20 14:01:10</param>
2642+ <param>2022/05/26 14:07:07</param>
26432643 <title>エンジンビルド時刻。</title>
26442644 <contents>このエンジンのビルド時刻を設定します。</contents>
26452645 <paramLevel>9</paramLevel>
@@ -2678,7 +2678,7 @@
26782678 <fieldDoc>
26792679 <paramId>BUILD_ID</paramId>
26802680 <seq>1070</seq>
2681- <param>20220520140110</param>
2681+ <param>20220526140707</param>
26822682 <title>エンジンビルドID</title>
26832683 <contents>このエンジンのビルドIDを設定します。
26842684 キャッシュコントロールを行う際のキー情報として使用します。</contents>
--- trunk/opengionV8/uap/webapps/gf/src/script/common/eventScript.js (revision 2246)
+++ trunk/opengionV8/uap/webapps/gf/src/script/common/eventScript.js (revision 2247)
@@ -306,6 +306,7 @@
306306 * @og.rev 5.9.28.1 (2018/01/19) {@xxx}が存在しない場合でも処理が流れるように対応
307307 * @og.rev 5.10.4.0 (2018/10/05) eventColumnのparam暗号化対応
308308 * @og.rev 7.0.2.2 (2019/03/25) eventColumnが動作しない(問合・トラブル 61200-190319-01)
309+ * @og.rev 8.1.2.3 (2022/05/20) YMD2リソースとイベントカラムの競合時の不具合対応(問合・トラブル 43100-220526-01)
309310 *
310311 * @param jEvCol イベントが発生した親カラムのjQueryオブジェクト
311312 * @param jTag 置き換え要素をラップしたspanタグのjQueryオブジェクト
@@ -564,7 +565,14 @@
564565 bindOldEvents( jNewCol.get(0), jQuery._data(jCol.clone(true).get(0)).events ); // 7.0.2.2 (2019/03/25)
565566 }
566567
567- jTag.empty().append( jNewCol );
568+ // 8.1.2.3 (2022/05/20) YMD2リソースとイベントカラムの競合時の不具合対応(問合・トラブル 43100-220526-01)
569+// jTag.empty().append( jNewCol );
570+ if( cid != null && cid != "" && $("#"+cid).attr('type')=='text') {
571+ $("#"+cid).val(jNewCol.val());
572+ }
573+ else {
574+ jTag.empty().append( jNewCol );
575+ }
568576
569577 if( jCol.length > 0 ) {
570578 jTag.find("input,select,textarea").attr( "name", cid ).attr( "id", cid );
Afficher sur ancien navigateur de dépôt.