Skip to content

Commit 597daf7

Browse files
committed
1.8
1 parent b8b6284 commit 597daf7

File tree

1 file changed

+21
-23
lines changed

1 file changed

+21
-23
lines changed

resources/assets/component.js

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -241,19 +241,19 @@ class ComponentCascadeDot {
241241
div.setAttribute('data-id', v.key);
242242
div.setAttribute('data-parent-nodes-id', JSON.stringify(v.parentNodes));
243243
let allow_select = false;
244-
if (v.hasOwnProperty('nodes')) {
244+
if (v.hasOwnProperty('nodes') && v.nodes.length>0) {
245245
let nodes = v.nodes.map((n) => n.key);
246246
div.setAttribute('data-nodes-id', JSON.stringify(nodes));
247-
}else {
247+
} else {
248248
div.setAttribute('checked', 'false');
249249
allow_select = true;
250250
}
251251
div.addEventListener('click', this.select.bind(this, div, stack));
252252
stackDom.append(div);
253253
/*selected append*/
254254
let index = this.selected_data.indexOf(parseInt(v.key));
255-
if(allow_select==false && index!==-1){
256-
this.selected_data.splice(index,1);
255+
if (allow_select == false && index !== -1) {
256+
this.selected_data.splice(index, 1);
257257
this.select_data = this.selected_data.slice(0);
258258
return;
259259
}
@@ -266,7 +266,7 @@ class ComponentCascadeDot {
266266
let parent_nodes = v.parentNodes;
267267
if (Array.isArray(parent_nodes)) {
268268
parent_nodes.forEach((node, stack) => {
269-
this.selectToParent(node, stack, parent_nodes[stack - 1],'false');
269+
this.selectToParent(node, stack, parent_nodes[stack - 1], 'false');
270270
});
271271
}
272272
});
@@ -295,13 +295,11 @@ class ComponentCascadeDot {
295295
} else {
296296
this.dimensional_data[dimension].push(data);
297297
}
298-
if (!data.hasOwnProperty('nodes')) {
298+
if (!data.hasOwnProperty('nodes') || !Array.isArray(data.nodes) || data.nodes.length == 0) {
299299
return;
300300
}
301-
if (Array.isArray(data.nodes) == true && data.nodes.length > 0) {
302-
dimension++;
303-
this.makeDimensional(data.nodes, dimension, parentNodes);
304-
}
301+
dimension++;
302+
this.makeDimensional(data.nodes, dimension, parentNodes);
305303
}
306304

307305
select(element, stack) {
@@ -312,22 +310,22 @@ class ComponentCascadeDot {
312310
end_node = true;
313311
}
314312
let parent_nodes = JSON.parse(element.getAttribute('data-parent-nodes-id'));
315-
if(checked == 'false' || checked==null){
316-
this.selectActive(stack, element,end_node,checked);
317-
}else {
313+
if (checked == 'false' || checked == null) {
314+
this.selectActive(stack, element, end_node, checked);
315+
} else {
318316
this.selectInactive(stack, element, end_node, checked);
319317
}
320318
/*nodes*/
321-
this.selectToChildren(stack + 1, nodes,end_node);
319+
this.selectToChildren(stack + 1, nodes, end_node);
322320
/*parent nodes*/
323321
if (Array.isArray(parent_nodes)) {
324322
for (let stack in parent_nodes) {
325-
this.selectToParent(parent_nodes[stack], parseInt(stack), parent_nodes[stack - 1],checked);
323+
this.selectToParent(parent_nodes[stack], parseInt(stack), parent_nodes[stack - 1], checked);
326324
}
327325
}
328326
}
329327

330-
selectActive(stack, element,end_node,checked) {
328+
selectActive(stack, element, end_node, checked) {
331329
checked != null && element.setAttribute('checked', 'true');
332330
let currentStackDocuments = this.STACKS[stack].childNodes;
333331
let parentNode = JSON.parse(element.getAttribute('data-parent-nodes-id')).pop();
@@ -338,15 +336,15 @@ class ComponentCascadeDot {
338336
currentStackDocuments[index].classList.add('dlp-label-silence');
339337
}
340338
});
341-
element.querySelector('i') != null &&element.removeChild(element.querySelector('i'));
342-
if(end_node){
339+
element.querySelector('i') != null && element.removeChild(element.querySelector('i'));
340+
if (end_node) {
343341
this.selectToSelected(element, stack);
344342
this.tagCal(parseInt(element.getAttribute('data-id')), this.MODE.insert);
345343
element.insertAdjacentHTML('beforeend', `<i>${_componentSvg.check}</i>`);
346344
}
347345
}
348346

349-
selectInactive(stack, element,end_node,checked) {
347+
selectInactive(stack, element, end_node, checked) {
350348
checked != null && element.setAttribute('checked', 'false');
351349
let id = element.getAttribute('data-id');
352350
this.tagCal(parseInt(id), this.MODE.delete);
@@ -379,12 +377,12 @@ class ComponentCascadeDot {
379377
div.textContent = element.textContent;
380378
var object = this;
381379
div.addEventListener('click', function () {
382-
object.selectInactive(stack, element,'true','true');
380+
object.selectInactive(stack, element, 'true', 'true');
383381
});
384382
this.SELECTED_DOM.append(div);
385383
}
386384

387-
selectToParent(node, stack, parent_node,checked) {
385+
selectToParent(node, stack, parent_node, checked) {
388386
let currentStackDocuments = this.STACKS[stack].childNodes;
389387
currentStackDocuments.forEach((D, index) => {
390388
if (checked == 'true') {
@@ -412,12 +410,12 @@ class ComponentCascadeDot {
412410
});
413411
}
414412

415-
selectToChildren(stack, nodes,end_node) {
413+
selectToChildren(stack, nodes, end_node) {
416414
if (stack > (this.dimensional_data.length - 1)) return;
417415
let currentStackDocuments = this.STACKS[stack].childNodes;
418416
let children = [];
419417
currentStackDocuments.forEach((D) => {
420-
if(end_node){
418+
if (end_node) {
421419
D.classList.add('dlp-label-silence');
422420
return;
423421
}

0 commit comments

Comments
 (0)