@kq_npm/client3d_webgl_vue 0.9.5-beta → 0.9.7-beta

package/aspectanalysis/index.js

@@ -88,17 +88,16 @@ class AspectAnalysisViewModels {
     _defineProperty(this, "_globaOptions", {
       //全局参数
       viewer: null,
-      _drawManager: null,
-      viewModel: null
+      _drawManager: null
     });
 
     this._globaOptions.viewer = scenceView._viewer;
-    this._globaOptions.viewModel = {
+    let options = {
       interval: aspect.interval || 500,
-      //采样间隔 
+      // 采样间隔
       width: aspect.arrowWidth || 20,
       // 箭头宽度
-      color: Cesium.Color.fromCssColorString(aspect.color || '#FFFF00'),
+      color: Cesium.Color.fromCssColorString(aspect.color || "#FFFF00"),
       // 箭头颜色
       viewer: scenceView._viewer
     };
@@ -106,12 +105,11 @@ class AspectAnalysisViewModels {
 
     this._globaOptions.viewer.scene.globe.enableLighting = true;
     this._globaOptions._drawManager = scenceView._drawManager;
-    let that = this;
-    this._aspectAnalysis = new Cesium.Kq3dAspect(this._globaOptions.viewModel);
+    var that = this;
+    this._aspectAnalysis = new Cesium.Kq3dAspect(options);
     this._globaOptions._drawFinishedEventListener = this._globaOptions._drawManager.drawFinishedEvent.addEventListener(shape => {
       if (shape) {
-        that._globaOptions.viewModel.positions = shape._controlPoints;
-        that._aspectAnalysis.positions = positions;
+        that._aspectAnalysis.positions = shape._controlPoints;
 
         that._globaOptions._drawManager.clear();
       }
@@ -121,8 +119,10 @@ class AspectAnalysisViewModels {
 
   start() {
     // 判断是否添加了地形
-    if (this._globaOptions.viewModel.viewer.terrainProvider.availability) {
+    if (this._globaOptions.viewer.terrainProvider.availability) {
       if (this._globaOptions._drawManager) {
+        this.clear();
+
         this._globaOptions._drawManager.startDraw("polygon", {
           clampToGround: true
         });
@@ -130,19 +130,27 @@ class AspectAnalysisViewModels {
     } else {
       throw "请加载地形后分析!";
     }
-  } // 设置填充纹理颜色
+  } // 设置采样间隔
+
+
+  setInterval(newValue) {
+    if (this._aspectAnalysis) this._aspectAnalysis._interval = newValue;
+  } // 设置箭头宽度
 
 
-  setColorTable(newValue) {
-    this._globaOptions.viewModel.colorTable = newValue;
-    if (this._slopeAnalysis) this._slopeAnalysis.colorTable = this._globaOptions.viewModel.colorTable;
+  setArrowWidth(newValue) {
+    if (this._aspectAnalysis) this._aspectAnalysis._width = newValue;
+  } // 设置箭头颜色
+
+
+  setArrowColor(newValue) {
+    if (this._aspectAnalysis) this._aspectAnalysis._color = Cesium.Color.fromCssColorString(newValue);
   } // 清除全部结果
 
 
   clear() {
     this._globaOptions._drawManager && this._globaOptions._drawManager.stopDraw();
-    this._aspectAnalysis && this._aspectAnalysis.destroy();
-    this._aspectAnalysis = null;
+    this._aspectAnalysis && this._aspectAnalysis.clear();
   } // 销毁
 
 
@@ -150,7 +158,7 @@ class AspectAnalysisViewModels {
     // 移除监听事件
     this._globaOptions._drawFinishedEventListener && this._globaOptions._drawFinishedEventListener();
     this._globaOptions._drawFinishedEventListener = null;
-    this._aspectAnalysis && this._aspectAnalysis.destroy();
+    this._aspectAnalysis && this._aspectAnalysis.clear();
     this._aspectAnalysis = null;
   }
 
@@ -185,8 +193,7 @@ const __default__ = {
       proxy
     } = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.getCurrentInstance)();
     let currentLang = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)("");
-    let language = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)({}); //计算属性
-    // 获取组件传参
+    let language = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)({}); // 获取组件传参
     // 分析类
 
     let viewModel = null; // 默认参数
@@ -194,7 +201,7 @@ const __default__ = {
     let formItem = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.reactive)({
       interval: props.settingParams && props.settingParams.interval || 500,
       arrowWidth: props.settingParams && props.settingParams.arrowWidth || 20,
-      arrowColor: props.settingParams && props.settingParams.arrowColor || "#FF0000"
+      arrowColor: props.settingParams && props.settingParams.arrowColor || "#FFFF00"
     });
     (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.onMounted)(() => {
       currentLang.value = proxy.$i18n.locale; // 获取当前语言
@@ -210,15 +217,18 @@ const __default__ = {
     function paramsChanged(key) {
       switch (key) {
         case "interval":
-          // 
+          // 采样间隔
+          viewModel.setInterval(formItem.interval);
           break;
 
         case "arrowWidth":
-          // 自定义填充样式区间
+          // 箭头间隔
+          viewModel.setArrowWidth(formItem.arrowWidth);
           break;
 
         case "arrowColor":
-          // 自定义填充样式颜色
+          // 箭头颜色
+          viewModel.setArrowColor(formItem.arrowColor);
           break;
 
         default:
@@ -228,7 +238,6 @@ const __default__ = {
 
 
     function startAnalysis() {
-      clearResult();
       viewModel && viewModel.start();
     } //清除结果
 
@@ -401,12 +410,12 @@ const __default__ = {
 
             }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_row, null, {
               default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_form_item, {
-                label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).color
+                label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).arrowColor
               }, {
                 default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_color_picker, {
                   modelValue: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).arrowColor,
                   "onUpdate:modelValue": _cache[8] || (_cache[8] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).arrowColor = $event),
-                  onChange: _cache[9] || (_cache[9] = $event => paramsChanged('slopeColorText'))
+                  onChange: _cache[9] || (_cache[9] = $event => paramsChanged('arrowColor'))
                 }, null, 8
                 /* PROPS */
                 , ["modelValue"])]),

package/index.js

@@ -651,7 +651,7 @@ class DrawManager {
         outlineColor: "#ff0000",
         outlineWidth: 1,
         outlineDash: false,
-        fill: false,
+        fill: true,
         fillStyle: null
       }
     });
@@ -899,7 +899,7 @@ class DrawManager {
         });
       }
 
-      if (type === "polygon" && style.polygon.fill && style.polygon.fillStyle) {
+      if (type === "polygon" && style.polygon.fillStyle) {
         style.polygon.material = this.getFillStyle(style.polygon.fillStyle);
       }
     }
@@ -981,6 +981,21 @@ class DrawManager {
   }
 
 }
+;// CONCATENATED MODULE: external "element-plus/es"
+var es_namespaceObject = require("element-plus/es");
+;// CONCATENATED MODULE: external "@kq_npm/client_common_vue/init.js"
+var init_js_namespaceObject = require("@kq_npm/client_common_vue/init.js");
+var init_js_default = /*#__PURE__*/__webpack_require__.n(init_js_namespaceObject);
+;// CONCATENATED MODULE: ./src/common/_ui/message/index.js
+
+
+
+es_namespaceObject.ElMessage.install = (Vue, opts) => {
+  init_js_default()(Vue, opts);
+  Vue.component("KqMessage", es_namespaceObject.ElMessage);
+};
+
+/* harmony default export */ var message = (es_namespaceObject.ElMessage);
 ;// CONCATENATED MODULE: external "@kq_npm/client_common_vue/_utils/webmapservice"
 var webmapservice_namespaceObject = require("@kq_npm/client_common_vue/_utils/webmapservice");
 var webmapservice_default = /*#__PURE__*/__webpack_require__.n(webmapservice_namespaceObject);
@@ -994,6 +1009,7 @@ var global_event_default = /*#__PURE__*/__webpack_require__.n(global_event_names
 
 
 
+
  //图层管理类
 
 class LayerManager {
@@ -1111,7 +1127,7 @@ class LayerManager {
           });
           var sourcePromise = webMapService.getMapInfo().then(mapInfo => {
             if (mapInfo.resultcode === "error") {
-              KqMessage({
+              message({
                 message: mapInfo.message,
                 type: "error"
               });
@@ -2830,9 +2846,6 @@ const __default__ = {
 const __exports__ = ScenceViewvue_type_script_setup_true_lang_js;
 
 /* harmony default export */ var ScenceView = (__exports__);
-;// CONCATENATED MODULE: external "@kq_npm/client_common_vue/init.js"
-var init_js_namespaceObject = require("@kq_npm/client_common_vue/init.js");
-var init_js_default = /*#__PURE__*/__webpack_require__.n(init_js_namespaceObject);
 ;// CONCATENATED MODULE: ./src/webgl/scenceview/index.js
 
 
@@ -4066,18 +4079,6 @@ Measure.install = (Vue, opts) => {
 };
 
 
-;// CONCATENATED MODULE: external "element-plus/es"
-var es_namespaceObject = require("element-plus/es");
-;// CONCATENATED MODULE: ./src/common/_ui/message/index.js
-
-
-
-es_namespaceObject.ElMessage.install = (Vue, opts) => {
-  init_js_default()(Vue, opts);
-  Vue.component("KqMessage", es_namespaceObject.ElMessage);
-};
-
-/* harmony default export */ var message = (es_namespaceObject.ElMessage);
 ;// CONCATENATED MODULE: ./src/webgl/flight/FlightViewModel.js
 
 //飞行操作类
@@ -12446,17 +12447,16 @@ class AspectAnalysisViewModels {
     _defineProperty(this, "_globaOptions", {
       //全局参数
       viewer: null,
-      _drawManager: null,
-      viewModel: null
+      _drawManager: null
     });
 
     this._globaOptions.viewer = scenceView._viewer;
-    this._globaOptions.viewModel = {
+    let options = {
       interval: aspect.interval || 500,
-      //采样间隔 
+      // 采样间隔
       width: aspect.arrowWidth || 20,
       // 箭头宽度
-      color: Cesium.Color.fromCssColorString(aspect.color || '#FFFF00'),
+      color: Cesium.Color.fromCssColorString(aspect.color || "#FFFF00"),
       // 箭头颜色
       viewer: scenceView._viewer
     };
@@ -12464,12 +12464,11 @@ class AspectAnalysisViewModels {
 
     this._globaOptions.viewer.scene.globe.enableLighting = true;
     this._globaOptions._drawManager = scenceView._drawManager;
-    let that = this;
-    this._aspectAnalysis = new Cesium.Kq3dAspect(this._globaOptions.viewModel);
+    var that = this;
+    this._aspectAnalysis = new Cesium.Kq3dAspect(options);
     this._globaOptions._drawFinishedEventListener = this._globaOptions._drawManager.drawFinishedEvent.addEventListener(shape => {
       if (shape) {
-        that._globaOptions.viewModel.positions = shape._controlPoints;
-        that._aspectAnalysis.positions = positions;
+        that._aspectAnalysis.positions = shape._controlPoints;
 
         that._globaOptions._drawManager.clear();
       }
@@ -12479,8 +12478,10 @@ class AspectAnalysisViewModels {
 
   start() {
     // 判断是否添加了地形
-    if (this._globaOptions.viewModel.viewer.terrainProvider.availability) {
+    if (this._globaOptions.viewer.terrainProvider.availability) {
       if (this._globaOptions._drawManager) {
+        this.clear();
+
         this._globaOptions._drawManager.startDraw("polygon", {
           clampToGround: true
         });
@@ -12488,19 +12489,27 @@ class AspectAnalysisViewModels {
     } else {
       throw "请加载地形后分析!";
     }
-  } // 设置填充纹理颜色
+  } // 设置采样间隔
 
 
-  setColorTable(newValue) {
-    this._globaOptions.viewModel.colorTable = newValue;
-    if (this._slopeAnalysis) this._slopeAnalysis.colorTable = this._globaOptions.viewModel.colorTable;
+  setInterval(newValue) {
+    if (this._aspectAnalysis) this._aspectAnalysis._interval = newValue;
+  } // 设置箭头宽度
+
+
+  setArrowWidth(newValue) {
+    if (this._aspectAnalysis) this._aspectAnalysis._width = newValue;
+  } // 设置箭头颜色
+
+
+  setArrowColor(newValue) {
+    if (this._aspectAnalysis) this._aspectAnalysis._color = Cesium.Color.fromCssColorString(newValue);
   } // 清除全部结果
 
 
   clear() {
     this._globaOptions._drawManager && this._globaOptions._drawManager.stopDraw();
-    this._aspectAnalysis && this._aspectAnalysis.destroy();
-    this._aspectAnalysis = null;
+    this._aspectAnalysis && this._aspectAnalysis.clear();
   } // 销毁
 
 
@@ -12508,7 +12517,7 @@ class AspectAnalysisViewModels {
     // 移除监听事件
     this._globaOptions._drawFinishedEventListener && this._globaOptions._drawFinishedEventListener();
     this._globaOptions._drawFinishedEventListener = null;
-    this._aspectAnalysis && this._aspectAnalysis.destroy();
+    this._aspectAnalysis && this._aspectAnalysis.clear();
     this._aspectAnalysis = null;
   }
 
@@ -12543,8 +12552,7 @@ const AspectAnalysisvue_type_script_setup_true_lang_js_default_ = {
       proxy
     } = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.getCurrentInstance)();
     let currentLang = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)("");
-    let language = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)({}); //计算属性
-    // 获取组件传参
+    let language = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)({}); // 获取组件传参
     // 分析类
 
     let viewModel = null; // 默认参数
@@ -12552,7 +12560,7 @@ const AspectAnalysisvue_type_script_setup_true_lang_js_default_ = {
     let formItem = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.reactive)({
       interval: props.settingParams && props.settingParams.interval || 500,
       arrowWidth: props.settingParams && props.settingParams.arrowWidth || 20,
-      arrowColor: props.settingParams && props.settingParams.arrowColor || "#FF0000"
+      arrowColor: props.settingParams && props.settingParams.arrowColor || "#FFFF00"
     });
     (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.onMounted)(() => {
       currentLang.value = proxy.$i18n.locale; // 获取当前语言
@@ -12568,15 +12576,18 @@ const AspectAnalysisvue_type_script_setup_true_lang_js_default_ = {
     function paramsChanged(key) {
       switch (key) {
         case "interval":
-          // 
+          // 采样间隔
+          viewModel.setInterval(formItem.interval);
           break;
 
         case "arrowWidth":
-          // 自定义填充样式区间
+          // 箭头间隔
+          viewModel.setArrowWidth(formItem.arrowWidth);
           break;
 
         case "arrowColor":
-          // 自定义填充样式颜色
+          // 箭头颜色
+          viewModel.setArrowColor(formItem.arrowColor);
           break;
 
         default:
@@ -12586,7 +12597,6 @@ const AspectAnalysisvue_type_script_setup_true_lang_js_default_ = {
 
 
     function startAnalysis() {
-      clearResult();
       viewModel && viewModel.start();
     } //清除结果
 
@@ -12759,12 +12769,12 @@ const AspectAnalysisvue_type_script_setup_true_lang_js_default_ = {
 
             }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_row, null, {
               default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_form_item, {
-                label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).color
+                label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).arrowColor
               }, {
                 default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_color_picker, {
                   modelValue: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).arrowColor,
                   "onUpdate:modelValue": _cache[8] || (_cache[8] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).arrowColor = $event),
-                  onChange: _cache[9] || (_cache[9] = $event => paramsChanged('slopeColorText'))
+                  onChange: _cache[9] || (_cache[9] = $event => paramsChanged('arrowColor'))
                 }, null, 8
                 /* PROPS */
                 , ["modelValue"])]),

package/package.json

@@ -1 +1 @@
-{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"0.9.5-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","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.9.7-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","css-vars-ponyfill":"^2.4.8","xe-utils":"^3.5.4"}}

package/scenceview/index.js

@@ -196,7 +196,7 @@ class DrawManager {
         outlineColor: "#ff0000",
         outlineWidth: 1,
         outlineDash: false,
-        fill: false,
+        fill: true,
         fillStyle: null
       }
     });
@@ -444,7 +444,7 @@ class DrawManager {
         });
       }
 
-      if (type === "polygon" && style.polygon.fill && style.polygon.fillStyle) {
+      if (type === "polygon" && style.polygon.fillStyle) {
         style.polygon.material = this.getFillStyle(style.polygon.fillStyle);
       }
     }
@@ -526,6 +526,21 @@ class DrawManager {
   }
 
 }
+;// CONCATENATED MODULE: external "element-plus/es"
+var es_namespaceObject = require("element-plus/es");
+;// CONCATENATED MODULE: external "@kq_npm/client_common_vue/init.js"
+var init_js_namespaceObject = require("@kq_npm/client_common_vue/init.js");
+var init_js_default = /*#__PURE__*/__webpack_require__.n(init_js_namespaceObject);
+;// CONCATENATED MODULE: ./src/common/_ui/message/index.js
+
+
+
+es_namespaceObject.ElMessage.install = (Vue, opts) => {
+  init_js_default()(Vue, opts);
+  Vue.component("KqMessage", es_namespaceObject.ElMessage);
+};
+
+/* harmony default export */ var message = (es_namespaceObject.ElMessage);
 ;// CONCATENATED MODULE: external "@kq_npm/client_common_vue/_utils/webmapservice"
 var webmapservice_namespaceObject = require("@kq_npm/client_common_vue/_utils/webmapservice");
 var webmapservice_default = /*#__PURE__*/__webpack_require__.n(webmapservice_namespaceObject);
@@ -539,6 +554,7 @@ var global_event_default = /*#__PURE__*/__webpack_require__.n(global_event_names
 
 
 
+
  //图层管理类
 
 class LayerManager {
@@ -656,7 +672,7 @@ class LayerManager {
           });
           var sourcePromise = webMapService.getMapInfo().then(mapInfo => {
             if (mapInfo.resultcode === "error") {
-              KqMessage({
+              message({
                 message: mapInfo.message,
                 type: "error"
               });
@@ -2375,9 +2391,6 @@ const __default__ = {
 const __exports__ = ScenceViewvue_type_script_setup_true_lang_js;
 
 /* harmony default export */ var ScenceView = (__exports__);
-;// CONCATENATED MODULE: external "@kq_npm/client_common_vue/init.js"
-var init_js_namespaceObject = require("@kq_npm/client_common_vue/init.js");
-var init_js_default = /*#__PURE__*/__webpack_require__.n(init_js_namespaceObject);
 ;// CONCATENATED MODULE: ./src/webgl/scenceview/index.js