@kq_npm/client3d_webgl_vue 4.2.3-beta → 4.2.5-beta

package/adddata/index.js

@@ -306,13 +306,8 @@ class AddDataViewModel {
       var name = file.name.replace(/(.*\/)*([^.]+).*/gi, "$2"); //文件名
 
       if (ext === "zip") {
-        (0,util_.uploadSHP)(that._geometryServerUrl, file, that._geometryServerToken, this._language, function (res) {
+        (0,util_.uploadSHP)(file, function (res) {
           if (res) {
-            if (res.srs) {
-              //返回的geojson数据已经做了处理,返回数据坐标系为4326
-              delete res.srs;
-            }
-
             var ds = new Cesium.Kq3dGeoJsonDataSource(name);
             ds.load(res, that._geojsonStyle).then(ds => {
               ds.entities.values.forEach(entity => {
@@ -948,11 +943,11 @@ class AddDataViewModel {
                       let entity = ds.entities.values[0];
 
                       if (entity.polygon) {
-                        shapeType = 'polygon';
+                        shapeType = "polygon";
                       } else if (entity.polyline) {
-                        shapeType = 'polyline';
+                        shapeType = "polyline";
                       } else if (entity.billboard || entity.point) {
-                        shapeType = 'point';
+                        shapeType = "point";
                       }
                     }
 
@@ -962,7 +957,7 @@ class AddDataViewModel {
                       visible: true,
                       serverType: serverType,
                       url: url,
-                      addType: 'geojson',
+                      addType: "geojson",
                       shapeType: shapeType
                     };
                     node.children.push(dsChild);
@@ -1488,7 +1483,7 @@ class AddDataViewModel {
 
   addDataServer(url, name) {
     window.KqGIS.datasourceService(url).getDatasources(async e => {
-      if (e.result.resultcode === 'success') {
+      if (e.result.resultcode === "success") {
         let datasourceList = e.result.result.datasources;
 
         if (datasourceList) {
@@ -1510,7 +1505,7 @@ class AddDataViewModel {
     });
     return new Promise((resolve, reject) => {
       window.KqGIS.datasetService(url).getDatasets(params, e => {
-        if (e.result.resultcode === 'success') {
+        if (e.result.resultcode === "success") {
           resolve(e.result.result.datasets);
         } else {
           console.error(e);
@@ -1529,12 +1524,12 @@ class AddDataViewModel {
       datasetName: datasetName,
       hasGeometry: true,
       returnContent: true,
-      outSRS: 'EPSG:4326'
+      outSRS: "EPSG:4326"
     });
     return new Promise((resolve, reject) => {
       window.KqGIS.dataFeatureService(url).getFeatureList(params, e => {
-        if (e.result.resultcode === 'success') {
-          e.result.result['datasetName'] = datasetName;
+        if (e.result.resultcode === "success") {
+          e.result.result["datasetName"] = datasetName;
           resolve(e.result.result);
         } else {
           console.error(e);

package/index.js

@@ -993,8 +993,8 @@ __webpack_require__.d(__webpack_exports__, {
   "Kq3dWeatherEffectViewModel": function() { return /* reexport */ WeatherEffectViewModel; },
   "Kq3dWireframeSketch": function() { return /* reexport */ WireframeSketch; },
   "Kq3dWireframeSketchViewModel": function() { return /* reexport */ WireframeSketchViewModel; },
-  "KqScenceView": function() { return /* reexport */ ScenceView; },
-  "KqScenceViewViewModel": function() { return /* reexport */ ScenceViewViewModel; },
+  "KqSceneView": function() { return /* reexport */ SceneView; },
+  "KqSceneViewViewModel": function() { return /* reexport */ SceneViewViewModel; },
   "default": function() { return /* binding */ webgl; },
   "webglComponents": function() { return /* reexport */ webglComponents; }
 });
@@ -1025,7 +1025,7 @@ var web_dom_exception_stack_js_namespaceObject = require("core-js/modules/web.do
 var es_array_includes_js_namespaceObject = require("core-js/modules/es.array.includes.js");
 // EXTERNAL MODULE: external "@kq_npm/client_common_vue/_utils/const-image"
 var const_image_ = __webpack_require__(277);
-;// CONCATENATED MODULE: ./src/webgl/scenceview/DrawManager.js
+;// CONCATENATED MODULE: ./src/webgl/sceneview/DrawManager.js
 
 
 
@@ -2313,7 +2313,7 @@ var util_ = __webpack_require__(458);
 // EXTERNAL MODULE: external "@kq_npm/client_common_vue/_types/global-event"
 var global_event_ = __webpack_require__(536);
 var global_event_default = /*#__PURE__*/__webpack_require__.n(global_event_);
-;// CONCATENATED MODULE: ./src/webgl/scenceview/LayerManager.js
+;// CONCATENATED MODULE: ./src/webgl/sceneview/LayerManager.js
 
 
 
@@ -4026,14 +4026,14 @@ function delTreeDataByGuid(data, guid) {
     }
   }
 }
-;// CONCATENATED MODULE: ./src/webgl/scenceview/ScenceViewViewModel.js
+;// CONCATENATED MODULE: ./src/webgl/sceneview/SceneViewViewModel.js
 
-//ScenceView逻辑类
+//SceneView逻辑类
 
 
 
 
-class ScenceViewViewModel extends (mitt_default()) {
+class SceneViewViewModel extends (mitt_default()) {
   // 三维球div id
   // 三维viewer对象
   // 语言
@@ -4481,7 +4481,7 @@ class ScenceViewViewModel extends (mitt_default()) {
   }
 
 }
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js!./node_modules/vue-loader/dist/index.js??ruleSet[0]!./src/webgl/scenceview/ScenceView.vue?vue&type=script&setup=true&lang=js
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js!./node_modules/vue-loader/dist/index.js??ruleSet[0]!./src/webgl/sceneview/SceneView.vue?vue&type=script&setup=true&lang=js
 
 const _hoisted_1 = {
   class: "kq-scence-view",
@@ -4500,9 +4500,9 @@ const _hoisted_4 = {
 
 
 const __default__ = {
-  name: "KqScenceView"
+  name: "KqSceneView"
 };
-/* harmony default export */ var ScenceViewvue_type_script_setup_true_lang_js = (/*#__PURE__*/Object.assign(__default__, {
+/* harmony default export */ var SceneViewvue_type_script_setup_true_lang_js = (/*#__PURE__*/Object.assign(__default__, {
   props: {
     target: {
       type: String,
@@ -4523,7 +4523,7 @@ const __default__ = {
         }
      */
     service: Object,
-    // ScenceView初始化的参数对象，包含初始化范围和layer信息。
+    // SceneView初始化的参数对象，包含初始化范围和layer信息。
     scenceInfo: Object,
     // 默认显示的图层组名称
     defaultShowLayerNames: Array,
@@ -4597,11 +4597,11 @@ const __default__ = {
         language: _language
       }; //初始化逻辑类
 
-      viewModel = new ScenceViewViewModel(props, lang);
+      viewModel = new SceneViewViewModel(props, lang);
       viewModel.initViewer();
     });
     /**
-     * 获取ScenceView的逻辑类
+     * 获取SceneView的逻辑类
      */
 
     function getViewModel() {
@@ -4655,23 +4655,23 @@ const __default__ = {
   }
 
 }));
-;// CONCATENATED MODULE: ./src/webgl/scenceview/ScenceView.vue?vue&type=script&setup=true&lang=js
+;// CONCATENATED MODULE: ./src/webgl/sceneview/SceneView.vue?vue&type=script&setup=true&lang=js
  
-;// CONCATENATED MODULE: ./src/webgl/scenceview/ScenceView.vue
+;// CONCATENATED MODULE: ./src/webgl/sceneview/SceneView.vue
 
 
 
-const __exports__ = ScenceViewvue_type_script_setup_true_lang_js;
+const __exports__ = SceneViewvue_type_script_setup_true_lang_js;
 
-/* harmony default export */ var ScenceView = (__exports__);
-;// CONCATENATED MODULE: ./src/webgl/scenceview/index.js
+/* harmony default export */ var SceneView = (__exports__);
+;// CONCATENATED MODULE: ./src/webgl/sceneview/index.js
 
 
 
 
-ScenceView.install = (Vue, opts) => {
+SceneView.install = (Vue, opts) => {
   init_js_default()(Vue, opts);
-  Vue.component(ScenceView.name, ScenceView);
+  Vue.component(SceneView.name, SceneView);
 };
 
 
@@ -28259,13 +28259,8 @@ class AddDataViewModel {
       var name = file.name.replace(/(.*\/)*([^.]+).*/gi, "$2"); //文件名
 
       if (ext === "zip") {
-        (0,util_.uploadSHP)(that._geometryServerUrl, file, that._geometryServerToken, this._language, function (res) {
+        (0,util_.uploadSHP)(file, function (res) {
           if (res) {
-            if (res.srs) {
-              //返回的geojson数据已经做了处理,返回数据坐标系为4326
-              delete res.srs;
-            }
-
             var ds = new Cesium.Kq3dGeoJsonDataSource(name);
             ds.load(res, that._geojsonStyle).then(ds => {
               ds.entities.values.forEach(entity => {
@@ -28901,11 +28896,11 @@ class AddDataViewModel {
                       let entity = ds.entities.values[0];
 
                       if (entity.polygon) {
-                        shapeType = 'polygon';
+                        shapeType = "polygon";
                       } else if (entity.polyline) {
-                        shapeType = 'polyline';
+                        shapeType = "polyline";
                       } else if (entity.billboard || entity.point) {
-                        shapeType = 'point';
+                        shapeType = "point";
                       }
                     }
 
@@ -28915,7 +28910,7 @@ class AddDataViewModel {
                       visible: true,
                       serverType: serverType,
                       url: url,
-                      addType: 'geojson',
+                      addType: "geojson",
                       shapeType: shapeType
                     };
                     node.children.push(dsChild);
@@ -29441,7 +29436,7 @@ class AddDataViewModel {
 
   addDataServer(url, name) {
     window.KqGIS.datasourceService(url).getDatasources(async e => {
-      if (e.result.resultcode === 'success') {
+      if (e.result.resultcode === "success") {
         let datasourceList = e.result.result.datasources;
 
         if (datasourceList) {
@@ -29463,7 +29458,7 @@ class AddDataViewModel {
     });
     return new Promise((resolve, reject) => {
       window.KqGIS.datasetService(url).getDatasets(params, e => {
-        if (e.result.resultcode === 'success') {
+        if (e.result.resultcode === "success") {
           resolve(e.result.result.datasets);
         } else {
           console.error(e);
@@ -29482,12 +29477,12 @@ class AddDataViewModel {
       datasetName: datasetName,
       hasGeometry: true,
       returnContent: true,
-      outSRS: 'EPSG:4326'
+      outSRS: "EPSG:4326"
     });
     return new Promise((resolve, reject) => {
       window.KqGIS.dataFeatureService(url).getFeatureList(params, e => {
-        if (e.result.resultcode === 'success') {
-          e.result.result['datasetName'] = datasetName;
+        if (e.result.resultcode === "success") {
+          e.result.result["datasetName"] = datasetName;
           resolve(e.result.result);
         } else {
           console.error(e);
@@ -40575,7 +40570,7 @@ GeologicalBodyAnalysis.install = (Vue, opts) => {
 
 
 const webglComponents = {
-  KqScenceView: ScenceView,
+  KqSceneView: SceneView,
   Kq3dMeasure: Measure,
   Kq3dFlight: Flight,
   Kq3dGPUSpatialQuery: GPUSpatialQuery,

package/package.json

@@ -1 +1 @@
-{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"4.2.3-beta","homepage":"","keywords":["KQGIS","webGL","Vue"],"restrictedVersion":true,"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.0","echarts-stat":"1.2.0","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","html2canvas":"1.4.1","xe-utils":"3.5.4"}}
+{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"4.2.5-beta","homepage":"","keywords":["KQGIS","webGL","Vue"],"restrictedVersion":true,"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.0","echarts-stat":"1.2.0","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","html2canvas":"1.4.1","xe-utils":"3.5.4"}}

package/{scenceview → sceneview}/index.js

@@ -551,13 +551,8 @@ class AddDataViewModel {
       var name = file.name.replace(/(.*\/)*([^.]+).*/gi, "$2"); //文件名
 
       if (ext === "zip") {
-        (0,util_.uploadSHP)(that._geometryServerUrl, file, that._geometryServerToken, this._language, function (res) {
+        (0,util_.uploadSHP)(file, function (res) {
           if (res) {
-            if (res.srs) {
-              //返回的geojson数据已经做了处理,返回数据坐标系为4326
-              delete res.srs;
-            }
-
             var ds = new Cesium.Kq3dGeoJsonDataSource(name);
             ds.load(res, that._geojsonStyle).then(ds => {
               ds.entities.values.forEach(entity => {
@@ -1193,11 +1188,11 @@ class AddDataViewModel {
                       let entity = ds.entities.values[0];
 
                       if (entity.polygon) {
-                        shapeType = 'polygon';
+                        shapeType = "polygon";
                       } else if (entity.polyline) {
-                        shapeType = 'polyline';
+                        shapeType = "polyline";
                       } else if (entity.billboard || entity.point) {
-                        shapeType = 'point';
+                        shapeType = "point";
                       }
                     }
 
@@ -1207,7 +1202,7 @@ class AddDataViewModel {
                       visible: true,
                       serverType: serverType,
                       url: url,
-                      addType: 'geojson',
+                      addType: "geojson",
                       shapeType: shapeType
                     };
                     node.children.push(dsChild);
@@ -1733,7 +1728,7 @@ class AddDataViewModel {
 
   addDataServer(url, name) {
     window.KqGIS.datasourceService(url).getDatasources(async e => {
-      if (e.result.resultcode === 'success') {
+      if (e.result.resultcode === "success") {
         let datasourceList = e.result.result.datasources;
 
         if (datasourceList) {
@@ -1755,7 +1750,7 @@ class AddDataViewModel {
     });
     return new Promise((resolve, reject) => {
       window.KqGIS.datasetService(url).getDatasets(params, e => {
-        if (e.result.resultcode === 'success') {
+        if (e.result.resultcode === "success") {
           resolve(e.result.result.datasets);
         } else {
           console.error(e);
@@ -1774,12 +1769,12 @@ class AddDataViewModel {
       datasetName: datasetName,
       hasGeometry: true,
       returnContent: true,
-      outSRS: 'EPSG:4326'
+      outSRS: "EPSG:4326"
     });
     return new Promise((resolve, reject) => {
       window.KqGIS.dataFeatureService(url).getFeatureList(params, e => {
-        if (e.result.resultcode === 'success') {
-          e.result.result['datasetName'] = datasetName;
+        if (e.result.resultcode === "success") {
+          e.result.result["datasetName"] = datasetName;
           resolve(e.result.result);
         } else {
           console.error(e);
@@ -38338,8 +38333,8 @@ __webpack_require__.r(__webpack_exports__);
 
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
-  "ScenceViewViewModel": function() { return /* reexport */ ScenceViewViewModel; },
-  "default": function() { return /* reexport */ ScenceView; }
+  "SceneViewViewModel": function() { return /* reexport */ SceneViewViewModel; },
+  "default": function() { return /* reexport */ SceneView; }
 });
 
 // EXTERNAL MODULE: external {"root":"Vue","commonjs":"vue","commonjs2":"vue","amd":"vue"}
@@ -38542,7 +38537,7 @@ var geologicalbodyanalysis = __webpack_require__(9378);
 
 
 const webglComponents = {
-  KqScenceView: ScenceView,
+  KqSceneView: SceneView,
   Kq3dMeasure: measure["default"],
   Kq3dFlight: flight["default"],
   Kq3dGPUSpatialQuery: gpuspatialquery["default"],
@@ -38611,7 +38606,7 @@ var web_dom_exception_stack_js_namespaceObject = require("core-js/modules/web.do
 var es_array_includes_js_ = __webpack_require__(3600);
 // EXTERNAL MODULE: external "@kq_npm/client_common_vue/_utils/const-image"
 var const_image_ = __webpack_require__(6277);
-;// CONCATENATED MODULE: ./src/webgl/scenceview/DrawManager.js
+;// CONCATENATED MODULE: ./src/webgl/sceneview/DrawManager.js
 
 
 
@@ -39886,7 +39881,7 @@ var util_ = __webpack_require__(3458);
 // EXTERNAL MODULE: external "@kq_npm/client_common_vue/_types/global-event"
 var global_event_ = __webpack_require__(3536);
 var global_event_default = /*#__PURE__*/__webpack_require__.n(global_event_);
-;// CONCATENATED MODULE: ./src/webgl/scenceview/LayerManager.js
+;// CONCATENATED MODULE: ./src/webgl/sceneview/LayerManager.js
 
 
 
@@ -41599,14 +41594,14 @@ function delTreeDataByGuid(data, guid) {
     }
   }
 }
-;// CONCATENATED MODULE: ./src/webgl/scenceview/ScenceViewViewModel.js
+;// CONCATENATED MODULE: ./src/webgl/sceneview/SceneViewViewModel.js
 
-//ScenceView逻辑类
+//SceneView逻辑类
 
 
 
 
-class ScenceViewViewModel extends (mitt_default()) {
+class SceneViewViewModel extends (mitt_default()) {
   // 三维球div id
   // 三维viewer对象
   // 语言
@@ -42054,7 +42049,7 @@ class ScenceViewViewModel extends (mitt_default()) {
   }
 
 }
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js!./node_modules/vue-loader/dist/index.js??ruleSet[0]!./src/webgl/scenceview/ScenceView.vue?vue&type=script&setup=true&lang=js
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js!./node_modules/vue-loader/dist/index.js??ruleSet[0]!./src/webgl/sceneview/SceneView.vue?vue&type=script&setup=true&lang=js
 
 const _hoisted_1 = {
   class: "kq-scence-view",
@@ -42073,9 +42068,9 @@ const _hoisted_4 = {
 
 
 const __default__ = {
-  name: "KqScenceView"
+  name: "KqSceneView"
 };
-/* harmony default export */ var ScenceViewvue_type_script_setup_true_lang_js = (/*#__PURE__*/Object.assign(__default__, {
+/* harmony default export */ var SceneViewvue_type_script_setup_true_lang_js = (/*#__PURE__*/Object.assign(__default__, {
   props: {
     target: {
       type: String,
@@ -42096,7 +42091,7 @@ const __default__ = {
         }
      */
     service: Object,
-    // ScenceView初始化的参数对象，包含初始化范围和layer信息。
+    // SceneView初始化的参数对象，包含初始化范围和layer信息。
     scenceInfo: Object,
     // 默认显示的图层组名称
     defaultShowLayerNames: Array,
@@ -42170,11 +42165,11 @@ const __default__ = {
         language: _language
       }; //初始化逻辑类
 
-      viewModel = new ScenceViewViewModel(props, lang);
+      viewModel = new SceneViewViewModel(props, lang);
       viewModel.initViewer();
     });
     /**
-     * 获取ScenceView的逻辑类
+     * 获取SceneView的逻辑类
      */
 
     function getViewModel() {
@@ -42228,26 +42223,26 @@ const __default__ = {
   }
 
 }));
-;// CONCATENATED MODULE: ./src/webgl/scenceview/ScenceView.vue?vue&type=script&setup=true&lang=js
+;// CONCATENATED MODULE: ./src/webgl/sceneview/SceneView.vue?vue&type=script&setup=true&lang=js
  
-;// CONCATENATED MODULE: ./src/webgl/scenceview/ScenceView.vue
+;// CONCATENATED MODULE: ./src/webgl/sceneview/SceneView.vue
 
 
 
-const __exports__ = ScenceViewvue_type_script_setup_true_lang_js;
+const __exports__ = SceneViewvue_type_script_setup_true_lang_js;
 
-/* harmony default export */ var ScenceView = (__exports__);
+/* harmony default export */ var SceneView = (__exports__);
 // EXTERNAL MODULE: external "@kq_npm/client_common_vue/init.js"
 var init_js_ = __webpack_require__(7997);
 var init_js_default = /*#__PURE__*/__webpack_require__.n(init_js_);
-;// CONCATENATED MODULE: ./src/webgl/scenceview/index.js
+;// CONCATENATED MODULE: ./src/webgl/sceneview/index.js
 
 
 
 
-ScenceView.install = (Vue, opts) => {
+SceneView.install = (Vue, opts) => {
   init_js_default()(Vue, opts);
-  Vue.component(ScenceView.name, ScenceView);
+  Vue.component(SceneView.name, SceneView);
 };