@antv/l7-layers 2.10.1 → 2.10.2

package/es/mask/index.js

@@ -1,4 +1,4 @@
-import _objectSpread from "@babel/runtime/helpers/objectSpread2";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
@@ -6,12 +6,7 @@ import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-
-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; }
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
@@ -19,8 +14,6 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 import BaseLayer from "../core/BaseLayer";
 import MaskModels from "./models";
-import { isVectorTile } from "../tile/utils";
-import { TYPES } from '@antv/l7-core';
 
 var MaskLayer = /*#__PURE__*/function (_BaseLayer) {
   _inherits(MaskLayer, _BaseLayer);
@@ -44,99 +37,36 @@ var MaskLayer = /*#__PURE__*/function (_BaseLayer) {
   }
 
   _createClass(MaskLayer, [{
-    key: "init",
-    value: function init() {
-      var _this2 = this;
-
-      // 设置配置项
-      var sceneId = this.container.get(TYPES.SceneID);
-      this.configService.setLayerConfig(sceneId, this.id, this.rawConfig);
-      this.layerType = this.rawConfig.layerType;
-      this.rendererService = this.container.get(TYPES.IRendererService);
-      this.layerService = this.container.get(TYPES.ILayerService);
-      this.mapService = this.container.get(TYPES.IMapService);
-      this.cameraService = this.container.get(TYPES.ICameraService);
-      this.coordinateService = this.container.get(TYPES.ICoordinateSystemService);
-      this.shaderModuleService = this.container.get(TYPES.IShaderModuleService);
-      this.postProcessingPassFactory = this.container.get(TYPES.IFactoryPostProcessingPass);
-      this.normalPassFactory = this.container.get(TYPES.IFactoryNormalPass); // 图层容器服务
-
-      this.styleAttributeService = this.container.get(TYPES.IStyleAttributeService); // 完成样式服务注册完成前添加的属性
-
-      this.pendingStyleAttributes.forEach(function (_ref) {
-        var attributeName = _ref.attributeName,
-            attributeField = _ref.attributeField,
-            attributeValues = _ref.attributeValues,
-            updateOptions = _ref.updateOptions;
-
-        _this2.styleAttributeService.updateStyleAttribute(attributeName, {
-          // @ts-ignore
-          scale: _objectSpread({
-            field: attributeField
-          }, _this2.splitValuesAndCallbackInAttribute( // @ts-ignore
-          attributeValues, // @ts-ignore
-          _this2.getLayerConfig()[attributeName]))
-        }, // @ts-ignore
-        updateOptions);
-      });
-      this.pendingStyleAttributes = []; // 获取插件集
-
-      this.plugins = this.container.getAll(TYPES.ILayerPlugin); // 完成插件注册，传入场景和图层容器内的服务
-
-      var _iterator = _createForOfIteratorHelper(this.plugins),
-          _step;
-
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var plugin = _step.value;
-          plugin.apply(this, {
-            rendererService: this.rendererService,
-            mapService: this.mapService,
-            styleAttributeService: this.styleAttributeService,
-            normalPassFactory: this.normalPassFactory,
-            postProcessingPassFactory: this.postProcessingPassFactory
-          });
-        } // 触发 init 生命周期插件
-
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
-      }
-
-      this.hooks.init.call();
-      this.hooks.afterInit.call();
-      return this;
-    }
-  }, {
     key: "buildModels",
-    value: function buildModels() {
-      var _this3 = this;
-
-      var shape = this.getModelType();
-      this.layerModel = new MaskModels[shape](this);
-      this.layerModel.initModels(function (models) {
-        _this3.dispatchModelLoad(models);
-      });
-    }
-  }, {
-    key: "rebuildModels",
-    value: function rebuildModels() {
-      var _this4 = this;
+    value: function () {
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        var shape;
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                shape = this.getModelType();
+                this.layerModel = new MaskModels[shape](this);
+                _context.next = 4;
+                return this.initLayerModels();
+
+              case 4:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
 
-      this.layerModel.buildModels(function (models) {
-        _this4.dispatchModelLoad(models);
-      });
-    }
+      return buildModels;
+    }()
   }, {
     key: "getModelType",
     value: function getModelType() {
-      var parserType = this.layerSource.getParserType();
-
-      if (isVectorTile(parserType)) {
-        return 'vectorMask';
-      }
-
       return 'fill';
     }
   }]);

package/es/mask/models/fill.d.ts

@@ -5,8 +5,8 @@ export default class MaskModel extends BaseModel {
         u_opacity: number;
         u_color: number[];
     };
-    initModels(callbackModel: (models: IModel[]) => void): void;
-    buildModels(callbackModel: (models: IModel[]) => void): Promise<void>;
+    initModels(): Promise<IModel[]>;
+    buildModels(): Promise<IModel[]>;
     clearModels(refresh?: boolean): void;
     protected registerBuiltinAttributes(): string;
 }

package/es/mask/models/fill.js

@@ -49,18 +49,43 @@ var MaskModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
-      this.buildModels(callbackModel);
-    }
-  }, {
-    key: "buildModels",
     value: function () {
-      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(callbackModel) {
+      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                this.layer.buildLayerModel({
+                _context.next = 2;
+                return this.buildModels();
+
+              case 2:
+                return _context.abrupt("return", _context.sent);
+
+              case 3:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function initModels() {
+        return _initModels.apply(this, arguments);
+      }
+
+      return initModels;
+    }()
+  }, {
+    key: "buildModels",
+    value: function () {
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        var model;
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                _context2.next = 2;
+                return this.layer.buildLayerModel({
                   moduleName: 'mask',
                   vertexShader: mask_vert,
                   fragmentShader: mask_frag,
@@ -84,22 +109,21 @@ var MaskModel = /*#__PURE__*/function (_BaseModel) {
                     }
                   },
                   pick: false
-                }).then(function (model) {
-                  callbackModel([model]);
-                }).catch(function (err) {
-                  console.warn(err);
-                  callbackModel([]);
                 });
 
-              case 1:
+              case 2:
+                model = _context2.sent;
+                return _context2.abrupt("return", [model]);
+
+              case 4:
               case "end":
-                return _context.stop();
+                return _context2.stop();
             }
           }
-        }, _callee, this);
+        }, _callee2, this);
       }));
 
-      function buildModels(_x) {
+      function buildModels() {
         return _buildModels.apply(this, arguments);
       }
 

package/es/mask/models/index.d.ts

@@ -1,4 +1,4 @@
-export declare type MaskModelType = 'fill' | 'vectorMask';
+export declare type MaskModelType = 'fill';
 declare const MaskModels: {
     [key in MaskModelType]: any;
 };

package/es/mask/models/index.js

@@ -1,7 +1,5 @@
-import MaskTileModel from "../../tile/models/tileModel";
 import FillModel from "./fill";
 var MaskModels = {
-  fill: FillModel,
-  vectorMask: MaskTileModel
+  fill: FillModel
 };
 export default MaskModels;

package/es/plugins/DataMappingPlugin.js

@@ -1,4 +1,5 @@
 import _objectSpread from "@babel/runtime/helpers/objectSpread2";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _initializerDefineProperty from "@babel/runtime/helpers/initializerDefineProperty";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
@@ -8,9 +9,10 @@ import _initializerWarningHelper from "@babel/runtime/helpers/initializerWarning
 
 var _dec, _dec2, _dec3, _class, _class2, _descriptor, _descriptor2;
 
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { TYPES } from '@antv/l7-core';
 import { Version } from '@antv/l7-maps';
-import { isColor, normalize, rgb2arr } from '@antv/l7-utils';
+import { normalize, rgb2arr } from '@antv/l7-utils';
 import { inject, injectable } from 'inversify';
 import { cloneDeep } from 'lodash';
 import 'reflect-metadata';
@@ -29,53 +31,72 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
       var _this = this;
 
       var styleAttributeService = _ref.styleAttributeService;
-      layer.hooks.init.tap('DataMappingPlugin', function () {
-        // 初始化重新生成 map
-        var source = layer.getSource();
-
-        if (source.inited) {
-          _this.generateMaping(layer, {
-            styleAttributeService: styleAttributeService
-          });
-        } else {
-          source.once('update', function () {
-            _this.generateMaping(layer, {
-              styleAttributeService: styleAttributeService
-            });
-          });
-        }
-      });
-      layer.hooks.beforeRenderData.tap('DataMappingPlugin', function () {
-        layer.dataState.dataMappingNeedUpdate = false;
-        var source = layer.getSource();
-
-        if (source.inited) {
-          _this.generateMaping(layer, {
-            styleAttributeService: styleAttributeService
-          });
-        } else {
-          source.once('update', function () {
-            _this.generateMaping(layer, {
-              styleAttributeService: styleAttributeService
-            });
-          });
-        }
+      layer.hooks.init.tapPromise('DataMappingPlugin', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                // 初始化重新生成 map
+                _this.generateMaping(layer, {
+                  styleAttributeService: styleAttributeService
+                });
+
+              case 1:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      })));
+      layer.hooks.beforeRenderData.tapPromise('DataMappingPlugin', /*#__PURE__*/function () {
+        var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(flag) {
+          return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+            while (1) {
+              switch (_context2.prev = _context2.next) {
+                case 0:
+                  if (flag) {
+                    _context2.next = 2;
+                    break;
+                  }
+
+                  return _context2.abrupt("return", flag);
+
+                case 2:
+                  layer.dataState.dataMappingNeedUpdate = false;
+
+                  _this.generateMaping(layer, {
+                    styleAttributeService: styleAttributeService
+                  });
+
+                  return _context2.abrupt("return", true);
+
+                case 5:
+                case "end":
+                  return _context2.stop();
+              }
+            }
+          }, _callee2);
+        }));
 
-        return true;
-      }); // remapping before render
+        return function (_x) {
+          return _ref3.apply(this, arguments);
+        };
+      }()); // remapping before render
 
       layer.hooks.beforeRender.tap('DataMappingPlugin', function () {
         var _layer$getLayerConfig = layer.getLayerConfig(),
             usage = _layer$getLayerConfig.usage;
 
-        if (usage === 'basemap') return;
+        if (usage === 'basemap') {
+          return;
+        }
+
         var source = layer.getSource();
 
         if (layer.layerModelNeedUpdate || !source || !source.inited) {
           return;
         }
 
-        var bottomColor = layer.getBottomColor();
         var attributes = styleAttributeService.getLayerStyleAttributes() || [];
         var filter = styleAttributeService.getLayerStyleAttribute('filter');
         var dataArray = source.data.dataArray;
@@ -87,19 +108,19 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
 
         if (filter !== null && filter !== void 0 && filter.needRemapping && filter !== null && filter !== void 0 && filter.scale) {
           filterData = dataArray.filter(function (record) {
-            return _this.applyAttributeMapping(filter, record, bottomColor)[0];
+            return _this.applyAttributeMapping(filter, record)[0];
           });
         }
 
         if (attributesToRemapping.length) {
           // 过滤数据
           if (filter !== null && filter !== void 0 && filter.needRemapping) {
-            var encodeData = _this.mapping(layer, attributes, filterData, undefined, bottomColor);
+            var encodeData = _this.mapping(layer, attributes, filterData, undefined);
 
             layer.setEncodedData(encodeData);
             filter.needRemapping = false;
           } else {
-            var _encodeData = _this.mapping(layer, attributesToRemapping, filterData, layer.getEncodedData(), bottomColor);
+            var _encodeData = _this.mapping(layer, attributesToRemapping, filterData, layer.getEncodedData());
 
             layer.setEncodedData(_encodeData);
           } // 处理文本更新
@@ -111,11 +132,10 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
     }
   }, {
     key: "generateMaping",
-    value: function generateMaping(layer, _ref2) {
+    value: function generateMaping(layer, _ref4) {
       var _this2 = this;
 
-      var styleAttributeService = _ref2.styleAttributeService;
-      var bottomColor = layer.getBottomColor();
+      var styleAttributeService = _ref4.styleAttributeService;
       var attributes = styleAttributeService.getLayerStyleAttributes() || [];
       var filter = styleAttributeService.getLayerStyleAttribute('filter');
       var dataArray = layer.getSource().data.dataArray;
@@ -123,30 +143,29 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
 
       if (filter !== null && filter !== void 0 && filter.scale) {
         filterData = dataArray.filter(function (record) {
-          return _this2.applyAttributeMapping(filter, record, bottomColor)[0];
+          return _this2.applyAttributeMapping(filter, record)[0];
         });
-      }
+      } // Tip: layer 对数据做处理
+      // 数据处理 在数据进行 mapping 生成 encodeData 之前对数据进行处理
+      // 在各个 layer 中继承
+
 
-      var encodeData = this.mapping(layer, attributes, filterData, undefined, bottomColor);
+      filterData = layer.processData(filterData);
+      var encodeData = this.mapping(layer, attributes, filterData, undefined);
       layer.setEncodedData(encodeData); // 对外暴露事件
 
       layer.emit('dataUpdate', null);
     }
   }, {
     key: "mapping",
-    value: function mapping(layer, attributes, data, predata, minimumColor) {
+    value: function mapping(layer, attributes, data, predata) {
       var _this3 = this;
 
-      var _ref3 = layer.getLayerConfig(),
-          _ref3$arrow = _ref3.arrow,
-          arrow = _ref3$arrow === void 0 ? {
+      var _ref5 = layer.getLayerConfig(),
+          _ref5$arrow = _ref5.arrow,
+          arrow = _ref5$arrow === void 0 ? {
         enable: false
-      } : _ref3$arrow,
-          usage = _ref3.usage;
-
-      if (usage === 'basemap') {
-        return this.mapLayerMapping(layer, attributes, data, predata);
-      }
+      } : _ref5$arrow;
 
       var usedAttributes = attributes.filter(function (attribute) {
         return attribute.scale !== undefined;
@@ -160,7 +179,7 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
         }, preRecord);
 
         usedAttributes.forEach(function (attribute) {
-          var values = _this3.applyAttributeMapping(attribute, record, minimumColor);
+          var values = _this3.applyAttributeMapping(attribute, record);
 
           attribute.needRemapping = false; // TODO: 支持每个属性配置 postprocess
 
@@ -338,7 +357,7 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
     }
   }, {
     key: "applyAttributeMapping",
-    value: function applyAttributeMapping(attribute, record, minimumColor) {
+    value: function applyAttributeMapping(attribute, record) {
       var _attribute$scale;
 
       if (!attribute.scale) {
@@ -347,10 +366,10 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
 
       var scalers = (attribute === null || attribute === void 0 ? void 0 : (_attribute$scale = attribute.scale) === null || _attribute$scale === void 0 ? void 0 : _attribute$scale.scalers) || [];
       var params = [];
-      scalers.forEach(function (_ref4) {
+      scalers.forEach(function (_ref6) {
         var _attribute$scale2;
 
-        var field = _ref4.field;
+        var field = _ref6.field;
 
         if (record.hasOwnProperty(field) || ((_attribute$scale2 = attribute.scale) === null || _attribute$scale2 === void 0 ? void 0 : _attribute$scale2.type) === 'variable') {
           // TODO:多字段，常量
@@ -358,11 +377,6 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
         }
       });
       var mappingResult = attribute.mapping ? attribute.mapping(params) : [];
-
-      if (attribute.name === 'color' && !isColor(mappingResult[0])) {
-        return [minimumColor];
-      }
-
       return mappingResult; // return attribute.mapping ? attribute.mapping(params) : [];
     }
   }, {
@@ -376,10 +390,10 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
 
       var scalers = (attribute === null || attribute === void 0 ? void 0 : (_attribute$scale3 = attribute.scale) === null || _attribute$scale3 === void 0 ? void 0 : _attribute$scale3.scalers) || [];
       var params = [];
-      scalers.forEach(function (_ref5) {
+      scalers.forEach(function (_ref7) {
         var _attribute$scale4;
 
-        var field = _ref5.field;
+        var field = _ref7.field;
 
         if (record.hasOwnProperty(field) || ((_attribute$scale4 = attribute.scale) === null || _attribute$scale4 === void 0 ? void 0 : _attribute$scale4.type) === 'variable') {
           params.push(record[field]);

package/es/plugins/DataSourcePlugin.js

@@ -1,8 +1,10 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 
 var _dec, _class;
 
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { TYPES } from '@antv/l7-core';
 import Source from '@antv/l7-source';
 import { injectable } from 'inversify';
@@ -18,41 +20,78 @@ var DataSourcePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
       var _this = this;
 
       this.mapService = layer.getContainer().get(TYPES.IMapService);
-      layer.hooks.init.tap('DataSourcePlugin', function () {
-        var source = layer.getSource();
+      layer.hooks.init.tapPromise('DataSourcePlugin', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        var source, _ref2, data, options;
 
-        if (!source) {
-          // Tip: 用户没有传入 source 的时候使用图层的默认数据
-          var _ref = layer.sourceOption || layer.defaultSourceConfig,
-              data = _ref.data,
-              options = _ref.options;
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                source = layer.getSource();
 
-          source = new Source(data, options);
-          layer.setSource(source);
-        }
+                if (source) {
+                  _context.next = 6;
+                  break;
+                }
 
-        if (source.inited) {
-          _this.updateClusterData(layer);
-        } else {
-          source.once('update', function () {
-            _this.updateClusterData(layer);
-          });
-        }
-      }); // 检测数据是否需要更新
+                // Tip: 用户没有传入 source 的时候使用图层的默认数据
+                _ref2 = layer.sourceOption || layer.defaultSourceConfig, data = _ref2.data, options = _ref2.options;
+                source = new Source(data, options);
+                _context.next = 6;
+                return new Promise(function (resolve) {
+                  source.on('update', function (e) {
+                    if (e.type === 'inited') {
+                      layer.initSource(source);
+                    }
+
+                    resolve(null);
+                  });
+                });
+
+              case 6:
+                if (source.inited) {
+                  _this.updateClusterData(layer);
+                } else {
+                  source.once('update', function () {
+                    _this.updateClusterData(layer);
+                  });
+                }
 
-      layer.hooks.beforeRenderData.tap('DataSourcePlugin', function () {
-        var neeUpdateCluster = _this.updateClusterData(layer);
+              case 7:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }))); // 检测数据是否需要更新
 
-        var dataSourceNeedUpdate = layer.dataState.dataSourceNeedUpdate;
-        layer.dataState.dataSourceNeedUpdate = false;
-        return neeUpdateCluster || dataSourceNeedUpdate;
-      });
+      layer.hooks.beforeRenderData.tapPromise('DataSourcePlugin', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        var neeUpdateCluster, dataSourceNeedUpdate;
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                neeUpdateCluster = _this.updateClusterData(layer);
+                dataSourceNeedUpdate = layer.dataState.dataSourceNeedUpdate;
+                layer.dataState.dataSourceNeedUpdate = false;
+                return _context2.abrupt("return", neeUpdateCluster || dataSourceNeedUpdate);
+
+              case 4:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2);
+      })));
     }
   }, {
     key: "updateClusterData",
     value: function updateClusterData(layer) {
       // Tip: 矢量瓦片不需要进行聚合操作
-      if (layer.isTileLayer || layer.tileLayer) return false;
+      if (layer.isTileLayer || layer.tileLayer || !layer.getSource()) {
+        return false;
+      }
+
       var source = layer.getSource();
       var cluster = source.cluster;
       var _source$clusterOption = source.clusterOptions.zoom,