|
|
@@ -312,13 +312,13 @@ projectGljObject={
|
|
|
showMaterialTreeData:function () {
|
|
|
this.projectGljSpread.setActiveSheetIndex(1);
|
|
|
let sel = this.materialTreeSheet.getSelections()[0];
|
|
|
- let oldNodeID = this.materialTree.selected.data.id;
|
|
|
+ let oldNodeID = this.materialTree.selected?this.materialTree.selected.data.id:"";
|
|
|
let gljList = projectObj.project.projectGLJ.datas.gljList;
|
|
|
gljList = _.sortByAll(gljList, [ 'code']);
|
|
|
this.createMaterialTree(gljList);
|
|
|
this.materialTreeController.showTreeData();
|
|
|
let newNode = this.materialTree.getNodeByID(oldNodeID);
|
|
|
- sel.row = newNode.serialNo();
|
|
|
+ sel.row = newNode?newNode.serialNo():-1;
|
|
|
this.materialTreeSheet.setSelection(sel.row==-1?0:sel.row,sel.col,sel.rowCount,sel.colCount);
|
|
|
this.materialTreeController.setTreeSelected(this.materialTree.items[sel.row==-1?0:sel.row]);
|
|
|
},
|
