@antv/l7-layers 2.11.5 → 2.11.6

package/es/core/BaseModel.d.ts

@@ -123,7 +123,7 @@ export default class BaseModel<ChildLayerStyleOptions = {}> implements ILayerMod
     getDefaultStyle(): unknown;
     getUninforms(): IModelUniform;
     getAnimateUniforms(): IModelUniform;
-    needUpdate(): boolean;
+    needUpdate(): Promise<boolean>;
     buildModels(): Promise<IModel[]>;
     initModels(): Promise<IModel[]>;
     clearModels(refresh?: boolean): void;

package/es/core/BaseModel.js

@@ -429,19 +429,13 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     }
   }, {
     key: "needUpdate",
-    value: function needUpdate() {
-      return false;
-    } // eslint-disable-next-line @typescript-eslint/no-unused-vars
-
-  }, {
-    key: "buildModels",
     value: function () {
-      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      var _needUpdate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                throw new Error('Method not implemented.');
+                return _context.abrupt("return", false);
 
               case 1:
               case "end":
@@ -451,17 +445,17 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
         }, _callee);
       }));
 
-      function buildModels() {
-        return _buildModels.apply(this, arguments);
+      function needUpdate() {
+        return _needUpdate.apply(this, arguments);
       }
 
-      return buildModels;
+      return needUpdate;
     }() // eslint-disable-next-line @typescript-eslint/no-unused-vars
 
   }, {
-    key: "initModels",
+    key: "buildModels",
     value: function () {
-      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
@@ -476,6 +470,31 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
         }, _callee2);
       }));
 
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
+
+      return buildModels;
+    }() // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
+  }, {
+    key: "initModels",
+    value: function () {
+      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                throw new Error('Method not implemented.');
+
+              case 1:
+              case "end":
+                return _context3.stop();
+            }
+          }
+        }, _callee3);
+      }));
+
       function initModels() {
         return _initModels.apply(this, arguments);
       }

package/es/plugins/UpdateModelPlugin.js

@@ -20,7 +20,11 @@ var UpdateModelPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functio
       layer.hooks.beforeRender.tap('UpdateModelPlugin', function () {
         // 处理文本更新
         if (layer.layerModel) {
-          layer.layerModel.needUpdate();
+          layer.layerModel.needUpdate().then(function (flag) {
+            if (flag) {
+              layer.renderLayers();
+            }
+          });
         }
       });
       layer.hooks.afterRender.tap('UpdateModelPlugin', function () {

package/es/point/models/text.d.ts

@@ -24,7 +24,7 @@ export default class TextModel extends BaseModel {
     getUninforms(): IModelUniform;
     initModels(): Promise<IModel[]>;
     buildModels(): Promise<IModel[]>;
-    needUpdate(): boolean;
+    needUpdate(): Promise<boolean>;
     clearModels(): void;
     protected registerBuiltinAttributes(): void;
     private bindEvent;

package/es/point/models/text.js

@@ -125,6 +125,7 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
           strokeWidth = _ref2$strokeWidth === void 0 ? 0 : _ref2$strokeWidth,
           _ref2$textAnchor = _ref2.textAnchor,
           textAnchor = _ref2$textAnchor === void 0 ? 'center' : _ref2$textAnchor,
+          textOffset = _ref2.textOffset,
           _ref2$textAllowOverla = _ref2.textAllowOverlap,
           textAllowOverlap = _ref2$textAllowOverla === void 0 ? false : _ref2$textAllowOverla,
           _ref2$halo = _ref2.halo,
@@ -145,7 +146,8 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
 
       this.preTextStyle = {
         textAnchor: textAnchor,
-        textAllowOverlap: textAllowOverlap
+        textAllowOverlap: textAllowOverlap,
+        textOffset: textOffset
       };
 
       if (this.dataTextureTest && this.dataTextureNeedUpdate({
@@ -202,7 +204,7 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
     key: "initModels",
     value: function () {
       var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var _ref3, _ref3$textAnchor, textAnchor, _ref3$textAllowOverla, textAllowOverlap;
+        var _ref3, _ref3$textAnchor, textAnchor, _ref3$textAllowOverla, textAllowOverlap, textOffset;
 
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
@@ -211,10 +213,11 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
                 // 绑定事件
                 this.bindEvent();
                 this.extent = this.textExtent();
-                _ref3 = this.layer.getLayerConfig(), _ref3$textAnchor = _ref3.textAnchor, textAnchor = _ref3$textAnchor === void 0 ? 'center' : _ref3$textAnchor, _ref3$textAllowOverla = _ref3.textAllowOverlap, textAllowOverlap = _ref3$textAllowOverla === void 0 ? true : _ref3$textAllowOverla;
+                _ref3 = this.layer.getLayerConfig(), _ref3$textAnchor = _ref3.textAnchor, textAnchor = _ref3$textAnchor === void 0 ? 'center' : _ref3$textAnchor, _ref3$textAllowOverla = _ref3.textAllowOverlap, textAllowOverlap = _ref3$textAllowOverla === void 0 ? true : _ref3$textAllowOverla, textOffset = _ref3.textOffset;
                 this.preTextStyle = {
                   textAnchor: textAnchor,
-                  textAllowOverlap: textAllowOverlap
+                  textAllowOverlap: textAllowOverlap,
+                  textOffset: textOffset
                 };
                 _context2.next = 6;
                 return this.buildModels();
@@ -289,31 +292,70 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
     }()
   }, {
     key: "needUpdate",
-    value: function needUpdate() {
-      var _ref5 = this.layer.getLayerConfig(),
-          _ref5$textAllowOverla = _ref5.textAllowOverlap,
-          textAllowOverlap = _ref5$textAllowOverla === void 0 ? false : _ref5$textAllowOverla;
+    value: function () {
+      var _needUpdate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+        var _ref5, _ref5$textAllowOverla, textAllowOverlap, _ref5$textAnchor, textAnchor, textOffset, data, zoom, extent, flag;
 
-      var data = this.layer.getEncodedData();
+        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+          while (1) {
+            switch (_context4.prev = _context4.next) {
+              case 0:
+                _ref5 = this.layer.getLayerConfig(), _ref5$textAllowOverla = _ref5.textAllowOverlap, textAllowOverlap = _ref5$textAllowOverla === void 0 ? false : _ref5$textAllowOverla, _ref5$textAnchor = _ref5.textAnchor, textAnchor = _ref5$textAnchor === void 0 ? 'center' : _ref5$textAnchor, textOffset = _ref5.textOffset;
+                data = this.layer.getEncodedData();
+
+                if (!(JSON.stringify(textOffset) !== JSON.stringify(this.preTextStyle.textOffset) || textAnchor !== this.preTextStyle.textAnchor)) {
+                  _context4.next = 6;
+                  break;
+                }
+
+                _context4.next = 5;
+                return this.mapping();
+
+              case 5:
+                return _context4.abrupt("return", true);
+
+              case 6:
+                if (!(data.length < 5 || textAllowOverlap)) {
+                  _context4.next = 8;
+                  break;
+                }
+
+                return _context4.abrupt("return", false);
+
+              case 8:
+                // textAllowOverlap 发生改变
+                zoom = this.mapService.getZoom();
+                extent = this.mapService.getBounds();
+                flag = boundsContains(this.extent, extent); // 文本不能压盖则进行过滤
+
+                if (!(Math.abs(this.currentZoom - zoom) > 1 || !flag || textAllowOverlap !== this.preTextStyle.textAllowOverlap)) {
+                  _context4.next = 15;
+                  break;
+                }
 
-      if (data.length < 5 || textAllowOverlap) {
-        // 小于不做避让
-        return false;
-      } // textAllowOverlap 发生改变
+                _context4.next = 14;
+                return this.reBuildModel();
 
+              case 14:
+                return _context4.abrupt("return", true);
 
-      var zoom = this.mapService.getZoom();
-      var extent = this.mapService.getBounds();
-      var flag = boundsContains(this.extent, extent); // 文本不能压盖则进行过滤
+              case 15:
+                return _context4.abrupt("return", false);
 
-      if (Math.abs(this.currentZoom - zoom) > 1 || !flag || textAllowOverlap !== this.preTextStyle.textAllowOverlap) {
-        // TODO this.mapping 数据未变化，避让
-        this.reBuildModel();
-        return true;
+              case 16:
+              case "end":
+                return _context4.stop();
+            }
+          }
+        }, _callee4, this);
+      }));
+
+      function needUpdate() {
+        return _needUpdate.apply(this, arguments);
       }
 
-      return false;
-    }
+      return needUpdate;
+    }()
   }, {
     key: "clearModels",
     value: function clearModels() {
@@ -505,7 +547,8 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
           _ref8$spacing = _ref8.spacing,
           spacing = _ref8$spacing === void 0 ? 2 : _ref8$spacing,
           _ref8$textAnchor = _ref8.textAnchor,
-          textAnchor = _ref8$textAnchor === void 0 ? 'center' : _ref8$textAnchor;
+          textAnchor = _ref8$textAnchor === void 0 ? 'center' : _ref8$textAnchor,
+          textOffset = _ref8.textOffset;
 
       var data = this.layer.getEncodedData();
       this.glyphInfo = data.map(function (feature) {
@@ -513,11 +556,9 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
             shape = _feature$shape === void 0 ? '' : _feature$shape,
             id = feature.id,
             _feature$size2 = feature.size,
-            size = _feature$size2 === void 0 ? 1 : _feature$size2,
-            _feature$textOffset = feature.textOffset,
-            textOffset = _feature$textOffset === void 0 ? [0, 0] : _feature$textOffset;
+            size = _feature$size2 === void 0 ? 1 : _feature$size2;
         var shaping = shapeText(shape.toString(), mapping, // @ts-ignore
-        size, textAnchor, 'left', spacing, textOffset, iconfont);
+        size, textAnchor, 'left', spacing, textOffset || feature.textOffset || [0, 0], iconfont);
         var glyphQuads = getGlyphQuads(shaping, textOffset, false);
         feature.shaping = shaping;
         feature.glyphQuads = glyphQuads; // feature.centroid = calculteCentroid(coordinates);
@@ -640,16 +681,16 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "reBuildModel",
     value: function () {
-      var _reBuildModel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+      var _reBuildModel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
         var _ref10, _ref10$mask, mask, _ref10$maskInside, maskInside, model;
 
-        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+        return _regeneratorRuntime.wrap(function _callee5$(_context5) {
           while (1) {
-            switch (_context4.prev = _context4.next) {
+            switch (_context5.prev = _context5.next) {
               case 0:
                 _ref10 = this.layer.getLayerConfig(), _ref10$mask = _ref10.mask, mask = _ref10$mask === void 0 ? false : _ref10$mask, _ref10$maskInside = _ref10.maskInside, maskInside = _ref10$maskInside === void 0 ? true : _ref10$maskInside;
                 this.filterGlyphs();
-                _context4.next = 4;
+                _context5.next = 4;
                 return this.layer.buildLayerModel({
                   moduleName: 'pointText',
                   vertexShader: textVert,
@@ -663,16 +704,16 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
                 });
 
               case 4:
-                model = _context4.sent;
+                model = _context5.sent;
                 // TODO 渲染流程待修改
-                this.layer.models = [model]; // this.layerService.throttleRenderLayers();
+                this.layer.models = [model];
 
               case 6:
               case "end":
-                return _context4.stop();
+                return _context5.stop();
             }
           }
-        }, _callee4, this);
+        }, _callee5, this);
       }));
 
       function reBuildModel() {

package/lib/core/BaseModel.js

@@ -448,19 +448,13 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     }
   }, {
     key: "needUpdate",
-    value: function needUpdate() {
-      return false;
-    } // eslint-disable-next-line @typescript-eslint/no-unused-vars
-
-  }, {
-    key: "buildModels",
     value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+      var _needUpdate = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                throw new Error('Method not implemented.');
+                return _context.abrupt("return", false);
 
               case 1:
               case "end":
@@ -470,17 +464,17 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         }, _callee);
       }));
 
-      function buildModels() {
-        return _buildModels.apply(this, arguments);
+      function needUpdate() {
+        return _needUpdate.apply(this, arguments);
       }
 
-      return buildModels;
+      return needUpdate;
     }() // eslint-disable-next-line @typescript-eslint/no-unused-vars
 
   }, {
-    key: "initModels",
+    key: "buildModels",
     value: function () {
-      var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
@@ -495,6 +489,31 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         }, _callee2);
       }));
 
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
+
+      return buildModels;
+    }() // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
+  }, {
+    key: "initModels",
+    value: function () {
+      var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
+        return _regenerator.default.wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                throw new Error('Method not implemented.');
+
+              case 1:
+              case "end":
+                return _context3.stop();
+            }
+          }
+        }, _callee3);
+      }));
+
       function initModels() {
         return _initModels.apply(this, arguments);
       }

package/lib/plugins/UpdateModelPlugin.js

@@ -32,7 +32,11 @@ _dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
       layer.hooks.beforeRender.tap('UpdateModelPlugin', function () {
         // 处理文本更新
         if (layer.layerModel) {
-          layer.layerModel.needUpdate();
+          layer.layerModel.needUpdate().then(function (flag) {
+            if (flag) {
+              layer.renderLayers();
+            }
+          });
         }
       });
       layer.hooks.afterRender.tap('UpdateModelPlugin', function () {

package/lib/point/models/text.js

@@ -142,6 +142,7 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
           strokeWidth = _ref2$strokeWidth === void 0 ? 0 : _ref2$strokeWidth,
           _ref2$textAnchor = _ref2.textAnchor,
           textAnchor = _ref2$textAnchor === void 0 ? 'center' : _ref2$textAnchor,
+          textOffset = _ref2.textOffset,
           _ref2$textAllowOverla = _ref2.textAllowOverlap,
           textAllowOverlap = _ref2$textAllowOverla === void 0 ? false : _ref2$textAllowOverla,
           _ref2$halo = _ref2.halo,
@@ -162,7 +163,8 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
 
       this.preTextStyle = {
         textAnchor: textAnchor,
-        textAllowOverlap: textAllowOverlap
+        textAllowOverlap: textAllowOverlap,
+        textOffset: textOffset
       };
 
       if (this.dataTextureTest && this.dataTextureNeedUpdate({
@@ -219,7 +221,7 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
     key: "initModels",
     value: function () {
       var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var _ref3, _ref3$textAnchor, textAnchor, _ref3$textAllowOverla, textAllowOverlap;
+        var _ref3, _ref3$textAnchor, textAnchor, _ref3$textAllowOverla, textAllowOverlap, textOffset;
 
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
@@ -228,10 +230,11 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
                 // 绑定事件
                 this.bindEvent();
                 this.extent = this.textExtent();
-                _ref3 = this.layer.getLayerConfig(), _ref3$textAnchor = _ref3.textAnchor, textAnchor = _ref3$textAnchor === void 0 ? 'center' : _ref3$textAnchor, _ref3$textAllowOverla = _ref3.textAllowOverlap, textAllowOverlap = _ref3$textAllowOverla === void 0 ? true : _ref3$textAllowOverla;
+                _ref3 = this.layer.getLayerConfig(), _ref3$textAnchor = _ref3.textAnchor, textAnchor = _ref3$textAnchor === void 0 ? 'center' : _ref3$textAnchor, _ref3$textAllowOverla = _ref3.textAllowOverlap, textAllowOverlap = _ref3$textAllowOverla === void 0 ? true : _ref3$textAllowOverla, textOffset = _ref3.textOffset;
                 this.preTextStyle = {
                   textAnchor: textAnchor,
-                  textAllowOverlap: textAllowOverlap
+                  textAllowOverlap: textAllowOverlap,
+                  textOffset: textOffset
                 };
                 _context2.next = 6;
                 return this.buildModels();
@@ -306,31 +309,70 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
     }()
   }, {
     key: "needUpdate",
-    value: function needUpdate() {
-      var _ref5 = this.layer.getLayerConfig(),
-          _ref5$textAllowOverla = _ref5.textAllowOverlap,
-          textAllowOverlap = _ref5$textAllowOverla === void 0 ? false : _ref5$textAllowOverla;
+    value: function () {
+      var _needUpdate = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
+        var _ref5, _ref5$textAllowOverla, textAllowOverlap, _ref5$textAnchor, textAnchor, textOffset, data, zoom, extent, flag;
 
-      var data = this.layer.getEncodedData();
+        return _regenerator.default.wrap(function _callee4$(_context4) {
+          while (1) {
+            switch (_context4.prev = _context4.next) {
+              case 0:
+                _ref5 = this.layer.getLayerConfig(), _ref5$textAllowOverla = _ref5.textAllowOverlap, textAllowOverlap = _ref5$textAllowOverla === void 0 ? false : _ref5$textAllowOverla, _ref5$textAnchor = _ref5.textAnchor, textAnchor = _ref5$textAnchor === void 0 ? 'center' : _ref5$textAnchor, textOffset = _ref5.textOffset;
+                data = this.layer.getEncodedData();
+
+                if (!(JSON.stringify(textOffset) !== JSON.stringify(this.preTextStyle.textOffset) || textAnchor !== this.preTextStyle.textAnchor)) {
+                  _context4.next = 6;
+                  break;
+                }
+
+                _context4.next = 5;
+                return this.mapping();
+
+              case 5:
+                return _context4.abrupt("return", true);
+
+              case 6:
+                if (!(data.length < 5 || textAllowOverlap)) {
+                  _context4.next = 8;
+                  break;
+                }
+
+                return _context4.abrupt("return", false);
+
+              case 8:
+                // textAllowOverlap 发生改变
+                zoom = this.mapService.getZoom();
+                extent = this.mapService.getBounds();
+                flag = (0, _l7Utils.boundsContains)(this.extent, extent); // 文本不能压盖则进行过滤
+
+                if (!(Math.abs(this.currentZoom - zoom) > 1 || !flag || textAllowOverlap !== this.preTextStyle.textAllowOverlap)) {
+                  _context4.next = 15;
+                  break;
+                }
 
-      if (data.length < 5 || textAllowOverlap) {
-        // 小于不做避让
-        return false;
-      } // textAllowOverlap 发生改变
+                _context4.next = 14;
+                return this.reBuildModel();
 
+              case 14:
+                return _context4.abrupt("return", true);
 
-      var zoom = this.mapService.getZoom();
-      var extent = this.mapService.getBounds();
-      var flag = (0, _l7Utils.boundsContains)(this.extent, extent); // 文本不能压盖则进行过滤
+              case 15:
+                return _context4.abrupt("return", false);
 
-      if (Math.abs(this.currentZoom - zoom) > 1 || !flag || textAllowOverlap !== this.preTextStyle.textAllowOverlap) {
-        // TODO this.mapping 数据未变化，避让
-        this.reBuildModel();
-        return true;
+              case 16:
+              case "end":
+                return _context4.stop();
+            }
+          }
+        }, _callee4, this);
+      }));
+
+      function needUpdate() {
+        return _needUpdate.apply(this, arguments);
       }
 
-      return false;
-    }
+      return needUpdate;
+    }()
   }, {
     key: "clearModels",
     value: function clearModels() {
@@ -522,7 +564,8 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
           _ref8$spacing = _ref8.spacing,
           spacing = _ref8$spacing === void 0 ? 2 : _ref8$spacing,
           _ref8$textAnchor = _ref8.textAnchor,
-          textAnchor = _ref8$textAnchor === void 0 ? 'center' : _ref8$textAnchor;
+          textAnchor = _ref8$textAnchor === void 0 ? 'center' : _ref8$textAnchor,
+          textOffset = _ref8.textOffset;
 
       var data = this.layer.getEncodedData();
       this.glyphInfo = data.map(function (feature) {
@@ -530,11 +573,9 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
             shape = _feature$shape === void 0 ? '' : _feature$shape,
             id = feature.id,
             _feature$size2 = feature.size,
-            size = _feature$size2 === void 0 ? 1 : _feature$size2,
-            _feature$textOffset = feature.textOffset,
-            textOffset = _feature$textOffset === void 0 ? [0, 0] : _feature$textOffset;
+            size = _feature$size2 === void 0 ? 1 : _feature$size2;
         var shaping = (0, _symbolLayout.shapeText)(shape.toString(), mapping, // @ts-ignore
-        size, textAnchor, 'left', spacing, textOffset, iconfont);
+        size, textAnchor, 'left', spacing, textOffset || feature.textOffset || [0, 0], iconfont);
         var glyphQuads = (0, _symbolLayout.getGlyphQuads)(shaping, textOffset, false);
         feature.shaping = shaping;
         feature.glyphQuads = glyphQuads; // feature.centroid = calculteCentroid(coordinates);
@@ -657,16 +698,16 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "reBuildModel",
     value: function () {
-      var _reBuildModel = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
+      var _reBuildModel = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
         var _ref10, _ref10$mask, mask, _ref10$maskInside, maskInside, model;
 
-        return _regenerator.default.wrap(function _callee4$(_context4) {
+        return _regenerator.default.wrap(function _callee5$(_context5) {
           while (1) {
-            switch (_context4.prev = _context4.next) {
+            switch (_context5.prev = _context5.next) {
               case 0:
                 _ref10 = this.layer.getLayerConfig(), _ref10$mask = _ref10.mask, mask = _ref10$mask === void 0 ? false : _ref10$mask, _ref10$maskInside = _ref10.maskInside, maskInside = _ref10$maskInside === void 0 ? true : _ref10$maskInside;
                 this.filterGlyphs();
-                _context4.next = 4;
+                _context5.next = 4;
                 return this.layer.buildLayerModel({
                   moduleName: 'pointText',
                   vertexShader: textVert,
@@ -680,16 +721,16 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
                 });
 
               case 4:
-                model = _context4.sent;
+                model = _context5.sent;
                 // TODO 渲染流程待修改
-                this.layer.models = [model]; // this.layerService.throttleRenderLayers();
+                this.layer.models = [model];
 
               case 6:
               case "end":
-                return _context4.stop();
+                return _context5.stop();
             }
           }
-        }, _callee4, this);
+        }, _callee5, this);
       }));
 
       function reBuildModel() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.11.5",
+  "version": "2.11.6",
   "description": "L7's collection of built-in layers",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -27,10 +27,10 @@
   "license": "ISC",
   "dependencies": {
     "@antv/async-hook": "^2.2.9",
-    "@antv/l7-core": "2.11.5",
-    "@antv/l7-maps": "2.11.5",
-    "@antv/l7-source": "2.11.5",
-    "@antv/l7-utils": "2.11.5",
+    "@antv/l7-core": "2.11.6",
+    "@antv/l7-maps": "2.11.6",
+    "@antv/l7-source": "2.11.6",
+    "@antv/l7-utils": "2.11.6",
     "@babel/runtime": "^7.7.7",
     "@mapbox/martini": "^0.2.0",
     "@turf/clone": "^6.5.0",
@@ -61,7 +61,7 @@
     "@types/gl-matrix": "^2.4.5",
     "@types/lodash": "^4.14.138"
   },
-  "gitHead": "b579a9cd07876173c77bd9d880034d8cbbeef87c",
+  "gitHead": "40a3dbc1cf1070f70054a1fc05de18c7b2c55cdc",
   "publishConfig": {
     "access": "public"
   }