Skip to content

Commit c261863

Browse files
committed
【update】 更新 leaflet dist 文件,leaflet dataflowlayer 增加是否是内部 layer 的判断 review by songym
1 parent 319580a commit c261863

File tree

7 files changed

+762
-756
lines changed

7 files changed

+762
-756
lines changed

dist/leaflet/iclient-leaflet-es6.js

Lines changed: 97 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -82744,113 +82744,115 @@ var NormalRenderer_NormalRenderer = external_L_default.a.GeoJSON.extend({
8274482744

8274582745
var DataFlowLayer_DataFlowLayer = external_L_default.a.LayerGroup.extend({
8274682746

82747-
options: {
82748-
geometry: null,
82749-
prjCoordSys: null,
82750-
excludeField: null,
82751-
idField: "id",
82752-
render: 'normal'
82753-
},
82754-
82755-
initialize: function (url, options) {
82756-
options = options || {};
82757-
external_L_default.a.Util.setOptions(this, options);
82758-
this.url = url;
82759-
this._layers = {};
82760-
this.dataService = new services_DataFlowService_DataFlowService(this.url, {
82761-
geometry: this.options.geometry,
82762-
prjCoordSys: this.options.prjCoordSys,
82763-
excludeField: this.options.excludeField
82764-
})
82747+
options: {
82748+
geometry: null,
82749+
prjCoordSys: null,
82750+
excludeField: null,
82751+
idField: "id",
82752+
render: 'normal'
82753+
},
82754+
82755+
initialize: function (url, options) {
82756+
options = options || {};
82757+
external_L_default.a.Util.setOptions(this, options);
82758+
this.url = url;
82759+
this._layers = {};
82760+
this.dataService = new services_DataFlowService_DataFlowService(this.url, {
82761+
geometry: this.options.geometry,
82762+
prjCoordSys: this.options.prjCoordSys,
82763+
excludeField: this.options.excludeField
82764+
})
8276582765

82766-
},
82767-
/**
82768-
* @private
82769-
* @function L.supermap.dataFlowLayer.prototype.onAdd
82770-
* @description 添加地图。
82771-
* @param {L.Map} map - 待添加的地图。
82772-
*/
82773-
onAdd: function (map) { // eslint-disable-line no-unused-vars
82774-
this.dataService.initSubscribe();
82775-
/**
82776-
* @event L.supermap.dataFlowLayer#subscribesucceeded
82777-
* @description 初始化成功后触发。
82778-
* @property {Object} e - 事件对象。
82779-
*/
82780-
this.dataService.on('subscribeSocketConnected', (e) => this.fire("subscribesucceeded", e));
82781-
82782-
/**
82783-
* @event L.supermap.dataFlowLayer#subscribefailed
82784-
* @description 初始化失败后触发。
82785-
* @property {Object} e - 事件对象。
82786-
*/
82787-
this.dataService.on('subscribeSocketError', (e) => this.fire("subscribefailed", e))
82788-
this.dataService.on('messageSucceeded', (msg) => this._onMessageSuccessed(msg));
82789-
82790-
/**
82791-
* @event L.supermap.dataFlowLayer#setfilterparamsucceeded
82792-
* @description 过滤参数设置成功后触发。
82793-
* @property {Object} e - 事件对象。
82794-
*/
82795-
this.dataService.on('setFilterParamSucceeded', (msg) => this.fire("setfilterparamsucceeded", msg));
82796-
if (this.options.render === 'mapv') {
82797-
this.addLayer(new MapvRenderer_MapvRenderer(this.url, this.options));
82798-
} else {
82799-
this.addLayer(new NormalRenderer_NormalRenderer(this.url, this.options));
82800-
}
82801-
external_L_default.a.LayerGroup.prototype.onAdd.call(this, map);
82802-
},
82766+
},
82767+
/**
82768+
* @private
82769+
* @function L.supermap.dataFlowLayer.prototype.onAdd
82770+
* @description 添加地图。
82771+
* @param {L.Map} map - 待添加的地图。
82772+
*/
82773+
onAdd: function (map) { // eslint-disable-line no-unused-vars
82774+
this.dataService.initSubscribe();
8280382775
/**
82804-
* @private
82805-
* @function L.supermap.dataFlowLayer.prototype.onRemove
82806-
* @description 删除指定地图。
82807-
* @param {L.Map} map - 待删除的地图。
82776+
* @event L.supermap.dataFlowLayer#subscribesucceeded
82777+
* @description 初始化成功后触发。
82778+
* @property {Object} e - 事件对象。
8280882779
*/
82809-
onRemove: function (map) { // eslint-disable-line no-unused-vars
82810-
external_L_default.a.LayerGroup.prototype.onRemove.call(this, map);
82811-
this.dataService && this.dataService.unSubscribe();
82812-
},
82780+
this.dataService.on('subscribeSocketConnected', (e) => this.fire("subscribesucceeded", e));
82781+
8281382782
/**
82814-
* @function L.supermap.dataFlowLayer.prototype.setExcludeField
82815-
* @description 设置唯一字段
82816-
* @param {string} excludeField - 唯一字段
82783+
* @event L.supermap.dataFlowLayer#subscribefailed
82784+
* @description 初始化失败后触发
82785+
* @property {Object} e - 事件对象
8281782786
*/
82818-
setExcludeField: function (excludeField) {
82819-
this.dataService.setExcludeField(excludeField);
82820-
this.options.excludeField = excludeField;
82821-
return this;
82822-
},
82787+
this.dataService.on('subscribeSocketError', (e) => this.fire("subscribefailed", e))
82788+
this.dataService.on('messageSucceeded', (msg) => this._onMessageSuccessed(msg));
8282382789

8282482790
/**
82825-
* @function L.supermap.dataFlowLayer.prototype.setGeometry
82826-
* @description 设置集合要素
82827-
* @param {GeoJSONObject} geometry - 待设置的 GeoJSON 几何要素对象
82791+
* @event L.supermap.dataFlowLayer#setfilterparamsucceeded
82792+
* @description 过滤参数设置成功后触发
82793+
* @property {Object} e - 事件对象
8282882794
*/
82829-
setGeometry: function (geometry) {
82830-
this.dataService.setGeometry(geometry);
82831-
this.options.geometry = geometry;
82832-
return this;
82833-
},
82834-
_onMessageSuccessed: function (msg) {
82835-
this.getLayers().map((layer) => {
82836-
layer.onMessageSuccessed(msg);
82837-
/**
82838-
* @description 图层数据更新成功后触发。
82839-
* @event L.supermap.dataFlowLayer#dataupdated
82840-
* @property {Object} layer - 更新数据成功的图层。
82841-
* @property {Object} data - 更新的要素。
82842-
*/
82843-
this.fire("dataupdated", {
82844-
layer: layer,
82845-
data: msg.featureResult
82846-
});
82847-
return layer;
82848-
})
82795+
this.dataService.on('setFilterParamSucceeded', (msg) => this.fire("setfilterparamsucceeded", msg));
82796+
if (this.options.render === 'mapv') {
82797+
this.addLayer(new MapvRenderer_MapvRenderer(this.url, this.options));
82798+
} else {
82799+
this.addLayer(new NormalRenderer_NormalRenderer(this.url, this.options));
8284982800
}
82801+
external_L_default.a.LayerGroup.prototype.onAdd.call(this, map);
82802+
},
82803+
/**
82804+
* @private
82805+
* @function L.supermap.dataFlowLayer.prototype.onRemove
82806+
* @description 删除指定地图。
82807+
* @param {L.Map} map - 待删除的地图。
82808+
*/
82809+
onRemove: function (map) { // eslint-disable-line no-unused-vars
82810+
external_L_default.a.LayerGroup.prototype.onRemove.call(this, map);
82811+
this.dataService && this.dataService.unSubscribe();
82812+
},
82813+
/**
82814+
* @function L.supermap.dataFlowLayer.prototype.setExcludeField
82815+
* @description 设置唯一字段。
82816+
* @param {string} excludeField - 唯一字段。
82817+
*/
82818+
setExcludeField: function (excludeField) {
82819+
this.dataService.setExcludeField(excludeField);
82820+
this.options.excludeField = excludeField;
82821+
return this;
82822+
},
82823+
82824+
/**
82825+
* @function L.supermap.dataFlowLayer.prototype.setGeometry
82826+
* @description 设置集合要素。
82827+
* @param {GeoJSONObject} geometry - 待设置的 GeoJSON 几何要素对象。
82828+
*/
82829+
setGeometry: function (geometry) {
82830+
this.dataService.setGeometry(geometry);
82831+
this.options.geometry = geometry;
82832+
return this;
82833+
},
82834+
_onMessageSuccessed: function (msg) {
82835+
this.getLayers().map((layer) => {
82836+
if (layer.onMessageSuccessed) {
82837+
layer.onMessageSuccessed(msg);
82838+
/**
82839+
* @description 图层数据更新成功后触发。
82840+
* @event L.supermap.dataFlowLayer#dataupdated
82841+
* @property {Object} layer - 更新数据成功的图层。
82842+
* @property {Object} data - 更新的要素。
82843+
*/
82844+
this.fire("dataupdated", {
82845+
layer: layer,
82846+
data: msg.featureResult
82847+
});
82848+
}
82849+
return layer;
82850+
})
82851+
}
8285082852

8285182853
});
8285282854
var DataFlowLayer_dataFlowLayer = function (url, options) {
82853-
return new DataFlowLayer_DataFlowLayer(url, options);
82855+
return new DataFlowLayer_DataFlowLayer(url, options);
8285482856
};
8285582857

8285682858
external_L_default.a.supermap.dataFlowLayer = DataFlowLayer_dataFlowLayer;

dist/leaflet/iclient-leaflet-es6.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/leaflet/iclient-leaflet.css

Lines changed: 452 additions & 452 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)