deeptwins-engine-3d 0.1.66 → 0.1.67

package/dist/esm/constant.d.ts

@@ -255,6 +255,15 @@ export declare const DEFAULT_RAIN: () => {
     direction: number;
     size: number;
     speed: number;
+    density: number;
+    opacity: number;
+    gloominess: number;
+    color: string;
+    lightningEnabled: boolean;
+    lightningFrequency: number;
+    lightningIntensity: number;
+    lightningTint: string;
+    lightningDuration: number;
 };
 export declare const DEFAULT_FOG: () => {
     startDistance: number;

package/dist/esm/constant.js

@@ -723,7 +723,16 @@ export var DEFAULT_RAIN = function DEFAULT_RAIN() {
   return {
     direction: -30,
     size: 10,
-    speed: 10
+    speed: 10,
+    density: 40,
+    opacity: 0.5,
+    gloominess: 0.5,
+    color: '#a8c6df',
+    lightningEnabled: false,
+    lightningFrequency: 20,
+    lightningIntensity: 0.35,
+    lightningTint: '#dfe8ff',
+    lightningDuration: 0.18
   };
 };
 

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

@@ -1,5 +1,8 @@
 export default class BaseLayer {
     private readonly _mapContext;
+    private _layerVisible;
+    private _layerStyle;
+    private _styleOverridesByIndex;
     id: any;
     type: any;
     options: any;
@@ -13,9 +16,29 @@ export default class BaseLayer {
     private readonly _renderClass;
     constructor({ id, source, options, entity, mapContext }: any);
     getMap(): any;
+    private _isCollectionPrimitiveType;
+    private _isBatchPrimitiveType;
+    private _getLayerVisibleState;
+    private _setEntityVisible;
+    private _resolveSource;
+    private _getCurrentSource;
+    private _mergeLayerStyle;
+    private _getStyleTemplate;
+    private _getOriginStyle;
+    private _trimStyleOverridesByLength;
+    private _shiftStyleOverridesAfterRemove;
+    private _setStyleOverrideByIndex;
+    private _canHotUpdateBatchPrimitiveStyle;
     private _createPrimitiveCollection;
+    private _initializePrimitiveLayers;
+    private _mountPrimitiveCollection;
+    private _disposePrimitiveCollection;
     private _createEntity;
     private _createPrimitive;
+    private _syncIncrementalData;
+    private _setEntityData;
+    private _setCollectionPrimitiveData;
+    private _rebuildBatchPrimitiveData;
     private _canOperate;
     show(isShow: boolean): void;
     private _getOne;

package/dist/esm/graphicLayer/BaseLayer.js

@@ -1,4 +1,11 @@
 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 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; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -8,7 +15,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import * as Cesium from 'deeptwins-cesium';
-import { cloneDeep, flattenDeep, isFunction, isString } from 'lodash';
+import { cloneDeep, flattenDeep, isFunction, isString, merge } from 'lodash';
 import { v4 as uuidv4 } from 'uuid';
 import * as constant from "../constant";
 import BaseSource from "../graphicLayer/BaseSource";
@@ -23,9 +30,12 @@ import PolylineGroundPrimitive from "./PolylineGroundPrimitive";
 import PolylinePrimitive from "./PolylinePrimitive";
 import PolylineVolumePrimitive from "./PolylineVolumePrimitive";
 import WallPrimitive from "./WallPrimitive";
+var COLLECTION_PRIMITIVE_TYPES = new Set(['pointP', 'billboardP', 'labelP']);
 var BaseLayer = /*#__PURE__*/function () {
   function BaseLayer(_ref) {
-    var _this = this;
+    var _this$_layerStyle$sho,
+      _this$_layerStyle,
+      _this = this;
     var id = _ref.id,
       source = _ref.source,
       options = _ref.options,
@@ -33,6 +43,11 @@ var BaseLayer = /*#__PURE__*/function () {
       mapContext = _ref.mapContext;
     _classCallCheck(this, BaseLayer);
     _defineProperty(this, "_mapContext", void 0);
+    _defineProperty(this, "_layerVisible", true);
+    _defineProperty(this, "_layerStyle", void 0);
+    // batch primitive 没有稳定的实例级更新能力，这里按 source 顺序保存局部样式覆盖，
+    // 后续 setData / removeOne 重建时再按索引重新应用。
+    _defineProperty(this, "_styleOverridesByIndex", new Map());
     _defineProperty(this, "id", void 0);
     _defineProperty(this, "type", void 0);
     _defineProperty(this, "options", void 0);
@@ -54,7 +69,11 @@ var BaseLayer = /*#__PURE__*/function () {
     this._mapContext = mapContext;
     this.id = id;
     this.type = options.type;
-    this.options = options;
+    this.options = _objectSpread(_objectSpread({}, options), {}, {
+      style: cloneDeep(options.style || {})
+    });
+    this._layerStyle = cloneDeep(this.options.style || {});
+    this._layerVisible = (_this$_layerStyle$sho = (_this$_layerStyle = this._layerStyle) === null || _this$_layerStyle === void 0 ? void 0 : _this$_layerStyle.show) !== null && _this$_layerStyle$sho !== void 0 ? _this$_layerStyle$sho : true;
     this.sourceId = source === null || source === void 0 ? void 0 : source.id;
     this._renderClass = constant.GRAPHIC_LAYER_TYPE_TO_CLASS[options.type];
     if (entity) {
@@ -68,17 +87,7 @@ var BaseLayer = /*#__PURE__*/function () {
     } else if (options.type.endsWith('P')) {
       // Primitive类型
       this.isPrimitive = true;
-      // 创建集合
-      this._createPrimitiveCollection(options.type);
-      // 实例的集合
-      var primitiveInstance = [];
-      source.source.forEach(function (t) {
-        _this._createPrimitive(t, options, primitiveInstance);
-      });
-      if (!['pointP', 'billboardP', 'labelP'].includes(options.type)) {
-        // 集合创建Primitive
-        this.primitiveCollection.createPrimitive(options, primitiveInstance);
-      }
+      this._initializePrimitiveLayers(source, options);
     } else {
       // entity类型
       this.isEntity = true;
@@ -93,6 +102,187 @@ var BaseLayer = /*#__PURE__*/function () {
       return this._mapContext && this._mapContext.getMap();
     }
 
+    // 是否是集合的Primitive类型
+  }, {
+    key: "_isCollectionPrimitiveType",
+    value: function _isCollectionPrimitiveType() {
+      var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.type;
+      return COLLECTION_PRIMITIVE_TYPES.has(type);
+    }
+
+    // point/billboard/label 以 collection 形式直接管理 primitive，
+    // 其他 *P 类型本质上都是“一次收集 GeometryInstance -> 一次创建 Primitive”。
+  }, {
+    key: "_isBatchPrimitiveType",
+    value: function _isBatchPrimitiveType() {
+      var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.type;
+      return !!type && type.endsWith('P') && !this._isCollectionPrimitiveType(type);
+    }
+
+    // 获取图层显示隐藏状态
+  }, {
+    key: "_getLayerVisibleState",
+    value: function _getLayerVisibleState() {
+      var _this$options$style$s, _this$options, _this$layers$0$entity, _this$layers$2;
+      var defaultShow = (_this$options$style$s = (_this$options = this.options) === null || _this$options === void 0 || (_this$options = _this$options.style) === null || _this$options === void 0 ? void 0 : _this$options.show) !== null && _this$options$style$s !== void 0 ? _this$options$style$s : true;
+      if (this.isPrimitive) {
+        var _this$primitiveCollec, _this$primitiveCollec2;
+        return (_this$primitiveCollec = (_this$primitiveCollec2 = this.primitiveCollection) === null || _this$primitiveCollec2 === void 0 ? void 0 : _this$primitiveCollec2.show) !== null && _this$primitiveCollec !== void 0 ? _this$primitiveCollec : defaultShow;
+      }
+      if (!this.layers.length) {
+        return defaultShow;
+      }
+      if (this.type === 'html') {
+        var _this$layers$;
+        return ((_this$layers$ = this.layers[0]) === null || _this$layers$ === void 0 || (_this$layers$ = _this$layers$.container) === null || _this$layers$ === void 0 || (_this$layers$ = _this$layers$.style) === null || _this$layers$ === void 0 ? void 0 : _this$layers$.display) !== 'none';
+      }
+      return (_this$layers$0$entity = (_this$layers$2 = this.layers[0]) === null || _this$layers$2 === void 0 || (_this$layers$2 = _this$layers$2.entity) === null || _this$layers$2 === void 0 ? void 0 : _this$layers$2.show) !== null && _this$layers$0$entity !== void 0 ? _this$layers$0$entity : defaultShow;
+    }
+
+    // 设置图层显示隐藏
+  }, {
+    key: "_setEntityVisible",
+    value: function _setEntityVisible(layer, isShow) {
+      if (this.type === 'html') {
+        layer.show(isShow);
+      } else if (layer.entity) {
+        layer.entity.show = isShow;
+      }
+    }
+
+    // 解析数据源
+  }, {
+    key: "_resolveSource",
+    value: function _resolveSource(data) {
+      var source = null;
+      var sourceType = BaseSource.analysisSourceType(data);
+      if (sourceType === 'sourceInstance') {
+        source = data;
+      } else if (sourceType === 'sourceId') {
+        source = this.getMap().graphicLayerCollection.graphicSources.get(data);
+      } else {
+        source = this.getMap().graphicLayerCollection.addSource(uuidv4(), data);
+      }
+      if (!source) {
+        utils.warn('未找到对应的数据源');
+        return null;
+      }
+      return source;
+    }
+
+    // 获取当前数据源
+  }, {
+    key: "_getCurrentSource",
+    value: function _getCurrentSource() {
+      return {
+        id: this.sourceId,
+        source: this.layers.map(function (t) {
+          return t.source;
+        })
+      };
+    }
+
+    // 合并图层样式
+  }, {
+    key: "_mergeLayerStyle",
+    value: function _mergeLayerStyle(style) {
+      this._layerStyle = merge(cloneDeep(this._layerStyle || {}), cloneDeep(style || {}));
+      this.options.style = cloneDeep(this._layerStyle);
+    }
+
+    // 获取样式模板
+  }, {
+    key: "_getStyleTemplate",
+    value: function _getStyleTemplate(layerIndex) {
+      var styleTemplate = cloneDeep(this._layerStyle || {});
+      if (this._isBatchPrimitiveType() && layerIndex !== undefined) {
+        var overrideStyle = this._styleOverridesByIndex.get(layerIndex);
+        if (overrideStyle) {
+          merge(styleTemplate, cloneDeep(overrideStyle));
+        }
+      }
+      return styleTemplate;
+    }
+
+    // 获取原始样式
+  }, {
+    key: "_getOriginStyle",
+    value: function _getOriginStyle(data, layerIndex) {
+      return utils.styleFun(this._getStyleTemplate(layerIndex), data.properties || {});
+    }
+
+    // 裁剪局部样式
+  }, {
+    key: "_trimStyleOverridesByLength",
+    value: function _trimStyleOverridesByLength(length) {
+      if (!this._styleOverridesByIndex.size) {
+        return;
+      }
+      var nextOverrides = new Map();
+      var _iterator = _createForOfIteratorHelper(this._styleOverridesByIndex.entries()),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var _step$value = _slicedToArray(_step.value, 2),
+            _index = _step$value[0],
+            style = _step$value[1];
+          if (_index < length) {
+            nextOverrides.set(_index, style);
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      this._styleOverridesByIndex = nextOverrides;
+    }
+
+    // 删除后调整局部样式索引
+  }, {
+    key: "_shiftStyleOverridesAfterRemove",
+    value: function _shiftStyleOverridesAfterRemove(removeIndex) {
+      if (!this._styleOverridesByIndex.size || removeIndex < 0) {
+        return;
+      }
+      var nextOverrides = new Map();
+      var _iterator2 = _createForOfIteratorHelper(this._styleOverridesByIndex.entries()),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var _step2$value = _slicedToArray(_step2.value, 2),
+            _index2 = _step2$value[0],
+            style = _step2$value[1];
+          if (_index2 < removeIndex) {
+            nextOverrides.set(_index2, style);
+          } else if (_index2 > removeIndex) {
+            nextOverrides.set(_index2 - 1, style);
+          }
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+      this._styleOverridesByIndex = nextOverrides;
+    }
+
+    // 设置局部样式
+  }, {
+    key: "_setStyleOverrideByIndex",
+    value: function _setStyleOverrideByIndex(layerIndex, style) {
+      var currentStyle = this._styleOverridesByIndex.get(layerIndex) || {};
+      this._styleOverridesByIndex.set(layerIndex, merge(cloneDeep(currentStyle), cloneDeep(style || {})));
+    }
+
+    // 批量Primitive样式是否支持热更新
+  }, {
+    key: "_canHotUpdateBatchPrimitiveStyle",
+    value: function _canHotUpdateBatchPrimitiveStyle(style) {
+      var keys = Object.keys(style || {});
+      return keys.length === 1 && keys[0] === 'show' && !isFunction(style.show);
+    }
+
     // 根据类型创建不同的集合
   }, {
     key: "_createPrimitiveCollection",
@@ -156,17 +346,66 @@ var BaseLayer = /*#__PURE__*/function () {
       };
       (_createType$type = createType[type]) === null || _createType$type === void 0 || _createType$type.call(createType);
     }
+  }, {
+    key: "_initializePrimitiveLayers",
+    value: function _initializePrimitiveLayers(source) {
+      var _this3 = this;
+      var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.options;
+      this._createPrimitiveCollection(options.type);
+      var primitiveInstance = [];
+      source.source.forEach(function (t, index) {
+        _this3._createPrimitive(t, options, primitiveInstance, index);
+      });
+      if (this._isBatchPrimitiveType(options.type)) {
+        this.primitiveCollection.createPrimitive(_objectSpread(_objectSpread({}, options), {}, {
+          style: cloneDeep(this._layerStyle || {})
+        }), primitiveInstance);
+      }
+    }
+  }, {
+    key: "_mountPrimitiveCollection",
+    value: function _mountPrimitiveCollection() {
+      var _this$getMap;
+      if (!this.primitiveCollection) {
+        return;
+      }
+      var primitives = (_this$getMap = this.getMap()) === null || _this$getMap === void 0 || (_this$getMap = _this$getMap.scene) === null || _this$getMap === void 0 ? void 0 : _this$getMap.primitives;
+      if (!primitives) {
+        return;
+      }
+      if (this._isCollectionPrimitiveType()) {
+        primitives.add(this.primitiveCollection);
+      } else if (this.primitiveCollection.primitive) {
+        primitives.add(this.primitiveCollection.primitive);
+      }
+    }
+  }, {
+    key: "_disposePrimitiveCollection",
+    value: function _disposePrimitiveCollection() {
+      if (!this.primitiveCollection) {
+        return;
+      }
+      if (this._isCollectionPrimitiveType()) {
+        var _this$primitiveCollec3, _this$primitiveCollec4, _this$getMap2;
+        (_this$primitiveCollec3 = (_this$primitiveCollec4 = this.primitiveCollection).removeAll) === null || _this$primitiveCollec3 === void 0 || _this$primitiveCollec3.call(_this$primitiveCollec4);
+        (_this$getMap2 = this.getMap()) === null || _this$getMap2 === void 0 || (_this$getMap2 = _this$getMap2.scene) === null || _this$getMap2 === void 0 || (_this$getMap2 = _this$getMap2.primitives) === null || _this$getMap2 === void 0 || _this$getMap2.remove(this.primitiveCollection);
+      } else {
+        this.primitiveCollection.removeAll();
+      }
+      this.primitiveCollection = null;
+    }
 
     // 创建相应的entity
   }, {
     key: "_createEntity",
     value: function _createEntity(data, options) {
+      var originStyle = this._getOriginStyle(data);
       var layer = new this._renderClass(_objectSpread(_objectSpread(_objectSpread({
         map: this.getMap()
       }, data), options), {}, {
         html: isFunction(options.html) ? options.html(data.properties) : options.html,
         source: data,
-        style: utils.styleFun(cloneDeep(options.style || {}), data.properties)
+        style: originStyle
       }));
       this.layers.push(layer);
       return layer;
@@ -175,10 +414,11 @@ var BaseLayer = /*#__PURE__*/function () {
     // 创建相应的primitive
   }, {
     key: "_createPrimitive",
-    value: function _createPrimitive(data, options, primitiveInstance) {
+    value: function _createPrimitive(data, options, primitiveInstance, layerIndex) {
+      var originStyle = this._getOriginStyle(data, layerIndex);
       var layer = new this._renderClass(_objectSpread(_objectSpread(_objectSpread({}, data), options), {}, {
         source: data,
-        style: utils.styleFun(cloneDeep(options.style || {}), data.properties),
+        style: originStyle,
         primitiveInstance: primitiveInstance,
         primitiveCollection: this.primitiveCollection,
         layerId: this.id,
@@ -187,6 +427,62 @@ var BaseLayer = /*#__PURE__*/function () {
       this.layers.push(layer);
     }
 
+    // 同步增量数据
+  }, {
+    key: "_syncIncrementalData",
+    value: function _syncIncrementalData(source, createLayer) {
+      if (source.source.length < this.layers.length) {
+        var startIndex = this.layers.length - 1;
+        for (var i = startIndex; i >= source.source.length; i--) {
+          this.removeOne(this.layers[i]);
+        }
+      }
+      for (var _i = 0; _i < source.source.length; _i++) {
+        var sourceData = source.source[_i];
+        if (this.layers[_i]) {
+          this.layers[_i].updateData(sourceData);
+        } else {
+          createLayer(sourceData, _i);
+        }
+      }
+    }
+
+    // 设置entity数据
+  }, {
+    key: "_setEntityData",
+    value: function _setEntityData(source) {
+      var _this4 = this;
+      var isShow = this._layerVisible;
+      this._syncIncrementalData(source, function (sourceData) {
+        var layer = _this4._createEntity(sourceData, _this4.options);
+        layer.entity && _this4.getMap().entities.add(layer.entity);
+        _this4._setEntityVisible(layer, isShow);
+      });
+    }
+
+    // 设置集合的Primitive数据
+  }, {
+    key: "_setCollectionPrimitiveData",
+    value: function _setCollectionPrimitiveData(source) {
+      var _this5 = this;
+      this._syncIncrementalData(source, function (sourceData, index) {
+        _this5._createPrimitive(sourceData, _this5.options, [], index);
+      });
+    }
+
+    // batch primitive 不再依赖实例级 updateData/updateStyle，
+    // 数据和样式变化统一通过整层重建保持一致性。
+  }, {
+    key: "_rebuildBatchPrimitiveData",
+    value: function _rebuildBatchPrimitiveData(source) {
+      var isShow = this._layerVisible;
+      this._disposePrimitiveCollection();
+      this.layers = [];
+      this._initializePrimitiveLayers(source, this.options);
+      this._mountPrimitiveCollection();
+      this.show(isShow);
+    }
+
     // 是否能进行操作
   }, {
     key: "_canOperate",
@@ -205,6 +501,7 @@ var BaseLayer = /*#__PURE__*/function () {
       if (!this._canOperate()) {
         return;
       }
+      this._layerVisible = isShow;
       if (this.isEntity) {
         if (this.type === 'html') {
           this.layers.forEach(function (t) {
@@ -233,13 +530,23 @@ var BaseLayer = /*#__PURE__*/function () {
   }, {
     key: "setStyle",
     value: function setStyle(style) {
-      var _this3 = this;
+      var _this6 = this;
       if (!this._canOperate()) {
         return;
       }
+      this._mergeLayerStyle(style);
+      if (this._isBatchPrimitiveType()) {
+        if (this._canHotUpdateBatchPrimitiveStyle(style)) {
+          this.show(!!style.show);
+          return;
+        }
+        this._trimStyleOverridesByLength(this.layers.length);
+        this._rebuildBatchPrimitiveData(this._getCurrentSource());
+        return;
+      }
       this.layers.forEach(function (t) {
-        var originStyle = utils.styleFun(style, t.source.properties);
-        var handleStyle = _this3._renderClass.handleOptions(originStyle);
+        var originStyle = _this6._getOriginStyle(t.source);
+        var handleStyle = _this6._renderClass.handleOptions(originStyle);
         t.updateStyle(originStyle, handleStyle);
       });
     }
@@ -253,6 +560,18 @@ var BaseLayer = /*#__PURE__*/function () {
       }
       var currLayer = this._getOne(layer);
       if (currLayer) {
+        if (this._isBatchPrimitiveType()) {
+          // batch primitive 无法可靠地只改单个实例，这里记录局部样式后整层重建。
+          var layerIndex = this.layers.findIndex(function (t) {
+            return t.id === currLayer.id;
+          });
+          if (layerIndex === -1) {
+            return;
+          }
+          this._setStyleOverrideByIndex(layerIndex, style);
+          this._rebuildBatchPrimitiveData(this._getCurrentSource());
+          return;
+        }
         var originStyle = utils.styleFun(style, currLayer.source.properties);
         var handleStyle = this._renderClass.handleOptions(originStyle);
         currLayer.updateStyle(originStyle, handleStyle);
@@ -266,40 +585,22 @@ var BaseLayer = /*#__PURE__*/function () {
       if (!this._canOperate()) {
         return;
       }
-      // 获取数据源
-      var source = null;
-      var sourceType = BaseSource.analysisSourceType(data);
-      if (sourceType === 'sourceInstance') {
-        source = data;
-      } else if (sourceType === 'sourceId') {
-        source = this.getMap().graphicLayerCollection.graphicSources.get(data);
-      } else {
-        source = this.getMap().graphicLayerCollection.addSource(uuidv4(), data);
+      var source = this._resolveSource(data);
+      if (!source) {
+        return;
       }
       this.sourceId = source.id;
-      // 移除多余的
-      if (source.source.length < this.layers.length) {
-        var startIndex = this.layers.length - 1;
-        for (var i = startIndex; i >= source.source.length; i--) {
-          this.removeOne(this.layers[i]);
-        }
+      if (this.isEntity) {
+        this._setEntityData(source);
+        return;
       }
-      // 实例的集合
-      var primitiveInstance = [];
-      for (var _i = 0; _i < source.source.length; _i++) {
-        var sourceData = source.source[_i];
-        if (this.layers[_i]) {
-          // 更新数据
-          this.layers[_i].updateData(sourceData);
-        } else {
-          // 创建数据
-          if (this.isEntity) {
-            var layer = this._createEntity(sourceData, this.options);
-            layer.entity && this.getMap().entities.add(layer.entity);
-          } else {
-            this._createPrimitive(sourceData, this.options, primitiveInstance);
-          }
-        }
+      if (this._isCollectionPrimitiveType()) {
+        this._setCollectionPrimitiveData(source);
+        return;
+      }
+      if (this.isPrimitive) {
+        this._trimStyleOverridesByLength(source.source.length);
+        this._rebuildBatchPrimitiveData(source);
       }
     }
 
@@ -307,7 +608,7 @@ var BaseLayer = /*#__PURE__*/function () {
   }, {
     key: "remove",
     value: function remove() {
-      var _this4 = this;
+      var _this7 = this;
       if (!this._canOperate()) {
         return;
       }
@@ -319,12 +620,11 @@ var BaseLayer = /*#__PURE__*/function () {
           });
         } else {
           this.layers.forEach(function (t) {
-            _this4.getMap().entities.remove(t.entity);
+            _this7.getMap().entities.remove(t.entity);
           });
         }
       } else {
-        this.primitiveCollection.removeAll();
-        this.getMap().scene.primitives.remove(this.primitiveCollection);
+        this._disposePrimitiveCollection();
       }
       this.layers = [];
       // 移除相应的graphicLayers上的数据
@@ -349,20 +649,42 @@ var BaseLayer = /*#__PURE__*/function () {
         return;
       }
       var currLayer = this._getOne(layer);
-      if (currLayer) {
-        if (this.isEntity) {
-          if (this.type === 'html') {
-            currLayer.remove();
-          } else {
-            this.getMap().entities.remove(currLayer.entity);
-          }
+      if (!currLayer) {
+        return;
+      }
+      var layerIndex = this.layers.findIndex(function (t) {
+        return t.id === currLayer.id;
+      });
+      if (this.isEntity) {
+        if (this.type === 'html') {
+          currLayer.remove();
         } else {
-          this.primitiveCollection.remove(currLayer.primitive);
+          this.getMap().entities.remove(currLayer.entity);
         }
         this.layers = this.layers.filter(function (t) {
           return t.id !== currLayer.id;
         });
+        return;
       }
+      if (this._isCollectionPrimitiveType()) {
+        var _currLayer$getPrimiti;
+        var primitive = (_currLayer$getPrimiti = currLayer.getPrimitive) === null || _currLayer$getPrimiti === void 0 ? void 0 : _currLayer$getPrimiti.call(currLayer);
+        primitive && this.primitiveCollection.remove(primitive);
+        this.layers = this.layers.filter(function (t) {
+          return t.id !== currLayer.id;
+        });
+        return;
+      }
+      this._shiftStyleOverridesAfterRemove(layerIndex);
+      var nextSource = {
+        id: this.sourceId,
+        source: this.layers.filter(function (t) {
+          return t.id !== currLayer.id;
+        }).map(function (t) {
+          return t.source;
+        })
+      };
+      this._rebuildBatchPrimitiveData(nextSource);
     }
 
     // 飞行至矢量数据图层位置
@@ -393,9 +715,9 @@ var BaseLayer = /*#__PURE__*/function () {
     key: "_toDestroy",
     value: function _toDestroy() {
       this.isDestroyed = true;
+      this._styleOverridesByIndex.clear();
       this.layers = [];
-      this.primitiveCollection && this.primitiveCollection.removeAll();
-      this.primitiveCollection = null;
+      this._disposePrimitiveCollection();
     }
   }, {
     key: "destroy",

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

@@ -7,5 +7,4 @@ export default class BasePrimitiveInstance {
     readonly isPrimitive: boolean;
     constructor(options: any);
     getMap(): any;
-    updateStyle(): void;
 }