В ручную совместил домашнюю и рабочую версию

This commit is contained in:
2020-02-27 10:49:02 +06:00
parent 3d93536189
commit cb3714d3b0
6 changed files with 65 additions and 57 deletions

View File

@ -23,7 +23,7 @@ class EdtRec
this.win=new TWin();
this.win.TWin(pageX-10,pageY-10);
this.win.setSize("500px","150px");
this.win.setContent('<div id="eDiv'+this.uid+'" style="width: 100%; height: 100%; position: relative;"></div>');
this.win.setContent('<div id="eDiv'+this.uid+'" style="width: 100%; /*height: 100%;*/ position: relative;"></div>');
let eDiv=document.getElementById('eDiv'+this.uid);
eDiv.innerHTML = '<table width="100%" height="100%" border="0px" cellspacing="0" cellpadding="0"><tr><td style="vertical-align:middle;" bgcolor="#F1F1F1"><center><IMG src="../resources/metadata/dbms/images/loading.gif"></center></td></tr></table>'
@ -346,7 +346,7 @@ class EdtRec
var button = document.createElement('input');
button.setAttribute("type","button");
button.setAttribute("value","...");
button.style.cssText="width:30px; font-size: 9pt;";
button.style.cssText="width:30px;font-size:9pt;margin:0px;padding:0px;";
button.onclick=function(thiz,nodeProp){ return function(){
thiz.callWindow(nodeProp);
};}(this,nodeProp);
@ -399,6 +399,7 @@ class EdtRec
}else
if(vt=="i4")
{
//alert("prop name = "+nodeProp.getAttribute("n"));
//If there is a node "list" with the elements "CheckBox" then create them.
@ -422,6 +423,7 @@ class EdtRec
opt=opt.nextSibling;
}
td2.appendChild( select );
}else
{
var table=document.createElement('table');
@ -432,9 +434,9 @@ class EdtRec
var newCell1 = newRow.insertCell(0); //in the created line we add a column
newCell1.style.cssText="padding:0px; padding-right:1px; width: 100%;";
var newCell2 = newRow.insertCell(1); //in the created line we add a column
newCell2.style.cssText="padding:0px; padding-right:1px;";
newCell2.style.cssText="padding:0px; padding-right:1px;height:100%;";
var newCell3 = newRow.insertCell(2); //in the created line we add a column
newCell3.style.cssText="padding:0px;";
newCell3.style.cssText="padding:0px;height:100%;";
input = document.createElement('input');
input.style.cssText="width: 100%; height:22px;";
@ -448,7 +450,7 @@ class EdtRec
button.setAttribute("type","button");
button.setAttribute("value","+");
button.setAttribute("title",_("Increase_by_1"));
button.style.cssText="height:22px;width:22px;";
button.style.cssText="height:100%;width:22px;margin:0px;padding:0px;";
button.onclick=function(inp){return function(){inp.value=getIntVal(inp.value)+1;}}(input);
newCell2.appendChild( button );
@ -457,7 +459,7 @@ class EdtRec
button.setAttribute("type","button");
button.setAttribute("value","-");
button.setAttribute("title",_("Decrease_by_1"));
button.style.cssText="height:22px;width:22px;";
button.style.cssText="height:100%;width:22px;margin:0px;padding:0px;";
button.onclick=function(inp){return function(){inp.value=getIntVal(inp.value)-1;}}(input);
newCell3.appendChild( button );
@ -486,9 +488,9 @@ class EdtRec
table.border=0;
let newRow=table.insertRow(0); //add a row to the created table
var newCell1 = newRow.insertCell(0); //in the created line we add a column
newCell1.style.cssText="padding:0px; width: 100%;";
newCell1.style.cssText="padding:0px;padding-right:1px;width:100%;";
var newCell2 = newRow.insertCell(1); //in the created line we add a column
newCell2.style.cssText="padding:0px;";
newCell2.style.cssText="padding:0px;height:100%;";
select = document.createElement('select');
select.style.cssText="width: 100%; height:22px; line-height: 22px;";
@ -508,7 +510,7 @@ class EdtRec
var button = document.createElement('input');
button.setAttribute("type","button");
button.setAttribute("value","...");
button.style.cssText="width:30px; font-size: 9pt;";
button.style.cssText="width:30px;font-size:9pt;margin:0px;padding:0px;height:100%;";
button.onclick=this.onSelObj(nodeProp.getAttribute("ot"),nodeProp.getAttribute("n"));
newCell2.appendChild(button);
@ -575,7 +577,7 @@ class EdtRec
var button = document.createElement('input');
button.setAttribute("type","button");
button.setAttribute("value","...");
button.style.cssText="width:30px; font-size: 9pt;";
button.style.cssText="width:30px;font-size:9pt;margin:0px;padding:0px;";
button.onclick=this.onSelObj(nodeProp.getAttribute("ot"),nodeProp.getAttribute("n"));
newCell2.appendChild(button);
@ -646,14 +648,14 @@ class EdtRec
btnSel.setAttribute("value","...");
btnSel.setAttribute("title",_('Upload'));
btnSel.style.cssText="width:30px; font-size: 9pt;";
btnSel.style.cssText="width:30px;font-size:9pt;margin:0px;padding:0px;";
newCell2.appendChild(btnSel);
var button2 = document.createElement('input');
button2.setAttribute("type","button");
button2.setAttribute("value","X");
button2.setAttribute("title",_('Delete'));
button2.style.cssText="height:22px;width:22px;";
button2.style.cssText="height:22px;width:22px;margin:0px;padding:0px;";
button2.onclick=function(inp,ifr){return function(){ inp.value=''; getIframeDocument(ifr).forms["form"].reset(); }}(input,ifr);
newCell3.appendChild(button2);
@ -688,7 +690,7 @@ class EdtRec
table.style.cssText="width:100%;border-spacing:0;border-collapse:collapse;";
//table.setAttribute("bgColor","#0000FF");
table.border=0;
newRow=table.insertRow(0);
let newRow=table.insertRow(0);
var newCell1 = newRow.insertCell(0);
newCell1.style.cssText="padding:0px;width: 100%;";
var newCell2 = newRow.insertCell(1);
@ -703,7 +705,7 @@ class EdtRec
newCell1.appendChild( input );
var img = document.createElement('img');
img.src='../resources/engine/images/datepicker.jpg';
img.src='../resources/metadata/dbms/images/datepicker.jpg';
img.style.cssText="cursor: pointer;";
newCell2.appendChild(img);
@ -760,7 +762,7 @@ class EdtRec
td.setAttribute("align","right");
button = document.createElement('input');
button.setAttribute("type","button");
button.style.cssText="width: 90px;";
button.style.cssText="margin:0px;margin-right:1px;padding:0px;";
button.setAttribute("value",_('Apply'));
button.onclick=function(thiz){
return function(){
@ -768,9 +770,10 @@ class EdtRec
};
}(this);
td.appendChild( button );
button = document.createElement('input'); //Button cancel
button.setAttribute("type","button");
button.style.cssText="width: 90px;";
button.style.cssText="margin:0px;padding:0px;";
button.setAttribute("value",_('Cancel'));
//button.onclick=function f_exit(this) { alert(this.win.div); }
button.onclick=function(thiz){ return function(){thiz.win.Close();};}(this);