Мелочь
This commit is contained in:
@ -662,7 +662,6 @@ class SRec
|
||||
//singleClick: true,
|
||||
onSelect: function(){ this.hide(); }
|
||||
});
|
||||
|
||||
}else
|
||||
if (columnNode.getAttribute("vt")==="date")
|
||||
{
|
||||
@ -759,7 +758,7 @@ class SRec
|
||||
input.classList.add('DBMS');
|
||||
input.style.cssText="width: 100%;";
|
||||
input.setAttribute("type","text");
|
||||
input.onkeydown=function(event){if(event.which==13) event.which=9;};
|
||||
input.onkeydown=(e)=>{ if(e==null) e=window.event; if(e.keyCode==13) { this.appendFilter(); this.sendFilter(-1,0); }};
|
||||
input.setAttribute("name",columnNode.getAttribute("n"));
|
||||
if(columnNode.getAttribute("size")!=null)
|
||||
input.setAttribute("maxlength",columnNode.getAttribute("size"),0);
|
||||
@ -805,7 +804,7 @@ class SRec
|
||||
input.classList.add('DBMS');
|
||||
input.style.cssText="width: 100%;";
|
||||
input.setAttribute("type","text");
|
||||
input.onkeydown=function(){ if(event.keyCode==13) event.keyCode=9; };
|
||||
input.onkeydown=(e)=>{ if(e==null) e=window.event; if(e.keyCode==13) { this.appendFilter(); this.sendFilter(-1,0); }};
|
||||
input.setAttribute("name",columnNode.getAttribute("n"));
|
||||
if(columnNode.getAttribute("size")!=null)
|
||||
input.setAttribute("maxlength",columnNode.getAttribute("size"),0);
|
||||
@ -838,7 +837,7 @@ class SRec
|
||||
input.setAttribute("type","text");
|
||||
button.classList.add('DBMS');
|
||||
input.style.cssText="width: 100%;";
|
||||
input.onkeydown=function(){ if(event.keyCode==13) event.keyCode=9; };
|
||||
input.onkeydown=(e)=>{ if(e==null) e=window.event; if(e.keyCode==13) { this.appendFilter(); this.sendFilter(-1,0); }};
|
||||
input.setAttribute("name",columnNode.getAttribute("n"));
|
||||
if(columnNode.getAttribute("size")!=null)
|
||||
input.setAttribute("maxlength",columnNode.getAttribute("size"),0);
|
||||
@ -920,15 +919,15 @@ class SRec
|
||||
let input = document.createElement('input');
|
||||
input.classList.add('DBMS');
|
||||
//After pressing Enter we pass the entered line to the server
|
||||
input.onkeydown=function(obj,val1,val2,val3,val4){
|
||||
input.onkeydown=function(obj,typeName,name,value,htmlid,filterName){
|
||||
return function(e){
|
||||
if(e==null) e=window.event;
|
||||
if(e.keyCode==13){
|
||||
obj.callFilterVal(val1,val2,-1,val3.value,val4);
|
||||
obj.callFilterVal(typeName,name,-1,value.value,htmlid,filterName);
|
||||
return false;
|
||||
}
|
||||
};
|
||||
}(this,object,fc,input,columnNode.getAttribute("n"));
|
||||
}(this,object,fc,input,columnNode.getAttribute("n"),columnNode.getAttribute("fn"));
|
||||
|
||||
input.style.cssText="width: 100%; height:22px; line-height:22px;";
|
||||
input.setAttribute("type","text");
|
||||
@ -1084,18 +1083,21 @@ class SRec
|
||||
//id - id of record if it is necessary to return only the description, if -1 then it is not considered
|
||||
//value - filter value text field
|
||||
//htmlid - field name in filter n
|
||||
callFilterVal(typeName,name,id,value,htmlid)
|
||||
callFilterVal(typeName,name,id,value,htmlid,filterName)
|
||||
{
|
||||
if(value!="")
|
||||
{
|
||||
if(this.request.callServer(ScriptName,'<?xml version="1.0" encoding="utf-8"?><metadata fn="6"><type n="'+typeName+'" c="'+name+'" pn="'+htmlid+'" id="'+id+'"><objects-list><filter><column n="'+name+'"><![CDATA['+value+']]></column></filter></objects-list></type></metadata>',true))
|
||||
let xml='<?xml version="1.0" encoding="utf-8"?><metadata fn="6"><type n="'+typeName+'" c="'+name+'" pn="'+htmlid+'" id="'+id+'"><objects-list><filter>';
|
||||
xml+='<column n="'+filterName+'"><![CDATA['+value+']]></column>';
|
||||
xml+='</filter></objects-list></type></metadata>';
|
||||
if(this.request.callServer(ScriptName,xml,true))
|
||||
{
|
||||
this.showProgressBar();
|
||||
}
|
||||
}else
|
||||
{
|
||||
document.getElementById("filter_"+htmlid).value=-1;
|
||||
appendFilter();
|
||||
document.getElementById("filter_"+this.uid+"_"+htmlid).value='';
|
||||
this.appendFilter();
|
||||
this.sendFilter(-1,0);
|
||||
}
|
||||
}
|
||||
@ -1412,8 +1414,8 @@ class SRec
|
||||
let rec=new SRec();
|
||||
rec.opener=this;
|
||||
rec.create(null);
|
||||
//rec.f_State=1; TODO then finish the job
|
||||
//rec.f_PropName=nodeColu.getAttribute("n");
|
||||
rec.f_State=1; //Зачем коментил?
|
||||
rec.f_PropName=nodeColu.getAttribute("n"); //Зачем коментил?
|
||||
rec.f_Settings=settings;
|
||||
rec.f_TypeName=TypeName;
|
||||
rec.win.setLeftTop(pageX-250,pageY-10);
|
||||
|
||||
Reference in New Issue
Block a user