diff --git a/metadata/dbms/dbms.css b/metadata/dbms/dbms.css index 96c2c35..be433cd 100644 --- a/metadata/dbms/dbms.css +++ b/metadata/dbms/dbms.css @@ -133,7 +133,7 @@ table.SShow { border-collapse: collapse; border: 1px double #999999; width: 100%; - background-color: #ffffff; + background-color: var(--row-color-2); border-spacing: 1px 1px; } diff --git a/metadata/dbms/tools.js b/metadata/dbms/tools.js index ecb23c5..4e41163 100644 --- a/metadata/dbms/tools.js +++ b/metadata/dbms/tools.js @@ -200,38 +200,42 @@ function alert2(title,smallText,fullText,okFunc=null) let win=new TWin(true); win.BuildGUI(10,10); win.setCaption(document.createTextNode(title)); - let html='\n\ - \n\ - \n\ - \n\ - \n\ - \n\ - \n\ - \n\ - \n\ - \n\ - \n\ - \n\ -
'+smallText+'
'+(fullText === undefined || fullText == '' ? '' : '')+' 
'; + let html=` + + + + + + + + + + + +
`+smallText+`
`+(fullText === undefined || fullText == '' ? '' : '')+` 
`; win.setContent(html); let obj=document.getElementById('show_'+win.uid); - if(obj!=null) obj.onclick=function(win){ - return function(){ - if(document.getElementById('show_'+win.uid).checked) { - document.getElementById('smallText_' + win.uid).style.display = "none"; - document.getElementById('fullText_' + win.uid).style.display = "table-row"; - }else{ - document.getElementById('smallText_' + win.uid).style.display = "table-row"; - document.getElementById('fullText_' + win.uid).style.display = "none"; - } - }; - }(win); + if(obj!=null){ + obj.onclick=function(win){ + return function(){ + if(document.getElementById('show_'+win.uid).checked) { + document.getElementById('smallText_' + win.uid).style.display = "none"; + document.getElementById('fullText_' + win.uid).style.display = "table-row"; + }else{ + document.getElementById('smallText_' + win.uid).style.display = "table-row"; + document.getElementById('fullText_' + win.uid).style.display = "none"; + } + }; + }(win); + } obj=document.getElementById('close_'+win.uid); - obj.focus(); - if(obj!=null) obj.onclick=function(win,okFunc){return function(){ win.Close(); if(okFunc!=null) okFunc(); };}(win,okFunc); + if(obj!=null){ + obj.focus(); + obj.onclick=function(win,okFunc){return function(){ win.Close(); if(okFunc!=null) okFunc(); };}(win,okFunc); + } win.setSize("300px","150px"); win.setCenter(); win.shadow=true; @@ -276,7 +280,6 @@ function confirm2(title,smallText,fullText,okFunc,cancelFunc) }(win); let btnO=document.getElementById(win.uid+'_ok'); - btnO.focus(); if(btnO!=null){ btnO.onclick=function(win){ return function(){ @@ -286,6 +289,7 @@ function confirm2(title,smallText,fullText,okFunc,cancelFunc) }(win,okFunc); } let btnC=document.getElementById(win.uid+'_cancel'); + btnC.focus(); if(btnC!=null) { btnC.onclick = function (win) { return function () {