@kq_npm/client3d_webgl_vue 1.0.8-beta → 1.1.0-beta

package/index.js

@@ -460,10 +460,10 @@ __webpack_require__.d(__webpack_exports__, {
   "Kq3dCompassViewModel": function() { return /* reexport */ CompassViewModel; },
   "Kq3dExcavateFillAnalysis": function() { return /* reexport */ ExcavateFillAnalysis; },
   "Kq3dExcavateFillAnalysisViewModel": function() { return /* reexport */ ExcavateFillAnalysisViewModel; },
-  "Kq3dFixedZoomin3d": function() { return /* reexport */ FixedZoomin3d; },
-  "Kq3dFixedZoomin3dViewModel": function() { return /* reexport */ FixedZoomin3dViewModel; },
-  "Kq3dFixedZoomout3d": function() { return /* reexport */ FixedZoomout3d; },
-  "Kq3dFixedZoomout3dViewModel": function() { return /* reexport */ FixedZoomout3dViewModel; },
+  "Kq3dFixedZoomin": function() { return /* reexport */ FixedZoomin; },
+  "Kq3dFixedZoominViewModel": function() { return /* reexport */ FixedZoomin3dViewModel; },
+  "Kq3dFixedZoomout": function() { return /* reexport */ FixedZoomout; },
+  "Kq3dFixedZoomoutViewModel": function() { return /* reexport */ FixedZoomout3dViewModel; },
   "Kq3dFlight": function() { return /* reexport */ Flight; },
   "Kq3dFlightViewModel": function() { return /* reexport */ FlightViewModel; },
   "Kq3dFloodAnalysis": function() { return /* reexport */ FloodAnalysis; },
@@ -516,6 +516,8 @@ __webpack_require__.d(__webpack_exports__, {
 
 ;// CONCATENATED MODULE: external {"root":"Vue","commonjs":"vue","commonjs2":"vue","amd":"vue"}
 var external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject = require("vue");
+;// CONCATENATED MODULE: external "@kq_npm/client3d_webgl_vue"
+var client3d_webgl_vue_namespaceObject = require("@kq_npm/client3d_webgl_vue");
 ;// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/defineProperty.js
 function _defineProperty(obj, key, value) {
   if (key in obj) {
@@ -2443,8 +2445,15 @@ class ScenceViewViewModel extends (mitt_default()) {
       }
     }
 
-    this._viewer = new Cesium.Viewer(this._viewerId, defaultOptions);
-    this._viewer.statusBar.show = false; // this._viewer.scene.globe.depthTestAgainstTerrain = true;
+    this._viewer = new Cesium.Viewer(this._viewerId, defaultOptions); //隐藏地图状态栏
+
+    this._viewer.statusBar.show = false;
+
+    if (!this._props.showLogo) {
+      //隐藏logo
+      this._viewer.bottomContainer.children[0].style.display = "none";
+    } // this._viewer.scene.globe.depthTestAgainstTerrain = true;
+
 
     this.initManagerClass();
     global_event_default().setWebMap(this._viewerId, "cesium", this);
@@ -2790,6 +2799,13 @@ const _hoisted_1 = {
   oncontextmenu: "return false;"
 };
 const _hoisted_2 = ["id"];
+const _hoisted_3 = {
+  class: "reset-view"
+};
+const _hoisted_4 = {
+  class: "compass"
+};
+
 
 
 const __default__ = {
@@ -2799,11 +2815,7 @@ const __default__ = {
   props: {
     target: {
       type: String,
-
-      default() {
-        return "cesiumContainer";
-      }
-
+      default: "cesiumContainer"
     },
     options: Object,
 
@@ -2823,7 +2835,21 @@ const __default__ = {
     // ScenceView初始化的参数对象，包含初始化范围和layer信息。
     scenceInfo: Object,
     // 默认显示的图层组名称
-    defaultShowLayerNames: Array
+    defaultShowLayerNames: Array,
+    showToolButtons: {
+      type: Boolean,
+      default: true
+    },
+
+    /**
+     * 例:"top-left","top-right","bottom-left","bottom-right","left","right","bottom" 
+     * {top:'16px',left:'16px'}, {top:16,left:16}
+     */
+    toolButtonsPosition: [String, Object],
+    showLogo: {
+      type: Boolean,
+      default: false
+    }
   },
 
   setup(__props) {
@@ -2836,13 +2862,35 @@ const __default__ = {
      *   target - viewer对象渲染的div的id
      *   options - 三维球初始化属性设置
      *   scenceUrl - 场景地址
-     *   showToolButtons - 是否显示左侧工具栏按钮
+     *   showToolButtons - 是否显示工具栏按钮
      */
 
     let language = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)({});
     let viewModel = null;
+    let toolButtonsCss = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)("top-left vertical");
+    let toolButtonsStyle = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)("");
     (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.onMounted)(() => {
-      //设置语言
+      if (props.toolButtonsPosition) {
+        if (typeof props.toolButtonsPosition === "string") {
+          let directionCss = "vertical";
+
+          if (props.toolButtonsPosition === "top" || props.toolButtonsPosition === "bottom") {
+            directionCss = "horizontal";
+          }
+
+          toolButtonsCss.value = props.toolButtonsPosition + " " + directionCss;
+        } else if (props.toolButtonsPosition instanceof Object) {
+          let styleString = "";
+
+          for (let key in props.toolButtonsPosition) {
+            styleString += key + ":" + props.toolButtonsPosition[key] + ";";
+          }
+
+          toolButtonsStyle.value = styleString;
+        }
+      } //设置语言
+
+
       let _lang = proxy.$i18n.locale;
       let _language = proxy.$i18n.messages[_lang]['webgl'];
       language.value = _language; //初始化逻辑类
@@ -2858,7 +2906,13 @@ const __default__ = {
       return (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_1, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.renderSlot)(_ctx.$slots, "default"), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("div", {
         id: props.target,
         class: "view-container"
-      }, null, 8
+      }, [props.showToolButtons ? ((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", {
+        key: 0,
+        class: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.normalizeClass)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(toolButtonsCss)),
+        style: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.normalizeStyle)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(toolButtonsStyle))
+      }, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("div", null, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(client3d_webgl_vue_namespaceObject.Kq3dFixedZoomout))]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("div", null, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(client3d_webgl_vue_namespaceObject.Kq3dFixedZoomin))]), (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.createVNode)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(client3d_webgl_vue_namespaceObject.Kq3dResetView))]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("div", _hoisted_4, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(client3d_webgl_vue_namespaceObject.Kq3dCompass))])], 6
+      /* CLASS, STYLE */
+      )) : (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createCommentVNode)("v-if", true)], 8
       /* PROPS */
       , _hoisted_2)]);
     };
@@ -2887,7 +2941,7 @@ ScenceView.install = (Vue, opts) => {
 
 ;// CONCATENATED MODULE: external "@element-plus/icons-vue"
 var icons_vue_namespaceObject = require("@element-plus/icons-vue");
-;// CONCATENATED MODULE: ./src/webgl/fixedzoomout3d/FixedZoomout3dViewModel.js
+;// CONCATENATED MODULE: ./src/webgl/fixedzoomout/FixedZoomoutViewModel.js
 
 // 三维固定缩放逻辑
 class FixedZoomout3dViewModel {
@@ -2956,17 +3010,17 @@ class FixedZoomout3dViewModel {
 }
 ;// CONCATENATED MODULE: external "@kq_npm/client_common_vue/_utils/gis-utils"
 var gis_utils_namespaceObject = require("@kq_npm/client_common_vue/_utils/gis-utils");
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js!./node_modules/vue-loader/dist/index.js??ruleSet[0]!./src/webgl/fixedzoomout3d/FixedZoomout3d.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/fixedzoomout/FixedZoomout.vue?vue&type=script&setup=true&lang=js
 
 
 
 
  // 获取组件传参
 
-const FixedZoomout3dvue_type_script_setup_true_lang_js_default_ = {
+const FixedZoomoutvue_type_script_setup_true_lang_js_default_ = {
   name: "Kq3dFixedZoomout3d"
 };
-/* harmony default export */ var FixedZoomout3dvue_type_script_setup_true_lang_js = (/*#__PURE__*/Object.assign(FixedZoomout3dvue_type_script_setup_true_lang_js_default_, {
+/* harmony default export */ var FixedZoomoutvue_type_script_setup_true_lang_js = (/*#__PURE__*/Object.assign(FixedZoomoutvue_type_script_setup_true_lang_js_default_, {
   props: {
     // 按钮图标大小
     iconSize: {
@@ -3031,27 +3085,27 @@ const FixedZoomout3dvue_type_script_setup_true_lang_js_default_ = {
   }
 
 }));
-;// CONCATENATED MODULE: ./src/webgl/fixedzoomout3d/FixedZoomout3d.vue?vue&type=script&setup=true&lang=js
+;// CONCATENATED MODULE: ./src/webgl/fixedzoomout/FixedZoomout.vue?vue&type=script&setup=true&lang=js
  
-;// CONCATENATED MODULE: ./src/webgl/fixedzoomout3d/FixedZoomout3d.vue
+;// CONCATENATED MODULE: ./src/webgl/fixedzoomout/FixedZoomout.vue
 
 
 
-const FixedZoomout3d_exports_ = FixedZoomout3dvue_type_script_setup_true_lang_js;
+const FixedZoomout_exports_ = FixedZoomoutvue_type_script_setup_true_lang_js;
 
-/* harmony default export */ var FixedZoomout3d = (FixedZoomout3d_exports_);
-;// CONCATENATED MODULE: ./src/webgl/fixedzoomout3d/index.js
+/* harmony default export */ var FixedZoomout = (FixedZoomout_exports_);
+;// CONCATENATED MODULE: ./src/webgl/fixedzoomout/index.js
 
 
 
 
-FixedZoomout3d.install = (Vue, opts) => {
+FixedZoomout.install = (Vue, opts) => {
   init_js_default()(Vue, opts);
-  Vue.component(FixedZoomout3d.name, FixedZoomout3d);
+  Vue.component(FixedZoomout.name, FixedZoomout);
 };
 
 
-;// CONCATENATED MODULE: ./src/webgl/fixedzoomin3d/FixedZoomin3dViewModel.js
+;// CONCATENATED MODULE: ./src/webgl/fixedzoomin/FixedZoominViewModel.js
 
 // 三维固定缩放逻辑
 class FixedZoomin3dViewModel {
@@ -3118,17 +3172,17 @@ class FixedZoomin3dViewModel {
   }
 
 }
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js!./node_modules/vue-loader/dist/index.js??ruleSet[0]!./src/webgl/fixedzoomin3d/FixedZoomin3d.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/fixedzoomin/FixedZoomin.vue?vue&type=script&setup=true&lang=js
 
 
 
 
  // 获取组件传参
 
-const FixedZoomin3dvue_type_script_setup_true_lang_js_default_ = {
+const FixedZoominvue_type_script_setup_true_lang_js_default_ = {
   name: "Kq3dFixedZoomin3d"
 };
-/* harmony default export */ var FixedZoomin3dvue_type_script_setup_true_lang_js = (/*#__PURE__*/Object.assign(FixedZoomin3dvue_type_script_setup_true_lang_js_default_, {
+/* harmony default export */ var FixedZoominvue_type_script_setup_true_lang_js = (/*#__PURE__*/Object.assign(FixedZoominvue_type_script_setup_true_lang_js_default_, {
   props: {
     // 按钮图标大小
     iconSize: {
@@ -3193,23 +3247,23 @@ const FixedZoomin3dvue_type_script_setup_true_lang_js_default_ = {
   }
 
 }));
-;// CONCATENATED MODULE: ./src/webgl/fixedzoomin3d/FixedZoomin3d.vue?vue&type=script&setup=true&lang=js
+;// CONCATENATED MODULE: ./src/webgl/fixedzoomin/FixedZoomin.vue?vue&type=script&setup=true&lang=js
  
-;// CONCATENATED MODULE: ./src/webgl/fixedzoomin3d/FixedZoomin3d.vue
+;// CONCATENATED MODULE: ./src/webgl/fixedzoomin/FixedZoomin.vue
 
 
 
-const FixedZoomin3d_exports_ = FixedZoomin3dvue_type_script_setup_true_lang_js;
+const FixedZoomin_exports_ = FixedZoominvue_type_script_setup_true_lang_js;
 
-/* harmony default export */ var FixedZoomin3d = (FixedZoomin3d_exports_);
-;// CONCATENATED MODULE: ./src/webgl/fixedzoomin3d/index.js
+/* harmony default export */ var FixedZoomin = (FixedZoomin_exports_);
+;// CONCATENATED MODULE: ./src/webgl/fixedzoomin/index.js
 
 
 
 
-FixedZoomin3d.install = (Vue, opts) => {
+FixedZoomin.install = (Vue, opts) => {
   init_js_default()(Vue, opts);
-  Vue.component(FixedZoomin3d.name, FixedZoomin3d);
+  Vue.component(FixedZoomin.name, FixedZoomin);
 };
 
 
@@ -3565,8 +3619,8 @@ const BaseterrainGalleryvue_type_script_setup_true_lang_js_hoisted_1 = {
 const BaseterrainGalleryvue_type_script_setup_true_lang_js_hoisted_2 = {
   class: "divSpan"
 };
-const _hoisted_3 = ["src"];
-const _hoisted_4 = ["src"];
+const BaseterrainGalleryvue_type_script_setup_true_lang_js_hoisted_3 = ["src"];
+const BaseterrainGalleryvue_type_script_setup_true_lang_js_hoisted_4 = ["src"];
 
 
 
@@ -3680,7 +3734,7 @@ const BaseterrainGalleryvue_type_script_setup_true_lang_js_default_ = {
                   alt: ""
                 }, null, 8
                 /* PROPS */
-                , _hoisted_3)]),
+                , BaseterrainGalleryvue_type_script_setup_true_lang_js_hoisted_3)]),
                 _: 1
                 /* STABLE */
 
@@ -3711,7 +3765,7 @@ const BaseterrainGalleryvue_type_script_setup_true_lang_js_default_ = {
                   alt: ""
                 }, null, 8
                 /* PROPS */
-                , _hoisted_4)]),
+                , BaseterrainGalleryvue_type_script_setup_true_lang_js_hoisted_4)]),
                 _: 1
                 /* STABLE */
 
@@ -4399,7 +4453,16 @@ const Flightvue_type_script_setup_true_lang_js_default_ = {
     let viewer = null;
     let pathPlayIndex = -1;
     let dropDownPath = null;
-    let viewModel = null;
+    let viewModel = null; // 表格头样式
+
+    let headClass = args => {
+      return {
+        "background-color": "var(--kq-fill-color-light)",
+        color: "var(--kq-color-info)",
+        "font-size": "14px"
+      };
+    };
+
     (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.onMounted)(() => {
       gis_utils_namespaceObject.utils.getWebMap(null, scenceView => {
         if (scenceView) {
@@ -4728,7 +4791,7 @@ const Flightvue_type_script_setup_true_lang_js_default_ = {
       /* PROPS */
       , ["title"]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_upload, {
         style: {
-          "margin-left": "12px"
+          "margin-left": "4px"
         },
         "on-change": importFile,
         "auto-upload": false,
@@ -4823,7 +4886,7 @@ const Flightvue_type_script_setup_true_lang_js_default_ = {
               onClick: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withModifiers)($event => showDropDownMenu(item, index), ["prevent", "stop"]),
               title: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).more
             }, {
-              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)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(icons_vue_namespaceObject.MoreFilled))]),
+              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)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(icons_vue_namespaceObject.More))]),
               _: 2
               /* DYNAMIC */
 
@@ -4943,7 +5006,8 @@ const Flightvue_type_script_setup_true_lang_js_default_ = {
       /* PROPS */
       , ["label"]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_table, {
         border: "",
-        data: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(tableData)
+        data: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(tableData),
+        "header-cell-style": (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(headClass)
       }, {
         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_table_column, {
           label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).no,
@@ -4954,12 +5018,14 @@ const Flightvue_type_script_setup_true_lang_js_default_ = {
         /* PROPS */
         , ["label"]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_table_column, {
           label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).position,
-          prop: "position"
+          prop: "position",
+          align: "center"
         }, null, 8
         /* PROPS */
         , ["label"]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_table_column, {
           label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).interval,
-          width: "100"
+          width: "100",
+          align: "center"
         }, {
           default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(scope => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_input_number, {
             modelValue: scope.row.interval,
@@ -4979,7 +5045,8 @@ const Flightvue_type_script_setup_true_lang_js_default_ = {
         /* PROPS */
         , ["label"]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_table_column, {
           label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).operation,
-          width: "90"
+          width: "90",
+          align: "center"
         }, {
           default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(scope => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_button, {
             onClick: $event => replaceKey(scope.$index, scope.row),
@@ -5027,7 +5094,7 @@ const Flightvue_type_script_setup_true_lang_js_default_ = {
 
       }, 8
       /* PROPS */
-      , ["data"]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_button, {
+      , ["data", "header-cell-style"]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_button, {
         class: "kq-flight3d-btn-add",
         onClick: addKey
       }, {
@@ -6118,6 +6185,15 @@ const ModelSelectvue_type_script_setup_true_lang_js_default_ = {
 
     let language = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)({});
     let viewModel = null; // 获取组件传参
+    // 表格头样式
+
+    let headClass = args => {
+      return {
+        "background-color": "var(--kq-fill-color-light)",
+        color: "var(--kq-color-info)",
+        "font-size": "14px"
+      };
+    };
 
     (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.onMounted)(() => {
       //父组件ScenceView初始化完成后执行
@@ -6220,7 +6296,8 @@ const ModelSelectvue_type_script_setup_true_lang_js_default_ = {
             },
             "cell-style": {
               padding: '8px 0'
-            }
+            },
+            "header-cell-style": (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(headClass)
           }, {
             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_table_column, {
               label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).fieldName,
@@ -6240,7 +6317,7 @@ const ModelSelectvue_type_script_setup_true_lang_js_default_ = {
 
           }, 8
           /* PROPS */
-          , ["data"])]),
+          , ["data", "header-cell-style"])]),
           _: 1
           /* STABLE */
 
@@ -17942,36 +18019,37 @@ const AddDatavue_type_script_setup_true_lang_js_default_ = {
       gis_utils_namespaceObject.utils.getWebMap(null, scenceView => {
         if (scenceView) {
           language.value = scenceView._language;
-          dataSourceTypeList.value = [{
-            type: 'kq3dimageryfile',
-            name: language.value.ImagertyTileFile,
-            namePlaceholder: language.value.unnamedLayer,
-            urlPlaceholder: language.value.format + ':http://<host>:<port>/xxx/<servername>/info.xml',
-            description: language.value.imagertyTileFiledescription
-          }, {
-            type: 'obterrain',
-            name: language.value.ObTerrainTileFile,
-            namePlaceholder: language.value.unnamedLayer,
-            urlPlaceholder: language.value.format + ':http://<host>:<port>/xxx/<servername>/info.xml',
-            description: language.value.imagertyObTerrainTileFiledescription
-          }, {
-            type: 'stkterrain',
-            name: language.value.StkTerrainTileFile,
-            namePlaceholder: language.value.unnamedLayer,
-            urlPlaceholder: language.value.format + ':http://<host>:<port>/xxx/<foldername>/',
-            description: language.value.imagertyStkTerrainTileFiledescription
-          }, {
-            type: '3dtiles',
-            name: language.value.Cesium3DTilesFile,
-            namePlaceholder: language.value.unnamedLayer,
-            urlPlaceholder: language.value.format + ':http://<host>:<port>/xxx/<servername>/tileset.json',
-            description: language.value.imagerty3DTilesFiledescription
-          }, {
+          dataSourceTypeList.value = [// {
+          //     type: 'kq3dimageryfile',
+          //     name: language.value.ImagertyTileFile,
+          //     namePlaceholder: language.value.unnamedLayer,
+          //     urlPlaceholder: language.value.format +':http://<host>:<port>/xxx/<servername>/info.xml',
+          //     description: language.value.imagertyTileFiledescription
+          // }, {
+          //     type: 'obterrain',
+          //     name: language.value.ObTerrainTileFile,
+          //     namePlaceholder: language.value.unnamedLayer,
+          //     urlPlaceholder: language.value.format +':http://<host>:<port>/xxx/<servername>/info.xml',
+          //     description: language.value.imagertyObTerrainTileFiledescription
+          // }, {
+          //     type: 'stkterrain',
+          //     name: language.value.StkTerrainTileFile,
+          //     namePlaceholder: language.value.unnamedLayer,
+          //     urlPlaceholder: language.value.format +':http://<host>:<port>/xxx/<foldername>/',
+          //     description: language.value.imagertyStkTerrainTileFiledescription
+          // }, 
+          {
             type: 'kqgis3dserver',
             name: language.value.KQGIS3DServer,
             namePlaceholder: language.value.unnamedLayer,
             urlPlaceholder: language.value.format + ':http://<host>:<port>/kqgis/rest/services/<servername>/realspace',
             description: language.value.imagerty3DServerdescription
+          }, {
+            type: 'kqgismapserver',
+            name: language.value.KQGISMapServer,
+            namePlaceholder: language.value.unnamedLayer,
+            urlPlaceholder: language.value.format + ':http://<host>:<port>/kqgis/rest/services/<servername>/map',
+            description: language.value.imagertyMapServerdescription
           }, {
             type: 'kqgisimageserver',
             name: language.value.KQGISImageServer,
@@ -17979,11 +18057,17 @@ const AddDatavue_type_script_setup_true_lang_js_default_ = {
             urlPlaceholder: language.value.format + ':http://<host>:<port>/kqgis/rest/services/<servername>/image',
             description: language.value.imagertyImageServerdescription
           }, {
-            type: 'kqgismapserver',
-            name: language.value.KQGISMapServer,
+            type: 'kqgisdataflowserver',
+            name: language.value.KQGISDataflowServer + '（未实现）',
             namePlaceholder: language.value.unnamedLayer,
-            urlPlaceholder: language.value.format + ':http://<host>:<port>/kqgis/rest/services/<servername>/map',
-            description: language.value.imagertyMapServerdescription
+            urlPlaceholder: language.value.format + ':http://<host>:<port>/kqgis/rest/services/<servername>/dataflow',
+            description: language.value.imagertyDataflowServerdescription
+          }, {
+            type: 'kqgistileserver',
+            name: language.value.KQGISTileServer + '（未实现）',
+            namePlaceholder: language.value.unnamedLayer,
+            urlPlaceholder: language.value.format + ':http://<host>:<port>/kqgis/rest/services/<servername>/tile',
+            description: language.value.imagertyTileServerdescription
           }, {
             type: 'arcgismapserver',
             name: language.value.ArcGISMapServer,
@@ -18002,40 +18086,46 @@ const AddDatavue_type_script_setup_true_lang_js_default_ = {
             namePlaceholder: language.value.unnamedLayer,
             urlPlaceholder: language.value.format + ':http://<host>:<port>/kqgis/rest/services/<servername>/map/wmts',
             description: language.value.imagertyOGCWMTSdescription
-          },
-          /*{
-            type: 'wfs',
-            name: language.value.OGCWFS,
-            namePlaceholder: language.value.wfsLayer,
-            urlPlaceholder: language.value.format +':http://<host>:<port>/ArcGIS/rest/services/<servername>/wfs',
-            description: language.value.imagertyOGCWFSdescription
-          }, {
-            type: 'mvt',
-            name: language.value.MVT,
-            namePlaceholder: language.value.unnamedLayer,
-            urlPlaceholder: language.value.format +':http://<host>:<port>/mvt/tiles/{z}/{x}/{y}.mvt',
-            stylePlaceholder: language.value.format +':http://<host>:<port>/mvt/style.json',
-            description: language.value.imagertyMVTdescription
-          }, */
-          {
-            type: 'geojson',
-            name: language.value.GeoJson,
-            namePlaceholder: language.value.unnamedLayer,
-            urlPlaceholder: language.value.format + ': http://<host>:<port>/xxx/<servername>/xxx.geojson',
-            description: language.value.imagertyGeoJsondescription
           }, {
-            type: 'kml',
-            name: language.value.KML,
-            namePlaceholder: language.value.unnamedLayer,
-            urlPlaceholder: language.value.format + ': http://<host>:<port>/xxx/<servername>/xxx.kml',
-            description: language.value.imagertyKMLdescription
-          }, {
-            type: 'czml',
-            name: language.value.CZML,
+            type: '3dtiles',
+            name: language.value.Cesium3DTilesFile,
             namePlaceholder: language.value.unnamedLayer,
-            urlPlaceholder: language.value.format + ': http://<host>:<port>/xxx/<servername>/xxx.czml',
-            description: language.value.imagertyCZMLdescription
-          }];
+            urlPlaceholder: language.value.format + ':http://<host>:<port>/tileset.json',
+            description: language.value.imagerty3DTilesFiledescription
+          }
+          /*, {
+             type: 'wfs',
+             name: language.value.OGCWFS,
+             namePlaceholder: language.value.wfsLayer,
+             urlPlaceholder: language.value.format +':http://<host>:<port>/ArcGIS/rest/services/<servername>/wfs',
+             description: language.value.imagertyOGCWFSdescription
+          }, {
+             type: 'mvt',
+             name: language.value.MVT,
+             namePlaceholder: language.value.unnamedLayer,
+             urlPlaceholder: language.value.format +':http://<host>:<port>/mvt/tiles/{z}/{x}/{y}.mvt',
+             stylePlaceholder: language.value.format +':http://<host>:<port>/mvt/style.json',
+             description: language.value.imagertyMVTdescription
+          }, {
+             type: 'geojson',
+             name: language.value.GeoJson,
+             namePlaceholder: language.value.unnamedLayer,
+             urlPlaceholder: language.value.format +': http://<host>:<port>/xxx/<servername>/xxx.geojson',
+             description: language.value.imagertyGeoJsondescription
+          }, {
+             type: 'kml',
+             name: language.value.KML,
+             namePlaceholder: language.value.unnamedLayer,
+             urlPlaceholder: language.value.format +': http://<host>:<port>/xxx/<servername>/xxx.kml',
+             description: language.value.imagertyKMLdescription
+          }, {
+             type: 'czml',
+             name: language.value.CZML,
+             namePlaceholder: language.value.unnamedLayer,
+             urlPlaceholder: language.value.format +': http://<host>:<port>/xxx/<servername>/xxx.czml',
+             description: language.value.imagertyCZMLdescription
+          }*/
+          ];
           dataSourceType.value = dataSourceTypeList.value[0];
           let options = {
             billboardImage: const_image_namespaceObject.BILLBOARD_IMAGE_URL
@@ -22103,8 +22193,8 @@ const webglComponents = {
   Kq3dHawkeye: Hawkeye,
   Kq3dRoller: Roller,
   Kq3dScreenShot: Screenshot,
-  Kq3dFixedZoomout3d: FixedZoomout3d,
-  Kq3dFixedZoomin3d: FixedZoomin3d,
+  Kq3dFixedZoomout: FixedZoomout,
+  Kq3dFixedZoomin: FixedZoomin,
   Kq3dResetView: ResetView,
   Kq3dCompass: Compass,
   Kq3dUnderground: Underground,

package/measure/style/measure.css

@@ -1 +1 @@
-:root{--kq-box-padding:16px;--kq-header-bg-color:var(--kq-color-primary);--kq-header-border-color:var(--kq-color-primary)}.kq-measure3d{z-index:999;width:272px;border-radius:var(--kq-border-radius-base);padding:16px;pointer-events:auto;cursor:default;background-color:var(--kq-bg-color)}.kq-measure3d p{margin:0}.kq-measure3d .kq-measure3d-mode{margin-left:5px}.kq-measure3d .kq-measure3d-mode .panel{width:100%}.kq-measure3d .kq-measure3d-mode .panel .title{color:var(--kq-text-color-regular);margin:0 0 8px;font-size:14px}.kq-measure3d .kq-measure3d-mode .panel .kq-select{width:100%}.kq-measure3d .kq-measure3d-btns{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-pack:distribute;justify-content:space-around;margin-top:12px}.kq-measure3d .kq-measure3d-btns .kq-button{width:48px;height:48px}.kq-measure3d .kq-measure3d-btns .kq-button .kq-icon path{fill:var(--kq-color-primary)}.kq-measure3d .kq-measure3d-btns .kq-button .icon-delete path{fill:var(--kq-color-danger)}.kq-measure3d .kq-measure3d-btns .kq-button:active .icon-delete path,.kq-measure3d .kq-measure3d-btns .kq-button:focus .icon-delete path,.kq-measure3d .kq-measure3d-btns .kq-button:hover .icon-delete path{fill:var(--kq-color-white)!important}.kq-measure3d .kq-measure3d-tip{color:var(--kq-text-color-regular);font-size:13px}.kq-measure3d .kq-measure3d-tip .kq-divider{margin:16px 0}.kq-measure3d .kq-measure3d-tip>p{margin:0}.kq-measure3d .kq-measure3d-result .kq-divider{margin:16px 0}.kq-measure3d .kq-measure3d-result .kq-measure3d-result-panel .panel{padding-bottom:16px}.kq-measure3d .kq-measure3d-result .kq-measure3d-result-panel .panel:last-child{padding:0}.kq-measure3d .kq-measure3d-result .kq-measure3d-result-panel .panel .title{color:var(--kq-text-color-regular);margin:0 0 8px;font-size:14px}.kq-measure3d .kq-measure3d-result .kq-measure3d-result-panel .panel .kq-select{width:100%}.kq-measure3d .kq-measure3d-result .kq-measure3d-result-panel .panel .result{padding:8px;background:var(--kq-sub-bg-color);border-radius:var(--kq-border-radius-base);color:var(--kq-text-color-regular);font-size:14px}.kq-measure3d .kq-measure3d-result .kq-measure3d-result-panel .panel .result .tit{padding-bottom:8px}.kq-measure3d .kq-measure3d-result .kq-measure3d-result-panel .panel .result .res+.tit{padding-top:12px}
+:root{--kq-box-padding:16px;--kq-header-bg-color:var(--kq-color-primary);--kq-header-border-color:var(--kq-color-primary)}.kq-measure3d{z-index:999;width:272px;border-radius:var(--kq-border-radius-base);padding:16px;pointer-events:auto;cursor:default;background-color:var(--kq-bg-color);-webkit-box-sizing:border-box;box-sizing:border-box}.kq-measure3d p{margin:0}.kq-measure3d .kq-measure3d-mode .panel{width:100%}.kq-measure3d .kq-measure3d-mode .panel .title{color:var(--kq-text-color-regular);margin:0 0 8px;font-size:14px}.kq-measure3d .kq-measure3d-mode .panel .kq-select{width:100%}.kq-measure3d .kq-measure3d-btns{margin-top:12px}.kq-measure3d .kq-measure3d-btns .kq-button{width:48px;height:48px}.kq-measure3d .kq-measure3d-btns .kq-button .kq-icon path{fill:var(--kq-color-primary)}.kq-measure3d .kq-measure3d-btns .kq-button .icon-delete path{fill:var(--kq-color-danger)}.kq-measure3d .kq-measure3d-btns .kq-button:active .icon-delete path,.kq-measure3d .kq-measure3d-btns .kq-button:focus .icon-delete path,.kq-measure3d .kq-measure3d-btns .kq-button:hover .icon-delete path{fill:var(--kq-color-white)!important}.kq-measure3d .kq-measure3d-btns .kq-button+.kq-button{margin-left:16px}.kq-measure3d .kq-measure3d-tip{color:var(--kq-text-color-regular);font-size:13px}.kq-measure3d .kq-measure3d-tip .kq-divider{margin:16px 0}.kq-measure3d .kq-measure3d-tip>p{margin:0}.kq-measure3d .kq-measure3d-result .kq-divider{margin:16px 0}.kq-measure3d .kq-measure3d-result .kq-measure3d-result-panel .panel{padding-bottom:16px}.kq-measure3d .kq-measure3d-result .kq-measure3d-result-panel .panel:last-child{padding:0}.kq-measure3d .kq-measure3d-result .kq-measure3d-result-panel .panel .title{color:var(--kq-text-color-regular);margin:0 0 8px;font-size:14px}.kq-measure3d .kq-measure3d-result .kq-measure3d-result-panel .panel .kq-select{width:100%}.kq-measure3d .kq-measure3d-result .kq-measure3d-result-panel .panel .result{padding:8px;background:var(--kq-sub-bg-color);border-radius:var(--kq-border-radius-base);color:var(--kq-text-color-regular);font-size:14px}.kq-measure3d .kq-measure3d-result .kq-measure3d-result-panel .panel .result .tit{padding-bottom:8px}.kq-measure3d .kq-measure3d-result .kq-measure3d-result-panel .panel .result .res+.tit{padding-top:12px}

package/modelselect/index.js

@@ -207,6 +207,15 @@ const __default__ = {
 
     let language = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)({});
     let viewModel = null; // 获取组件传参
+    // 表格头样式
+
+    let headClass = args => {
+      return {
+        "background-color": "var(--kq-fill-color-light)",
+        color: "var(--kq-color-info)",
+        "font-size": "14px"
+      };
+    };
 
     (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.onMounted)(() => {
       //父组件ScenceView初始化完成后执行
@@ -309,7 +318,8 @@ const __default__ = {
             },
             "cell-style": {
               padding: '8px 0'
-            }
+            },
+            "header-cell-style": (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(headClass)
           }, {
             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_table_column, {
               label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).fieldName,
@@ -329,7 +339,7 @@ const __default__ = {
 
           }, 8
           /* PROPS */
-          , ["data"])]),
+          , ["data", "header-cell-style"])]),
           _: 1
           /* STABLE */
 

package/package.json

@@ -1 +1 @@
-{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"1.0.8-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":"1.1.0-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"}}