@vtx/ol-map 1.0.85 → 1.0.87

package/lib/feature-layer/FeatureLayer.js

@@ -15,15 +15,15 @@ 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"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-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 _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 _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 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 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"); } }
@@ -47,7 +47,7 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
   _inherits(FeatureLayer, _Vector);
   var _super = _createSuper(FeatureLayer);
   function FeatureLayer(options) {
-    var _thisSuper, _this;
+    var _thisSuper, _this2;
     _classCallCheck(this, FeatureLayer);
     var url = options.url,
       params = options.params,
@@ -91,8 +91,8 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
         });
       }
     }
-    _this = _super.call(this, props);
-    _defineProperty(_assertThisInitialized(_this), "getClusterTextStyle", function (size) {
+    _this2 = _super.call(this, props);
+    _defineProperty(_assertThisInitialized(_this2), "getClusterTextStyle", function (size) {
       return new _style3.Text({
         text: String(size),
         font: '18px Calibri,sans-serif',
@@ -107,8 +107,8 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
         offsetX: 16
       });
     });
-    _defineProperty(_assertThisInitialized(_this), "getLabelStyle", function (feature, color) {
-      var labelField = _this._options.labelField;
+    _defineProperty(_assertThisInitialized(_this2), "getLabelStyle", function (feature, color) {
+      var labelField = _this2._options.labelField;
 
       // 判断是否是聚合点位
       if (feature.isCluster) {
@@ -139,87 +139,90 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
         });
       }
     });
-    _set((_thisSuper = _assertThisInitialized(_this), _getPrototypeOf(FeatureLayer.prototype)), "show", show, _thisSuper, true);
+    _set((_thisSuper = _assertThisInitialized(_this2), _getPrototypeOf(FeatureLayer.prototype)), "show", show, _thisSuper, true);
     // 参数
-    _this._options = options;
+    _this2._options = options;
 
     // 地图
-    _this.map = map;
+    _this2.map = map;
 
     // 接口地址
-    _this.url = url;
+    _this2.url = url;
 
     // 接口地址请求类型
-    _this.method = method;
+    _this2.method = method;
 
     // 接口查询参数
-    _this.params = params;
+    _this2.params = params;
 
     // 图层标识
-    _this.key = key;
+    _this2.key = key;
 
     // 图层名称
-    _this.name = name;
+    _this2.name = name;
 
     // 标签
-    _this.label = label;
+    _this2.label = label;
 
     // 标签字段
-    _this.labelField = _labelField;
+    _this2.labelField = _labelField;
 
     // 聚合
-    _this.cluster = cluster;
+    _this2.cluster = cluster;
 
     // 聚合距离
-    _this.distance = (cluster === null || cluster === void 0 ? void 0 : cluster.distance) || 80;
+    _this2.distance = (cluster === null || cluster === void 0 ? void 0 : cluster.distance) || 80;
 
     // 海量点
-    _this.point = point;
+    _this2.point = point;
 
     // 自动刷新标识
-    _this.autoRefresh = autoRefresh;
+    _this2.autoRefresh = autoRefresh;
 
     // 模版内容
-    _this.template = template;
+    _this2.template = template;
 
     // 图层控制
-    _this.layerControl = layerControl;
+    _this2.layerControl = layerControl;
 
     // 过滤
-    _this.group = group;
+    _this2.group = group;
 
     // 处理获取的数据
-    _this.afterGetData = afterGetData;
+    _this2.afterGetData = afterGetData;
 
     // 数据查询字段
-    _this.valueField = valueField;
+    _this2.valueField = valueField;
 
     // 图例
-    _this.legend = legend;
+    _this2.legend = legend;
 
     // 样式
-    _this.style = style;
+    _this2.style = style;
 
     // 数据
-    _this.data = data;
+    _this2.data = data;
 
     // 数据取值字段
-    _this.dataField = dataField || 'geometryInfo';
+    _this2.dataField = dataField || 'geometryInfo';
 
     // 仅展示
-    _this.viewOnly = viewOnly;
+    _this2.viewOnly = viewOnly;
 
     // 是否初始化
-    _this.inited = false;
+    _this2.inited = false;
 
     // 加密
-    _this.encrypt = encrypt;
+    _this2.encrypt = encrypt;
+
+    // 临时数据
+    _this2._features = [];
 
     // 默认是否展示
     if (defaultShow) {
-      _this.init();
+      _this2.init();
     }
-    return _this;
+    return _this2;
   }
 
   // 初始化数据
@@ -282,15 +285,15 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
   }, {
     key: "getStyleByMode",
     value: function getStyleByMode() {
-      var _this2 = this;
+      var _this3 = this;
       return function (feature, resolution) {
-        var _this2$group;
-        var _this2$_options = _this2._options,
-          style = _this2$_options.style,
-          cluster = _this2$_options.cluster,
-          otherStyle = _this2$_options.otherStyle;
+        var _this3$group;
+        var _this3$_options = _this3._options,
+          style = _this3$_options.style,
+          cluster = _this3$_options.cluster,
+          otherStyle = _this3$_options.otherStyle;
         var show = true;
-        (_this2$group = _this2.group) === null || _this2$group === void 0 || _this2$group.map(function (v) {
+        (_this3$group = _this3.group) === null || _this3$group === void 0 ? void 0 : _this3$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;
@@ -299,6 +302,7 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
             }
           }
         });
+        feature.show = show;
         if (!show) {
           return null;
         }
@@ -317,7 +321,7 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
         }
         if (style) {
           if (typeof style === 'string' || (0, _isFunction["default"])(style) && cluster) {
-            styles.push(new _renderer["default"].Marker(_objectSpread({}, _this2.getMarkerOptions(feature, style))));
+            styles.push(new _renderer["default"].Marker(_objectSpread({}, _this3.getMarkerOptions(feature, style))));
             return styles;
           } else if (style instanceof _style3.Style) {
             // 判断是否为 ol Style
@@ -328,7 +332,7 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
 
             var _style = style(feature);
             if (_style !== null && _style !== void 0 && _style.type && _style !== null && _style !== void 0 && _style.style) {
-              var options = _this2.getSimpleStyle(feature, _style);
+              var options = _this3.getSimpleStyle(feature, _style);
               styles.push(_renderer["default"].Simple(options));
               return styles;
             }
@@ -339,7 +343,7 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
               mode = _style2.mode;
             if (mode) {
               if (mode === 'Simple') {
-                var _options = _this2.getSimpleStyle(feature, style.render);
+                var _options = _this3.getSimpleStyle(feature, style.render);
                 styles.push(_renderer["default"].Simple(_options));
                 return styles;
               }
@@ -347,11 +351,11 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
                 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 = _this2.getSimpleStyle(feature, style.render.render[0]);
+                  var _options2 = _this3.getSimpleStyle(feature, style.render.render[0]);
                   styles.push(_renderer["default"].Simple(_options2));
                   return styles;
                 }
-                var _options3 = _this2.getMultipleStyle(feature, style.render);
+                var _options3 = _this3.getMultipleStyle(feature, style.render);
                 styles.push(_renderer["default"].UniqueValue(feature, _options3));
                 return styles;
               }
@@ -359,16 +363,16 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
                 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 = _this2.getSimpleStyle(feature, style.render.render[0]);
+                  var _options4 = _this3.getSimpleStyle(feature, style.render.render[0]);
                   styles.push(_renderer["default"].Simple(_options4));
                   return styles;
                 }
-                var _options5 = _this2.getMultipleStyle(feature, style.render);
+                var _options5 = _this3.getMultipleStyle(feature, style.render);
                 styles.push(_renderer["default"].ClassBreaks(feature, _options5));
                 return styles;
               }
             } else if (style.style) {
-              var _options6 = _this2.getSimpleStyle(feature, style);
+              var _options6 = _this3.getSimpleStyle(feature, style);
               styles.push(_renderer["default"].Simple(_options6));
               return styles;
             }
@@ -407,11 +411,11 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
     key: "getMultipleStyle",
     value: function getMultipleStyle(feature, _render) {
       var _render$render,
-        _this3 = this;
+        _this4 = this;
       var render = _objectSpread({}, _render);
       if (render !== null && render !== void 0 && (_render$render = render.render) !== null && _render$render !== void 0 && _render$render.length) {
         render.render = render.render.map(function (v) {
-          return _this3.getSimpleStyle(feature, v);
+          return _this4.getSimpleStyle(feature, v);
         });
       }
       return render;
@@ -432,11 +436,11 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
       var isFun = (0, _isFunction["default"])(style);
       var data = {};
       if (isFun) {
-        var _data, _data2, _data3, _data4, _data5, _data6;
+        var _data, _data$style, _data2, _data3, _data3$style, _data4, _data5, _data5$style, _data6;
         data = style(feature) || {};
-        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;
+        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;
       }
       var size = ((_feature$get4 = feature.get('features')) === null || _feature$get4 === void 0 ? void 0 : _feature$get4.length) || 0;
       var P = {
@@ -449,20 +453,18 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
           icon: icon,
           type: 'PointIcon'
         },
-        marker_cluster: _objectSpread(_objectSpread({
+        marker_cluster: _objectSpread({
           // 聚合图标
           icon: icon,
           color: size > 1 ? '' : color,
           iconOptions: size > 1 ? _objectSpread({
             hideFooter: true,
             info: {
-              text: '',
+              text: size,
               fontSize: 18
             }
           }, (cluster === null || cluster === void 0 ? void 0 : cluster.iconOptions) || {}) : {}
-        }, size > 1 ? cluster === null || cluster === void 0 ? void 0 : cluster.style : cluster === null || cluster === void 0 ? void 0 : cluster.commonStyle), {}, {
-          image: size > 1 ? '' : image || ''
-        }),
+        }, size > 1 ? cluster === null || cluster === void 0 ? void 0 : cluster.style : cluster === null || cluster === void 0 ? void 0 : cluster.commonStyle),
         point_cluster: _objectSpread({
           // 聚合点位
           icon: icon,
@@ -498,37 +500,39 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
           _style.text = this.getLabelStyle(feature, color);
         }
       }
-      if (feature.isCluster && size > 1 && type === 'marker_cluster') {
-        _style.text = this.getClusterTextStyle(size);
-      }
+
+      // if (feature.isCluster && size > 1 && type === 'marker_cluster') {
+      //     _style.text = this.getClusterTextStyle(size);
+      // }
+
       return _style;
     }
   }, {
     key: "setClusterSource",
     value: function setClusterSource(cluster) {
-      var _this4 = this;
+      var _this$_features;
+      var _this = this;
       var source = new _source.Vector({
-        features: this._features
+        features: (_this$_features = this._features) === null || _this$_features === void 0 ? void 0 : _this$_features.filter(function (v) {
+          return v.show;
+        })
       });
-      var showCluster = false;
-      if (cluster) {
-        if ((0, _isObject["default"])(cluster)) {
-          if (cluster.show) {
-            showCluster = true;
-          }
-        } else {
-          showCluster = true;
-        }
-      }
-      if (showCluster) {
+      var _ref = (0, _isObject["default"])(cluster) ? cluster : {
+          show: cluster
+        },
+        show = _ref.show,
+        minDistance = _ref.minDistance,
+        distance = _ref.distance;
+      if (show) {
         var clusterSource = new _source.Cluster(_objectSpread({
-          distance: this.distance,
+          distance: distance || 100,
+          minDistance: minDistance || 50,
           source: source,
           createCluster: function createCluster(point, features) {
             var feature = new _ol.Feature({
               geometry: point,
               features: features.map(function (v) {
-                v.layerKey = _this4.key;
+                v.layerKey = _this.key;
                 return v;
               })
             });
@@ -638,14 +642,14 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
     }
   }, {
     key: "getFeaturesByFieldValueOpera",
-    value: function getFeaturesByFieldValueOpera(_ref) {
+    value: function getFeaturesByFieldValueOpera(_ref2) {
       var _this7 = this;
-      var field = _ref.field,
-        value = _ref.value,
-        _ref$operation = _ref.operation,
-        operation = _ref$operation === void 0 ? '===' : _ref$operation,
-        features = _ref.features,
-        filter = _ref.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 || _this7.getFeatures();
         if (filter) {
@@ -698,8 +702,8 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
     key: "setGroup",
     value: function setGroup(group) {
       if (group !== null && group !== void 0 && group.length) {
-        var _this$_features;
-        if ((_this$_features = this._features) !== null && _this$_features !== void 0 && _this$_features.length) {
+        var _this$_features2;
+        if ((_this$_features2 = this._features) !== null && _this$_features2 !== void 0 && _this$_features2.length) {
           this._features.map(function (feature) {
             var show = true;
             group.map(function (v) {
@@ -708,14 +712,18 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
                 if (v.hasOwnProperty('show') && !v.show) {
                   show = false;
                 }
-                feature.show = show;
               }
             });
+            feature.show = show;
           });
         }
         this.group = group;
         this.setVisibleByGroup();
-        this.setStyle(this.getStyleByMode());
+        if (this._options.cluster) {
+          this.setClusterMode(this._options.cluster);
+        } else {
+          this.setStyle(this.getStyleByMode());
+        }
       }
     }
 
@@ -754,5 +762,6 @@ var FeatureLayer = /*#__PURE__*/function (_Vector) {
   }]);
   return FeatureLayer;
 }(_layer.Vector);
-var _default = exports["default"] = FeatureLayer;
+var _default = FeatureLayer;
+exports["default"] = _default;
 //# sourceMappingURL=FeatureLayer.js.map