@antv/l7-layers 2.14.1 → 2.14.3

package/es/wind/models/wind.js

@@ -13,7 +13,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 import { AttributeType, gl } from '@antv/l7-core';
-import { FrequencyController, getMask } from '@antv/l7-utils';
+import { FrequencyController } from '@antv/l7-utils';
 import BaseModel from "../../core/BaseModel";
 import { RasterImageTriangulation } from "../../core/triangulation";
 
@@ -59,14 +59,14 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
 
   _createClass(WindModel, [{
     key: "render",
-    value: function render() {
+    value: function render(options) {
       var _this2 = this;
 
-      // Tip: 控制风场的平均更新频率
+      this.drawColorMode(options); // Tip: 控制风场的平均更新频率
+
       this.frequency.run(function () {
         _this2.drawWind();
       });
-      this.drawColorMode();
     }
   }, {
     key: "getUninforms",
@@ -82,13 +82,13 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
             _source$data2$images,
             _this3 = this;
 
-        var _ref, _ref$uMin, uMin, _ref$uMax, uMax, _ref$vMin, vMin, _ref$vMax, vMax, _ref$fadeOpacity, fadeOpacity, _ref$speedFactor, speedFactor, _ref$dropRate, dropRate, _ref$dropRateBump, dropRateBump, _ref$rampColors, rampColors, _ref$sizeScale, sizeScale, _ref$mask, mask, _ref$maskInside, maskInside, createTexture2D, source, glContext, model;
+        var _ref, _ref$uMin, uMin, _ref$uMax, uMax, _ref$vMin, vMin, _ref$vMax, vMax, _ref$fadeOpacity, fadeOpacity, _ref$speedFactor, speedFactor, _ref$dropRate, dropRate, _ref$dropRateBump, dropRateBump, _ref$rampColors, rampColors, _ref$sizeScale, sizeScale, createTexture2D, source, glContext, model;
 
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _ref = this.layer.getLayerConfig(), _ref$uMin = _ref.uMin, uMin = _ref$uMin === void 0 ? -21.32 : _ref$uMin, _ref$uMax = _ref.uMax, uMax = _ref$uMax === void 0 ? 26.8 : _ref$uMax, _ref$vMin = _ref.vMin, vMin = _ref$vMin === void 0 ? -21.57 : _ref$vMin, _ref$vMax = _ref.vMax, vMax = _ref$vMax === void 0 ? 21.42 : _ref$vMax, _ref$fadeOpacity = _ref.fadeOpacity, fadeOpacity = _ref$fadeOpacity === void 0 ? 0.996 : _ref$fadeOpacity, _ref$speedFactor = _ref.speedFactor, speedFactor = _ref$speedFactor === void 0 ? 0.25 : _ref$speedFactor, _ref$dropRate = _ref.dropRate, dropRate = _ref$dropRate === void 0 ? 0.003 : _ref$dropRate, _ref$dropRateBump = _ref.dropRateBump, dropRateBump = _ref$dropRateBump === void 0 ? 0.01 : _ref$dropRateBump, _ref$rampColors = _ref.rampColors, rampColors = _ref$rampColors === void 0 ? defaultRampColors : _ref$rampColors, _ref$sizeScale = _ref.sizeScale, sizeScale = _ref$sizeScale === void 0 ? 0.5 : _ref$sizeScale, _ref$mask = _ref.mask, mask = _ref$mask === void 0 ? false : _ref$mask, _ref$maskInside = _ref.maskInside, maskInside = _ref$maskInside === void 0 ? true : _ref$maskInside;
+                _ref = this.layer.getLayerConfig(), _ref$uMin = _ref.uMin, uMin = _ref$uMin === void 0 ? -21.32 : _ref$uMin, _ref$uMax = _ref.uMax, uMax = _ref$uMax === void 0 ? 26.8 : _ref$uMax, _ref$vMin = _ref.vMin, vMin = _ref$vMin === void 0 ? -21.57 : _ref$vMin, _ref$vMax = _ref.vMax, vMax = _ref$vMax === void 0 ? 21.42 : _ref$vMax, _ref$fadeOpacity = _ref.fadeOpacity, fadeOpacity = _ref$fadeOpacity === void 0 ? 0.996 : _ref$fadeOpacity, _ref$speedFactor = _ref.speedFactor, speedFactor = _ref$speedFactor === void 0 ? 0.25 : _ref$speedFactor, _ref$dropRate = _ref.dropRate, dropRate = _ref$dropRate === void 0 ? 0.003 : _ref$dropRate, _ref$dropRateBump = _ref.dropRateBump, dropRateBump = _ref$dropRateBump === void 0 ? 0.01 : _ref$dropRateBump, _ref$rampColors = _ref.rampColors, rampColors = _ref$rampColors === void 0 ? defaultRampColors : _ref$rampColors, _ref$sizeScale = _ref.sizeScale, sizeScale = _ref$sizeScale === void 0 ? 0.5 : _ref$sizeScale;
                 createTexture2D = this.rendererService.createTexture2D;
                 source = this.layer.getSource();
                 this.texture = createTexture2D({
@@ -144,9 +144,7 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
                   primitive: gl.TRIANGLES,
                   depth: {
                     enable: false
-                  },
-                  stencil: getMask(mask, maskInside),
-                  blend: this.getBlend()
+                  }
                 });
 
               case 10:
@@ -310,6 +308,8 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
     value: function drawColorMode() {
       var _this$colorModel;
 
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
       var _ref3 = this.layer.getLayerConfig(),
           opacity = _ref3.opacity;
 
@@ -320,7 +320,9 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
         uniforms: {
           u_opacity: opacity || 1.0,
           u_texture: this.texture
-        }
+        },
+        blend: this.getBlend(),
+        stencil: this.getStencil(options)
       });
       this.layer.hooks.afterRender.call();
     }

package/lib/Geometry/models/billboard.js

@@ -29,8 +29,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _l7Core = require("@antv/l7-core");
 
-var _l7Utils = require("@antv/l7-utils");
-
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
@@ -121,13 +119,13 @@ var BillBoardModel = /*#__PURE__*/function (_BaseModel) {
     key: "initModels",
     value: function () {
       var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var _ref3, _ref3$mask, mask, _ref3$maskInside, maskInside, drawCanvas, createTexture2D, model;
+        var _ref3, drawCanvas, createTexture2D, model;
 
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _ref3 = this.layer.getLayerConfig(), _ref3$mask = _ref3.mask, mask = _ref3$mask === void 0 ? false : _ref3$mask, _ref3$maskInside = _ref3.maskInside, maskInside = _ref3$maskInside === void 0 ? true : _ref3$maskInside, drawCanvas = _ref3.drawCanvas;
+                _ref3 = this.layer.getLayerConfig(), drawCanvas = _ref3.drawCanvas;
                 createTexture2D = this.rendererService.createTexture2D;
                 this.texture = createTexture2D({
                   height: 0,
@@ -147,9 +145,7 @@ var BillBoardModel = /*#__PURE__*/function (_BaseModel) {
                   primitive: _l7Core.gl.TRIANGLES,
                   depth: {
                     enable: true
-                  },
-                  blend: this.getBlend(),
-                  stencil: (0, _l7Utils.getMask)(mask, maskInside)
+                  }
                 });
 
               case 6:

package/lib/Geometry/models/plane.js

@@ -33,8 +33,6 @@ var _l7Core = require("@antv/l7-core");
 
 var _l7Maps = require("@antv/l7-maps");
 
-var _l7Utils = require("@antv/l7-utils");
-
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
@@ -197,13 +195,13 @@ var PlaneModel = /*#__PURE__*/function (_BaseModel) {
     key: "initModels",
     value: function () {
       var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var _ref5, _ref5$mask, mask, _ref5$maskInside, maskInside, mapTexture, createTexture2D, model;
+        var _ref5, mapTexture, createTexture2D, model;
 
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _ref5 = this.layer.getLayerConfig(), _ref5$mask = _ref5.mask, mask = _ref5$mask === void 0 ? false : _ref5$mask, _ref5$maskInside = _ref5.maskInside, maskInside = _ref5$maskInside === void 0 ? true : _ref5$maskInside, mapTexture = _ref5.mapTexture;
+                _ref5 = this.layer.getLayerConfig(), mapTexture = _ref5.mapTexture;
                 this.mapTexture = mapTexture;
                 createTexture2D = this.rendererService.createTexture2D;
                 this.texture = createTexture2D({
@@ -221,8 +219,6 @@ var PlaneModel = /*#__PURE__*/function (_BaseModel) {
                   depth: {
                     enable: true
                   },
-                  stencil: (0, _l7Utils.getMask)(mask, maskInside),
-                  blend: this.getBlend(),
                   cull: {
                     enable: true,
                     face: _l7Core.gl.BACK // gl.FRONT | gl.BACK;

package/lib/core/BaseLayer.js

@@ -175,10 +175,41 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }
 
   (0, _createClass2.default)(BaseLayer, [{
+    key: "addMask",
+    value: function addMask(layer) {
+      this.masks.push(layer);
+      this.enableMask();
+    }
+  }, {
+    key: "removeMask",
+    value: function removeMask(layer) {
+      var layerIndex = this.masks.indexOf(layer);
+
+      if (layerIndex > -1) {
+        this.masks.splice(layerIndex, 1);
+      }
+    }
+  }, {
+    key: "disableMask",
+    value: function disableMask() {
+      this.updateLayerConfig({
+        enableMask: false
+      });
+    }
+  }, {
+    key: "enableMask",
+    value: function enableMask() {
+      this.updateLayerConfig({
+        enableMask: true
+      });
+    } // 将废弃
+
+  }, {
     key: "addMaskLayer",
     value: function addMaskLayer(maskLayer) {
       this.masks.push(maskLayer);
-    }
+    } // 将废弃
+
   }, {
     key: "removeMaskLayer",
     value: function removeMaskLayer(maskLayer) {
@@ -354,7 +385,8 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
 
               case 31:
                 this.log(_l7Core.IDebugLog.LayerInitEnd);
-                this.inited = true; // 触发初始化完成事件;
+                this.inited = true; // add mask layer
+                // 触发初始化完成事件;
 
                 this.emit('inited', {
                   target: this,
@@ -494,7 +526,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     key: "filter",
     value: function filter(field, values, updateOptions) {
       var flag = this.updateStyleAttribute('filter', field, values, updateOptions);
-      this.dataState.dataSourceNeedUpdate = flag;
+      this.dataState.dataSourceNeedUpdate = flag && this.inited;
       return this;
     }
   }, {
@@ -505,7 +537,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         values: values
       };
       var flag = this.updateStyleAttribute('shape', field, values, updateOptions);
-      this.dataState.dataSourceNeedUpdate = flag;
+      this.dataState.dataSourceNeedUpdate = flag && this.inited;
       return this;
     }
   }, {
@@ -650,6 +682,8 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "render",
     value: function render() {
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
       if (this.tileLayer) {
         // 瓦片图层执行单独的 render 渲染队列
         this.tileLayer.render();
@@ -663,7 +697,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
       } // Tip: this.getEncodedData().length !== 0 这个判断是为了解决在 2.5.x 引入数据纹理后产生的 空数据渲染导致 texture 超出上限问题
 
 
-      this.renderModels();
+      this.renderModels(options);
       return this;
     }
     /**
@@ -835,8 +869,8 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     value: function setBlend(type) {
       this.updateLayerConfig({
         blend: type
-      });
-      this.layerModelNeedUpdate = true;
+      }); // this.layerModelNeedUpdate = true;
+
       this.reRender();
       return this;
     }
@@ -1021,12 +1055,18 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
       this.layerChildren.map(function (child) {
         return child.destroy(false);
       });
-      this.layerChildren = []; // remove mask list
+      this.layerChildren = []; // remove mask list maskfence 掩膜需要销毁
+
+      var _this$getLayerConfig10 = this.getLayerConfig(),
+          maskfence = _this$getLayerConfig10.maskfence;
+
+      if (maskfence) {
+        this.masks.map(function (mask) {
+          return mask.destroy(false);
+        });
+        this.masks = [];
+      }
 
-      this.masks.map(function (mask) {
-        return mask.destroy(false);
-      });
-      this.masks = [];
       this.hooks.beforeDestroy.call(); // 清除sources事件
 
       this.layerSource.off('update', this.sourceEvent);
@@ -1362,11 +1402,11 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "needPick",
     value: function needPick(type) {
-      var _this$getLayerConfig10 = this.getLayerConfig(),
-          _this$getLayerConfig11 = _this$getLayerConfig10.enableHighlight,
-          enableHighlight = _this$getLayerConfig11 === void 0 ? true : _this$getLayerConfig11,
-          _this$getLayerConfig12 = _this$getLayerConfig10.enableSelect,
-          enableSelect = _this$getLayerConfig12 === void 0 ? true : _this$getLayerConfig12; // 判断layer是否监听事件;
+      var _this$getLayerConfig11 = this.getLayerConfig(),
+          _this$getLayerConfig12 = _this$getLayerConfig11.enableHighlight,
+          enableHighlight = _this$getLayerConfig12 === void 0 ? true : _this$getLayerConfig12,
+          _this$getLayerConfig13 = _this$getLayerConfig11.enableSelect,
+          enableSelect = _this$getLayerConfig13 === void 0 ? true : _this$getLayerConfig13; // 判断layer是否监听事件;
 
 
       var isPick = this.eventNames().indexOf(type) !== -1 || this.eventNames().indexOf('un' + type) !== -1;
@@ -1457,9 +1497,11 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     }()
   }, {
     key: "renderModels",
-    value: function renderModels(isPicking) {
+    value: function renderModels() {
       var _this11 = this;
 
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
       // TODO: this.getEncodedData().length > 0 这个判断是为了解决在 2.5.x 引入数据纹理后产生的 空数据渲染导致 texture 超出上限问题
       if (this.encodeDataLength <= 0 && !this.forceRender) {
         return this;
@@ -1468,8 +1510,10 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
       this.hooks.beforeRender.call();
       this.models.forEach(function (model) {
         model.draw({
-          uniforms: _this11.layerModel.getUninforms()
-        }, isPicking);
+          uniforms: _this11.layerModel.getUninforms(),
+          blend: _this11.layerModel.getBlend(),
+          stencil: _this11.layerModel.getStencil(options)
+        }, (options === null || options === void 0 ? void 0 : options.ispick) || false);
       });
       this.hooks.afterRender.call();
       return this;

package/lib/core/BaseModel.js

@@ -11,6 +11,8 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
 var _initializerDefineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/initializerDefineProperty"));
@@ -35,6 +37,8 @@ var _lodash = require("lodash");
 
 var _blend = require("../utils/blend");
 
+var _stencil = require("../utils/stencil");
+
 var _dec, _class, _descriptor;
 
 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; } } }; }
@@ -431,6 +435,39 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
 
       return _blend.BlendTypes[_l7Core.BlendType[blend]];
     }
+  }, {
+    key: "getStencil",
+    value: function getStencil(option) {
+      var _this$layer$getLayerC3 = this.layer.getLayerConfig(),
+          _this$layer$getLayerC4 = _this$layer$getLayerC3.mask,
+          mask = _this$layer$getLayerC4 === void 0 ? false : _this$layer$getLayerC4,
+          _this$layer$getLayerC5 = _this$layer$getLayerC3.maskInside,
+          maskInside = _this$layer$getLayerC5 === void 0 ? true : _this$layer$getLayerC5,
+          enableMask = _this$layer$getLayerC3.enableMask,
+          _this$layer$getLayerC6 = _this$layer$getLayerC3.maskOperation,
+          maskOperation = _this$layer$getLayerC6 === void 0 ? _l7Core.MaskOperation.AND : _this$layer$getLayerC6; // TODO 临时处理，后期移除MaskLayer
+
+
+      if (this.layer.type === 'MaskLayer') {
+        return (0, _stencil.getStencilMask)({
+          isStencil: true,
+          stencilType: _l7Core.StencilType.SINGLE
+        }); // 用于遮罩的stencil 参数
+      }
+
+      if (option.isStencil) {
+        return (0, _stencil.getStencilMask)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, option), {}, {
+          maskOperation: maskOperation
+        })); // 用于遮罩的stencil 参数
+      }
+
+      var maskflag = mask || //  mask 兼容历史写法
+      enableMask && this.layer.masks.length !== 0 || // 外部图层的mask
+      this.layer.tileMask !== undefined; // 瓦片图层
+      // !!(mask || enableMask || this.layer.tileMask);
+
+      return (0, _stencil.getStencil)(maskflag, maskInside);
+    }
   }, {
     key: "getDefaultStyle",
     value: function getDefaultStyle() {
@@ -531,10 +568,11 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     key: "getAttribute",
     value: function getAttribute() {
       throw new Error('Method not implemented.');
-    }
+    } // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
   }, {
     key: "render",
-    value: function render() {
+    value: function render(renderOptions) {
       throw new Error('Method not implemented.');
     }
   }, {

package/lib/core/LayerPickService.js

@@ -7,14 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -32,6 +28,8 @@ var BaseLayerPickService = /*#__PURE__*/function () {
   (0, _createClass2.default)(BaseLayerPickService, [{
     key: "pickRender",
     value: function pickRender(target) {
+      var container = this.layer.getContainer();
+      var layerService = container.get(_l7Core.TYPES.ILayerService);
       var layer = this.layer; // 瓦片图层的拾取绘制
 
       if (layer.tileLayer) {
@@ -39,34 +37,10 @@ var BaseLayerPickService = /*#__PURE__*/function () {
       }
 
       layer.hooks.beforePickingEncode.call();
-
-      if (layer.masks.length > 0) {
-        // 若存在 mask，则在 pick 阶段的绘制也启用
-        layer.masks.filter(function (mask) {
-          return mask.inited;
-        }).forEach( /*#__PURE__*/function () {
-          var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(m) {
-            return _regenerator.default.wrap(function _callee$(_context) {
-              while (1) {
-                switch (_context.prev = _context.next) {
-                  case 0:
-                    m.render();
-
-                  case 1:
-                  case "end":
-                    return _context.stop();
-                }
-              }
-            }, _callee);
-          }));
-
-          return function (_x) {
-            return _ref.apply(this, arguments);
-          };
-        }());
-      }
-
-      layer.renderModels(true);
+      layerService.renderTileLayerMask(layer);
+      layer.renderModels({
+        ispick: true
+      });
       layer.hooks.afterPickingEncode.call();
     }
   }, {

package/lib/heatmap/index.js

@@ -85,11 +85,12 @@ var HeatMapLayer = /*#__PURE__*/function (_BaseLayer) {
     value: function renderModels() {
       var _this2 = this;
 
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var shape = this.getModelType();
 
       if (shape === 'heatmap') {
         if (this.layerModel) {
-          this.layerModel.render(); // 独立的渲染流程
+          this.layerModel.render(options); // 独立的渲染流程
         }
 
         return this;
@@ -102,7 +103,9 @@ var HeatMapLayer = /*#__PURE__*/function (_BaseLayer) {
       this.hooks.beforeRender.call();
       this.models.forEach(function (model) {
         return model.draw({
-          uniforms: _this2.layerModel.getUninforms()
+          uniforms: _this2.layerModel.getUninforms(),
+          blend: _this2.layerModel.getBlend(),
+          stencil: _this2.layerModel.getStencil(options)
         });
       });
       this.hooks.afterRender.call();

package/lib/heatmap/models/grid.js

@@ -23,8 +23,6 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 
 var _l7Core = require("@antv/l7-core");
 
-var _l7Utils = require("@antv/l7-utils");
-
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
 
 var _triangulation = require("../../core/triangulation");
@@ -92,14 +90,12 @@ var GridModel = /*#__PURE__*/function (_BaseModel) {
     key: "buildModels",
     value: function () {
       var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, model;
-
+        var model;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                _ref2 = this.layer.getLayerConfig(), _ref2$mask = _ref2.mask, mask = _ref2$mask === void 0 ? false : _ref2$mask, _ref2$maskInside = _ref2.maskInside, maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside;
-                _context2.next = 3;
+                _context2.next = 2;
                 return this.layer.buildLayerModel({
                   moduleName: 'heatmapGrid',
                   vertexShader: heatmapGridVert,
@@ -108,15 +104,14 @@ var GridModel = /*#__PURE__*/function (_BaseModel) {
                   primitive: _l7Core.gl.TRIANGLES,
                   depth: {
                     enable: false
-                  },
-                  stencil: (0, _l7Utils.getMask)(mask, maskInside)
+                  }
                 });
 
-              case 3:
+              case 2:
                 model = _context2.sent;
                 return _context2.abrupt("return", [model]);
 
-              case 5:
+              case 4:
               case "end":
                 return _context2.stop();
             }

package/lib/heatmap/models/grid3d.js

@@ -23,8 +23,6 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 
 var _l7Core = require("@antv/l7-core");
 
-var _l7Utils = require("@antv/l7-utils");
-
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
 
 var _triangulation = require("../../core/triangulation");
@@ -92,14 +90,12 @@ var Grid3DModel = /*#__PURE__*/function (_BaseModel) {
     key: "buildModels",
     value: function () {
       var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, model;
-
+        var model;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                _ref2 = this.layer.getLayerConfig(), _ref2$mask = _ref2.mask, mask = _ref2$mask === void 0 ? false : _ref2$mask, _ref2$maskInside = _ref2.maskInside, maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside;
-                _context2.next = 3;
+                _context2.next = 2;
                 return this.layer.buildLayerModel({
                   moduleName: 'heatmapGrid3d',
                   vertexShader: heatmapGrid3dVert,
@@ -108,16 +104,14 @@ var Grid3DModel = /*#__PURE__*/function (_BaseModel) {
                   primitive: _l7Core.gl.TRIANGLES,
                   depth: {
                     enable: true
-                  },
-                  blend: this.getBlend(),
-                  stencil: (0, _l7Utils.getMask)(mask, maskInside)
+                  }
                 });
 
-              case 3:
+              case 2:
                 model = _context2.sent;
                 return _context2.abrupt("return", [model]);
 
-              case 5:
+              case 4:
               case "end":
                 return _context2.stop();
             }