@kq_npm/client3d_webgl_vue 0.4.4-beta → 0.4.6-beta

package/index.js

@@ -8639,22 +8639,18 @@ class SkylineAnalysisViewModel {
    * 天际线分析逻辑类构造函数
    * @param {*} viewer 三维对象
    * @param {*} option 天际线分析参数对象
-   * @param {*} echartObject 二维天际线折线图表显影双向绑定对象
    */
-  constructor(viewer, option, echartObject) {
+  constructor(viewer, option) {
     _defineProperty(this, "_skylineAnalysis", null);
 
     _defineProperty(this, "_skylineAnalysisChart", null);
 
     _defineProperty(this, "_skylineAnalysisChartTitle", "");
 
-    _defineProperty(this, "_skylineAnalysistVis", null);
-
     _defineProperty(this, "_options", null);
 
     _defineProperty(this, "_showLimitHeightBody", null);
 
-    this._skylineAnalysistVis = echartObject || {};
     viewer.scene.globe.depthTestAgainstTerrain = true; //开启深度检测
 
     viewer.scene.postProcessStages._fxaa.enabled = true; // 检查参数
@@ -8745,9 +8741,8 @@ class SkylineAnalysisViewModel {
       this._skylineAnalysis.faceColor = this._options.faceColor;
       this._skylineAnalysis.faceOutlineColor = this._options.faceOutlineColor;
 
-      this._skylineAnalysis.drawHeightGeo();
+      this._skylineAnalysis.drawHeightGeo(); // this._skylineAnalysis.viewer.camera.moveBackward(30);
 
-      this._skylineAnalysis.viewer.camera.moveBackward(30);
     } else {
       throw "请添加模型后绘制!";
     }
@@ -8759,12 +8754,9 @@ class SkylineAnalysisViewModel {
 
   setSkyline2D() {
     if (!this._skylineAnalysis) return;
-    this._skylineAnalysistVis.value = true;
 
     var data = this._skylineAnalysis.updateBuffer();
 
-    console.log(data);
-    console.log(this._skylineAnalysisChart);
     var option = {
       title: {
         text: this._skylineAnalysisChartTitle
@@ -8891,8 +8883,6 @@ class SkylineAnalysisViewModel {
 
       this._skylineAnalysis = new window.Cesium.Kq3dSkyline(this._options);
     }
-
-    this._skylineAnalysistVis.value = false;
   }
   /**
    * 注销
@@ -8907,8 +8897,6 @@ class SkylineAnalysisViewModel {
 
       this._skylineAnalysis = null;
     }
-
-    this._skylineAnalysistVis.value = false;
   }
 
 }
@@ -8926,6 +8914,7 @@ const SkylineAnalysisvue_type_script_setup_true_lang_js_hoisted_3 = {
   class: "kq3d-skyline-analysis-result"
 };
 const SkylineAnalysisvue_type_script_setup_true_lang_js_hoisted_4 = {
+  key: 0,
   id: "resultEcahrt",
   class: "resultEcahrt"
 };
@@ -8955,7 +8944,7 @@ const SkylineAnalysisvue_type_script_setup_true_lang_js_default_ = {
 
     let viewModel = null; // chart显示
 
-    let resultEcahrtVis = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)(true); // 获取组件传参
+    let resultEcahrtVis = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)(false); // 获取组件传参
 
     let formItem = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.reactive)({
       skylineColor: props.settingParams && props.settingParams.skylineColor || "#E6A23C",
@@ -8969,15 +8958,17 @@ const SkylineAnalysisvue_type_script_setup_true_lang_js_default_ = {
         if (scenceView) {
           language.value = scenceView._language;
           viewModel = new SkylineAnalysisViewModel(scenceView._viewer, formItem, resultEcahrtVis);
-          viewModel._skylineAnalysisChart = external_echarts_namespaceObject.init(document.getElementById("resultEcahrt"));
           viewModel._skylineAnalysisChartTitle = language.value["skylineAnalysisChartTitle"];
-          resultEcahrtVis.value = false;
         }
       });
     }); // 提取天际线
 
     function pickSkyLine() {
-      viewModel && viewModel.pickSkyLine();
+      resultEcahrtVis.value = true;
+      setTimeout(() => {
+        viewModel._skylineAnalysisChart = external_echarts_namespaceObject.init(document.getElementById("resultEcahrt"));
+        viewModel && viewModel.pickSkyLine();
+      }, 500);
     } // 绘制限高体
 
 
@@ -8992,6 +8983,7 @@ const SkylineAnalysisvue_type_script_setup_true_lang_js_default_ = {
 
 
     function clearResult() {
+      resultEcahrtVis.value = false;
       viewModel && viewModel.clear();
     } // 改变天际线颜色
 
@@ -9017,6 +9009,7 @@ const SkylineAnalysisvue_type_script_setup_true_lang_js_default_ = {
 
 
     (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.onBeforeUnmount)(() => {
+      resultEcahrtVis.value = false;
       viewModel && viewModel.destroy();
     });
     expose({
@@ -9313,9 +9306,7 @@ const SkylineAnalysisvue_type_script_setup_true_lang_js_default_ = {
         _: 1
         /* STABLE */
 
-      })]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("div", SkylineAnalysisvue_type_script_setup_true_lang_js_hoisted_3, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withDirectives)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("div", SkylineAnalysisvue_type_script_setup_true_lang_js_hoisted_4, null, 512
-      /* NEED_PATCH */
-      ), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(resultEcahrtVis)]])])]);
+      })]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("div", SkylineAnalysisvue_type_script_setup_true_lang_js_hoisted_3, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(resultEcahrtVis) ? ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementBlock)("div", SkylineAnalysisvue_type_script_setup_true_lang_js_hoisted_4)) : (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createCommentVNode)("v-if", true)])]);
     };
   }
 

package/package.json

@@ -1 +1 @@
-{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"0.4.4-beta","homepage":"","keywords":["KQGIS","webGL","Vue"],"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"KQWEB GROUP","license":"Apache-2.0","dependencies":{"colorcolor":"^1.1.1","echarts":"^5.3.3","js-cookie":"^3.0.1","omit.js":"^2.0.2","save":"^2.5.0","tinycolor2":"^1.4.2","vue-i18n":"^9.2.0-beta.36","xlsx":"^0.18.5","@turf/turf":"^6.5.0","css-vars-ponyfill":"^2.4.8","xe-utils":"^3.5.4"}}
+{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"0.4.6-beta","homepage":"","keywords":["KQGIS","webGL","Vue"],"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"KQWEB GROUP","license":"Apache-2.0","dependencies":{"colorcolor":"^1.1.1","echarts":"^5.3.3","js-cookie":"^3.0.1","omit.js":"^2.0.2","save":"^2.5.0","tinycolor2":"^1.4.2","vue-i18n":"^9.2.0-beta.36","xlsx":"^0.18.5","@turf/turf":"^6.5.0","css-vars-ponyfill":"^2.4.8","xe-utils":"^3.5.4"}}

package/skylineanalysis/index.js

@@ -92,22 +92,18 @@ class SkylineAnalysisViewModel {
    * 天际线分析逻辑类构造函数
    * @param {*} viewer 三维对象
    * @param {*} option 天际线分析参数对象
-   * @param {*} echartObject 二维天际线折线图表显影双向绑定对象
    */
-  constructor(viewer, option, echartObject) {
+  constructor(viewer, option) {
     _defineProperty(this, "_skylineAnalysis", null);
 
     _defineProperty(this, "_skylineAnalysisChart", null);
 
     _defineProperty(this, "_skylineAnalysisChartTitle", "");
 
-    _defineProperty(this, "_skylineAnalysistVis", null);
-
     _defineProperty(this, "_options", null);
 
     _defineProperty(this, "_showLimitHeightBody", null);
 
-    this._skylineAnalysistVis = echartObject || {};
     viewer.scene.globe.depthTestAgainstTerrain = true; //开启深度检测
 
     viewer.scene.postProcessStages._fxaa.enabled = true; // 检查参数
@@ -198,9 +194,8 @@ class SkylineAnalysisViewModel {
       this._skylineAnalysis.faceColor = this._options.faceColor;
       this._skylineAnalysis.faceOutlineColor = this._options.faceOutlineColor;
 
-      this._skylineAnalysis.drawHeightGeo();
+      this._skylineAnalysis.drawHeightGeo(); // this._skylineAnalysis.viewer.camera.moveBackward(30);
 
-      this._skylineAnalysis.viewer.camera.moveBackward(30);
     } else {
       throw "请添加模型后绘制!";
     }
@@ -212,12 +207,9 @@ class SkylineAnalysisViewModel {
 
   setSkyline2D() {
     if (!this._skylineAnalysis) return;
-    this._skylineAnalysistVis.value = true;
 
     var data = this._skylineAnalysis.updateBuffer();
 
-    console.log(data);
-    console.log(this._skylineAnalysisChart);
     var option = {
       title: {
         text: this._skylineAnalysisChartTitle
@@ -344,8 +336,6 @@ class SkylineAnalysisViewModel {
 
       this._skylineAnalysis = new window.Cesium.Kq3dSkyline(this._options);
     }
-
-    this._skylineAnalysistVis.value = false;
   }
   /**
    * 注销
@@ -360,8 +350,6 @@ class SkylineAnalysisViewModel {
 
       this._skylineAnalysis = null;
     }
-
-    this._skylineAnalysistVis.value = false;
   }
 
 }
@@ -379,6 +367,7 @@ const _hoisted_3 = {
   class: "kq3d-skyline-analysis-result"
 };
 const _hoisted_4 = {
+  key: 0,
   id: "resultEcahrt",
   class: "resultEcahrt"
 };
@@ -408,7 +397,7 @@ const __default__ = {
 
     let viewModel = null; // chart显示
 
-    let resultEcahrtVis = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)(true); // 获取组件传参
+    let resultEcahrtVis = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)(false); // 获取组件传参
 
     let formItem = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.reactive)({
       skylineColor: props.settingParams && props.settingParams.skylineColor || "#E6A23C",
@@ -422,15 +411,17 @@ const __default__ = {
         if (scenceView) {
           language.value = scenceView._language;
           viewModel = new SkylineAnalysisViewModel(scenceView._viewer, formItem, resultEcahrtVis);
-          viewModel._skylineAnalysisChart = external_echarts_namespaceObject.init(document.getElementById("resultEcahrt"));
           viewModel._skylineAnalysisChartTitle = language.value["skylineAnalysisChartTitle"];
-          resultEcahrtVis.value = false;
         }
       });
     }); // 提取天际线
 
     function pickSkyLine() {
-      viewModel && viewModel.pickSkyLine();
+      resultEcahrtVis.value = true;
+      setTimeout(() => {
+        viewModel._skylineAnalysisChart = external_echarts_namespaceObject.init(document.getElementById("resultEcahrt"));
+        viewModel && viewModel.pickSkyLine();
+      }, 500);
     } // 绘制限高体
 
 
@@ -445,6 +436,7 @@ const __default__ = {
 
 
     function clearResult() {
+      resultEcahrtVis.value = false;
       viewModel && viewModel.clear();
     } // 改变天际线颜色
 
@@ -470,6 +462,7 @@ const __default__ = {
 
 
     (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.onBeforeUnmount)(() => {
+      resultEcahrtVis.value = false;
       viewModel && viewModel.destroy();
     });
     expose({
@@ -766,9 +759,7 @@ const __default__ = {
         _: 1
         /* STABLE */
 
-      })]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("div", _hoisted_3, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withDirectives)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("div", _hoisted_4, null, 512
-      /* NEED_PATCH */
-      ), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(resultEcahrtVis)]])])]);
+      })]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("div", _hoisted_3, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(resultEcahrtVis) ? ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementBlock)("div", _hoisted_4)) : (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createCommentVNode)("v-if", true)])]);
     };
   }