diff --git a/src/Editor/SelectControls.ts b/src/Editor/SelectControls.ts index 7f350c81c..08e2ab8ef 100644 --- a/src/Editor/SelectControls.ts +++ b/src/Editor/SelectControls.ts @@ -31,7 +31,7 @@ export class SelectControls implements EditorService private m_SelectCss: SelectMarquee; private m_Editor: Editor; private m_Viewer: Viewer; - private m_SelectSet: SelectSet = new SelectSet(); + private m_SelectSet: SelectSet = new SelectSet(true); m_Filter: Filter; private m_SelectType: SelectType = SelectType.None; private m_FirstPickPoint: Vector3; @@ -210,7 +210,7 @@ export class SelectControls implements EditorService Cancel() { this.RestState(); - this.m_SelectSet = new SelectSet(); + this.m_SelectSet = new SelectSet(true); this.UpdateView(); this.CanenEvent(); diff --git a/src/Editor/SelectSet.ts b/src/Editor/SelectSet.ts index f0f3cebe8..a3111ebff 100644 --- a/src/Editor/SelectSet.ts +++ b/src/Editor/SelectSet.ts @@ -1,4 +1,3 @@ -import * as THREE from 'three'; import { arrayRemoveOnce } from '../Common/ArrayExt'; import { GetEntity, IsEntity, log } from '../Common/Utils'; import { Entity } from '../DatabaseServices/Entity'; @@ -8,14 +7,9 @@ import { CheckFilter, Filter } from './SelectFilter'; //选择集. export class SelectSet { - constructor() - { - - } + constructor(private showLog = false) { } /** * 选择数据 - * - * @memberof SelectSet */ private m_SelectSetList = new Array(); private m_IdSelect = new Map(); @@ -27,7 +21,9 @@ export class SelectSet selectData.m_SelectList = selectData.m_SelectList.filter(obj => !this.m_IdSelect.has(obj.id)) let dupCount = selectCount - selectData.m_SelectList.length; - log(`选择${selectCount}个,重复${dupCount}个.`); + + if (this.showLog) + log(`选择${selectCount}个,重复${dupCount}个.`); //加入集合 this.m_SelectSetList.push(selectData); @@ -50,6 +46,12 @@ export class SelectSet } } + Clear() + { + this.m_SelectSetList.length = 0; + this.m_IdSelect.clear(); + } + get SelectSetList() { return this.m_SelectSetList;