|
|
@@ -81,7 +81,7 @@ $(document).ready(function() {
|
|
|
invalidAll();
|
|
|
return;
|
|
|
}
|
|
|
- let last = first, sameParent = true, specNode = false, nodeUsed = this.checkNodeUsed(tree, first);
|
|
|
+ let last = first, sameParent = true, specNode = !!first.node_type, nodeUsed = this.checkNodeUsed(tree, first);
|
|
|
if (sel.rowCount > 1 && first) {
|
|
|
for (let r = 1; r < sel.rowCount; r++) {
|
|
|
const rNode = tree.nodes[sel.row + r];
|
|
|
@@ -105,7 +105,7 @@ $(document).ready(function() {
|
|
|
const isFixed = first.tree_level === 1 || [2,3,4].indexOf(topParent.node_type) >= 0;
|
|
|
|
|
|
setObjEnable($('a[name=base-opr][type=add]'), valid && first && !isFixed);
|
|
|
- setObjEnable($('a[name=base-opr][type=delete]'), valid && first && sameParent && !isFixed && specNode);
|
|
|
+ setObjEnable($('a[name=base-opr][type=delete]'), valid && first && sameParent && !isFixed && !specNode);
|
|
|
setObjEnable($('a[name=base-opr][type=up-move]'), valid && first && sameParent && preNode && !isFixed);
|
|
|
setObjEnable($('a[name=base-opr][type=down-move]'), valid && first && sameParent && !tree.isLastSibling(last) && !isFixed);
|
|
|
setObjEnable($('a[name=base-opr][type=up-level]'), valid && first && sameParent && tree.getParent(first) && !nodeUsed && first.tree_level > 2 && !isFixed);
|
|
|
@@ -734,7 +734,7 @@ $(document).ready(function() {
|
|
|
const tree = sheet.zh_tree;
|
|
|
if (!tree) return true;
|
|
|
const first = sheet.zh_tree.nodes[row];
|
|
|
- let last = first, sameParent = true, specNode = false, nodeUsed = billsObj.checkNodeUsed(tree, first);
|
|
|
+ let last = first, sameParent = true, specNode = !!first.node_type, nodeUsed = billsObj.checkNodeUsed(tree, first);
|
|
|
if (sel.rowCount > 1 && first) {
|
|
|
for (let r = 1; r < sel.rowCount; r++) {
|
|
|
const rNode = tree.nodes[sel.row + r];
|
|
|
@@ -742,7 +742,6 @@ $(document).ready(function() {
|
|
|
sameParent = false;
|
|
|
break;
|
|
|
}
|
|
|
- if (!specNode) specNode = !!rNode.node_type;
|
|
|
nodeUsed = nodeUsed || billsObj.checkNodeUsed(tree, rNode);
|
|
|
if (rNode.tree_level > first.tree_level) continue;
|
|
|
if ((rNode.tree_level < first.tree_level) || (rNode.tree_level === first.tree_level && rNode.tree_pid !== first.tree_pid)) {
|
