|
|
@ -518,12 +518,24 @@ export class BoardConfigModal extends React.Component<BoardConfigProps, {}>{
|
|
|
|
{
|
|
|
|
{
|
|
|
|
//从刀库获取新的刀具 否则使用缓存刀具轮廓 解决不同店铺编辑保存二维刀路时鉴权失败问题
|
|
|
|
//从刀库获取新的刀具 否则使用缓存刀具轮廓 解决不同店铺编辑保存二维刀路时鉴权失败问题
|
|
|
|
let polyline = useNewKnife ? await this.getToplinesDetailPolyline(id) : br.KnifePolylineMap.get(id) ?? await this.getToplinesDetailPolyline(id);
|
|
|
|
let polyline = useNewKnife ? await this.getToplinesDetailPolyline(id) : br.KnifePolylineMap.get(id) ?? await this.getToplinesDetailPolyline(id);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//二维刀路时鉴权失败时 保存路径后退出
|
|
|
|
|
|
|
|
if (!polyline)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
path.ColorIndex = c.ColorIndex;
|
|
|
|
|
|
|
|
if (!pathMap.has(c.ColorIndex))
|
|
|
|
|
|
|
|
pathMap.set(c.ColorIndex, [path]);
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
pathMap.get(c.ColorIndex).push(path);
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
halfWidth = polyline.BoundingBox.getSize(new Vector3).x / 2;
|
|
|
|
halfWidth = polyline.BoundingBox.getSize(new Vector3).x / 2;
|
|
|
|
knifeSizeMap.set(id, halfWidth);
|
|
|
|
knifeSizeMap.set(id, halfWidth);
|
|
|
|
knifeMap.set(id, polyline);
|
|
|
|
knifeMap.set(id, polyline);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//忽略与板没有交集的刀路
|
|
|
|
//提示与板没有交集的刀路
|
|
|
|
if (brCurveBox.intersectsBox(path.BoundingBox, halfWidth))
|
|
|
|
if (brCurveBox.intersectsBox(path.BoundingBox, halfWidth))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
//异型板情况
|
|
|
|
//异型板情况
|
|
|
|