diff --git a/src/BaseDialog/index.js b/src/BaseDialog/index.js index cbafd23..df9aab3 100644 --- a/src/BaseDialog/index.js +++ b/src/BaseDialog/index.js @@ -3,7 +3,7 @@ class BaseDialog { this.container = container this.options = { ...options } this.options.ismove = true - if(options.ismove === false) { + if (options.ismove === false) { this.options.ismove = options.ismove } this.closeCallBack = options.closeCallBack @@ -12,7 +12,6 @@ class BaseDialog { } async init() { - this.closeAll() DialogAll.push(this) this.isDestroy = false @@ -62,7 +61,7 @@ class BaseDialog { }); } - if(this.options.ismove) { + if (this.options.ismove) { this.moveDiv() } } @@ -92,7 +91,7 @@ class BaseDialog { } closeAll() { - for(let i=DialogAll.length-1;i>=0;i--) { + for (let i = DialogAll.length - 1; i >= 0; i--) { DialogAll[i].close() DialogAll.splice(i, 1) } @@ -187,6 +186,14 @@ class BaseDialog { _this._element.body.style.bottom = 'unset' _this._element.body.style.right = 'unset' } + + //鼠标抬起事件 + document.onmouseup = function (e) { + window.onmousemove = null + } + window.ondragend = function (e) { + window.onmousemove = null + } } //鼠标抬起事件 diff --git a/src/In/index.js b/src/In/index.js index ca9db7f..234bfa3 100644 --- a/src/In/index.js +++ b/src/In/index.js @@ -73,7 +73,7 @@ import { dialog as ContourDialog } from '../Global/Contour' import { on as SplitScreenOn, off as SplitScreenOff, setActiveId as SplitScreenSetActiveId, getSdk } from '../Global/SplitScreen' import LocateCurrent from '../Obj/Base/LocateCurrent' -import { Clear as AnalysisClear } from '../Obj/Analysis/clear' +import { AnalysisClear, SectionClear } from '../Obj/Analysis/clear' import CutFillAnalysis from '../Obj/Analysis/CutFill' import Submerge from '../Obj/Analysis/Submerge' import ViewShed from '../Obj/Analysis/ViewShed' @@ -390,7 +390,9 @@ if (!window.YJ) { Section, TerrainExcavation, Flat, - Analyses: [] + AnalysesResults: [], + SectionResults: [], + ClearSection: SectionClear }, CoordTransform, RoutePlanningArrays: [], diff --git a/src/Obj/Analysis/CircleViewShed/index.js b/src/Obj/Analysis/CircleViewShed/index.js index 2ae1abd..6ed2c77 100644 --- a/src/Obj/Analysis/CircleViewShed/index.js +++ b/src/Obj/Analysis/CircleViewShed/index.js @@ -35,7 +35,7 @@ class CircleViewShed extends Tools { this.Dialog = _Dialog this._EventBinding = new EventBinding() this.html = null - YJ.Analysis.Analyses.push(this) + YJ.Analysis.AnalysesResults.push(this) CircleViewShed.edit(this) // CircleViewShed.create(this) } diff --git a/src/Obj/Analysis/Contour/index.js b/src/Obj/Analysis/Contour/index.js index cd162c6..6a246f9 100644 --- a/src/Obj/Analysis/Contour/index.js +++ b/src/Obj/Analysis/Contour/index.js @@ -44,7 +44,7 @@ class ContourAnalysis { "#2F0000", ]; //等高线赋值颜色，内含default值 this.countorLineList = Cesium.defaultValue(options.countorLineList, []); - YJ.Analysis.Analyses.push(this) + YJ.Analysis.AnalysesResults.push(this) this.createNewLine(); } createNewLine() { diff --git a/src/Obj/Analysis/CutFill/index.js b/src/Obj/Analysis/CutFill/index.js index f528a52..64a0659 100644 --- a/src/Obj/Analysis/CutFill/index.js +++ b/src/Obj/Analysis/CutFill/index.js @@ -27,7 +27,7 @@ class CutFillAnalysis { } this.entities = [] this.Draw = new DrawPolygon(this.sdk) - YJ.Analysis.Analyses.push(this) + YJ.Analysis.AnalysesResults.push(this) CutFillAnalysis.EditBox(this) } diff --git a/src/Obj/Analysis/Profile/index.js b/src/Obj/Analysis/Profile/index.js index 3954af3..8073339 100644 --- a/src/Obj/Analysis/Profile/index.js +++ b/src/Obj/Analysis/Profile/index.js @@ -15,7 +15,7 @@ class Profile extends Draw { super(sdk) this.viewer = sdk.viewer; this.Dialog = _Dialog - YJ.Analysis.Analyses.push(this) + YJ.Analysis.AnalysesResults.push(this) Profile.create(this) } static create(that) { diff --git a/src/Obj/Analysis/Section/index.js b/src/Obj/Analysis/Section/index.js index fe4138a..2ecf3b6 100644 --- a/src/Obj/Analysis/Section/index.js +++ b/src/Obj/Analysis/Section/index.js @@ -15,7 +15,7 @@ class Section extends Tools { this.tiles3d = tiles3d this.options = { ...options } this.options.regionsType = this.options.regionsType || false - // YJ.Analysis.Analyses.push(this) + YJ.Analysis.SectionResults.push(this) this.Planes = [] Section.start(this) } diff --git a/src/Obj/Analysis/SlopeAspect/index.js b/src/Obj/Analysis/SlopeAspect/index.js index 4aa1383..ccd70ac 100644 --- a/src/Obj/Analysis/SlopeAspect/index.js +++ b/src/Obj/Analysis/SlopeAspect/index.js @@ -24,7 +24,7 @@ class SlopeAspect extends Tools { this.result = []; //存储创建的坡度分析结果，primitive集合 this.handler = undefined; this.toolTip = ""; - YJ.Analysis.Analyses.push(this) + YJ.Analysis.AnalysesResults.push(this) this.Draw = new DrawPolygon(this.sdk) // this.createNew4Distance() this.createNew4Num(50) diff --git a/src/Obj/Analysis/Submerge/index.js b/src/Obj/Analysis/Submerge/index.js index ab94009..1ed1486 100644 --- a/src/Obj/Analysis/Submerge/index.js +++ b/src/Obj/Analysis/Submerge/index.js @@ -26,7 +26,7 @@ class Submerge extends Tools { this.status = true this.area = 0 this._elms = {}; - YJ.Analysis.Analyses.push(this) + YJ.Analysis.AnalysesResults.push(this) Submerge.EditBox(this) // Submerge.create(this) } diff --git a/src/Obj/Analysis/ViewShed/index.js b/src/Obj/Analysis/ViewShed/index.js index b793227..573c00c 100644 --- a/src/Obj/Analysis/ViewShed/index.js +++ b/src/Obj/Analysis/ViewShed/index.js @@ -56,7 +56,7 @@ class ViewShedStage extends Tools { this.Dialog = _Dialog this._EventBinding = new EventBinding() this.html = null - YJ.Analysis.Analyses.push(this) + YJ.Analysis.AnalysesResults.push(this) ViewShedStage.edit(this) // ViewShedStage.edit(this) // this.update(); diff --git a/src/Obj/Analysis/ViewShed2/index.js b/src/Obj/Analysis/ViewShed2/index.js index ac7c509..80c4005 100644 --- a/src/Obj/Analysis/ViewShed2/index.js +++ b/src/Obj/Analysis/ViewShed2/index.js @@ -50,7 +50,7 @@ class ViewShedStage extends Tools { this.ids = [] this.Dialog = _Dialog this.html = null - YJ.Analysis.Analyses.push(this) + YJ.Analysis.AnalysesResults.push(this) ViewShedStage.create(this) // ViewShedStage.edit(this) // this.update(); diff --git a/src/Obj/Analysis/ViewShed3/index.js b/src/Obj/Analysis/ViewShed3/index.js index 54894ff..3117df0 100644 --- a/src/Obj/Analysis/ViewShed3/index.js +++ b/src/Obj/Analysis/ViewShed3/index.js @@ -38,7 +38,7 @@ class ViewShedStage extends Tools { this.viewpointPrimitive = null this.Dialog = _Dialog this.html = null - YJ.Analysis.Analyses.push(this) + YJ.Analysis.AnalysesResults.push(this) ViewShedStage.create(this) } diff --git a/src/Obj/Analysis/Visibility/index.js b/src/Obj/Analysis/Visibility/index.js index c356687..a7e44cd 100644 --- a/src/Obj/Analysis/Visibility/index.js +++ b/src/Obj/Analysis/Visibility/index.js @@ -27,7 +27,7 @@ class VisibilityAnalysis extends Tools { this.viewPointHeight = options.viewPointHeight this.Dialog = _Dialog this._EventBinding = new EventBinding() - YJ.Analysis.Analyses.push(this) + YJ.Analysis.AnalysesResults.push(this) VisibilityAnalysis.edit(this) } diff --git a/src/Obj/Analysis/clear.js b/src/Obj/Analysis/clear.js index 045ab07..3c904ec 100644 --- a/src/Obj/Analysis/clear.js +++ b/src/Obj/Analysis/clear.js @@ -1,8 +1,14 @@ -function Clear() { - YJ.Analysis.Analyses.forEach(m => { +function AnalysisClear() { + YJ.Analysis.AnalysesResults.forEach(m => { m.destroy() }) - // YJ.Analysis.Analyses = [] + // YJ.Analysis.AnalysesResults = [] } -export {Clear} \ No newline at end of file +function SectionClear() { + YJ.Analysis.SectionResults.forEach(m => { + m.destroy() + }) +} + +export {AnalysisClear, SectionClear} \ No newline at end of file diff --git a/src/Obj/Analysis/test/index.js b/src/Obj/Analysis/test/index.js index 9efc4b0..a54b54b 100644 --- a/src/Obj/Analysis/test/index.js +++ b/src/Obj/Analysis/test/index.js @@ -50,7 +50,7 @@ class Test extends Tools { this.ids = [] this.Dialog = _Dialog this.html = null - YJ.Analysis.Analyses.push(this) + YJ.Analysis.AnalysesResults.push(this) Test.create(this) // Test.edit(this) // this.update();