Skip to content

Commit 2728523

Browse files
committed
1.7
1 parent 5f3a193 commit 2728523

File tree

1 file changed

+12
-15
lines changed

1 file changed

+12
-15
lines changed

resources/assets/component.js

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -239,13 +239,13 @@ class ComponentCascadeDot {
239239
div.className = 'dlp dlp-text dlp-label';
240240
div.textContent = v.val;
241241
div.setAttribute('data-id', v.key);
242-
div.setAttribute('checked', 'false');
243242
div.setAttribute('data-parent-nodes-id', JSON.stringify(v.parentNodes));
244243
let allow_select = false;
245244
if (v.hasOwnProperty('nodes')) {
246245
let nodes = v.nodes.map((n) => n.key);
247246
div.setAttribute('data-nodes-id', JSON.stringify(nodes));
248247
}else {
248+
div.setAttribute('checked', 'false');
249249
allow_select = true;
250250
}
251251
div.addEventListener('click', this.select.bind(this, div, stack));
@@ -312,32 +312,30 @@ class ComponentCascadeDot {
312312
end_node = true;
313313
}
314314
let parent_nodes = JSON.parse(element.getAttribute('data-parent-nodes-id'));
315-
if(checked == 'false'){
315+
if(checked == 'false' || checked==null){
316+
this.selectActive(stack, element,end_node,checked);
316317
/*nodes*/
317318
this.selectToChildren(stack + 1, nodes,end_node);
318-
/*current stack*/
319-
this.selectActive(stack, element,end_node);
320319
/*parent nodes*/
321320
if (Array.isArray(parent_nodes)) {
322321
for (let stack in parent_nodes) {
323-
this.selectToParent(checked, parent_nodes[stack], parseInt(stack), parent_nodes[stack - 1], parent_nodes[stack + 1]);
322+
this.selectToParent(checked, parent_nodes[stack], parseInt(stack), parent_nodes[stack - 1]);
324323
}
325324
}
326325
return;
327326
}
328327
/*current stack*/
329-
this.selectInactive(stack, element,end_node);
328+
this.selectInactive(stack, element,end_node,checked);
330329
/*parent nodes*/
331330
if (Array.isArray(parent_nodes)) {
332331
for (let stack in parent_nodes) {
333-
this.selectToParent(checked, parent_nodes[stack], parseInt(stack), parent_nodes[stack - 1], parent_nodes[stack + 1]);
332+
this.selectToParent(checked, parent_nodes[stack], parseInt(stack), parent_nodes[stack - 1]);
334333
}
335334
}
336335
}
337336

338-
selectActive(stack, element,end_node) {
339-
if (element.getAttribute('checked') == 'true') return;
340-
element.setAttribute('checked', 'true');
337+
selectActive(stack, element,end_node,checked) {
338+
checked != null && element.setAttribute('checked', 'true');
341339
let currentStackDocuments = this.STACKS[stack].childNodes;
342340
let parentNode = JSON.parse(element.getAttribute('data-parent-nodes-id')).pop();
343341
currentStackDocuments.forEach((D, index) => {
@@ -355,9 +353,8 @@ class ComponentCascadeDot {
355353
}
356354
}
357355

358-
selectInactive(stack, element,end_node) {
359-
if (element.getAttribute('checked') == 'false') return;
360-
element.setAttribute('checked', 'false');
356+
selectInactive(stack, element,end_node,checked) {
357+
checked != null && element.setAttribute('checked', 'false');
361358
let id = element.getAttribute('data-id');
362359
this.tagCal(parseInt(id), this.MODE.delete);
363360
element.querySelector('i') != null && element.removeChild(element.querySelector('i'));
@@ -389,12 +386,12 @@ class ComponentCascadeDot {
389386
div.textContent = element.textContent;
390387
var object = this;
391388
div.addEventListener('click', function () {
392-
object.selectInactive(stack, element);
389+
object.selectInactive(stack, element,'true','true');
393390
});
394391
this.SELECTED_DOM.append(div);
395392
}
396393

397-
selectToParent(checked, node, stack, parent_node, child_nodes) {
394+
selectToParent(checked, node, stack, parent_node) {
398395
let currentStackDocuments = this.STACKS[stack].childNodes;
399396
currentStackDocuments.forEach((D, index) => {
400397
if (checked == 'true') {

0 commit comments

Comments
 (0)