@vtx/ol-map 1.0.133 → 1.0.135

package/lib/feature-layer/FeatureLayer.js

@@ -8,7 +8,7 @@ var _layer = require("ol/layer");
 var _ol = require("ol");
 var _source = require("ol/source");
 var _renderer = _interopRequireDefault(require("../renderer"));
-var _style5 = require("ol/style");
+var _style6 = require("ol/style");
 var _isFunction = _interopRequireDefault(require("../_util/isFunction"));
 var _createFeatureCollection = require("./createFeatureCollection");
 var _isObject = _interopRequireDefault(require("../_util/isObject"));
@@ -21,35 +21,37 @@ var _excluded = ["url", "params", "data", "dataField", "features", "sourceOption
   _excluded2 = ["color", "background", "backgroundStroke", "backgroundStrokeWidth"],
   _excluded3 = ["type", "iconSrc", "color", "scale"],
   _excluded4 = ["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 _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 _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 _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 _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 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 s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.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.includes(n)) 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 _superPropGet(t, o, e, r) { var p = _get(_getPrototypeOf(1 & r ? t.prototype : t), o, e); return 2 & r && "function" == typeof p ? function (t) { return p.apply(e, t); } : p; }
+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 _superPropSet(t, e, o, r, p, f) { return _set(_getPrototypeOf(f ? t.prototype : t), e, o, r, p); }
+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) {
   if (alarmBg) {
     var itemVal = alarmBg.find(function (v) {
@@ -82,10 +84,8 @@ var addOverlay = function addOverlay(feature, map, alarmBg) {
   }
 };
 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,
@@ -135,8 +135,8 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
         });
       }
     }
-    _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,
@@ -146,7 +146,7 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
       var style = _objectSpread({
         text: String(size),
         font: '18px Calibri,sans-serif',
-        fill: new _style5.Fill({
+        fill: new _style6.Fill({
           color: color || '#fff'
         }),
         padding: [0, 0, 0, 0],
@@ -157,19 +157,19 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
         offsetX: 16
       }, otherVal);
       if (background) {
-        style.backgroundFill = new _style5.Fill({
+        style.backgroundFill = new _style6.Fill({
           color: background
         });
       }
       if (backgroundStroke) {
-        style.backgroundStroke = new _style5.Stroke({
+        style.backgroundStroke = new _style6.Stroke({
           color: '#FFFFFF',
           width: backgroundStrokeWidth || 2
         });
       }
-      return new _style5.Text(style);
+      return new _style6.Text(style);
     });
-    _defineProperty(_assertThisInitialized(_this2), "getLabelStyle", function (feature, color) {
+    _defineProperty(_this2, "getLabelStyle", function (feature, color) {
       var labelField = _this2._options.labelField;
 
       // 判断是否是聚合点位
@@ -181,16 +181,16 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
         }
       }
       if (labelField) {
-        return new _style5.Text({
+        return new _style6.Text({
           text: feature.values_[labelField] || '-',
           font: '12px Calibri,sans-serif',
-          fill: new _style5.Fill({
+          fill: new _style6.Fill({
             color: color
           }),
-          backgroundFill: new _style5.Fill({
+          backgroundFill: new _style6.Fill({
             color: '#fff'
           }),
-          backgroundStroke: new _style5.Stroke({
+          backgroundStroke: new _style6.Stroke({
             color: color,
             width: 1
           }),
@@ -201,7 +201,7 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
         });
       }
     });
-    _set((_thisSuper = _assertThisInitialized(_this2), _getPrototypeOf(FeatureLayer.prototype)), "show", show, _thisSuper, true);
+    _superPropSet((_this2, FeatureLayer), "show", show, _this2, 1, 1);
     // 参数
     _this2._options = _options;
 
@@ -313,7 +313,8 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
   }
 
   // 初始化数据
-  _createClass(FeatureLayer, [{
+  _inherits(FeatureLayer, _Vector);
+  return _createClass(FeatureLayer, [{
     key: "init",
     value: function init() {
       // 是否存在地址
@@ -334,7 +335,7 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
   }, {
     key: "show",
     get: function get() {
-      return _get(_getPrototypeOf(FeatureLayer.prototype), "show", this);
+      return _superPropGet(FeatureLayer, "show", this, 1);
     },
     set: function set(value) {
       this.setVisible(value);
@@ -394,16 +395,14 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
     }
   }, {
     key: "getCustomClusterStyle",
-    value: function getCustomClusterStyle(feature) {
+    value: function getCustomClusterStyle(feature, clusterStyle) {
       var _feature$get2;
-      var cluster = this._options.cluster;
-      var _cluster$style = cluster.style,
-        type = _cluster$style.type,
-        iconSrc = _cluster$style.iconSrc,
-        color = _cluster$style.color,
-        _cluster$style$scale = _cluster$style.scale,
-        scale = _cluster$style$scale === void 0 ? 1 : _cluster$style$scale,
-        iconOptions = _objectWithoutProperties(_cluster$style, _excluded3);
+      var type = clusterStyle.type,
+        iconSrc = clusterStyle.iconSrc,
+        color = clusterStyle.color,
+        _clusterStyle$scale = clusterStyle.scale,
+        scale = _clusterStyle$scale === void 0 ? 1 : _clusterStyle$scale,
+        iconOptions = _objectWithoutProperties(clusterStyle, _excluded3);
       var size = ((_feature$get2 = feature.get('features')) === null || _feature$get2 === void 0 ? void 0 : _feature$get2.length) || 0;
       return [new _renderer["default"].Marker({
         image: (0, _Marker.getImgUrl)(type || 'CommonIcon', {
@@ -433,7 +432,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;
@@ -460,13 +459,13 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
           }
         }
         if (size > 1 && cluster !== null && cluster !== void 0 && cluster.style.iconSrc) {
-          return _this4.getCustomClusterStyle(feature);
+          return _this4.getCustomClusterStyle(feature, cluster.style);
         }
         if (style) {
           if (typeof style === 'string' || (0, _isFunction["default"])(style) && cluster) {
             styles.push(new _renderer["default"].Marker(_objectSpread({}, _this4.getMarkerOptions(feature, style))));
             return styles;
-          } else if (style instanceof _style5.Style) {
+          } else if (style instanceof _style6.Style) {
             // 判断是否为 ol Style
             styles.push(style);
             return styles;
@@ -517,17 +516,17 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
             }
           }
         }
-        styles.push(new _style5.Style({
-          image: new _style5.Circle({
+        styles.push(new _style6.Style({
+          image: new _style6.Circle({
             radius: 4,
-            fill: new _style5.Fill({
+            fill: new _style6.Fill({
               color: 'rgba(0,155,255, 0.8)'
             })
           }),
-          fill: new _style5.Fill({
+          fill: new _style6.Fill({
             color: 'rgba(255, 255, 255, 0.6)'
           }),
-          stroke: new _style5.Stroke({
+          stroke: new _style6.Stroke({
             color: '#009BFF',
             width: 2
           })
@@ -566,32 +565,41 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
       var icon = (style === null || style === void 0 ? void 0 : style.icon) || style;
       var image = style === null || style === void 0 ? void 0 : style.image;
       var color = (style === null || style === void 0 ? void 0 : style.color) || '#2491fc';
+      var iconSize = (style === null || style === void 0 ? void 0 : style.size) || null;
+      var hideFooter = (style === null || style === void 0 ? void 0 : style.hideFooter) || null;
       var _this$_options = this._options,
         cluster = _this$_options.cluster,
         point = _this$_options.point,
         label = _this$_options.label;
-
       // 判断是否为自定义函数渲染
       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, _data7, _data8, _data9, _data10;
         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;
+        iconSize = ((_data7 = data) === null || _data7 === void 0 || (_data7 = _data7.style) === null || _data7 === void 0 ? void 0 : _data7.size) || ((_data8 = data) === null || _data8 === void 0 ? void 0 : _data8.size) || iconSize;
+        hideFooter = ((_data9 = data) === null || _data9 === void 0 || (_data9 = _data9.style) === null || _data9 === void 0 ? void 0 : _data9.hideFooter) || ((_data10 = data) === null || _data10 === void 0 ? void 0 : _data10.hideFooter) || hideFooter;
       }
       var size = ((_feature$get4 = feature.get('features')) === null || _feature$get4 === void 0 ? void 0 : _feature$get4.length) || 0;
+      var iconOptions = {
+        size: iconSize,
+        hideFooter: hideFooter
+      };
       var P = {
         marker: {
           // 图标
           icon: icon,
-          image: image
+          image: image,
+          iconOptions: iconOptions
         },
         point: {
           // 点位
           icon: icon,
-          type: 'PointIcon'
+          type: 'PointIcon',
+          iconOptions: iconOptions
         },
         marker_cluster: _objectSpread({
           // 聚合图标
@@ -634,8 +642,8 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
       if (label) {
         var _Object$keys;
         if ((_Object$keys = Object.keys(data)) !== null && _Object$keys !== void 0 && _Object$keys.includes('customText')) {
-          var _data7;
-          _style.text = (_data7 = data) === null || _data7 === void 0 ? void 0 : _data7.customText;
+          var _data11;
+          _style.text = (_data11 = data) === null || _data11 === void 0 ? void 0 : _data11.customText;
         } else {
           _style.text = this.getLabelStyle(feature, color);
         }
@@ -684,39 +692,45 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
               })
             });
             if ((_group = group) !== null && _group !== void 0 && _group.length) {
-              var _group2;
-              var style;
+              var _group2, _groupItem;
+              var style, groupItem;
               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;
+                  groupItem = v;
                 }
               });
               var markerStyle = _objectSpread({}, style.style);
-              if (size > 1) {
-                var _style4, _markerStyle2, _cluster2;
-                if ((_style4 = style) !== null && _style4 !== void 0 && _style4.clusterStyle) {
-                  markerStyle = _objectSpread({}, style.clusterStyle);
+              if (size > 1 && (_groupItem = groupItem) !== null && _groupItem !== void 0 && (_groupItem = _groupItem.clusterStyle) !== null && _groupItem !== void 0 && _groupItem.iconSrc) {
+                var _style = _this6.getCustomClusterStyle(feature, groupItem.clusterStyle);
+                feature.setStyle(_style);
+              } else {
+                if (size > 1) {
+                  var _style4, _markerStyle2, _cluster2;
+                  if ((_style4 = style) !== null && _style4 !== void 0 && _style4.clusterStyle) {
+                    markerStyle = _objectSpread({}, style.clusterStyle);
+                  }
+                  var _markerStyle = markerStyle,
+                    numberStyle = _markerStyle.numberStyle,
+                    iconOptions = _markerStyle.iconOptions,
+                    otherStyle = _objectWithoutProperties(_markerStyle, _excluded4);
+                  markerStyle = _objectSpread(_objectSpread({}, otherStyle), {}, {
+                    text: _this6.getClusterTextStyle((_markerStyle2 = markerStyle) !== null && _markerStyle2 !== void 0 && _markerStyle2.image ? size : ' ', numberStyle),
+                    iconOptions: _objectSpread({
+                      hideFooter: true,
+                      info: {
+                        text: size,
+                        fontSize: 18
+                      }
+                    }, iconOptions || ((_cluster2 = cluster) === null || _cluster2 === void 0 ? void 0 : _cluster2.iconOptions) || {})
+                  });
                 }
-                var _markerStyle = markerStyle,
-                  numberStyle = _markerStyle.numberStyle,
-                  iconOptions = _markerStyle.iconOptions,
-                  otherStyle = _objectWithoutProperties(_markerStyle, _excluded4);
-                markerStyle = _objectSpread(_objectSpread({}, otherStyle), {}, {
-                  text: _this6.getClusterTextStyle((_markerStyle2 = markerStyle) !== null && _markerStyle2 !== void 0 && _markerStyle2.image ? size : ' ', numberStyle),
-                  iconOptions: _objectSpread({
-                    hideFooter: true,
-                    info: {
-                      text: size,
-                      fontSize: 18
-                    }
-                  }, iconOptions || ((_cluster2 = cluster) === null || _cluster2 === void 0 ? void 0 : _cluster2.iconOptions) || {})
-                });
+                var _style5 = new _renderer["default"].Marker(markerStyle);
+                feature.setStyle(_style5);
               }
-              var _style = new _renderer["default"].Marker(markerStyle);
-              feature.setStyle(_style);
             }
 
             // 增加聚合点位标识
@@ -975,7 +989,7 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
   }, {
     key: "setVisible",
     value: function setVisible(visible) {
-      _get(_getPrototypeOf(FeatureLayer.prototype), "setVisible", this).call(this, visible); // 将属性传递给父类
+      _superPropGet(FeatureLayer, "setVisible", this, 3)([visible]); // 将属性传递给父类
 
       var map = this.getMap && this.getMap();
       if (map) {
@@ -1008,8 +1022,6 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
       this.clearAlarmBg();
     }
   }]);
-  return FeatureLayer;
 }(_layer.Vector);
-var _default = FeatureLayer;
-exports["default"] = _default;
+var _default = exports["default"] = FeatureLayer;
 //# sourceMappingURL=FeatureLayer.js.map