deeptwins-engine-3d 0.1.8 → 0.1.10

package/dist/esm/graphicLayer/GraphicLayerCollection.js

@@ -11,44 +11,52 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { flattenDeep } from 'lodash';
 import { v4 as uuidv4 } from 'uuid';
 import * as utils from "../tool/utils";
-import { cameraFlyToPositions, isArray } from "../tool/utils";
 import BaseLayer from "./BaseLayer";
 import BaseSource from "./BaseSource";
 var GraphicLayerCollection = /*#__PURE__*/function () {
-  function GraphicLayerCollection(map) {
+  function GraphicLayerCollection(mapContext) {
     _classCallCheck(this, GraphicLayerCollection);
-    _defineProperty(this, "_map", null);
-    _defineProperty(this, "isDestroy", false);
+    _defineProperty(this, "_mapContext", void 0);
+    _defineProperty(this, "isDestroyed", false);
     // @ts-ignore
     _defineProperty(this, "graphicLayers", new Map());
     // @ts-ignore
     _defineProperty(this, "graphicSources", new Map());
-    this._map = map;
+    this._mapContext = mapContext;
   }
 
   // 是否能进行操作
   _createClass(GraphicLayerCollection, [{
     key: "_canOperate",
     value: function _canOperate() {
-      if (this.isDestroy) {
-        throw new Error('GraphicLayerCollection实例已销毁');
+      if (this.isDestroyed) {
+        utils.error('GraphicLayerCollection实例已销毁');
+        return false;
       }
+      return true;
+    }
+  }, {
+    key: "getMap",
+    value: function getMap() {
+      return this._mapContext && this._mapContext.getMap();
     }
 
     // 添加数据
   }, {
     key: "addSource",
     value: function addSource(id, geoJson) {
-      this._canOperate();
+      if (!this._canOperate()) {
+        return;
+      }
       var uuid = id;
       if (this.graphicSources.get(uuid)) {
-        console.warn("id".concat(uuid, "\u5DF2\u7ECF\u5B58\u5728\uFF0C\u5DF2\u81EA\u52A8\u751F\u6210\u968F\u673Aid"));
+        utils.warn("id".concat(uuid, "\u5DF2\u7ECF\u5B58\u5728\uFF0C\u5DF2\u81EA\u52A8\u751F\u6210\u968F\u673Aid"));
         uuid = uuidv4();
       }
       var source = new BaseSource({
         id: uuid,
         source: geoJson,
-        graphicLayerCollection: this
+        mapContext: this._mapContext
       });
       this.graphicSources.set(source.id, source);
       return source;
@@ -58,16 +66,18 @@ var GraphicLayerCollection = /*#__PURE__*/function () {
   }, {
     key: "addCustomSource",
     value: function addCustomSource(id, positions) {
-      this._canOperate();
+      if (!this._canOperate()) {
+        return;
+      }
       var uuid = id;
       if (this.graphicSources.get(uuid)) {
-        console.warn("id".concat(uuid, "\u5DF2\u7ECF\u5B58\u5728\uFF0C\u5DF2\u81EA\u52A8\u751F\u6210\u968F\u673Aid"));
+        utils.warn("id".concat(uuid, "\u5DF2\u7ECF\u5B58\u5728\uFF0C\u5DF2\u81EA\u52A8\u751F\u6210\u968F\u673Aid"));
         uuid = uuidv4();
       }
       var source = new BaseSource({
         id: uuid,
         customSource: positions,
-        graphicLayerCollection: this
+        mapContext: this._mapContext
       });
       this.graphicSources.set(source.id, source);
       return source;
@@ -77,7 +87,9 @@ var GraphicLayerCollection = /*#__PURE__*/function () {
   }, {
     key: "addLayer",
     value: function addLayer(data, options) {
-      this._canOperate();
+      if (!this._canOperate()) {
+        return;
+      }
       var _ref = options || {},
         id = _ref.id;
       var uuid = id ? String(id) : uuidv4();
@@ -99,7 +111,7 @@ var GraphicLayerCollection = /*#__PURE__*/function () {
         id: uuid,
         source: source,
         options: options,
-        graphicLayerCollection: this
+        mapContext: this._mapContext
       });
       // 添加到地图上
       this._addLayerToMap(layer, options);
@@ -110,7 +122,9 @@ var GraphicLayerCollection = /*#__PURE__*/function () {
   }, {
     key: "addCustomSourceToLayer",
     value: function addCustomSourceToLayer(positions, options) {
-      this._canOperate();
+      if (!this._canOperate()) {
+        return;
+      }
       var uuid = uuidv4();
       var source = this.addCustomSource(uuid, positions);
       // 生成graphicLayer
@@ -118,7 +132,7 @@ var GraphicLayerCollection = /*#__PURE__*/function () {
         id: uuid,
         source: source,
         options: options,
-        graphicLayerCollection: this
+        mapContext: this._mapContext
       });
       // 添加到地图上
       this._addLayerToMap(layer, options);
@@ -133,14 +147,14 @@ var GraphicLayerCollection = /*#__PURE__*/function () {
       if (layer.isEntity) {
         layer.layers.forEach(function (t) {
           if (t.entity) {
-            _this._map.entities.add(t.entity);
+            _this.getMap().entities.add(t.entity);
           }
         });
       } else {
         if (['pointP', 'billboardP', 'labelP'].includes(options.type)) {
-          this._map.scene.primitives.add(layer.primitiveCollection);
+          this.getMap().scene.primitives.add(layer.primitiveCollection);
         } else {
-          this._map.scene.primitives.add(layer.primitiveCollection.primitive);
+          this.getMap().scene.primitives.add(layer.primitiveCollection.primitive);
         }
       }
       this.graphicLayers.set(layer.id, layer);
@@ -150,7 +164,9 @@ var GraphicLayerCollection = /*#__PURE__*/function () {
   }, {
     key: "_removeGraphicMapLayer",
     value: function _removeGraphicMapLayer(layerId) {
-      this._canOperate();
+      if (!this._canOperate()) {
+        return;
+      }
       this.graphicLayers.delete(layerId);
     }
 
@@ -158,7 +174,9 @@ var GraphicLayerCollection = /*#__PURE__*/function () {
   }, {
     key: "_removeGraphicMapSource",
     value: function _removeGraphicMapSource(sourceId) {
-      this._canOperate();
+      if (!this._canOperate()) {
+        return;
+      }
       this.graphicSources.delete(sourceId);
       var graphicValues = this.graphicLayers.values();
       var _iterator = _createForOfIteratorHelper(graphicValues),
@@ -181,7 +199,9 @@ var GraphicLayerCollection = /*#__PURE__*/function () {
   }, {
     key: "_clearGraphicMapLayer",
     value: function _clearGraphicMapLayer() {
-      this._canOperate();
+      if (!this._canOperate()) {
+        return;
+      }
       this.graphicLayers.clear();
     }
 
@@ -189,7 +209,9 @@ var GraphicLayerCollection = /*#__PURE__*/function () {
   }, {
     key: "_clearGraphicMapSource",
     value: function _clearGraphicMapSource() {
-      this._canOperate();
+      if (!this._canOperate()) {
+        return;
+      }
       this.graphicSources.clear();
     }
 
@@ -197,7 +219,9 @@ var GraphicLayerCollection = /*#__PURE__*/function () {
   }, {
     key: "getLayer",
     value: function getLayer(id) {
-      this._canOperate();
+      if (!this._canOperate()) {
+        return;
+      }
       return utils.isString(id) ? this.graphicLayers.get(id) : id;
     }
 
@@ -205,7 +229,9 @@ var GraphicLayerCollection = /*#__PURE__*/function () {
   }, {
     key: "getSource",
     value: function getSource(id) {
-      this._canOperate();
+      if (!this._canOperate()) {
+        return;
+      }
       return utils.isString(id) ? this.graphicSources.get(id) : id;
     }
 
@@ -213,8 +239,13 @@ var GraphicLayerCollection = /*#__PURE__*/function () {
   }, {
     key: "showLayer",
     value: function showLayer(layer, isShow) {
-      this._canOperate();
+      if (!this._canOperate()) {
+        return;
+      }
       var graphicLayer = this.getLayer(layer);
+      if (!graphicLayer) {
+        utils.warn('未找到对应图层');
+      }
       graphicLayer.show(isShow);
     }
 
@@ -222,8 +253,13 @@ var GraphicLayerCollection = /*#__PURE__*/function () {
   }, {
     key: "removeLayer",
     value: function removeLayer(layer) {
-      this._canOperate();
+      if (!this._canOperate()) {
+        return;
+      }
       var graphicLayer = this.getLayer(layer);
+      if (!graphicLayer) {
+        utils.warn('未找到对应图层');
+      }
       graphicLayer.remove();
     }
 
@@ -231,8 +267,13 @@ var GraphicLayerCollection = /*#__PURE__*/function () {
   }, {
     key: "removeSource",
     value: function removeSource(source) {
-      this._canOperate();
+      if (!this._canOperate()) {
+        return;
+      }
       var graphicSource = this.getSource(source);
+      if (!graphicSource) {
+        utils.warn('未找到对应的数据源');
+      }
       graphicSource.remove();
     }
 
@@ -240,9 +281,11 @@ var GraphicLayerCollection = /*#__PURE__*/function () {
   }, {
     key: "clearLayer",
     value: function clearLayer() {
-      this._canOperate();
-      this._map.entities.removeAll();
-      this._map.scene.primitives.removeAll();
+      if (!this._canOperate()) {
+        return;
+      }
+      this.getMap().entities.removeAll();
+      this.getMap().scene.primitives.removeAll();
       var graphicLayers = this.graphicLayers.values();
       var _iterator2 = _createForOfIteratorHelper(graphicLayers),
         _step2;
@@ -257,13 +300,16 @@ var GraphicLayerCollection = /*#__PURE__*/function () {
         _iterator2.f();
       }
       this._clearGraphicMapLayer();
+      this._clearGraphicMapSource();
     }
 
     // 清除所有数据
   }, {
     key: "clearSource",
     value: function clearSource() {
-      this._canOperate();
+      if (!this._canOperate()) {
+        return;
+      }
       var graphicSources = this.graphicSources.values();
       var _iterator3 = _createForOfIteratorHelper(graphicSources),
         _step3;
@@ -284,8 +330,13 @@ var GraphicLayerCollection = /*#__PURE__*/function () {
   }, {
     key: "setLayerStyle",
     value: function setLayerStyle(layer, style) {
-      this._canOperate();
+      if (!this._canOperate()) {
+        return;
+      }
       var graphicLayer = this.getLayer(layer);
+      if (!graphicLayer) {
+        utils.warn('未找到对应图层');
+      }
       graphicLayer.setStyle(style);
     }
 
@@ -293,7 +344,9 @@ var GraphicLayerCollection = /*#__PURE__*/function () {
   }, {
     key: "setLayerData",
     value: function setLayerData(layer, data) {
-      this._canOperate();
+      if (!this._canOperate()) {
+        return;
+      }
       var source = null;
       var sourceType = BaseSource.analysisSourceType(data);
       if (sourceType === 'sourceInstance') {
@@ -326,7 +379,11 @@ var GraphicLayerCollection = /*#__PURE__*/function () {
         graphicLayers.push(this.getLayer(layer));
       }
       graphicLayers.forEach(function (t) {
-        t.setData(source);
+        if (t) {
+          t.setData(source);
+        } else {
+          utils.warn("\u56FE\u5C42".concat(t.id, "\u4E0D\u5B58\u5728"));
+        }
       });
     }
 
@@ -334,8 +391,14 @@ var GraphicLayerCollection = /*#__PURE__*/function () {
   }, {
     key: "setSourceData",
     value: function setSourceData(source, data) {
-      this._canOperate();
+      if (!this._canOperate()) {
+        return;
+      }
       var graphicSource = this.getSource(source);
+      if (!graphicSource) {
+        utils.warn('未找到对应的数据源');
+        return;
+      }
       graphicSource.setData(data);
     }
 
@@ -343,8 +406,14 @@ var GraphicLayerCollection = /*#__PURE__*/function () {
   }, {
     key: "flyToLayer",
     value: function flyToLayer(layer, options) {
-      this._canOperate();
+      if (!this._canOperate()) {
+        return;
+      }
       var graphicLayer = this.getLayer(layer);
+      if (!graphicLayer) {
+        utils.warn('未找到对应图层');
+        return;
+      }
       graphicLayer.flyTo(options);
     }
 
@@ -353,8 +422,10 @@ var GraphicLayerCollection = /*#__PURE__*/function () {
     key: "flyToLayers",
     value: function flyToLayers(layers, options) {
       var _this2 = this;
-      this._canOperate();
-      if (isArray(layers)) {
+      if (!this._canOperate()) {
+        return;
+      }
+      if (utils.isArray(layers)) {
         var graphicLayers = layers.map(function (layer) {
           return _this2.getLayer(layer);
         });
@@ -363,7 +434,7 @@ var GraphicLayerCollection = /*#__PURE__*/function () {
             return p.source.positions;
           });
         }));
-        cameraFlyToPositions(this._map.camera, positions, options);
+        utils.cameraFlyToPositions(this.getMap().camera, positions, options);
       }
     }
 
@@ -371,8 +442,13 @@ var GraphicLayerCollection = /*#__PURE__*/function () {
   }, {
     key: "destroy",
     value: function destroy() {
-      this.isDestroy = true;
+      if (!this._canOperate()) {
+        return;
+      }
       this.clearLayer();
+      this.graphicLayers = new Map();
+      this.graphicSources = new Map();
+      this.isDestroyed = true;
     }
   }]);
   return GraphicLayerCollection;

package/dist/esm/graphicLayer/HtmlEntity.js

@@ -1,4 +1,4 @@
-var _excluded = ["style", "source", "postDomBack", "map"];
+var _excluded = ["style", "postDomBack", "map"];
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -20,6 +20,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { cloneDeep, isNil, merge } from 'lodash';
 import { DEFAULT_HTML_OPTIONS, HTML_CONTAINER_ID } from "../constant";
 import { ClampToGround } from "../tool/common";
+import * as utils from "../tool/utils";
 import { isString } from "../tool/utils";
 import BaseEntity from "./BaseEntity";
 var horizontalOriginObj = {
@@ -47,7 +48,6 @@ var HtmlEntity = /*#__PURE__*/function (_BaseEntity) {
     var _this;
     _classCallCheck(this, HtmlEntity);
     _this = _super.call(this, options);
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     _defineProperty(_assertThisInitialized(_this), "isDestroyed", false);
     _defineProperty(_assertThisInitialized(_this), "isInit", false);
     _defineProperty(_assertThisInitialized(_this), "container", void 0);
@@ -56,7 +56,6 @@ var HtmlEntity = /*#__PURE__*/function (_BaseEntity) {
     _defineProperty(_assertThisInitialized(_this), "postDomBack", void 0);
     _defineProperty(_assertThisInitialized(_this), "_clampToGround", void 0);
     var style = options.style,
-      source = options.source,
       postDomBack = options.postDomBack,
       map = options.map,
       currOptions = _objectWithoutProperties(options, _excluded);
@@ -102,15 +101,19 @@ var HtmlEntity = /*#__PURE__*/function (_BaseEntity) {
     key: "_canOperate",
     value: function _canOperate() {
       if (this.isDestroyed) {
-        throw new Error('BaseLayer实例已销毁');
+        utils.error('Html实例已销毁');
+        return false;
       }
+      return true;
     }
 
     // 更新位置
   }, {
     key: "reSetPosition",
     value: function reSetPosition(position, cameraHeight) {
-      this._canOperate();
+      if (!this._canOperate()) {
+        return;
+      }
       if (!this.isInit) return;
       this.container.style.transform = "translate3d(".concat(position.x - (this.horizontalOrigin ? this.container.clientWidth / this.horizontalOrigin : 0), "px, ").concat(position.y - (this.verticalOrigin ? this.container.clientHeight / this.verticalOrigin : 0), "px, 0) ").concat(this.style.scaleOfDistance ? "scale(".concat(Math.min(1, this.style.scaleOfDistance / cameraHeight), ")") : '');
     }
@@ -119,7 +122,9 @@ var HtmlEntity = /*#__PURE__*/function (_BaseEntity) {
   }, {
     key: "show",
     value: function show(isShow) {
-      this._canOperate();
+      if (!this._canOperate()) {
+        return;
+      }
       if (isShow) {
         this.container.style.display = 'block';
       } else {
@@ -131,7 +136,9 @@ var HtmlEntity = /*#__PURE__*/function (_BaseEntity) {
   }, {
     key: "remove",
     value: function remove() {
-      this._canOperate();
+      if (!this._canOperate()) {
+        return;
+      }
       this.isDestroyed = true;
       this.container.remove();
     }
@@ -140,7 +147,9 @@ var HtmlEntity = /*#__PURE__*/function (_BaseEntity) {
   }, {
     key: "updateStyle",
     value: function updateStyle(style) {
-      this._canOperate();
+      if (!this._canOperate()) {
+        return;
+      }
       var mergeStyle = merge(DEFAULT_HTML_OPTIONS(), cloneDeep(style || {}));
       this._setStyle(mergeStyle);
     }
@@ -163,7 +172,9 @@ var HtmlEntity = /*#__PURE__*/function (_BaseEntity) {
     key: "updateData",
     value: function updateData(data) {
       var _this2 = this;
-      this._canOperate();
+      if (!this._canOperate()) {
+        return;
+      }
       this.source = data;
       if (this.style.clampToGround) {
         this._clampToGround.getHeightByTypeToCartesian3([this.source.positions], this.style.clampToGround).then(function (res) {

package/dist/esm/graphicLayer/LabelEntity.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["style", "source", "entity"],
+var _excluded = ["style", "entity"],
   _excluded2 = ["backgroundColor", "fillColor", "outlineColor", "backgroundPadding", "pixelOffset", "eyeOffset"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -33,9 +33,7 @@ var LabelEntity = /*#__PURE__*/function (_BaseEntity) {
     var _this;
     _classCallCheck(this, LabelEntity);
     _this = _super.call(this, options);
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     var style = options.style,
-      source = options.source,
       entity = options.entity,
       currOptions = _objectWithoutProperties(options, _excluded);
     if (entity) {
@@ -58,11 +56,10 @@ var LabelEntity = /*#__PURE__*/function (_BaseEntity) {
     function _init(options) {
       var style = options.style;
       var positions = PositionProperty.changeToPropertyData.call(this);
-      this.graphic = new Cesium.LabelGraphics(style);
       this.entity = new Cesium.Entity({
         position: positions,
         id: this.id,
-        label: this.graphic
+        label: new Cesium.LabelGraphics(style)
       });
     }
 

package/dist/esm/graphicLayer/LabelPrimitive.d.ts

@@ -2,6 +2,8 @@ import BasePointPrimitive from './BasePointPrimitive';
 export default class LabelPrimitive extends BasePointPrimitive {
     constructor(options: any);
     static handleOptions(style: any): any;
+    getPrimitive(): any;
     private _init;
     updateData(data: any): void;
+    updateStyle(originStyle: any, style: any): void;
 }

package/dist/esm/graphicLayer/LabelPrimitive.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["style", "source", "entity"],
+var _excluded = ["style"],
   _excluded2 = ["backgroundColor", "fillColor", "outlineColor", "backgroundPadding", "pixelOffset", "eyeOffset"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -31,10 +31,7 @@ var LabelPrimitive = /*#__PURE__*/function (_BasePointPrimitive) {
     var _this;
     _classCallCheck(this, LabelPrimitive);
     _this = _super.call(this, options);
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     var style = options.style,
-      source = options.source,
-      entity = options.entity,
       currOptions = _objectWithoutProperties(options, _excluded);
     var mergeStyle = merge(DEFAULT_LABEL_PRIMITIVE_OPTIONS(), cloneDeep(style || {}));
     var currStyle = LabelPrimitive.handleOptions(mergeStyle);
@@ -46,14 +43,26 @@ var LabelPrimitive = /*#__PURE__*/function (_BasePointPrimitive) {
 
   // 处理点的参数
   _createClass(LabelPrimitive, [{
-    key: "_init",
+    key: "getPrimitive",
     value:
+    // 获取primitive
+    function getPrimitive() {
+      var _primitiveCollection$,
+        _this2 = this;
+      var primitiveCollection = this.getPrimitiveCollection();
+      return primitiveCollection === null || primitiveCollection === void 0 || (_primitiveCollection$ = primitiveCollection._labels) === null || _primitiveCollection$ === void 0 ? void 0 : _primitiveCollection$.find(function (t) {
+        return t.id === _this2.id;
+      });
+    }
+
     // 初始化
-    function _init(options) {
+  }, {
+    key: "_init",
+    value: function _init(options) {
       var style = options.style,
         positions = options.positions,
         primitiveCollection = options.primitiveCollection;
-      this.primitive = primitiveCollection.add(_objectSpread({
+      primitiveCollection.add(_objectSpread({
         id: this.id,
         position: positions
       }, style));
@@ -65,7 +74,21 @@ var LabelPrimitive = /*#__PURE__*/function (_BasePointPrimitive) {
     value: function updateData(data) {
       var positions = data.positions;
       this.source = data;
-      this.primitive.position = positions;
+      var primitive = this.getPrimitive();
+      if (!primitive) return;
+      primitive.position = positions;
+    }
+
+    // 更新样式
+  }, {
+    key: "updateStyle",
+    value: function updateStyle(originStyle, style) {
+      this.style = merge(this.style, originStyle);
+      var primitive = this.getPrimitive();
+      if (!primitive) return;
+      for (var key in style) {
+        primitive[key] = style[key];
+      }
     }
   }], [{
     key: "handleOptions",

package/dist/esm/graphicLayer/ModelEntity.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["style", "source", "entity"],
+var _excluded = ["style", "entity"],
   _excluded2 = ["orientation"],
   _excluded3 = ["silhouetteColor", "color", "imageBasedLightingFactor", "lightColor", "orientation"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -34,9 +34,7 @@ var ModelEntity = /*#__PURE__*/function (_BaseEntity) {
     var _this;
     _classCallCheck(this, ModelEntity);
     _this = _super.call(this, options);
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     var style = options.style,
-      source = options.source,
       entity = options.entity,
       currOptions = _objectWithoutProperties(options, _excluded);
     if (entity) {
@@ -62,11 +60,10 @@ var ModelEntity = /*#__PURE__*/function (_BaseEntity) {
         style = _objectWithoutProperties(_options$style, _excluded2);
       var positions = PositionProperty.changeToPropertyData.call(this);
       var newOrientation = PositionProperty.changeToPropertyOrientation.call(this, orientation);
-      this.graphic = new Cesium.ModelGraphics(style);
       this.entity = new Cesium.Entity({
         position: positions,
         id: this.id,
-        model: this.graphic,
+        model: new Cesium.ModelGraphics(style),
         orientation: newOrientation
       });
     }

package/dist/esm/graphicLayer/ModelPrimitive.d.ts

@@ -1,5 +1,5 @@
 import BasePrimitive from './BasePrimitive';
 export default class ModelPrimitive extends BasePrimitive {
     constructor(map: any);
-    createPrimitive(options?: any): void;
+    createPrimitive(options: any, primitiveInstance: any[]): void;
 }

package/dist/esm/graphicLayer/ModelPrimitive.js

@@ -27,9 +27,10 @@ var ModelPrimitive = /*#__PURE__*/function (_BasePrimitive) {
     value: function createPrimitive() {
       var _this = this;
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      var primitiveInstance = arguments.length > 1 ? arguments[1] : undefined;
       var style = merge(DEFAULT_MODEL_PRIMITIVE_OPTIONS(), cloneDeep(options.style || {}));
       this.primitive = new Cesium.PrimitiveCollection();
-      Promise.allSettled(this.primitiveInstance).then(function (models) {
+      Promise.allSettled(primitiveInstance).then(function (models) {
         models.forEach(function (model) {
           if (model.status === 'fulfilled') {
             _this.primitive.add(model.value);