@vtx/ol-map 1.0.99 → 1.0.101

package/lib/feature-layer/FeatureLayer.js

@@ -8,20 +8,27 @@ var _layer = require("ol/layer");
 var _ol = require("ol");
 var _source = require("ol/source");
 var _renderer = _interopRequireDefault(require("../renderer"));
-var _style3 = require("ol/style");
+var _style5 = require("ol/style");
 var _isFunction = _interopRequireDefault(require("../_util/isFunction"));
 var _createFeatureCollection = require("./createFeatureCollection");
 var _isObject = _interopRequireDefault(require("../_util/isObject"));
 var _encryptParams = _interopRequireDefault(require("../_util/encryptParams"));
-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"];
+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"],
+  _excluded2 = ["color", "background", "backgroundStroke", "backgroundStrokeWidth"],
+  _excluded3 = ["numberStyle", "iconOptions"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _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 _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; }
@@ -46,37 +53,37 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 var FeatureLayer = /*#__PURE__*/function (_Vector) {
   _inherits(FeatureLayer, _Vector);
   var _super = _createSuper(FeatureLayer);
-  function FeatureLayer(options) {
+  function FeatureLayer(_options) {
     var _thisSuper, _this2;
     _classCallCheck(this, FeatureLayer);
-    var url = options.url,
-      params = options.params,
-      data = options.data,
-      dataField = options.dataField,
-      features = options.features,
-      sourceOptions = options.sourceOptions,
-      key = options.key,
-      name = options.name,
-      label = options.label,
-      _labelField = options.labelField,
-      point = options.point,
-      cluster = options.cluster,
-      template = options.template,
-      autoRefresh = options.autoRefresh,
-      method = options.method,
-      layerControl = options.layerControl,
-      show = options.show,
-      style = options.style,
-      group = options.group,
-      iconOptions = options.iconOptions,
-      afterGetData = options.afterGetData,
-      legend = options.legend,
-      viewOnly = options.viewOnly,
-      encrypt = options.encrypt,
-      valueField = options.valueField,
-      map = options.map,
-      tipTemplate = options.tipTemplate,
-      other = _objectWithoutProperties(options, _excluded);
+    var url = _options.url,
+      params = _options.params,
+      data = _options.data,
+      dataField = _options.dataField,
+      features = _options.features,
+      sourceOptions = _options.sourceOptions,
+      key = _options.key,
+      name = _options.name,
+      label = _options.label,
+      _labelField = _options.labelField,
+      point = _options.point,
+      cluster = _options.cluster,
+      template = _options.template,
+      autoRefresh = _options.autoRefresh,
+      method = _options.method,
+      layerControl = _options.layerControl,
+      show = _options.show,
+      _style2 = _options.style,
+      group = _options.group,
+      iconOptions = _options.iconOptions,
+      afterGetData = _options.afterGetData,
+      legend = _options.legend,
+      viewOnly = _options.viewOnly,
+      encrypt = _options.encrypt,
+      valueField = _options.valueField,
+      map = _options.map,
+      tipTemplate = _options.tipTemplate,
+      other = _objectWithoutProperties(_options, _excluded);
     var props = _objectSpread({}, other);
     props.source = props.source || new _source.Vector(_objectSpread({
       features: features
@@ -89,16 +96,32 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
           if (f.show) {
             defaultShow = true;
           }
+
+          // 将字符函数转化为可执行的函数
+          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));
+          }
         });
       }
     }
     _this2 = _super.call(this, props);
-    _defineProperty(_assertThisInitialized(_this2), "getClusterTextStyle", function (size) {
-      return new _style3.Text({
+    _defineProperty(_assertThisInitialized(_this2), "getClusterTextStyle", function (size, options) {
+      var _ref = options && _typeof(options) === 'object' ? options : {},
+        color = _ref.color,
+        background = _ref.background,
+        backgroundStroke = _ref.backgroundStroke,
+        backgroundStrokeWidth = _ref.backgroundStrokeWidth,
+        otherVal = _objectWithoutProperties(_ref, _excluded2);
+      var style = _objectSpread({
         text: String(size),
         font: '18px Calibri,sans-serif',
-        fill: new _style3.Fill({
-          color: '#fff'
+        fill: new _style5.Fill({
+          color: color || '#fff'
         }),
         padding: [0, 0, 0, 0],
         justify: 'center',
@@ -106,7 +129,19 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
         textBaseline: 'middle',
         offsetY: -22,
         offsetX: 16
-      });
+      }, otherVal);
+      if (background) {
+        style.backgroundFill = new _style5.Fill({
+          color: background
+        });
+      }
+      if (backgroundStroke) {
+        style.backgroundStroke = new _style5.Stroke({
+          color: '#FFFFFF',
+          width: backgroundStrokeWidth || 2
+        });
+      }
+      return new _style5.Text(style);
     });
     _defineProperty(_assertThisInitialized(_this2), "getLabelStyle", function (feature, color) {
       var labelField = _this2._options.labelField;
@@ -120,16 +155,16 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
         }
       }
       if (labelField) {
-        return new _style3.Text({
+        return new _style5.Text({
           text: feature.values_[labelField] || '-',
           font: '12px Calibri,sans-serif',
-          fill: new _style3.Fill({
+          fill: new _style5.Fill({
             color: color
           }),
-          backgroundFill: new _style3.Fill({
+          backgroundFill: new _style5.Fill({
             color: '#fff'
           }),
-          backgroundStroke: new _style3.Stroke({
+          backgroundStroke: new _style5.Stroke({
             color: color,
             width: 1
           }),
@@ -142,7 +177,7 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
     });
     _set((_thisSuper = _assertThisInitialized(_this2), _getPrototypeOf(FeatureLayer.prototype)), "show", show, _thisSuper, true);
     // 参数
-    _this2._options = options;
+    _this2._options = _options;
 
     // 地图
     _this2.map = map;
@@ -199,7 +234,7 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
     _this2.legend = legend;
 
     // 样式
-    _this2.style = style;
+    _this2.style = _style2;
 
     // 数据
     _this2.data = data;
@@ -327,7 +362,7 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
           if (typeof style === 'string' || (0, _isFunction["default"])(style) && cluster) {
             styles.push(new _renderer["default"].Marker(_objectSpread({}, _this3.getMarkerOptions(feature, style))));
             return styles;
-          } else if (style instanceof _style3.Style) {
+          } else if (style instanceof _style5.Style) {
             // 判断是否为 ol Style
             styles.push(style);
             return styles;
@@ -343,56 +378,56 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
             styles.push(_style);
             return styles;
           } else if ((0, _isObject["default"])(style)) {
-            var _style2 = style,
-              mode = _style2.mode;
+            var _style3 = style,
+              mode = _style3.mode;
             if (mode) {
               if (mode === 'Simple') {
-                var _options = _this3.getSimpleStyle(feature, style.render);
-                styles.push(_renderer["default"].Simple(_options));
+                var _options2 = _this3.getSimpleStyle(feature, style.render);
+                styles.push(_renderer["default"].Simple(_options2));
                 return styles;
               }
               if (mode === 'UniqueValue') {
                 var _feature$get2;
                 var size = ((_feature$get2 = feature.get('features')) === null || _feature$get2 === void 0 ? void 0 : _feature$get2.length) || 0;
                 if (size > 1) {
-                  var _options2 = _this3.getSimpleStyle(feature, style.render.render[0]);
-                  styles.push(_renderer["default"].Simple(_options2));
+                  var _options3 = _this3.getSimpleStyle(feature, style.render.render[0]);
+                  styles.push(_renderer["default"].Simple(_options3));
                   return styles;
                 }
-                var _options3 = _this3.getMultipleStyle(feature, style.render);
-                styles.push(_renderer["default"].UniqueValue(feature, _options3));
+                var _options4 = _this3.getMultipleStyle(feature, style.render);
+                styles.push(_renderer["default"].UniqueValue(feature, _options4));
                 return styles;
               }
               if (mode === 'ClassBreaks') {
                 var _feature$get3;
                 var _size = ((_feature$get3 = feature.get('features')) === null || _feature$get3 === void 0 ? void 0 : _feature$get3.length) || 0;
                 if (_size > 1) {
-                  var _options4 = _this3.getSimpleStyle(feature, style.render.render[0]);
-                  styles.push(_renderer["default"].Simple(_options4));
+                  var _options5 = _this3.getSimpleStyle(feature, style.render.render[0]);
+                  styles.push(_renderer["default"].Simple(_options5));
                   return styles;
                 }
-                var _options5 = _this3.getMultipleStyle(feature, style.render);
-                styles.push(_renderer["default"].ClassBreaks(feature, _options5));
+                var _options6 = _this3.getMultipleStyle(feature, style.render);
+                styles.push(_renderer["default"].ClassBreaks(feature, _options6));
                 return styles;
               }
             } else if (style.style) {
-              var _options6 = _this3.getSimpleStyle(feature, style);
-              styles.push(_renderer["default"].Simple(_options6));
+              var _options7 = _this3.getSimpleStyle(feature, style);
+              styles.push(_renderer["default"].Simple(_options7));
               return styles;
             }
           }
         }
-        styles.push(new _style3.Style({
-          image: new _style3.Circle({
+        styles.push(new _style5.Style({
+          image: new _style5.Circle({
             radius: 4,
-            fill: new _style3.Fill({
+            fill: new _style5.Fill({
               color: 'rgba(0,155,255, 0.8)'
             })
           }),
-          fill: new _style3.Fill({
+          fill: new _style5.Fill({
             color: 'rgba(255, 255, 255, 0.6)'
           }),
-          stroke: new _style3.Stroke({
+          stroke: new _style5.Stroke({
             color: '#009BFF',
             width: 2
           })
@@ -512,25 +547,30 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
   }, {
     key: "setClusterSource",
     value: function setClusterSource(cluster) {
-      var _this$_features;
+      var _this$_features,
+        _this5 = this;
       var _this = this;
-      var _ref = (0, _isObject["default"])(cluster) ? cluster : {
+      var _ref2 = (0, _isObject["default"])(cluster) ? cluster : {
           show: cluster
         },
-        show = _ref.show,
-        minDistance = _ref.minDistance,
-        distance = _ref.distance;
+        show = _ref2.show,
+        minDistance = _ref2.minDistance,
+        distance = _ref2.distance,
+        group = _ref2.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;
         })
       });
       if (show) {
-        var clusterSource = new _source.Cluster(_objectSpread({
+        group = group || this.group;
+        var clusterSource = new _MyCluster["default"](_objectSpread({
           distance: distance || 100,
           minDistance: minDistance || 50,
           source: source,
+          group: group,
           createCluster: function createCluster(point, features) {
+            var _group;
             var feature = new _ol.Feature({
               geometry: point,
               features: features.map(function (v) {
@@ -538,6 +578,41 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
                 return v;
               })
             });
+            if ((_group = group) !== null && _group !== void 0 && _group.length) {
+              var _group2;
+              var style;
+              var f = features[0];
+              var size = features.length;
+              (_group2 = group) === null || _group2 === void 0 ? 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;
+                }
+              });
+              var markerStyle = _objectSpread({}, style.style);
+              if (size > 1) {
+                var _style4, _markerStyle2;
+                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, _excluded3);
+                markerStyle = _objectSpread(_objectSpread({}, otherStyle), {}, {
+                  text: _this5.getClusterTextStyle((_markerStyle2 = markerStyle) !== null && _markerStyle2 !== void 0 && _markerStyle2.image ? size : ' ', numberStyle),
+                  iconOptions: _objectSpread({
+                    hideFooter: true,
+                    info: {
+                      text: size,
+                      fontSize: 18
+                    }
+                  }, iconOptions || (cluster === null || cluster === void 0 ? void 0 : cluster.iconOptions) || {})
+                });
+              }
+              var _style = new _renderer["default"].Marker(markerStyle);
+              feature.setStyle(_style);
+            }
 
             // 增加聚合点位标识
             feature.isCluster = true;
@@ -555,7 +630,7 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
   }, {
     key: "refresh",
     value: function refresh() {
-      var _this5 = this;
+      var _this6 = this;
       (0, _createFeatureCollection.getDataByHttpByParams)({
         url: this.url,
         params: this.params,
@@ -565,10 +640,10 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
       }).then(function (features) {
         if (features) {
           var new_features = features;
-          _this5._features = new_features;
+          _this6._features = new_features;
           var newFeatures = [];
           new_features.map(function (v) {
-            var f = _this5.getFeatureByFieldValue('id', v.values_.id);
+            var f = _this6.getFeatureByFieldValue('id', v.values_.id);
             if (f) {
               f.values_ = v.values_;
             } else {
@@ -576,9 +651,9 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
             }
           });
           if (newFeatures.length) {
-            _this5.getSource().addFeatures(newFeatures);
+            _this6.getSource().addFeatures(newFeatures);
           }
-          _this5.getSource().changed();
+          _this6.getSource().changed();
         }
       });
     }
@@ -596,7 +671,7 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
   }, {
     key: "loadUrlData",
     value: function loadUrlData(url, params, method) {
-      var _this6 = this;
+      var _this7 = this;
       var afterGetData = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : this.afterGetData;
       this.getSource().clear();
       this._features = [];
@@ -611,11 +686,11 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
         field: this.dataField
       }).then(function (features) {
         if (features !== null && features !== void 0 && features.length) {
-          _this6._features = features;
-          _this6.getSource().addFeatures(features);
+          _this7._features = features;
+          _this7.getSource().addFeatures(features);
         }
-        if (_this6._options.cluster) {
-          _this6.setClusterMode(_this6._options.cluster);
+        if (_this7._options.cluster) {
+          _this7.setClusterMode(_this7._options.cluster);
         }
       });
     }
@@ -644,16 +719,16 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
     }
   }, {
     key: "getFeaturesByFieldValueOpera",
-    value: function getFeaturesByFieldValueOpera(_ref2) {
-      var _this7 = this;
-      var field = _ref2.field,
-        value = _ref2.value,
-        _ref2$operation = _ref2.operation,
-        operation = _ref2$operation === void 0 ? '===' : _ref2$operation,
-        features = _ref2.features,
-        filter = _ref2.filter;
+    value: function getFeaturesByFieldValueOpera(_ref3) {
+      var _this8 = 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;
       return new Promise(function (resolve, reject) {
-        var _features = features || _this7.getFeatures();
+        var _features = features || _this8.getFeatures();
         if (filter) {
           _features = _features.filter(function (feature) {
             return filter(feature.values_);
@@ -709,8 +784,8 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
           this._features.map(function (feature) {
             var show = true;
             group.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, feature.values_)) {
+              var _v$filter3;
+              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;
                 }