igor/Metadata_PHP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.dirt.kz/igor/Metadata_PHP

Browse Source 
# Conflicts:
#	metadata/dbms/editrecord.js
This commit is contained in:
igor
2021-10-14 19:48:33 +06:00
parent 66cc2fbd03 830e89fbfc
commit 526f6f66c5
5 changed files with 51 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
metadata/dbms/editrecord.js
View File

@ -127,7 +127,7 @@ class EdtRec
this.record_id=record_id;
this.nodeMetadata=Node.cloneNode(true); //Для чего клонирую?
var nodeType=findFirstNode(this.nodeMetadata, 'type');
let nodeType=findFirstNode(this.nodeMetadata, 'type');
//Appending settings to nodeMetadata
this.setXMLSettings(this.f_Settings);
@ -163,7 +163,7 @@ class EdtRec
//For convenience, when adding a new record, we rewrite the values from the parent filter in the edit field.
if(nodeFilters!=null)
{
var nodeFilter=nodeFilters.firstChild;
let nodeFilter=nodeFilters.firstChild;
while (nodeFilter!=null)
{
if(nodeFilter.nodeName=="column")
@ -208,7 +208,7 @@ class EdtRec
td.style.cssText="font-weight: bold;";
td.colSpan = "2";
var div=document.createElement('div');
let div=document.createElement('div');
div.style.cssText='border: solid 1px black; background-color: rgba(0,0,0,0.5); width:100%; height: 300px;';
div.innerHTML='';
@ -216,12 +216,12 @@ class EdtRec
tr.appendChild(td);
eTable.tBodies[0].appendChild(tr);
var subSRec=new SRec();
let subSRec=new SRec();
subSRec.create(div);
//Перебираю данные из текущего запроса и пытаюсь подменить строку (до получения анных (при создании новой записи))
var nPs=findFirstNode(this.nodeMetadata, 'properties')
var nP=nPs.firstChild
let nPs=findFirstNode(this.nodeMetadata, 'properties')
let nP=nPs.firstChild
while (nP!=null)
{
if (nP.nodeName=="prop")
@ -241,9 +241,9 @@ class EdtRec
}else
if (nodeProp.nodeName=="divide") //Grouping fields.
{
var tr = document.createElement('tr');
let tr = document.createElement('tr');
tr.style.cssText="background-color: var(--back-color-title);";
var td = document.createElement('td');
let td = document.createElement('td');
td.style.cssText="font-weight: bold;";
td.colSpan = "2";
td.innerHTML=nodeProp.getAttribute("d");
@ -298,7 +298,7 @@ class EdtRec
if(nodeProp.getAttribute("t")!=null) td1.title=nodeProp.getAttribute("t");
if (nodeProp.getAttribute("maybenull")=='0') td1.style.cssText="font-weight: bold;";
var value=getCdata(nodeProp).nodeValue;
let value=getCdata(nodeProp).nodeValue;
if(vt=="string" || vt=="str")
@ -772,6 +772,9 @@ class EdtRec
}
nodeProp=nodeProp.nextSibling;
}
//Button apply
let tr = document.createElement('tr');
let td = document.createElement('td');
//Button apply
tr = document.createElement('tr');