@kq_npm/client3d_webgl_vue 3.2.7-beta → 3.2.9-beta

package/clientPrint/index.js

@@ -2,44 +2,6 @@
 /******/ 	"use strict";
 /******/ 	var __webpack_modules__ = ({
 
-/***/ 9821:
-/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
-
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "Z": function() { return /* binding */ ClientPrintViewModel; }
-/* harmony export */ });
-/* harmony import */ var _Users_zpc_Documents_KQGEOSpace_KQGISClientForVue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8270);
-
-
-/**
- * @class ClientPrintViewModel
- * @classdesc 客户端打印
- */
-class ClientPrintViewModel {
-  constructor(scenceView) {
-    (0,_Users_zpc_Documents_KQGEOSpace_KQGISClientForVue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, "_viewer", null);
-
-    this._viewer = scenceView._viewer;
-  }
-  /**
-   * 改变状态栏方法
-   */
-
-
-  changStatusBar(val) {
-    this._viewer.statusBar.show = val;
-  }
-  /**
-   * 销毁执行方法。
-   */
-
-
-  destroy() {}
-
-}
-
-/***/ }),
-
 /***/ 8422:
 /***/ (function(module) {
 
@@ -61,13 +23,6 @@ module.exports = require("@kq_npm/client_common_vue/_types/global-event");
 
 /***/ }),
 
-/***/ 9702:
-/***/ (function(module) {
-
-module.exports = require("@kq_npm/client_common_vue/_utils/const-image");
-
-/***/ }),
-
 /***/ 5406:
 /***/ (function(module) {
 
@@ -80,29 +35,6 @@ module.exports = require("@kq_npm/client_common_vue/init.js");
 
 module.exports = require("vue");
 
-/***/ }),
-
-/***/ 8270:
-/***/ (function(__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
-
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "Z": function() { return /* binding */ _defineProperty; }
-/* harmony export */ });
-function _defineProperty(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value: value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-
-  return obj;
-}
-
 /***/ })
 
 /******/ 	});
@@ -181,7 +113,6 @@ __webpack_require__.r(__webpack_exports__);
 
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
-  "ClientPrint3dViewModel": function() { return /* reexport */ ClientPrintViewModel/* default */.Z; },
   "default": function() { return /* reexport */ ClientPrint; }
 });
 
@@ -189,15 +120,11 @@ __webpack_require__.d(__webpack_exports__, {
 var es_array_includes_js_ = __webpack_require__(3600);
 // EXTERNAL MODULE: external {"root":"Vue","commonjs":"vue","commonjs2":"vue","amd":"vue"}
 var external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_ = __webpack_require__(637);
-// EXTERNAL MODULE: ./src/webgl/clientPrint/ClientPrintViewModel.js
-var ClientPrintViewModel = __webpack_require__(9821);
 ;// CONCATENATED MODULE: external "html2canvas"
 var external_html2canvas_namespaceObject = require("html2canvas");
 var external_html2canvas_default = /*#__PURE__*/__webpack_require__.n(external_html2canvas_namespaceObject);
 // EXTERNAL MODULE: external "@element-plus/icons-vue"
 var icons_vue_ = __webpack_require__(8422);
-// EXTERNAL MODULE: external "@kq_npm/client_common_vue/_utils/const-image"
-var const_image_ = __webpack_require__(9702);
 ;// CONCATENATED MODULE: external "vue3-print-nb"
 var external_vue3_print_nb_namespaceObject = require("vue3-print-nb");
 var external_vue3_print_nb_default = /*#__PURE__*/__webpack_require__.n(external_vue3_print_nb_namespaceObject);
@@ -342,28 +269,15 @@ const _hoisted_41 = {
   class: "baseImage"
 };
 const _hoisted_42 = ["src"];
-
-const _hoisted_43 = /*#__PURE__*/(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", {
-  style: {
-    "width": "100%",
-    "height": "100%",
-    "position": "absolute",
-    "index": "1000"
-  }
-}, null, -1
-/* HOISTED */
-);
-
-const _hoisted_44 = ["src"];
-const _hoisted_45 = ["id"];
-const _hoisted_46 = ["onClick"];
-const _hoisted_47 = {
+const _hoisted_43 = ["id"];
+const _hoisted_44 = ["onClick"];
+const _hoisted_45 = {
   class: "kq3d-client-print-infomationContainer"
 };
-const _hoisted_48 = {
+const _hoisted_46 = {
   class: "kq3d-client-print-systemTime"
 };
-const _hoisted_49 = {
+const _hoisted_47 = {
   class: "kq3d-client-print-companyName"
 };
 
@@ -371,8 +285,6 @@ const _hoisted_49 = {
 
 
 
-
-
 const __default__ = {
   name: "Kq3dClientPrint"
 };
@@ -414,6 +326,10 @@ const __default__ = {
     scenceInfo: Object,
     // 默认显示的图层组名称
     defaultShowLayerNames: Array,
+
+    /**
+     *   showToolButtons - 是否显示工具栏按钮
+     */
     showToolButtons: {
       type: Boolean,
       default: true
@@ -433,8 +349,7 @@ const __default__ = {
   setup(__props, {
     expose
   }) {
-    const props = __props;
-    let viewModel = null; // 标题的数据
+    const props = __props; // 标题的数据
 
     let setTitleDataform = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)({
       style: {
@@ -573,9 +488,7 @@ const __default__ = {
     let papAnchor = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)("纵向"); // 默认
     // 图片格式
 
-    let imageType = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)("png"); //地图对象
-
-    let map2_ref = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(); //图例对象
+    let imageType = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)("png"); //图例对象
 
     let lengend_ref = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(); // 图例窗口显示与隐藏
 
@@ -597,7 +510,8 @@ const __default__ = {
     let systemTime = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(""); // 公司名
 
     let companyName = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)("");
-    let printState = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(false); // 打印对象
+    let printState = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(false);
+    let printViewer = null; // 打印对象
 
     let printObj = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)({
       id: "printMap",
@@ -635,7 +549,7 @@ const __default__ = {
       initControl();
       global_event_default().getWebMapByMapTarget("scencePrint", scenceView => {
         if (scenceView && scenceView._viewer) {
-          viewModel = new ClientPrintViewModel/* default */.Z(scenceView);
+          printViewer = scenceView._viewer;
           cameraToImage = new Cesium.Kq3dCanvasToImage(scenceView._viewer._container, {
             viewer: scenceView._viewer,
             canvas: scenceView._viewer.scene.canvas
@@ -645,7 +559,6 @@ const __default__ = {
     });
     (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.onBeforeUnmount)(() => {
       destroy();
-      viewModel = null;
     });
     /**
      * 获取当前时间
@@ -702,7 +615,7 @@ const __default__ = {
     }
 
     function changStatusBar() {
-      viewModel && viewModel.changStatusBar(scalesShow.value);
+      if (printViewer) printViewer.statusBar.show = scalesShow.value;
     }
     /**
      * 显示切换
@@ -907,7 +820,6 @@ const __default__ = {
 
       function moveWin(event) {
         event = event || window.event;
-        map2_ref.value.getWebMap().map.dragging.disable();
         var x = event.pageX;
         var y = event.pageY;
 
@@ -1239,7 +1151,6 @@ const __default__ = {
           labelValue: ""
         }
       };
-      viewModel.destroy();
     } // 抛出方法 外部调用
 
 
@@ -1281,6 +1192,8 @@ const __default__ = {
 
       const _component_kq_legend = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.resolveComponent)("kq-legend");
 
+      const _component_kq3d_compass = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.resolveComponent)("kq3d-compass");
+
       const _component_kq_scence_view = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.resolveComponent)("kq-scence-view");
 
       const _component_kq_scrollbar = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.resolveComponent)("kq-scrollbar");
@@ -2214,12 +2127,7 @@ const __default__ = {
             onMouseover: setdragCursor,
             onMousedown: dragTl,
             id: "divcompassDiv"
-          }, [_hoisted_43, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("img", {
-            class: "kq3d-client-print-compassImgStyle",
-            src: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(const_image_.COMMPASS_URL)
-          }, null, 8
-          /* PROPS */
-          , _hoisted_44)], 544
+          }, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq3d_compass)], 544
           /* HYDRATE_EVENTS, NEED_PATCH */
           ), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(compassShow)]]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createCommentVNode)(" 文本标注 "), ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(true), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementBlock)(external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.Fragment, null, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.renderList)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(setLabelData).value, item => {
             return (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withDirectives)(((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementBlock)("div", {
@@ -2255,9 +2163,9 @@ const __default__ = {
 
             })], 8
             /* PROPS */
-            , _hoisted_46)], 40
+            , _hoisted_44)], 40
             /* PROPS, HYDRATE_EVENTS */
-            , _hoisted_45)), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.vShow, item.data.isShow]]);
+            , _hoisted_43)), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.vShow, item.data.isShow]]);
           }), 128
           /* KEYED_FRAGMENT */
           ))]),
@@ -2268,9 +2176,9 @@ const __default__ = {
         /* PROPS */
         , ["options", "service", "scenceInfo", "showToolButtons", "defaultShowLayerNames", "toolButtonsPosition", "showLogo"])], 512
         /* NEED_PATCH */
-        ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_47, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_48, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("span", null, "日期：" + (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(systemTime)), 1
+        ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_45, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_46, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("span", null, "日期：" + (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(systemTime)), 1
         /* TEXT */
-        )]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_49, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("span", null, "公司：" + (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(companyName)), 1
+        )]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_47, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("span", null, "公司：" + (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(companyName)), 1
         /* TEXT */
         )])])], 512
         /* NEED_PATCH */
@@ -2303,7 +2211,6 @@ var init_js_default = /*#__PURE__*/__webpack_require__.n(init_js_);
 
 
 
-
 ClientPrint.install = (Vue, opts) => {
   init_js_default()(Vue, opts);
   Vue.component(ClientPrint.name, ClientPrint);

package/index.js

@@ -471,7 +471,6 @@ __webpack_require__.d(__webpack_exports__, {
   "Kq3dBoxClip": function() { return /* reexport */ BoxClip; },
   "Kq3dBoxClipViewModel": function() { return /* reexport */ BoxClipViewModel; },
   "Kq3dClientPrint": function() { return /* reexport */ ClientPrint; },
-  "Kq3dClientPrintViewModel": function() { return /* reexport */ ClientPrintViewModel; },
   "Kq3dCompareMap": function() { return /* reexport */ CompareMap; },
   "Kq3dCompareMapViewModel": function() { return /* reexport */ CompareMapViewModel; },
   "Kq3dCompass": function() { return /* reexport */ Compass; },
@@ -3809,35 +3808,6 @@ Compass.install = (Vue, opts) => {
 };
 
 
-;// CONCATENATED MODULE: ./src/webgl/clientPrint/ClientPrintViewModel.js
-
-
-/**
- * @class ClientPrintViewModel
- * @classdesc 客户端打印
- */
-class ClientPrintViewModel {
-  constructor(scenceView) {
-    _defineProperty(this, "_viewer", null);
-
-    this._viewer = scenceView._viewer;
-  }
-  /**
-   * 改变状态栏方法
-   */
-
-
-  changStatusBar(val) {
-    this._viewer.statusBar.show = val;
-  }
-  /**
-   * 销毁执行方法。
-   */
-
-
-  destroy() {}
-
-}
 ;// CONCATENATED MODULE: external "html2canvas"
 var external_html2canvas_namespaceObject = require("html2canvas");
 var external_html2canvas_default = /*#__PURE__*/__webpack_require__.n(external_html2canvas_namespaceObject);
@@ -3982,28 +3952,15 @@ const _hoisted_41 = {
   class: "baseImage"
 };
 const _hoisted_42 = ["src"];
-
-const _hoisted_43 = /*#__PURE__*/(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("div", {
-  style: {
-    "width": "100%",
-    "height": "100%",
-    "position": "absolute",
-    "index": "1000"
-  }
-}, null, -1
-/* HOISTED */
-);
-
-const _hoisted_44 = ["src"];
-const _hoisted_45 = ["id"];
-const _hoisted_46 = ["onClick"];
-const _hoisted_47 = {
+const _hoisted_43 = ["id"];
+const _hoisted_44 = ["onClick"];
+const _hoisted_45 = {
   class: "kq3d-client-print-infomationContainer"
 };
-const _hoisted_48 = {
+const _hoisted_46 = {
   class: "kq3d-client-print-systemTime"
 };
-const _hoisted_49 = {
+const _hoisted_47 = {
   class: "kq3d-client-print-companyName"
 };
 
@@ -4011,8 +3968,6 @@ const _hoisted_49 = {
 
 
 
-
-
 const ClientPrintvue_type_script_setup_true_lang_js_default_ = {
   name: "Kq3dClientPrint"
 };
@@ -4054,6 +4009,10 @@ const ClientPrintvue_type_script_setup_true_lang_js_default_ = {
     scenceInfo: Object,
     // 默认显示的图层组名称
     defaultShowLayerNames: Array,
+
+    /**
+     *   showToolButtons - 是否显示工具栏按钮
+     */
     showToolButtons: {
       type: Boolean,
       default: true
@@ -4073,8 +4032,7 @@ const ClientPrintvue_type_script_setup_true_lang_js_default_ = {
   setup(__props, {
     expose
   }) {
-    const props = __props;
-    let viewModel = null; // 标题的数据
+    const props = __props; // 标题的数据
 
     let setTitleDataform = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)({
       style: {
@@ -4213,9 +4171,7 @@ const ClientPrintvue_type_script_setup_true_lang_js_default_ = {
     let papAnchor = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)("纵向"); // 默认
     // 图片格式
 
-    let imageType = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)("png"); //地图对象
-
-    let map2_ref = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)(); //图例对象
+    let imageType = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)("png"); //图例对象
 
     let lengend_ref = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)(); // 图例窗口显示与隐藏
 
@@ -4237,7 +4193,8 @@ const ClientPrintvue_type_script_setup_true_lang_js_default_ = {
     let systemTime = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)(""); // 公司名
 
     let companyName = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)("");
-    let printState = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)(false); // 打印对象
+    let printState = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)(false);
+    let printViewer = null; // 打印对象
 
     let printObj = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)({
       id: "printMap",
@@ -4275,7 +4232,7 @@ const ClientPrintvue_type_script_setup_true_lang_js_default_ = {
       initControl();
       global_event_default().getWebMapByMapTarget("scencePrint", scenceView => {
         if (scenceView && scenceView._viewer) {
-          viewModel = new ClientPrintViewModel(scenceView);
+          printViewer = scenceView._viewer;
           cameraToImage = new Cesium.Kq3dCanvasToImage(scenceView._viewer._container, {
             viewer: scenceView._viewer,
             canvas: scenceView._viewer.scene.canvas
@@ -4285,7 +4242,6 @@ const ClientPrintvue_type_script_setup_true_lang_js_default_ = {
     });
     (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.onBeforeUnmount)(() => {
       destroy();
-      viewModel = null;
     });
     /**
      * 获取当前时间
@@ -4342,7 +4298,7 @@ const ClientPrintvue_type_script_setup_true_lang_js_default_ = {
     }
 
     function changStatusBar() {
-      viewModel && viewModel.changStatusBar(scalesShow.value);
+      if (printViewer) printViewer.statusBar.show = scalesShow.value;
     }
     /**
      * 显示切换
@@ -4547,7 +4503,6 @@ const ClientPrintvue_type_script_setup_true_lang_js_default_ = {
 
       function moveWin(event) {
         event = event || window.event;
-        map2_ref.value.getWebMap().map.dragging.disable();
         var x = event.pageX;
         var y = event.pageY;
 
@@ -4879,7 +4834,6 @@ const ClientPrintvue_type_script_setup_true_lang_js_default_ = {
           labelValue: ""
         }
       };
-      viewModel.destroy();
     } // 抛出方法 外部调用
 
 
@@ -4921,6 +4875,8 @@ const ClientPrintvue_type_script_setup_true_lang_js_default_ = {
 
       const _component_kq_legend = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq-legend");
 
+      const _component_kq3d_compass = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq3d-compass");
+
       const _component_kq_scence_view = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq-scence-view");
 
       const _component_kq_scrollbar = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq-scrollbar");
@@ -5854,12 +5810,7 @@ const ClientPrintvue_type_script_setup_true_lang_js_default_ = {
             onMouseover: setdragCursor,
             onMousedown: dragTl,
             id: "divcompassDiv"
-          }, [_hoisted_43, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("img", {
-            class: "kq3d-client-print-compassImgStyle",
-            src: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(const_image_namespaceObject.COMMPASS_URL)
-          }, null, 8
-          /* PROPS */
-          , _hoisted_44)], 544
+          }, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq3d_compass)], 544
           /* HYDRATE_EVENTS, 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)(compassShow)]]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createCommentVNode)(" 文本标注 "), ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.openBlock)(true), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementBlock)(external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.Fragment, null, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.renderList)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(setLabelData).value, item => {
             return (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withDirectives)(((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", {
@@ -5895,9 +5846,9 @@ const ClientPrintvue_type_script_setup_true_lang_js_default_ = {
 
             })], 8
             /* PROPS */
-            , _hoisted_46)], 40
+            , _hoisted_44)], 40
             /* PROPS, HYDRATE_EVENTS */
-            , _hoisted_45)), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.vShow, item.data.isShow]]);
+            , _hoisted_43)), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.vShow, item.data.isShow]]);
           }), 128
           /* KEYED_FRAGMENT */
           ))]),
@@ -5908,9 +5859,9 @@ const ClientPrintvue_type_script_setup_true_lang_js_default_ = {
         /* PROPS */
         , ["options", "service", "scenceInfo", "showToolButtons", "defaultShowLayerNames", "toolButtonsPosition", "showLogo"])], 512
         /* NEED_PATCH */
-        ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("div", _hoisted_47, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("div", _hoisted_48, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("span", null, "日期：" + (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(systemTime)), 1
+        ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("div", _hoisted_45, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("div", _hoisted_46, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("span", null, "日期：" + (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(systemTime)), 1
         /* TEXT */
-        )]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("div", _hoisted_49, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("span", null, "公司：" + (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(companyName)), 1
+        )]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("div", _hoisted_47, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("span", null, "公司：" + (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(companyName)), 1
         /* TEXT */
         )])])], 512
         /* NEED_PATCH */
@@ -5940,7 +5891,6 @@ const ClientPrint_exports_ = ClientPrintvue_type_script_setup_true_lang_js;
 
 
 
-
 ClientPrint.install = (Vue, opts) => {
   init_js_default()(Vue, opts);
   Vue.component(ClientPrint.name, ClientPrint);
@@ -27207,7 +27157,6 @@ StatusBar.install = (Vue, opts) => {
 
  // 客户端打印
 
-
  // 在线地形
 
 

package/package.json

@@ -1 +1 @@
-{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"3.2.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","html2canvas":"^1.4.1","xe-utils":"^3.5.4"}}
+{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"3.2.9-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","html2canvas":"^1.4.1","xe-utils":"^3.5.4"}}

package/scenceview/index.js

@@ -3834,44 +3834,6 @@ BoxClip.install = (Vue, opts) => {
 
 
 
-/***/ }),
-
-/***/ 9821:
-/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
-
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "Z": function() { return /* binding */ ClientPrintViewModel; }
-/* harmony export */ });
-/* harmony import */ var _Users_zpc_Documents_KQGEOSpace_KQGISClientForVue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8270);
-
-
-/**
- * @class ClientPrintViewModel
- * @classdesc 客户端打印
- */
-class ClientPrintViewModel {
-  constructor(scenceView) {
-    (0,_Users_zpc_Documents_KQGEOSpace_KQGISClientForVue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, "_viewer", null);
-
-    this._viewer = scenceView._viewer;
-  }
-  /**
-   * 改变状态栏方法
-   */
-
-
-  changStatusBar(val) {
-    this._viewer.statusBar.show = val;
-  }
-  /**
-   * 销毁执行方法。
-   */
-
-
-  destroy() {}
-
-}
-
 /***/ }),
 
 /***/ 2935:
@@ -3883,21 +3845,15 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* reexport */ ClientPrint; }
 });
 
-// UNUSED EXPORTS: ClientPrint3dViewModel
-
 // EXTERNAL MODULE: external "core-js/modules/es.array.includes.js"
 var es_array_includes_js_ = __webpack_require__(3600);
 // EXTERNAL MODULE: external {"root":"Vue","commonjs":"vue","commonjs2":"vue","amd":"vue"}
 var external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_ = __webpack_require__(637);
-// EXTERNAL MODULE: ./src/webgl/clientPrint/ClientPrintViewModel.js
-var ClientPrintViewModel = __webpack_require__(9821);
 ;// CONCATENATED MODULE: external "html2canvas"
 var external_html2canvas_namespaceObject = require("html2canvas");
 var external_html2canvas_default = /*#__PURE__*/__webpack_require__.n(external_html2canvas_namespaceObject);
 // EXTERNAL MODULE: external "@element-plus/icons-vue"
 var icons_vue_ = __webpack_require__(8422);
-// EXTERNAL MODULE: external "@kq_npm/client_common_vue/_utils/const-image"
-var const_image_ = __webpack_require__(9702);
 ;// CONCATENATED MODULE: external "vue3-print-nb"
 var external_vue3_print_nb_namespaceObject = require("vue3-print-nb");
 var external_vue3_print_nb_default = /*#__PURE__*/__webpack_require__.n(external_vue3_print_nb_namespaceObject);
@@ -4042,28 +3998,15 @@ const _hoisted_41 = {
   class: "baseImage"
 };
 const _hoisted_42 = ["src"];
-
-const _hoisted_43 = /*#__PURE__*/(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", {
-  style: {
-    "width": "100%",
-    "height": "100%",
-    "position": "absolute",
-    "index": "1000"
-  }
-}, null, -1
-/* HOISTED */
-);
-
-const _hoisted_44 = ["src"];
-const _hoisted_45 = ["id"];
-const _hoisted_46 = ["onClick"];
-const _hoisted_47 = {
+const _hoisted_43 = ["id"];
+const _hoisted_44 = ["onClick"];
+const _hoisted_45 = {
   class: "kq3d-client-print-infomationContainer"
 };
-const _hoisted_48 = {
+const _hoisted_46 = {
   class: "kq3d-client-print-systemTime"
 };
-const _hoisted_49 = {
+const _hoisted_47 = {
   class: "kq3d-client-print-companyName"
 };
 
@@ -4071,8 +4014,6 @@ const _hoisted_49 = {
 
 
 
-
-
 const __default__ = {
   name: "Kq3dClientPrint"
 };
@@ -4114,6 +4055,10 @@ const __default__ = {
     scenceInfo: Object,
     // 默认显示的图层组名称
     defaultShowLayerNames: Array,
+
+    /**
+     *   showToolButtons - 是否显示工具栏按钮
+     */
     showToolButtons: {
       type: Boolean,
       default: true
@@ -4133,8 +4078,7 @@ const __default__ = {
   setup(__props, {
     expose
   }) {
-    const props = __props;
-    let viewModel = null; // 标题的数据
+    const props = __props; // 标题的数据
 
     let setTitleDataform = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)({
       style: {
@@ -4273,9 +4217,7 @@ const __default__ = {
     let papAnchor = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)("纵向"); // 默认
     // 图片格式
 
-    let imageType = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)("png"); //地图对象
-
-    let map2_ref = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(); //图例对象
+    let imageType = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)("png"); //图例对象
 
     let lengend_ref = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(); // 图例窗口显示与隐藏
 
@@ -4297,7 +4239,8 @@ const __default__ = {
     let systemTime = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(""); // 公司名
 
     let companyName = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)("");
-    let printState = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(false); // 打印对象
+    let printState = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(false);
+    let printViewer = null; // 打印对象
 
     let printObj = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)({
       id: "printMap",
@@ -4335,7 +4278,7 @@ const __default__ = {
       initControl();
       global_event_default().getWebMapByMapTarget("scencePrint", scenceView => {
         if (scenceView && scenceView._viewer) {
-          viewModel = new ClientPrintViewModel/* default */.Z(scenceView);
+          printViewer = scenceView._viewer;
           cameraToImage = new Cesium.Kq3dCanvasToImage(scenceView._viewer._container, {
             viewer: scenceView._viewer,
             canvas: scenceView._viewer.scene.canvas
@@ -4345,7 +4288,6 @@ const __default__ = {
     });
     (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.onBeforeUnmount)(() => {
       destroy();
-      viewModel = null;
     });
     /**
      * 获取当前时间
@@ -4402,7 +4344,7 @@ const __default__ = {
     }
 
     function changStatusBar() {
-      viewModel && viewModel.changStatusBar(scalesShow.value);
+      if (printViewer) printViewer.statusBar.show = scalesShow.value;
     }
     /**
      * 显示切换
@@ -4607,7 +4549,6 @@ const __default__ = {
 
       function moveWin(event) {
         event = event || window.event;
-        map2_ref.value.getWebMap().map.dragging.disable();
         var x = event.pageX;
         var y = event.pageY;
 
@@ -4939,7 +4880,6 @@ const __default__ = {
           labelValue: ""
         }
       };
-      viewModel.destroy();
     } // 抛出方法 外部调用
 
 
@@ -4981,6 +4921,8 @@ const __default__ = {
 
       const _component_kq_legend = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.resolveComponent)("kq-legend");
 
+      const _component_kq3d_compass = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.resolveComponent)("kq3d-compass");
+
       const _component_kq_scence_view = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.resolveComponent)("kq-scence-view");
 
       const _component_kq_scrollbar = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.resolveComponent)("kq-scrollbar");
@@ -5914,12 +5856,7 @@ const __default__ = {
             onMouseover: setdragCursor,
             onMousedown: dragTl,
             id: "divcompassDiv"
-          }, [_hoisted_43, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("img", {
-            class: "kq3d-client-print-compassImgStyle",
-            src: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(const_image_.COMMPASS_URL)
-          }, null, 8
-          /* PROPS */
-          , _hoisted_44)], 544
+          }, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq3d_compass)], 544
           /* HYDRATE_EVENTS, NEED_PATCH */
           ), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(compassShow)]]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createCommentVNode)(" 文本标注 "), ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(true), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementBlock)(external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.Fragment, null, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.renderList)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(setLabelData).value, item => {
             return (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withDirectives)(((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementBlock)("div", {
@@ -5955,9 +5892,9 @@ const __default__ = {
 
             })], 8
             /* PROPS */
-            , _hoisted_46)], 40
+            , _hoisted_44)], 40
             /* PROPS, HYDRATE_EVENTS */
-            , _hoisted_45)), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.vShow, item.data.isShow]]);
+            , _hoisted_43)), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.vShow, item.data.isShow]]);
           }), 128
           /* KEYED_FRAGMENT */
           ))]),
@@ -5968,9 +5905,9 @@ const __default__ = {
         /* PROPS */
         , ["options", "service", "scenceInfo", "showToolButtons", "defaultShowLayerNames", "toolButtonsPosition", "showLogo"])], 512
         /* NEED_PATCH */
-        ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_47, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_48, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("span", null, "日期：" + (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(systemTime)), 1
+        ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_45, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_46, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("span", null, "日期：" + (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(systemTime)), 1
         /* TEXT */
-        )]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_49, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("span", null, "公司：" + (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(companyName)), 1
+        )]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_47, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("span", null, "公司：" + (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(companyName)), 1
         /* TEXT */
         )])])], 512
         /* NEED_PATCH */
@@ -6003,7 +5940,6 @@ var init_js_default = /*#__PURE__*/__webpack_require__.n(init_js_);
 
 
 
-
 ClientPrint.install = (Vue, opts) => {
   init_js_default()(Vue, opts);
   Vue.component(ClientPrint.name, ClientPrint);
@@ -25733,7 +25669,6 @@ var statusbar = __webpack_require__(6466);
 
  // 客户端打印
 
-
  // 在线地形