!2924 修复:拖动右侧材质图片错误触发手绘图导入

pull/2927/head
黄诗津 2 months ago committed by ChenX
parent 0fff614283
commit 43109a9df2

@ -159,7 +159,7 @@ export async function ImportPictureTemplateData(file: File)
{
let selectSpace = new PointSelectSpaceClamp();
await selectSpace.Select();
if (!selectSpace.ParseOK || !selectSpace.SpaceParse.Boards.length)
if (!selectSpace.ParseOK || selectSpace.SpaceParse.Boards.filter((br) => br.BoardType != BoardType.Behind).length === 0)
{
Log("请选择有效板件", LogType.Error);
return;
@ -168,7 +168,7 @@ export async function ImportPictureTemplateData(file: File)
isUseSpace = true;
const spaceParse = selectSpace.SpaceParse;
thickness = spaceParse.Boards.filter((br) => br.BoardType != BoardType.Behind)[0].Thickness;
thickness = spaceParse.Boards.filter((br) => br.BoardType != BoardType.Behind)[0]?.Thickness;
const min = spaceParse.SpaceBox.applyMatrix4(spaceParse.SpaceOCS).min;

@ -107,12 +107,12 @@ export class MaterialExplorer extends React.Component<{ materialTable: MaterialT
componentDidMount()
{
document.addEventListener("drop", this.handleDrop);
document.body.addEventListener("drop", this.handleDrop);
}
componentWillUnmount()
{
document.removeEventListener("drop", this.handleDrop);
document.body.removeEventListener("drop", this.handleDrop);
this._RemoveFunc();
}
@ -121,6 +121,7 @@ export class MaterialExplorer extends React.Component<{ materialTable: MaterialT
let material = app.Database.MaterialTable.GetAt(e.dataTransfer.getData("mat"));
if (!material)
return;
e.stopPropagation();
let pt = new Vector3(e.offsetX, e.offsetY, 0);
let raycaster = GenerateRaycaster(pt, app.Viewer);

@ -42,7 +42,8 @@ export interface IImgListProps
}
@observer
export class MaterialList extends React.Component<IImgListProps, {}> {
export class MaterialList extends React.Component<IImgListProps, {}>
{
static defaultProps: Partial<IImgListProps> = {
isRightToolbar: false,
};
@ -300,11 +301,11 @@ export class MaterialList extends React.Component<IImgListProps, {}> {
};
componentDidMount()
{
document.addEventListener("drop", this.handleApply);
document.body.addEventListener("drop", this.handleApply);
}
componentWillUnmount()
{
document.removeEventListener("drop", this.handleApply);
document.body.removeEventListener("drop", this.handleApply);
}
public render()
{

Loading…
Cancel
Save