@kq_npm/client3d_webgl_vue 4.1.0-beta → 4.1.1-beta

package/scenceview/index.js

@@ -17297,6 +17297,409 @@ Measure.install = (Vue, opts) => {
 
 
 
+/***/ }),
+
+/***/ 1677:
+/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+
+
+// EXPORTS
+__webpack_require__.d(__webpack_exports__, {
+  "default": function() { return /* reexport */ ModelExcavate; }
+});
+
+// UNUSED EXPORTS: ModelExcavateViewModel
+
+// 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: external "@kq_npm/client_common_vue/_utils/gis-utils"
+var gis_utils_ = __webpack_require__(826);
+// EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/defineProperty.js
+var defineProperty = __webpack_require__(8270);
+// EXTERNAL MODULE: ./src/common/_ui/message/index.js
+var message = __webpack_require__(1349);
+;// CONCATENATED MODULE: ./src/webgl/modelexcavate/ModelExcavateViewModel.js
+
+//模型开挖逻辑类
+
+class ModelExcavateViewModel {
+  //三维viewer对象
+  //Box裁剪存储参数对象
+  //绘制管理对象
+  //绘制完成监听事件
+  constructor(scenceView, options) {
+    (0,defineProperty/* default */.Z)(this, "_viewer", null);
+
+    (0,defineProperty/* default */.Z)(this, "_options", {});
+
+    (0,defineProperty/* default */.Z)(this, "_Kq3dTerrainExcavation", null);
+
+    (0,defineProperty/* default */.Z)(this, "_drawManager", null);
+
+    (0,defineProperty/* default */.Z)(this, "_removeEventListener", null);
+
+    this._viewer = scenceView._viewer;
+    this._options = options;
+    this._drawManager = scenceView._drawManager;
+    this._viewer.scene.globe.depthTestAgainstTerrain = true; //开启深度检测
+    // var kq3dFlattenning = new window.Cesium.Kq3dFlattenning(this._viewer, {});
+    // var g_flattenedPolygonTexture = kq3dFlattenning.createFlattenedPolygonTexture();
+
+    var that = this;
+    this._removeEventListener = this._drawManager.drawFinishedEvent.addEventListener(shape => {
+      if (shape) {
+        that._options.positions = shape._controlPoints;
+        this._Kq3dTerrainExcavation = this._Kq3dTerrainExcavation && this._Kq3dTerrainExcavation.destroy();
+        this._Kq3dTerrainExcavation = new window.Cesium.Kq3dTerrainExcavation({
+          viewer: this.viewer,
+          height: this._options.height,
+          positions: that._options.positions,
+          hasWall: false
+        });
+
+        that._drawManager.clear();
+      }
+    });
+  }
+
+  start() {
+    // 判断是否添加了模型
+    var flag = false;
+    var models = this._viewer.scene.primitives._primitives;
+
+    for (let i = 0; i < models.length; i++) {
+      if (models[i]._url) {
+        flag = true;
+      }
+    }
+
+    if (flag) {
+      this.clear();
+
+      this._drawManager.startDraw("polygon", {
+        clampToGround: true
+      });
+    } else {
+      (0,message/* default */.Z)({
+        message: "请添加模型后拾取!",
+        type: "warning"
+      });
+    }
+  } //清除
+
+
+  clear() {
+    this._drawManager.stopDraw(); // 销毁地形开挖
+
+  } //销毁
+
+
+  destroy() {
+    this.clear();
+  }
+
+}
+// EXTERNAL MODULE: external "@kq_npm/client_icons_vue"
+var client_icons_vue_ = __webpack_require__(348);
+// EXTERNAL MODULE: external "@kq_npm/client_common_vue/_utils/util"
+var util_ = __webpack_require__(9519);
+// EXTERNAL MODULE: external "vue-i18n/dist/vue-i18n.cjs.js"
+var vue_i18n_cjs_js_ = __webpack_require__(7080);
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js!./node_modules/vue-loader/dist/index.js??ruleSet[0]!./src/webgl/modelexcavate/ModelExcavate.vue?vue&type=script&setup=true&lang=js
+
+const _hoisted_1 = {
+  class: "kq3d-model-excavate-box",
+  ref: "ref_box"
+};
+const _hoisted_2 = {
+  class: "kq3d-model-excavate-span"
+};
+const _hoisted_3 = {
+  class: "kq3d-model-excavate-footer"
+};
+
+
+
+
+
+ //语言
+
+const __default__ = {
+  name: "Kq3dModelExcavate"
+};
+/* harmony default export */ var ModelExcavatevue_type_script_setup_true_lang_js = (/*#__PURE__*/Object.assign(__default__, {
+  props: {
+    //指定组件绑定的viewer对象的div的id
+    mapTarget: String,
+    // 设置参数
+    settingParams: {
+      type: Object
+    },
+    // 是否显示阴影效果
+    showShadow: {
+      type: Boolean,
+      default: true
+    },
+
+    /**
+     * 例："center","topLeft","topRight","bottomLeft","bottomRight", "topCenter", "bottomCenter" {top:'16px',left:'16px'}, {top:16,left:16}
+     */
+    position: [String, Object],
+    // 是否生成HeaderTemp
+    showHeaderTemp: {
+      type: Boolean,
+      default: false
+    },
+    // 是否折叠HeaderTemp，showHeaderTemp为true时生效
+    isCollapseHeaderTemp: {
+      type: Boolean,
+      default: false
+    },
+    // HeaderTemp标题
+    headerTempTitle: {
+      type: String
+    },
+    // HeaderTemp图标
+    headerTempIcon: {
+      type: [Object, String],
+      default: client_icons_vue_.IconModelExcavation
+    },
+    // HeaderTemp Title&Icon的位置
+    isRight: {
+      type: Boolean,
+      default: true
+    }
+  },
+
+  setup(__props, {
+    expose
+  }) {
+    const props = __props;
+    let language = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)({});
+    let viewModel = null;
+    let currentLang = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(""); // 获取组件传参
+
+    let formItem = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.reactive)({
+      excavationDepth: props.settingParams && props.settingParams.excavationDepth || 20,
+      // 地形开挖深度
+      minExcavationDepth: props.settingParams && props.settingParams.minExcavationDepth || 0,
+      // 地形开挖深度范围最小值
+      maxExcavationDepth: props.settingParams && props.settingParams.maxExcavationDepth || 100 // 地形开挖深度范围最大值
+
+    }); // 组件容器Ref
+
+    let boxRef = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(null); // 生成组件默认header
+
+    let headerTemp = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)();
+    let headerTempRef = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(); // 国际化
+
+    let {
+      locale,
+      messages
+    } = (0,vue_i18n_cjs_js_.useI18n)();
+    let headerTempTitle = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(null);
+    (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.watch)(() => locale.value, (newVal, oldVal) => {
+      language.value = messages.value[newVal]["webgl"];
+      headerTempTitle.value = language.value.modelExcavateTitle;
+    });
+    (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.onMounted)(() => {
+      (0,util_.updatePosition)(boxRef.value, props);
+      (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.watch)(() => props.position, (newVal, oldVal) => {
+        (0,util_.updatePosition)(boxRef.value, props);
+      });
+      watchCreateHeaderTemp();
+      (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.watch)(() => props.showHeaderTemp, (newVal, oldVal) => {
+        watchCreateHeaderTemp();
+      }); //父组件ScenceView初始化完成后执行
+
+      gis_utils_.utils.getWebMap(null, scenceView => {
+        if (scenceView) {
+          viewModel = new ModelExcavateViewModel(scenceView, {
+            excavationDepth: formItem.excavationDepth
+          });
+        }
+      });
+    });
+    /**
+     * @description 监听header生成
+     */
+
+    const watchCreateHeaderTemp = () => {
+      if (props.showHeaderTemp) {
+        // 生成headerTemp
+        headerTemp.value = (0,util_.createHeaderTemp)(boxRef.value, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toRefs)(props), headerTempRef, headerTempTitle);
+      }
+    }; // 调整开挖深度
+
+
+    function changeHeight() {
+      viewModel && viewModel.setHeight(formItem.excavationDepth);
+    } // 开始分析
+
+
+    function startOperation() {
+      viewModel && viewModel.start();
+    } // 清除
+
+
+    function clear() {
+      viewModel && viewModel.clear();
+    } // 销毁
+
+
+    (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.onBeforeUnmount)(() => {
+      viewModel && viewModel.destroy();
+    });
+    expose({
+      clear
+    });
+    return (_ctx, _cache) => {
+      const _component_kq_col = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.resolveComponent)("kq-col");
+
+      const _component_kq_slider = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.resolveComponent)("kq-slider");
+
+      const _component_kq_input_number = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.resolveComponent)("kq-input-number");
+
+      const _component_kq_row = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.resolveComponent)("kq-row");
+
+      const _component_kq_button = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.resolveComponent)("kq-button");
+
+      return (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementBlock)("section", {
+        class: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.normalizeClass)(["kq3d-model-excavate", {
+          'kq-box-shadow': __props.showShadow
+        }]),
+        ref_key: "boxRef",
+        ref: boxRef
+      }, [__props.showHeaderTemp ? ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createBlock)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.resolveDynamicComponent)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(headerTemp)), {
+        key: 0,
+        ref_key: "headerTempRef",
+        ref: headerTempRef
+      }, null, 512
+      /* NEED_PATCH */
+      )) : (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createCommentVNode)("v-if", true), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_1, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, {
+        gutter: 10
+      }, {
+        default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_col, {
+          span: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(currentLang) === 'zh' ? 7 : 10
+        }, {
+          default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("span", _hoisted_2, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).excavationDepth), 1
+          /* TEXT */
+          )]),
+          _: 1
+          /* STABLE */
+
+        }, 8
+        /* PROPS */
+        , ["span"]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_col, {
+          span: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(currentLang) === 'zh' ? 11 : 8
+        }, {
+          default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_slider, {
+            modelValue: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(formItem).excavationDepth,
+            "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(formItem).excavationDepth = $event),
+            step: 100,
+            min: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(formItem).minExcavationDepth,
+            max: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(formItem).maxExcavationDepth,
+            onChange: _cache[1] || (_cache[1] = $event => changeHeight()),
+            onClick: _cache[2] || (_cache[2] = $event => changeHeight())
+          }, null, 8
+          /* PROPS */
+          , ["modelValue", "min", "max"])]),
+          _: 1
+          /* STABLE */
+
+        }, 8
+        /* PROPS */
+        , ["span"]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_col, {
+          span: 6,
+          style: {
+            "text-align": "end"
+          }
+        }, {
+          default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_input_number, {
+            modelValue: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(formItem).excavationDepth,
+            "onUpdate:modelValue": _cache[3] || (_cache[3] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(formItem).excavationDepth = $event),
+            min: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(formItem).minExcavationDepth,
+            step: 1,
+            max: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(formItem).maxExcavationDepth,
+            "controls-position": "right",
+            onInput: _cache[4] || (_cache[4] = $event => changeHeight())
+          }, null, 8
+          /* PROPS */
+          , ["modelValue", "min", "max"])]),
+          _: 1
+          /* STABLE */
+
+        })]),
+        _: 1
+        /* STABLE */
+
+      }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, {
+        class: "kq3d-model-excavate-tip"
+      }, {
+        default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("p", null, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).skylineTips), 1
+        /* TEXT */
+        ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createCommentVNode)(" <p v-if=\"formItem.terrainStyle === 2\">{{ \"(\" + language.reverseDrawPolygon + \")\" }}</p> ")]),
+        _: 1
+        /* STABLE */
+
+      }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_3, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_button, {
+        onClick: _cache[5] || (_cache[5] = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withModifiers)($event => startOperation(), ["stop"])),
+        title: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).startOperation,
+        type: "primary"
+      }, {
+        default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createTextVNode)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).startOperation), 1
+        /* TEXT */
+        )]),
+        _: 1
+        /* STABLE */
+
+      }, 8
+      /* PROPS */
+      , ["title"]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_button, {
+        onClick: _cache[6] || (_cache[6] = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withModifiers)($event => clear(), ["stop"])),
+        title: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).clear
+      }, {
+        default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createTextVNode)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).clear), 1
+        /* TEXT */
+        )]),
+        _: 1
+        /* STABLE */
+
+      }, 8
+      /* PROPS */
+      , ["title"])])], 512
+      /* NEED_PATCH */
+      )], 2
+      /* CLASS */
+      );
+    };
+  }
+
+}));
+;// CONCATENATED MODULE: ./src/webgl/modelexcavate/ModelExcavate.vue?vue&type=script&setup=true&lang=js
+ 
+;// CONCATENATED MODULE: ./src/webgl/modelexcavate/ModelExcavate.vue
+
+
+
+const __exports__ = ModelExcavatevue_type_script_setup_true_lang_js;
+
+/* harmony default export */ var ModelExcavate = (__exports__);
+// EXTERNAL MODULE: external "@kq_npm/client_common_vue/init.js"
+var init_js_ = __webpack_require__(5406);
+var init_js_default = /*#__PURE__*/__webpack_require__.n(init_js_);
+;// CONCATENATED MODULE: ./src/webgl/modelexcavate/index.js
+
+
+
+
+ModelExcavate.install = (Vue, opts) => {
+  init_js_default()(Vue, opts);
+  Vue.component(ModelExcavate.name, ModelExcavate);
+};
+
+
+
 /***/ }),
 
 /***/ 435:
@@ -30164,7 +30567,8 @@ class StatusBarViewModel {
     (0,_Users_zpc_Documents_KQGEOSpace_KQGISClientForVue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, "_viewer", null);
 
     viewer.statusBar.show = true;
-    viewer.statusBar.readyPromise.then(() => {
+    let callback = viewer.statusBar.readyPromise.then || viewer.statusBar.readyPromise.resolve;
+    callback(() => {
       // viewer.statusBar.container.style.bottom = "16px";
       //viewer.statusBar.container.parentElement.style.right = "0px!important";
       // console.log(viewer.statusBar.container.parentElement.style.right);
@@ -36746,6 +37150,8 @@ var limitheightanalysis = __webpack_require__(5551);
 var terrainprofileanalysis = __webpack_require__(7649);
 // EXTERNAL MODULE: ./src/webgl/scaneffect/index.js + 4 modules
 var scaneffect = __webpack_require__(7584);
+// EXTERNAL MODULE: ./src/webgl/modelexcavate/index.js + 4 modules
+var modelexcavate = __webpack_require__(1677);
 // EXTERNAL MODULE: ./src/webgl/sightlineanalysis/index.js + 5 modules
 var sightlineanalysis = __webpack_require__(6031);
 // EXTERNAL MODULE: ./src/webgl/viewshedanalysis/index.js + 4 modules
@@ -36848,6 +37254,9 @@ var geologicalbodyanalysis = __webpack_require__(9378);
  // 扫描线
 
 
+ // 模型开挖
+
+
 
 
 
@@ -36946,7 +37355,8 @@ const webglComponents = {
   Kq3dGeologicalBodyAnalysis: geologicalbodyanalysis["default"],
   Kq3dLimitHeightAnalysis: limitheightanalysis["default"],
   Kq3dTerrainProfileAnalysis: terrainprofileanalysis["default"],
-  Kq3dScanEffect: scaneffect["default"]
+  Kq3dScanEffect: scaneffect["default"],
+  Kq3dModelExcavate: modelexcavate["default"]
 }; // 全局引入
 
 const install = function (Vue, opts = {}) {
@@ -37021,7 +37431,7 @@ class DrawManager {
         //文字内容
         fontSize: 25,
         //文字大小
-        fontFamily: 'Microsoft YaHei',
+        fontFamily: "Microsoft YaHei",
         color: "#ff0000" //文字颜色
         // opacity: 0.5, //文字颜色透明度
         // clampToGround: false //是否贴地
@@ -37126,11 +37536,11 @@ class DrawManager {
 
     let editFinishedEvent = this._drawHandler.editHandler.editFinished;
     this.editSelectedEvent.addEventListener(shape => {
-      if (shape) this.addMouseEvent('move', 'label');
+      if (shape) this.addMouseEvent("move", "label");
     });
     editFinishedEvent.addEventListener(shape => {
       if (shape) {
-        this.removeMouseEvent('move', 'label');
+        this.removeMouseEvent("move", "label");
         this._labelUpdateData && this._labelUpdateData();
       }
     }); // 关闭双击旋转交互
@@ -37195,7 +37605,7 @@ class DrawManager {
 
   getImageWithColor(imgUrl, color, width = 32, height = 32) {
     if (color) {
-      var svgStr = window.atob(imgUrl.split(',')[1]);
+      var svgStr = window.atob(imgUrl.split(",")[1]);
       var regex = /#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})/g; // 修改svg颜色
 
       svgStr = svgStr.replace(regex, color); // 修改svg大小
@@ -37646,7 +38056,7 @@ class DrawManager {
     if (!primitive) return;
     let type = primitive._geoType;
 
-    if (primitive.type === 'text') {
+    if (primitive.type === "text") {
       if (primitive.fontSize != style.fontSize) {
         // 修改样式弹窗的 offset
         if (this._stylePopup && this._stylePopup.show) {
@@ -37658,7 +38068,7 @@ class DrawManager {
       primitive.fontFamily = style.fontFamily;
       primitive.text = style.content;
       primitive.fillColor = Cesium.Color.fromCssColorString(style.color);
-    } else if (type === 'point') {
+    } else if (type === "point") {
       if (primitive.height != style.iconSize[1]) {
         // 修改样式弹窗的 offset
         if (this._stylePopup && this._stylePopup.show) {
@@ -37669,14 +38079,14 @@ class DrawManager {
       primitive.image = this.getImageWithColor(style.iconUrl, style.color, style.iconSize[0], style.iconSize[1]);
       primitive.width = style.iconSize[0];
       primitive.height = style.iconSize[1];
-    } else if (type === 'polyline' || type === 'polygon') {
+    } else if (type === "polyline" || type === "polygon") {
       if (style.weight != undefined) primitive.width = style.weight;
       if (style.color != undefined) primitive.color = Cesium.Color.fromCssColorString(style.color);
       if (style.dashArray != undefined) primitive.dashArray = style.dashArray;
       if (style.opacity != undefined) primitive.color = primitive.color.withAlpha(style.opacity);
     }
 
-    if (type === 'polygon') {
+    if (type === "polygon") {
       primitive.fill = style.fill === undefined ? true : style.fill;
 
       if (primitive.fill) {
@@ -37690,18 +38100,18 @@ class DrawManager {
   }
 
   getShapeTypeById(id) {
-    let type = '';
+    let type = "";
 
     let primitive = this._drawLayer.getById(id);
 
     if (primitive) {
       type = primitive.type;
-      if (type == 'marker') type = 'Marker';
-      if (type == 'polyline') type = 'Line';
-      if (type == 'polygon') type = 'Polygon';
-      if (type == 'rectangle') type = 'Rectangle';
-      if (type == 'circle') type = 'Circle';
-      if (type == 'text') type = 'Text';
+      if (type == "marker") type = "Marker";
+      if (type == "polyline") type = "Line";
+      if (type == "polygon") type = "Polygon";
+      if (type == "rectangle") type = "Rectangle";
+      if (type == "circle") type = "Circle";
+      if (type == "text") type = "Text";
     }
 
     return type;
@@ -37789,7 +38199,7 @@ class DrawManager {
     let shape = null;
 
     if (type == "Marker") {
-      shape = this._drawHandler.createShape(this._drawHandler.ShapeTypes.MARKER.type, '', {
+      shape = this._drawHandler.createShape(this._drawHandler.ShapeTypes.MARKER.type, "", {
         position: info.coordinate,
         disableDepthTestDistance: Number.POSITIVE_INFINITY,
         width: info.style.iconSize[0],
@@ -37797,7 +38207,7 @@ class DrawManager {
         image: this.getImageWithColor(info.style.iconUrl, info.style.color, info.style.iconSize[0], info.style.iconSize[1])
       });
     } else if (type == "Line") {
-      shape = this._drawHandler.createShape(this._drawHandler.ShapeTypes.POLYLINE.type, '', {
+      shape = this._drawHandler.createShape(this._drawHandler.ShapeTypes.POLYLINE.type, "", {
         controlPoints: info.coordinate,
         color: Cesium.Color.fromCssColorString(info.style.color).withAlpha(info.style.opacity),
         width: info.style.weight,
@@ -37805,7 +38215,7 @@ class DrawManager {
         clampToGround: true
       });
     } else if (type == "Polygon") {
-      shape = this._drawHandler.createShape(this._drawHandler.ShapeTypes.POLYGON.type, '', {
+      shape = this._drawHandler.createShape(this._drawHandler.ShapeTypes.POLYGON.type, "", {
         controlPoints: info.coordinate,
         color: Cesium.Color.fromCssColorString(info.style.color),
         width: info.style.weight,
@@ -37814,7 +38224,7 @@ class DrawManager {
         clampToGround: true
       });
     } else if (type == "Rectangle") {
-      shape = this._drawHandler.createShape(this._drawHandler.ShapeTypes.RECTANGLE.type, '', {
+      shape = this._drawHandler.createShape(this._drawHandler.ShapeTypes.RECTANGLE.type, "", {
         controlPoints: info.coordinate,
         color: Cesium.Color.fromCssColorString(info.style.color),
         width: info.style.weight,
@@ -37823,7 +38233,7 @@ class DrawManager {
         clampToGround: true
       });
     } else if (type == "Circle") {
-      shape = this._drawHandler.createShape(this._drawHandler.ShapeTypes.CIRCLE.type, '', {
+      shape = this._drawHandler.createShape(this._drawHandler.ShapeTypes.CIRCLE.type, "", {
         controlPoints: info.coordinate,
         color: Cesium.Color.fromCssColorString(info.style.color),
         width: info.style.weight,
@@ -37832,7 +38242,7 @@ class DrawManager {
         clampToGround: true
       });
     } else if (type == "Text") {
-      shape = this._drawHandler.createShape(this._drawHandler.ShapeTypes.TEXT.type, '', {
+      shape = this._drawHandler.createShape(this._drawHandler.ShapeTypes.TEXT.type, "", {
         latlng: info.coordinate,
         text: info.style.content,
         fontSize: info.style.fontSize,
@@ -37870,7 +38280,7 @@ class DrawManager {
 
 
     this.enableEdit(true);
-    this.addMouseEvent('click', 'label'); // 标注坐标修改回调事件
+    this.addMouseEvent("click", "label"); // 标注坐标修改回调事件
 
     this._labelUpdateData = updateData;
     return layerList;
@@ -37888,7 +38298,7 @@ class DrawManager {
         coordinate = feature.geometry.coordinates;
         if (type === "MultiPoint") coordinate = coordinate[0];
         let position = Cesium.Cartesian3.fromDegrees(coordinate[0], coordinate[1]);
-        shape = this._drawHandler.createShape(this._drawHandler.ShapeTypes.MARKER.type, '', {
+        shape = this._drawHandler.createShape(this._drawHandler.ShapeTypes.MARKER.type, "", {
           position: position,
           disableDepthTestDistance: Number.POSITIVE_INFINITY,
           width: 32,
@@ -37905,7 +38315,7 @@ class DrawManager {
         coordinate.forEach(arr => {
           positions.push(Cesium.Cartesian3.fromDegrees(arr[0], arr[1]));
         });
-        shape = this._drawHandler.createShape(this._drawHandler.ShapeTypes.POLYLINE.type, '线', {
+        shape = this._drawHandler.createShape(this._drawHandler.ShapeTypes.POLYLINE.type, "线", {
           controlPoints: positions,
           color: Cesium.Color.fromCssColorString(style.color),
           width: style.weight,
@@ -37921,13 +38331,14 @@ class DrawManager {
         coordinate.forEach(arr => {
           positions.push(Cesium.Cartesian3.fromDegrees(arr[0], arr[1]));
         });
-        shape = this._drawHandler.createShape(this._drawHandler.ShapeTypes.POLYGON.type, '面', {
+        shape = this._drawHandler.createShape(this._drawHandler.ShapeTypes.POLYGON.type, "面", {
           controlPoints: positions,
           color: Cesium.Color.fromCssColorString(style.color),
           width: style.weight,
           fillColor: Cesium.Color.fromCssColorString(style.fillColor).withAlpha(style.fillOpacity),
           fill: true,
-          clampToGround: true
+          clampToGround: true,
+          material: this.getFillStyle(style.fillStyle)
         });
         break;
 
@@ -37942,8 +38353,7 @@ class DrawManager {
 
       if (isLocation) {
         setTimeout(() => {
-          this._drawHandler.startEdit(shape);
-
+          //this._drawHandler.startEdit(shape);
           let offset = new Cesium.HeadingPitchRange(0, Cesium.Math.toRadians(-90), 0);
 
           this._viewer.camera.flyToBoundingSphere(shape.boundingSphere, {
@@ -38020,8 +38430,8 @@ class DrawManager {
       let offsetY = -8;
 
       if (!clickPosition) {
-        if (shape.type == 'marker') offsetY -= shape.height * shape._scaleHeight;
-        if (shape.type == 'text') offsetY -= shape.fontSize;
+        if (shape.type == "marker") offsetY -= shape.height * shape._scaleHeight;
+        if (shape.type == "text") offsetY -= shape.fontSize;
       }
 
       this.destroyStylePopup();
@@ -38097,7 +38507,7 @@ class DrawManager {
       that._mouseHandlers[target].setInputAction(function (movement) {
         if (target == "label") {
           if (that._drawHandler.editHandler._pickedAnchor && that._drawHandler.editHandler._shapeObject) {
-            that.removeMouseEvent('move', 'label');
+            that.removeMouseEvent("move", "label");
             that.destroyStylePopup();
           }
         }
@@ -38143,7 +38553,7 @@ class DrawManager {
 
       this._handler.setInputAction(function (movement) {
         // that.closePointPoup();
-        that.openPointPoup('1002', 'AAA'); //  that.removePointAll();
+        that.openPointPoup("1002", "AAA"); //  that.removePointAll();
         //that.clearPointByIdCustom();
       }, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
     }
@@ -38177,7 +38587,7 @@ class DrawManager {
   createPointPoup(entity) {
     if (this._htmlTag) this._htmlTag.destroy();
     this._htmlTag = new Cesium.Kq3dHtmlTag(this._viewer, {
-      html: '<div>' + entity.properties.id._value + '</div>',
+      html: "<div>" + entity.properties.id._value + "</div>",
       position: entity.position,
       anchor: [0, -entity.properties.height._value],
       alignmentMode: 7
@@ -40001,7 +40411,8 @@ class ScenceViewViewModel extends (mitt_default()) {
       sceneModePicker: false,
       infoBox: false,
       languageStyle: this._lang.type == 'zh' ? 'zh-CN' : 'en',
-      navigationHelpButton: false
+      navigationHelpButton: false,
+      statusBar: true
     };
 
     for (var key in this._props.options) {