|
|
|
@ -118,20 +118,6 @@ export class CombinatAttributeBrush implements Command
|
|
|
|
|
en.HardwareOption = { ...orgEn.HardwareOption };
|
|
|
|
|
en.DataList = [...orgEn.DataList.map(d => [d[0], d[1]])] as [string, string][];
|
|
|
|
|
}
|
|
|
|
|
if (option.ProcessingGroupList)
|
|
|
|
|
{
|
|
|
|
|
// 复制加工组
|
|
|
|
|
[...orgEn.ProcessingGroupList].map(item =>
|
|
|
|
|
{
|
|
|
|
|
let pg = new ProcessingGroupRecord;
|
|
|
|
|
pg.Name = (item?.Object as ProcessingGroupRecord).Name;
|
|
|
|
|
pg.Objects = [en.Id];
|
|
|
|
|
if (en.ProcessingGroupList.some(pgId => pg.Name === (pgId?.Object as ProcessingGroupRecord)?.Name))
|
|
|
|
|
return;
|
|
|
|
|
app.Database.ProcessingGroupTable.Add(pg);
|
|
|
|
|
en.ProcessingGroupList.push(pg.Id);
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
for (const k in option)
|
|
|
|
@ -149,6 +135,20 @@ export class CombinatAttributeBrush implements Command
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (option.ProcessingGroupList)
|
|
|
|
|
{
|
|
|
|
|
// 复制加工组
|
|
|
|
|
[...orgEn.ProcessingGroupList].map(item =>
|
|
|
|
|
{
|
|
|
|
|
let pg = new ProcessingGroupRecord;
|
|
|
|
|
pg.Name = (item?.Object as ProcessingGroupRecord).Name;
|
|
|
|
|
pg.Objects = [en.Id];
|
|
|
|
|
if (en.ProcessingGroupList.some(pgId => pg.Name === (pgId?.Object as ProcessingGroupRecord)?.Name))
|
|
|
|
|
return;
|
|
|
|
|
app.Database.ProcessingGroupTable.Add(pg);
|
|
|
|
|
en.ProcessingGroupList.push(pg.Id);
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|