|
|
|
@ -248,10 +248,8 @@ export class ProcessingGroupModal extends React.Component<{ store: ProcessingGro
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
for (let g of removepg)
|
|
|
|
|
{
|
|
|
|
|
this.DelGroup(g);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//添加
|
|
|
|
|
for (let c of selectedLeftNodeSet)
|
|
|
|
|
{
|
|
|
|
@ -346,7 +344,7 @@ export class ProcessingGroupModal extends React.Component<{ store: ProcessingGro
|
|
|
|
|
let childs: ITreeNode[] = []; //板件(实体)节点
|
|
|
|
|
for (let obj of g.Objects)
|
|
|
|
|
{
|
|
|
|
|
if (obj.IsErase)
|
|
|
|
|
if (!obj || obj.IsErase)
|
|
|
|
|
continue;
|
|
|
|
|
let childnode: ITreeNode;
|
|
|
|
|
//查看/添加
|
|
|
|
@ -579,7 +577,7 @@ export class ProcessingGroupModal extends React.Component<{ store: ProcessingGro
|
|
|
|
|
DelGroup = (g: ProcessingGroupRecord) =>
|
|
|
|
|
{
|
|
|
|
|
for (let objID of g.Objects)
|
|
|
|
|
if (objID.Object instanceof Board)
|
|
|
|
|
if (objID?.Object && objID.Object instanceof Board)
|
|
|
|
|
arrayRemove(objID.Object.ProcessingGroupList, g.Id);
|
|
|
|
|
g.Objects.length = 0;
|
|
|
|
|
g.Erase();
|
|
|
|
@ -665,7 +663,7 @@ export class ProcessingGroupModal extends React.Component<{ store: ProcessingGro
|
|
|
|
|
if (g.Name === c)
|
|
|
|
|
for (let obj of g.Objects)
|
|
|
|
|
{
|
|
|
|
|
if (obj.IsErase || !(obj.Object instanceof Entity))
|
|
|
|
|
if (!obj || obj.IsErase || !(obj.Object instanceof Entity))
|
|
|
|
|
continue;
|
|
|
|
|
if (this.props.store.flag && !(this.props.store.checkEnts.includes(obj.Object)))
|
|
|
|
|
continue;
|
|
|
|
|