@vtx/ol-map 1.0.103 → 1.0.105

package/lib/feature-layer/FeatureLayer.js

@@ -13,69 +13,75 @@ var _isFunction = _interopRequireDefault(require("../_util/isFunction"));
 var _createFeatureCollection = require("./createFeatureCollection");
 var _isObject = _interopRequireDefault(require("../_util/isObject"));
 var _encryptParams = _interopRequireDefault(require("../_util/encryptParams"));
+var _stringToFun = _interopRequireDefault(require("../_util/stringToFun"));
+var _convertCamelToCSS = _interopRequireDefault(require("../convertCamelToCSS"));
 var _MyCluster = _interopRequireDefault(require("./MyCluster"));
 var _excluded = ["url", "params", "data", "dataField", "features", "sourceOptions", "key", "name", "label", "labelField", "point", "cluster", "template", "autoRefresh", "method", "layerControl", "show", "style", "group", "iconOptions", "afterGetData", "legend", "viewOnly", "encrypt", "valueField", "map", "tipTemplate", "alarmBg"],
   _excluded2 = ["color", "background", "backgroundStroke", "backgroundStrokeWidth"],
   _excluded3 = ["numberStyle", "iconOptions"];
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
+function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _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 _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-function _get() { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get.bind(); } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(arguments.length < 3 ? target : receiver); } return desc.value; }; } return _get.apply(this, arguments); }
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-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); }; }
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-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; } }
-function set(target, property, value, receiver) { if (typeof Reflect !== "undefined" && Reflect.set) { set = Reflect.set; } else { set = function set(target, property, value, receiver) { var base = _superPropBase(target, property); var desc; if (base) { desc = Object.getOwnPropertyDescriptor(base, property); if (desc.set) { desc.set.call(receiver, value); return true; } else if (!desc.writable) { return false; } } desc = Object.getOwnPropertyDescriptor(receiver, property); if (desc) { if (!desc.writable) { return false; } desc.value = value; Object.defineProperty(receiver, property, desc); } else { _defineProperty(receiver, property, value); } return true; }; } return set(target, property, value, receiver); }
-function _set(target, property, value, receiver, isStrict) { var s = set(target, property, value, receiver || target); if (!s && isStrict) { throw new TypeError('failed to set property'); } return value; }
-function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], t.indexOf(o) >= 0 || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.indexOf(n) >= 0) continue; t[n] = r[n]; } return t; }
+function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
+function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
+function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
+function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
+function _possibleConstructorReturn(t, e) { if (e && ("object" == _typeof(e) || "function" == typeof e)) return e; if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined"); return _assertThisInitialized(t); }
+function _assertThisInitialized(e) { if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); return e; }
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+function _get() { return _get = "undefined" != typeof Reflect && Reflect.get ? Reflect.get.bind() : function (e, t, r) { var p = _superPropBase(e, t); if (p) { var n = Object.getOwnPropertyDescriptor(p, t); return n.get ? n.get.call(arguments.length < 3 ? e : r) : n.value; } }, _get.apply(null, arguments); }
+function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
+function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
+function set(e, r, t, o) { return set = "undefined" != typeof Reflect && Reflect.set ? Reflect.set : function (e, r, t, o) { var f, i = _superPropBase(e, r); if (i) { if ((f = Object.getOwnPropertyDescriptor(i, r)).set) return f.set.call(o, t), !0; if (!f.writable) return !1; } if (f = Object.getOwnPropertyDescriptor(o, r)) { if (!f.writable) return !1; f.value = t, Object.defineProperty(o, r, f); } else _defineProperty(o, r, t); return !0; }, set(e, r, t, o); }
+function _set(e, r, t, o, f) { if (!set(e, r, t, o || e) && f) throw new TypeError("failed to set property"); return t; }
+function _superPropBase(t, o) { for (; !{}.hasOwnProperty.call(t, o) && null !== (t = _getPrototypeOf(t));); return t; }
+function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) { return t.__proto__ || Object.getPrototypeOf(t); }, _getPrototypeOf(t); }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 var addOverlay = function addOverlay(feature, map, alarmBg) {
-  var image = alarmBg.image,
-    filter = alarmBg.filter,
-    field = alarmBg.field,
-    style = alarmBg.style;
-  var status = feature.get('status');
-  if (!status && !['2', '4'].includes(status)) {
-    return;
+  if (alarmBg) {
+    var itemVal = alarmBg.find(function (v) {
+      return v.filter(feature.values_);
+    });
+    if (itemVal) {
+      var image = itemVal.image,
+        style = itemVal.style;
+      var dom;
+      if (image) {
+        dom = document.createElement('img');
+        dom.src = image;
+      } else {
+        dom = document.createElement('div');
+        dom.className = "ol-map-icon-alarm";
+      }
+      if (style) {
+        dom.style.cssText = style;
+      }
+      var overlay = new _ol.Overlay({
+        element: dom,
+        positioning: 'bottom-center',
+        stopEvent: true,
+        className: 'ol-overlay_container-stop_event'
+      });
+      map.addOverlay(overlay);
+      overlay.setPosition(feature.getGeometry().getCoordinates());
+      return overlay;
+    }
   }
-  var dom = document.createElement('div');
-  dom.className = "ol-map-icon-alarm-".concat(status);
-  var overlay = new _ol.Overlay({
-    element: dom,
-    positioning: 'bottom-center',
-    stopEvent: true,
-    className: 'ol-overlay_container-stop_event'
-  });
-  map.addOverlay(overlay);
-  overlay.setPosition(feature.getGeometry().getCoordinates());
-  return overlay;
 };
 var FeatureLayer = /*#__PURE__*/function (_Vector) {
-  _inherits(FeatureLayer, _Vector);
-  var _super = _createSuper(FeatureLayer);
   function FeatureLayer(_options) {
-    var _thisSuper, _this2;
+    var _this2;
     _classCallCheck(this, FeatureLayer);
     var url = _options.url,
       params = _options.params,
@@ -120,19 +126,12 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
           }
 
           // 将字符函数转化为可执行的函数
-          if (f.filter && typeof f.filter === 'string' && f.filter.indexOf('=>') !== -1) {
-            f.filter = f.filter.replaceAll(' ', '');
-            var _f$filter$split = f.filter.split('=>'),
-              _f$filter$split2 = _slicedToArray(_f$filter$split, 2),
-              a = _f$filter$split2[0],
-              c = _f$filter$split2[1];
-            f.filter = new Function(a, "return ".concat(c));
-          }
+          f.filter = (0, _stringToFun["default"])(f.filter);
         });
       }
     }
-    _this2 = _super.call(this, props);
-    _defineProperty(_assertThisInitialized(_this2), "getClusterTextStyle", function (size, options) {
+    _this2 = _callSuper(this, FeatureLayer, [props]);
+    _defineProperty(_this2, "getClusterTextStyle", function (size, options) {
       var _ref = options && _typeof(options) === 'object' ? options : {},
         color = _ref.color,
         background = _ref.background,
@@ -165,7 +164,7 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
       }
       return new _style5.Text(style);
     });
-    _defineProperty(_assertThisInitialized(_this2), "getLabelStyle", function (feature, color) {
+    _defineProperty(_this2, "getLabelStyle", function (feature, color) {
       var labelField = _this2._options.labelField;
 
       // 判断是否是聚合点位
@@ -197,7 +196,7 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
         });
       }
     });
-    _set((_thisSuper = _assertThisInitialized(_this2), _getPrototypeOf(FeatureLayer.prototype)), "show", show, _thisSuper, true);
+    _set((_this2, _getPrototypeOf(FeatureLayer.prototype)), "show", show, _this2, true);
     // 参数
     _this2._options = _options;
 
@@ -277,7 +276,23 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
     _this2.tipTemplate = tipTemplate;
 
     // 报警背景
-    _this2.alarmBg = alarmBg;
+    if (alarmBg) {
+      _this2.alarmBg = (Array.isArray(alarmBg) ? alarmBg : [alarmBg]).map(function (item) {
+        var filter = item.filter,
+          style = item.style;
+        filter = (0, _stringToFun["default"])(filter);
+        if (style) {
+          style = item.style && _typeof(item.style) === 'object' ? style : {
+            color: style
+          };
+          style = (0, _convertCamelToCSS["default"])(style);
+        }
+        return _objectSpread(_objectSpread({}, item), {}, {
+          filter: filter,
+          style: style
+        });
+      });
+    }
 
     // 临时数据
     _this2._features = [];
@@ -290,7 +305,8 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
   }
 
   // 初始化数据
-  _createClass(FeatureLayer, [{
+  _inherits(FeatureLayer, _Vector);
+  return _createClass(FeatureLayer, [{
     key: "init",
     value: function init() {
       // 是否存在地址
@@ -343,16 +359,18 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
     key: "setClusterMode",
     value: function setClusterMode(val) {
       var _this3 = this;
-      this._options.cluster = val;
+      this._options.cluster = (0, _isObject["default"])(val) ? val : {
+        show: val
+      };
       this.setClusterSource(val);
       this.setStyle(this.getStyleByMode());
-      if (this.map) {
+      if (this.map && this._options.cluster.show) {
         var map = this.map;
         this.destroy();
 
         // 监听地图缩放大于阈值时取消聚合
         var oldZoom = map.getView().getZoom();
-        this.moveEnd = map.on("moveend", function () {
+        this.moveEnd = map.on('moveend', function () {
           var zoom = map.getView().getZoom(); //获取当前地图的缩放级别
           if (oldZoom !== zoom) {
             var _this3$_options$clust;
@@ -377,7 +395,7 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
           cluster = _this4$_options.cluster,
           otherStyle = _this4$_options.otherStyle;
         var show = true;
-        (_this4$group = _this4.group) === null || _this4$group === void 0 ? void 0 : _this4$group.map(function (v) {
+        (_this4$group = _this4.group) === null || _this4$group === void 0 || _this4$group.map(function (v) {
           var _v$filter;
           if (v !== null && v !== void 0 && (_v$filter = v.filter) !== null && _v$filter !== void 0 && _v$filter.call(v, feature.values_)) {
             style = v.style || style;
@@ -520,17 +538,18 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
       var isFun = (0, _isFunction["default"])(style);
       var data = {};
       if (isFun) {
-        var _data, _data$style, _data2, _data3, _data3$style, _data4, _data5, _data5$style, _data6;
+        var _data, _data2, _data3, _data4, _data5, _data6;
         data = style(feature) || {};
-        icon = ((_data = data) === null || _data === void 0 ? void 0 : (_data$style = _data.style) === null || _data$style === void 0 ? void 0 : _data$style.icon) || ((_data2 = data) === null || _data2 === void 0 ? void 0 : _data2.icon) || icon;
-        color = ((_data3 = data) === null || _data3 === void 0 ? void 0 : (_data3$style = _data3.style) === null || _data3$style === void 0 ? void 0 : _data3$style.color) || ((_data4 = data) === null || _data4 === void 0 ? void 0 : _data4.color) || color;
-        image = ((_data5 = data) === null || _data5 === void 0 ? void 0 : (_data5$style = _data5.style) === null || _data5$style === void 0 ? void 0 : _data5$style.image) || ((_data6 = data) === null || _data6 === void 0 ? void 0 : _data6.image) || image;
+        icon = ((_data = data) === null || _data === void 0 || (_data = _data.style) === null || _data === void 0 ? void 0 : _data.icon) || ((_data2 = data) === null || _data2 === void 0 ? void 0 : _data2.icon) || icon;
+        color = ((_data3 = data) === null || _data3 === void 0 || (_data3 = _data3.style) === null || _data3 === void 0 ? void 0 : _data3.color) || ((_data4 = data) === null || _data4 === void 0 ? void 0 : _data4.color) || color;
+        image = ((_data5 = data) === null || _data5 === void 0 || (_data5 = _data5.style) === null || _data5 === void 0 ? void 0 : _data5.image) || ((_data6 = data) === null || _data6 === void 0 ? void 0 : _data6.image) || image;
       }
       var size = ((_feature$get4 = feature.get('features')) === null || _feature$get4 === void 0 ? void 0 : _feature$get4.length) || 0;
       var P = {
         marker: {
           // 图标
-          icon: icon
+          icon: icon,
+          image: image
         },
         point: {
           // 点位
@@ -595,13 +614,14 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
       var _this$_features,
         _this6 = this;
       var _this = this;
-      var _ref2 = (0, _isObject["default"])(cluster) ? cluster : {
-          show: cluster
-        },
-        show = _ref2.show,
-        minDistance = _ref2.minDistance,
-        distance = _ref2.distance,
-        group = _ref2.group;
+      cluster = (0, _isObject["default"])(cluster) ? cluster : {
+        show: cluster
+      };
+      var _cluster = cluster,
+        show = _cluster.show,
+        minDistance = _cluster.minDistance,
+        distance = _cluster.distance,
+        group = _cluster.group;
       var source = new _source.Vector({
         features: (_this$_features = this._features) === null || _this$_features === void 0 ? void 0 : _this$_features.filter(function (v) {
           return !v.hasOwnProperty('show') || v.show;
@@ -631,7 +651,7 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
               var style;
               var f = features[0];
               var size = features.length;
-              (_group2 = group) === null || _group2 === void 0 ? void 0 : _group2.map(function (v) {
+              (_group2 = group) === null || _group2 === void 0 || _group2.map(function (v) {
                 var _v$filter2;
                 if (v !== null && v !== void 0 && (_v$filter2 = v.filter) !== null && _v$filter2 !== void 0 && _v$filter2.call(v, f.values_)) {
                   style = v.style || style;
@@ -639,7 +659,7 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
               });
               var markerStyle = _objectSpread({}, style.style);
               if (size > 1) {
-                var _style4, _markerStyle2;
+                var _style4, _markerStyle2, _cluster2;
                 if ((_style4 = style) !== null && _style4 !== void 0 && _style4.clusterStyle) {
                   markerStyle = _objectSpread({}, style.clusterStyle);
                 }
@@ -655,7 +675,7 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
                       text: size,
                       fontSize: 18
                     }
-                  }, iconOptions || (cluster === null || cluster === void 0 ? void 0 : cluster.iconOptions) || {})
+                  }, iconOptions || ((_cluster2 = cluster) === null || _cluster2 === void 0 ? void 0 : _cluster2.iconOptions) || {})
                 });
               }
               var _style = new _renderer["default"].Marker(markerStyle);
@@ -811,14 +831,14 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
     }
   }, {
     key: "getFeaturesByFieldValueOpera",
-    value: function getFeaturesByFieldValueOpera(_ref3) {
+    value: function getFeaturesByFieldValueOpera(_ref2) {
       var _this11 = this;
-      var field = _ref3.field,
-        value = _ref3.value,
-        _ref3$operation = _ref3.operation,
-        operation = _ref3$operation === void 0 ? '===' : _ref3$operation,
-        features = _ref3.features,
-        filter = _ref3.filter;
+      var field = _ref2.field,
+        value = _ref2.value,
+        _ref2$operation = _ref2.operation,
+        operation = _ref2$operation === void 0 ? '===' : _ref2$operation,
+        features = _ref2.features,
+        filter = _ref2.filter;
       return new Promise(function (resolve, reject) {
         var _features = features || _this11.getFeatures();
         if (filter) {
@@ -877,6 +897,7 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
             var show = true;
             group.map(function (v) {
               var _v$filter3;
+              v.filter = (0, _stringToFun["default"])(v.filter);
               if (v !== null && v !== void 0 && (_v$filter3 = v.filter) !== null && _v$filter3 !== void 0 && _v$filter3.call(v, feature.values_)) {
                 if (v.hasOwnProperty('show') && !v.show) {
                   show = false;
@@ -935,18 +956,21 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
       }
     }
   }, {
-    key: "destroy",
-    value: function destroy() {
+    key: "clearMoveEnd",
+    value: function clearMoveEnd() {
       var map = this.map;
       if (map && this.moveEnd) {
-        map.un("moveend", this.moveEnd);
+        map.un('moveend', this.moveEnd);
         this.moveEnd = null;
       }
+    }
+  }, {
+    key: "destroy",
+    value: function destroy() {
+      this.clearMoveEnd();
       this.clearAlarmBg();
     }
   }]);
-  return FeatureLayer;
 }(_layer.Vector);
-var _default = FeatureLayer;
-exports["default"] = _default;
+var _default = exports["default"] = FeatureLayer;
 //# sourceMappingURL=FeatureLayer.js.map