@antv/l7-layers 2.10.2 → 2.10.4

package/lib/line/models/wall.js

@@ -7,10 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -151,34 +147,11 @@ var LineWallModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function () {
-      var _initModels = (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:
-                this.updateTexture();
-                this.iconService.on('imageUpdate', this.updateTexture);
-                _context.next = 4;
-                return this.buildModels();
-
-              case 4:
-                return _context.abrupt("return", _context.sent);
-
-              case 5:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-
-      function initModels() {
-        return _initModels.apply(this, arguments);
-      }
-
-      return initModels;
-    }()
+    value: function initModels(callbackModel) {
+      this.updateTexture();
+      this.iconService.on('imageUpdate', this.updateTexture);
+      this.buildModels(callbackModel);
+    }
   }, {
     key: "clearModels",
     value: function clearModels() {
@@ -189,43 +162,23 @@ var LineWallModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "buildModels",
-    value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var model;
-        return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                _context2.next = 2;
-                return this.layer.buildLayerModel({
-                  moduleName: 'lineWall',
-                  vertexShader: line_vert,
-                  fragmentShader: line_frag,
-                  triangulation: _triangulation.LineTriangulation,
-                  depth: {
-                    enable: false
-                  },
-                  blend: this.getBlend()
-                });
-
-              case 2:
-                model = _context2.sent;
-                return _context2.abrupt("return", [model]);
-
-              case 4:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2, this);
-      }));
-
-      function buildModels() {
-        return _buildModels.apply(this, arguments);
-      }
-
-      return buildModels;
-    }()
+    value: function buildModels(callbackModel) {
+      this.layer.buildLayerModel({
+        moduleName: 'lineWall',
+        vertexShader: line_vert,
+        fragmentShader: line_frag,
+        triangulation: _triangulation.LineTriangulation,
+        depth: {
+          enable: false
+        },
+        blend: this.getBlend()
+      }).then(function (model) {
+        callbackModel([model]);
+      }).catch(function (err) {
+        console.warn(err);
+        callbackModel([]);
+      });
+    }
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {

package/lib/mask/index.js

@@ -7,9 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
@@ -25,10 +23,20 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
+var _l7Core = require("@antv/l7-core");
+
 var _BaseLayer2 = _interopRequireDefault(require("../core/BaseLayer"));
 
+var _utils = require("../tile/utils");
+
 var _models = _interopRequireDefault(require("./models"));
 
+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 _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); }; }
 
 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; } }
@@ -53,36 +61,99 @@ var MaskLayer = /*#__PURE__*/function (_BaseLayer) {
   }
 
   (0, _createClass2.default)(MaskLayer, [{
-    key: "buildModels",
-    value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var shape;
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                shape = this.getModelType();
-                this.layerModel = new _models.default[shape](this);
-                _context.next = 4;
-                return this.initLayerModels();
-
-              case 4:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-
-      function buildModels() {
-        return _buildModels.apply(this, arguments);
+    key: "init",
+    value: function init() {
+      var _this2 = this;
+
+      // 设置配置项
+      var sceneId = this.container.get(_l7Core.TYPES.SceneID);
+      this.configService.setLayerConfig(sceneId, this.id, this.rawConfig);
+      this.layerType = this.rawConfig.layerType;
+      this.rendererService = this.container.get(_l7Core.TYPES.IRendererService);
+      this.layerService = this.container.get(_l7Core.TYPES.ILayerService);
+      this.mapService = this.container.get(_l7Core.TYPES.IMapService);
+      this.cameraService = this.container.get(_l7Core.TYPES.ICameraService);
+      this.coordinateService = this.container.get(_l7Core.TYPES.ICoordinateSystemService);
+      this.shaderModuleService = this.container.get(_l7Core.TYPES.IShaderModuleService);
+      this.postProcessingPassFactory = this.container.get(_l7Core.TYPES.IFactoryPostProcessingPass);
+      this.normalPassFactory = this.container.get(_l7Core.TYPES.IFactoryNormalPass); // 图层容器服务
+
+      this.styleAttributeService = this.container.get(_l7Core.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: (0, _objectSpread2.default)({
+            field: attributeField
+          }, _this2.splitValuesAndCallbackInAttribute( // @ts-ignore
+          attributeValues, // @ts-ignore
+          _this2.getLayerConfig()[attributeName]))
+        }, // @ts-ignore
+        updateOptions);
+      });
+      this.pendingStyleAttributes = []; // 获取插件集
+
+      this.plugins = this.container.getAll(_l7Core.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();
       }
 
-      return buildModels;
-    }()
+      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 _models.default[shape](this);
+      this.layerModel.initModels(function (models) {
+        _this3.dispatchModelLoad(models);
+      });
+    }
+  }, {
+    key: "rebuildModels",
+    value: function rebuildModels() {
+      var _this4 = this;
+
+      this.layerModel.buildModels(function (models) {
+        _this4.dispatchModelLoad(models);
+      });
+    }
   }, {
     key: "getModelType",
     value: function getModelType() {
+      var parserType = this.layerSource.getParserType();
+
+      if ((0, _utils.isVectorTile)(parserType)) {
+        return 'vectorMask';
+      }
+
       return 'fill';
     }
   }]);

package/lib/mask/models/fill.js

@@ -67,43 +67,18 @@ var MaskModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function () {
-      var _initModels = (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:
-                _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;
-    }()
+    value: function initModels(callbackModel) {
+      this.buildModels(callbackModel);
+    }
   }, {
     key: "buildModels",
     value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var model;
-        return _regenerator.default.wrap(function _callee2$(_context2) {
+      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(callbackModel) {
+        return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
-            switch (_context2.prev = _context2.next) {
+            switch (_context.prev = _context.next) {
               case 0:
-                _context2.next = 2;
-                return this.layer.buildLayerModel({
+                this.layer.buildLayerModel({
                   moduleName: 'mask',
                   vertexShader: mask_vert,
                   fragmentShader: mask_frag,
@@ -127,21 +102,22 @@ var MaskModel = /*#__PURE__*/function (_BaseModel) {
                     }
                   },
                   pick: false
+                }).then(function (model) {
+                  callbackModel([model]);
+                }).catch(function (err) {
+                  console.warn(err);
+                  callbackModel([]);
                 });
 
-              case 2:
-                model = _context2.sent;
-                return _context2.abrupt("return", [model]);
-
-              case 4:
+              case 1:
               case "end":
-                return _context2.stop();
+                return _context.stop();
             }
           }
-        }, _callee2, this);
+        }, _callee, this);
       }));
 
-      function buildModels() {
+      function buildModels(_x) {
         return _buildModels.apply(this, arguments);
       }
 

package/lib/mask/models/index.js

@@ -7,10 +7,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _tileModel = _interopRequireDefault(require("../../tile/models/tileModel"));
+
 var _fill = _interopRequireDefault(require("./fill"));
 
 var MaskModels = {
-  fill: _fill.default
+  fill: _fill.default,
+  vectorMask: _tileModel.default
 };
 var _default = MaskModels;
 exports.default = _default;

package/lib/plugins/DataMappingPlugin.js

@@ -7,12 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _initializerDefineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/initializerDefineProperty"));
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -52,57 +48,40 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
       var _this = this;
 
       var styleAttributeService = _ref.styleAttributeService;
-      layer.hooks.init.tapPromise('DataMappingPlugin', /*#__PURE__*/(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:
-                // 初始化重新生成 map
-                _this.generateMaping(layer, {
-                  styleAttributeService: styleAttributeService
-                });
-
-              case 1:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee);
-      })));
-      layer.hooks.beforeRenderData.tapPromise('DataMappingPlugin', /*#__PURE__*/function () {
-        var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(flag) {
-          return _regenerator.default.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);
-        }));
+      layer.hooks.init.tap('DataMappingPlugin', function () {
+        // 初始化重新生成 map
+        var source = layer.getSource();
 
-        return function (_x) {
-          return _ref3.apply(this, arguments);
-        };
-      }()); // remapping before render
+        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
+            });
+          });
+        }
+
+        return true;
+      }); // remapping before render
 
       layer.hooks.beforeRender.tap('DataMappingPlugin', function () {
         var _layer$getLayerConfig = layer.getLayerConfig(),
@@ -118,6 +97,7 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
           return;
         }
 
+        var bottomColor = layer.getBottomColor();
         var attributes = styleAttributeService.getLayerStyleAttributes() || [];
         var filter = styleAttributeService.getLayerStyleAttribute('filter');
         var dataArray = source.data.dataArray;
@@ -129,19 +109,19 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
 
         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)[0];
+            return _this.applyAttributeMapping(filter, record, bottomColor)[0];
           });
         }
 
         if (attributesToRemapping.length) {
           // 过滤数据
           if (filter !== null && filter !== void 0 && filter.needRemapping) {
-            var encodeData = _this.mapping(layer, attributes, filterData, undefined);
+            var encodeData = _this.mapping(layer, attributes, filterData, undefined, bottomColor);
 
             layer.setEncodedData(encodeData);
             filter.needRemapping = false;
           } else {
-            var _encodeData = _this.mapping(layer, attributesToRemapping, filterData, layer.getEncodedData());
+            var _encodeData = _this.mapping(layer, attributesToRemapping, filterData, layer.getEncodedData(), bottomColor);
 
             layer.setEncodedData(_encodeData);
           } // 处理文本更新
@@ -153,10 +133,11 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
     }
   }, {
     key: "generateMaping",
-    value: function generateMaping(layer, _ref4) {
+    value: function generateMaping(layer, _ref2) {
       var _this2 = this;
 
-      var styleAttributeService = _ref4.styleAttributeService;
+      var styleAttributeService = _ref2.styleAttributeService;
+      var bottomColor = layer.getBottomColor();
       var attributes = styleAttributeService.getLayerStyleAttributes() || [];
       var filter = styleAttributeService.getLayerStyleAttribute('filter');
       var dataArray = layer.getSource().data.dataArray;
@@ -164,29 +145,30 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
 
       if (filter !== null && filter !== void 0 && filter.scale) {
         filterData = dataArray.filter(function (record) {
-          return _this2.applyAttributeMapping(filter, record)[0];
+          return _this2.applyAttributeMapping(filter, record, bottomColor)[0];
         });
-      } // Tip: layer 对数据做处理
-      // 数据处理 在数据进行 mapping 生成 encodeData 之前对数据进行处理
-      // 在各个 layer 中继承
-
+      }
 
-      filterData = layer.processData(filterData);
-      var encodeData = this.mapping(layer, attributes, filterData, undefined);
+      var encodeData = this.mapping(layer, attributes, filterData, undefined, bottomColor);
       layer.setEncodedData(encodeData); // 对外暴露事件
 
       layer.emit('dataUpdate', null);
     }
   }, {
     key: "mapping",
-    value: function mapping(layer, attributes, data, predata) {
+    value: function mapping(layer, attributes, data, predata, minimumColor) {
       var _this3 = this;
 
-      var _ref5 = layer.getLayerConfig(),
-          _ref5$arrow = _ref5.arrow,
-          arrow = _ref5$arrow === void 0 ? {
+      var _ref3 = layer.getLayerConfig(),
+          _ref3$arrow = _ref3.arrow,
+          arrow = _ref3$arrow === void 0 ? {
         enable: false
-      } : _ref5$arrow;
+      } : _ref3$arrow,
+          usage = _ref3.usage;
+
+      if (usage === 'basemap') {
+        return this.mapLayerMapping(layer, attributes, data, predata);
+      }
 
       var usedAttributes = attributes.filter(function (attribute) {
         return attribute.scale !== undefined;
@@ -198,7 +180,7 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
           coordinates: record.coordinates
         }, preRecord);
         usedAttributes.forEach(function (attribute) {
-          var values = _this3.applyAttributeMapping(attribute, record);
+          var values = _this3.applyAttributeMapping(attribute, record, minimumColor);
 
           attribute.needRemapping = false; // TODO: 支持每个属性配置 postprocess
 
@@ -374,7 +356,7 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
     }
   }, {
     key: "applyAttributeMapping",
-    value: function applyAttributeMapping(attribute, record) {
+    value: function applyAttributeMapping(attribute, record, minimumColor) {
       var _attribute$scale;
 
       if (!attribute.scale) {
@@ -383,10 +365,10 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
 
       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 (_ref6) {
+      scalers.forEach(function (_ref4) {
         var _attribute$scale2;
 
-        var field = _ref6.field;
+        var field = _ref4.field;
 
         if (record.hasOwnProperty(field) || ((_attribute$scale2 = attribute.scale) === null || _attribute$scale2 === void 0 ? void 0 : _attribute$scale2.type) === 'variable') {
           // TODO:多字段，常量
@@ -394,6 +376,11 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
         }
       });
       var mappingResult = attribute.mapping ? attribute.mapping(params) : [];
+
+      if (attribute.name === 'color' && !(0, _l7Utils.isColor)(mappingResult[0])) {
+        return [minimumColor];
+      }
+
       return mappingResult; // return attribute.mapping ? attribute.mapping(params) : [];
     }
   }, {
@@ -407,10 +394,10 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
 
       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 (_ref7) {
+      scalers.forEach(function (_ref5) {
         var _attribute$scale4;
 
-        var field = _ref7.field;
+        var field = _ref5.field;
 
         if (record.hasOwnProperty(field) || ((_attribute$scale4 = attribute.scale) === null || _attribute$scale4 === void 0 ? void 0 : _attribute$scale4.type) === 'variable') {
           params.push(record[field]);