Skip to content

Commit 18242aa

Browse files
zhurczhurc
committed
废弃ElasticSearch change属性&fix ElasticSearch查询逻辑错误问题
1 parent 4fe4d61 commit 18242aa

File tree

9 files changed

+167
-118
lines changed

9 files changed

+167
-118
lines changed

‎dist/iclient-classic.js‎

Lines changed: 33 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6164,7 +6164,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
61646164
* @classdesc ElasticSearch服务类。
61656165
* @param url - {string} ElasticSearch服务地址。
61666166
* @param options - {Object} 可选参数。如:</br>
6167-
* change - {function} 服务器返回数据后执行的函数。</br>
6167+
* change - {function} 服务器返回数据后执行的函数。废弃,不建议使用。使用search或msearch方法。</br>
61686168
* openGeoFence - {boolean} 是否开启地理围栏验证，默认为不开启。</br>
61696169
* outOfGeoFence - {function} 数据超出地理围栏后执行的函数。</br>
61706170
* geoFence - {Object} 地理围栏。</br>
@@ -6188,8 +6188,9 @@ var ElasticSearch = exports.ElasticSearch = function () {
61886188
host: this.url
61896189
});
61906190
/**
6191+
* @deprecated
61916192
* @member SuperMap.ElasticSearch.prototype.change -{function}
6192-
* @description 服务器返回数据后执行的函数
6193+
* @description 服务器返回数据后执行的函数。废弃,不建议使用。使用search或msearch方法。
61936194
*/
61946195
this.change = null;
61956196
/**
@@ -6543,21 +6544,23 @@ var ElasticSearch = exports.ElasticSearch = function () {
65436544
* 参数设置参考 https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/api-reference.html#api-msearch</br>
65446545
* 更多信息参考 https://www.elastic.co/guide/en/elasticsearch/reference/current/search-multi-search.html</br>
65456546
* @param params - {Object} 参数。
6546-
* @param callback - {function} 回调函数。
6547+
* @param callback - {function} 请求返回的回调函数。也可以使用then表达式获取返回结果。<br>
6548+
* 回调参数：error,response。结果存储在response.responses中
65476549
*/
65486550

65496551
}, {
65506552
key: 'msearch',
65516553
value: function msearch(params, callback) {
65526554
var me = this;
6553-
if (me.openGeoFence) {
6554-
return me.client.msearch(params, callback).then(function (resp) {
6555-
me._update(resp.responses);
6556-
}, function (err) {
6557-
me.events.triggerEvent('error', { error: err });
6558-
});
6559-
}
6560-
return me.client.msearch(params, callback);
6555+
6556+
return me.client.msearch(params).then(function (resp) {
6557+
me._update(resp.responses, callback);
6558+
return resp;
6559+
}, function (err) {
6560+
callback(err);
6561+
me.events.triggerEvent('error', { error: err });
6562+
return err;
6563+
});
65616564
}
65626565

65636566
/**
@@ -6701,21 +6704,22 @@ var ElasticSearch = exports.ElasticSearch = function () {
67016704
* 参数设置参考 https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/api-reference.html#api-search</br>
67026705
* 更多信息参考 https://www.elastic.co/guide/en/elasticsearch/reference/current/search-search.html</br>
67036706
* @param params - {Object} 参数。
6704-
* @param callback - {function} 回调函数。
6707+
* @param callback - {function} 请求返回的回调函数。也可以使用then表达式获取返回结果。<br>
6708+
* 回调参数：error,response,结果存储在response.responses中
67056709
*/
67066710

67076711
}, {
67086712
key: 'search',
67096713
value: function search(params, callback) {
67106714
var me = this;
6711-
if (me.openGeoFence) {
6712-
return me.client.search(params, callback).then(function (resp) {
6713-
me._update(resp.responses);
6714-
}, function (err) {
6715-
me.events.triggerEvent('error', { error: err });
6716-
});
6717-
}
6718-
return me.client.search(params, callback);
6715+
return me.client.search(params).then(function (resp) {
6716+
me._update(resp.responses, callback);
6717+
return resp;
6718+
}, function (err) {
6719+
callback(err);
6720+
me.events.triggerEvent('error', { error: err });
6721+
return err;
6722+
});
67196723
}
67206724

67216725
/**
@@ -6809,17 +6813,23 @@ var ElasticSearch = exports.ElasticSearch = function () {
68096813
}
68106814
}, {
68116815
key: '_update',
6812-
value: function _update(data) {
6816+
value: function _update(data, callback) {
68136817
var me = this;
68146818
if (!data) {
68156819
return;
68166820
}
68176821
me.data = data;
6818-
if (me.geoFence) {
6822+
if (me.openGeoFence && me.geoFence) {
68196823
me._validateDatas(data);
68206824
}
68216825
me.events.triggerEvent('change', { data: me.data });
6822-
me.change && me.change(data);
6826+
//change方法已废弃，不建议使用。建议使用search方法的第二个参数传入请求成功的回调
6827+
if (me.change) {
6828+
me.change && me.change(data);
6829+
} else {
6830+
//加responses是为了保持跟原来es自身的数据结构一致
6831+
callback && callback(undefined, { responses: data });
6832+
}
68236833
}
68246834
}, {
68256835
key: '_validateDatas',

‎dist/iclient-classic.min.js‎

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

‎dist/iclient9-leaflet.js‎

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -27197,7 +27197,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
2719727197
* @classdesc ElasticSearch服务类。
2719827198
* @param url - {string} ElasticSearch服务地址。
2719927199
* @param options - {Object} 可选参数。如:</br>
27200-
* change - {function} 服务器返回数据后执行的函数。</br>
27200+
* change - {function} 服务器返回数据后执行的函数。废弃,不建议使用。使用search或msearch方法。</br>
2720127201
* openGeoFence - {boolean} 是否开启地理围栏验证，默认为不开启。</br>
2720227202
* outOfGeoFence - {function} 数据超出地理围栏后执行的函数。</br>
2720327203
* geoFence - {Object} 地理围栏。</br>
@@ -27221,8 +27221,9 @@ var ElasticSearch = exports.ElasticSearch = function () {
2722127221
host: this.url
2722227222
});
2722327223
/**
27224+
* @deprecated
2722427225
* @member SuperMap.ElasticSearch.prototype.change -{function}
27225-
* @description 服务器返回数据后执行的函数
27226+
* @description 服务器返回数据后执行的函数。废弃,不建议使用。使用search或msearch方法。
2722627227
*/
2722727228
this.change = null;
2722827229
/**
@@ -27576,21 +27577,23 @@ var ElasticSearch = exports.ElasticSearch = function () {
2757627577
* 参数设置参考 https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/api-reference.html#api-msearch</br>
2757727578
* 更多信息参考 https://www.elastic.co/guide/en/elasticsearch/reference/current/search-multi-search.html</br>
2757827579
* @param params - {Object} 参数。
27579-
* @param callback - {function} 回调函数。
27580+
* @param callback - {function} 请求返回的回调函数。也可以使用then表达式获取返回结果。<br>
27581+
* 回调参数：errorresponse。结果存储在response.responses中
2758027582
*/
2758127583

2758227584
}, {
2758327585
key: 'msearch',
2758427586
value: function msearch(params, callback) {
2758527587
var me = this;
27586-
if (me.openGeoFence) {
27587-
return me.client.msearch(params, callback).then(function (resp) {
27588-
me._update(resp.responses);
27589-
}, function (err) {
27590-
me.events.triggerEvent('error', { error: err });
27591-
});
27592-
}
27593-
return me.client.msearch(params, callback);
27588+
27589+
return me.client.msearch(params).then(function (resp) {
27590+
me._update(resp.responses, callback);
27591+
return resp;
27592+
}, function (err) {
27593+
callback(err);
27594+
me.events.triggerEvent('error', { error: err });
27595+
return err;
27596+
});
2759427597
}
2759527598

2759627599
/**
@@ -27734,21 +27737,22 @@ var ElasticSearch = exports.ElasticSearch = function () {
2773427737
* 参数设置参考 https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/api-reference.html#api-search</br>
2773527738
* 更多信息参考 https://www.elastic.co/guide/en/elasticsearch/reference/current/search-search.html</br>
2773627739
* @param params - {Object} 参数。
27737-
* @param callback - {function} 回调函数。
27740+
* @param callback - {function} 请求返回的回调函数。也可以使用then表达式获取返回结果。<br>
27741+
* 回调参数：errorresponse结果存储在response.responses中
2773827742
*/
2773927743

2774027744
}, {
2774127745
key: 'search',
2774227746
value: function search(params, callback) {
2774327747
var me = this;
27744-
if (me.openGeoFence) {
27745-
return me.client.search(params, callback).then(function (resp) {
27746-
me._update(resp.responses);
27747-
}, function (err) {
27748-
me.events.triggerEvent('error', { error: err });
27749-
});
27750-
}
27751-
return me.client.search(params, callback);
27748+
return me.client.search(params).then(function (resp) {
27749+
me._update(resp.responses, callback);
27750+
return resp;
27751+
}, function (err) {
27752+
callback(err);
27753+
me.events.triggerEvent('error', { error: err });
27754+
return err;
27755+
});
2775227756
}
2775327757

2775427758
/**
@@ -27842,17 +27846,23 @@ var ElasticSearch = exports.ElasticSearch = function () {
2784227846
}
2784327847
}, {
2784427848
key: '_update',
27845-
value: function _update(data) {
27849+
value: function _update(data, callback) {
2784627850
var me = this;
2784727851
if (!data) {
2784827852
return;
2784927853
}
2785027854
me.data = data;
27851-
if (me.geoFence) {
27855+
if (me.openGeoFence && me.geoFence) {
2785227856
me._validateDatas(data);
2785327857
}
2785427858
me.events.triggerEvent('change', { data: me.data });
27855-
me.change && me.change(data);
27859+
//change方法已废弃，不建议使用。建议使用search方法的第二个参数传入请求成功的回调
27860+
if (me.change) {
27861+
me.change && me.change(data);
27862+
} else {
27863+
//加responses是为了保持跟原来es自身的数据结构一致
27864+
callback && callback(undefined, { responses: data });
27865+
}
2785627866
}
2785727867
}, {
2785827868
key: '_validateDatas',
@@ -94234,7 +94244,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
9423494244
/* 500 */
9423594245
/***/ (function(module, exports) {
9423694246

94237-
module.exports = {"_from":"proj4@2.3.15","_id":"proj4@2.3.15","_inBundle":false,"_integrity":"sha1-WtBui8owvg/6OJpJ5FZfUfBtCJ4=","_location":"/proj4","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"proj4@2.3.15","name":"proj4","escapedName":"proj4","rawSpec":"2.3.15","saveSpec":null,"fetchSpec":"2.3.15"},"_requiredBy":["/"],"_resolved":"https://registry.npmjs.org/proj4/-/proj4-2.3.15.tgz","_shasum":"5ad06e8bca30be0ffa389a49e4565f51f06d089e","_spec":"proj4@2.3.15","_where":"G:\\iClient9","author":"","bugs":{"url":"https://github.com/proj4js/proj4js/issues"},"bundleDependencies":false,"contributors":[{"name":"Mike Adair","email":"madair@dmsolutions.ca"},{"name":"Richard Greenwood","email":"rich@greenwoodmap.com"},{"name":"Calvin Metcalf","email":"calvin.metcalf@gmail.com"},{"name":"Richard Marsden","url":"http://www.winwaed.com"},{"name":"T. Mittan"},{"name":"D. Steinwand"},{"name":"S. Nelson"}],"dependencies":{"mgrs":"~0.0.2"},"deprecated":false,"description":"Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.","devDependencies":{"browserify":"~12.0.1","chai":"~1.8.1","curl":"git://github.com/cujojs/curl.git","grunt":"~0.4.2","grunt-browserify":"~4.0.1","grunt-cli":"~0.1.13","grunt-contrib-connect":"~0.6.0","grunt-contrib-jshint":"~0.8.0","grunt-contrib-uglify":"~0.11.1","grunt-mocha-phantomjs":"~0.4.0","istanbul":"~0.2.4","mocha":"~1.17.1","tin":"~0.4.0"},"directories":{"test":"test","doc":"docs"},"homepage":"https://github.com/proj4js/proj4js#readme","jam":{"main":"dist/proj4.js","include":["dist/proj4.js","README.md","AUTHORS","LICENSE.md"]},"license":"MIT","main":"lib/index.js","name":"proj4","repository":{"type":"git","url":"git://github.com/proj4js/proj4js.git"},"scripts":{"test":"./node_modules/istanbul/lib/cli.js test ./node_modules/mocha/bin/_mocha test/test.js"},"version":"2.3.15"}
94247+
module.exports = {"_from":"proj4@2.3.15","_id":"proj4@2.3.15","_inBundle":false,"_integrity":"sha1-WtBui8owvg/6OJpJ5FZfUfBtCJ4=","_location":"/proj4","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"proj4@2.3.15","name":"proj4","escapedName":"proj4","rawSpec":"2.3.15","saveSpec":null,"fetchSpec":"2.3.15"},"_requiredBy":["/"],"_resolved":"https://registry.npmjs.org/proj4/-/proj4-2.3.15.tgz","_shasum":"5ad06e8bca30be0ffa389a49e4565f51f06d089e","_spec":"proj4@2.3.15","_where":"F:\\dev\\iClient","author":"","bugs":{"url":"https://github.com/proj4js/proj4js/issues"},"bundleDependencies":false,"contributors":[{"name":"Mike Adair","email":"madair@dmsolutions.ca"},{"name":"Richard Greenwood","email":"rich@greenwoodmap.com"},{"name":"Calvin Metcalf","email":"calvin.metcalf@gmail.com"},{"name":"Richard Marsden","url":"http://www.winwaed.com"},{"name":"T. Mittan"},{"name":"D. Steinwand"},{"name":"S. Nelson"}],"dependencies":{"mgrs":"~0.0.2"},"deprecated":false,"description":"Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.","devDependencies":{"browserify":"~12.0.1","chai":"~1.8.1","curl":"git://github.com/cujojs/curl.git","grunt":"~0.4.2","grunt-browserify":"~4.0.1","grunt-cli":"~0.1.13","grunt-contrib-connect":"~0.6.0","grunt-contrib-jshint":"~0.8.0","grunt-contrib-uglify":"~0.11.1","grunt-mocha-phantomjs":"~0.4.0","istanbul":"~0.2.4","mocha":"~1.17.1","tin":"~0.4.0"},"directories":{"test":"test","doc":"docs"},"homepage":"https://github.com/proj4js/proj4js#readme","jam":{"main":"dist/proj4.js","include":["dist/proj4.js","README.md","AUTHORS","LICENSE.md"]},"license":"MIT","main":"lib/index.js","name":"proj4","repository":{"type":"git","url":"git://github.com/proj4js/proj4js.git"},"scripts":{"test":"./node_modules/istanbul/lib/cli.js test ./node_modules/mocha/bin/_mocha test/test.js"},"version":"2.3.15"}
9423894248

9423994249
/***/ }),
9424094250
/* 501 */

‎dist/iclient9-leaflet.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/iclient9-mapboxgl.js‎

Lines changed: 33 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26133,7 +26133,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
2613326133
* @classdesc ElasticSearch服务类。
2613426134
* @param url - {string} ElasticSearch服务地址。
2613526135
* @param options - {Object} 可选参数。如:</br>
26136-
* change - {function} 服务器返回数据后执行的函数。</br>
26136+
* change - {function} 服务器返回数据后执行的函数。废弃,不建议使用。使用search或msearch方法。</br>
2613726137
* openGeoFence - {boolean} 是否开启地理围栏验证，默认为不开启。</br>
2613826138
* outOfGeoFence - {function} 数据超出地理围栏后执行的函数。</br>
2613926139
* geoFence - {Object} 地理围栏。</br>
@@ -26157,8 +26157,9 @@ var ElasticSearch = exports.ElasticSearch = function () {
2615726157
host: this.url
2615826158
});
2615926159
/**
26160+
* @deprecated
2616026161
* @member SuperMap.ElasticSearch.prototype.change -{function}
26161-
* @description 服务器返回数据后执行的函数
26162+
* @description 服务器返回数据后执行的函数。废弃,不建议使用。使用search或msearch方法。
2616226163
*/
2616326164
this.change = null;
2616426165
/**
@@ -26512,21 +26513,23 @@ var ElasticSearch = exports.ElasticSearch = function () {
2651226513
* 参数设置参考 https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/api-reference.html#api-msearch</br>
2651326514
* 更多信息参考 https://www.elastic.co/guide/en/elasticsearch/reference/current/search-multi-search.html</br>
2651426515
* @param params - {Object} 参数。
26515-
* @param callback - {function} 回调函数。
26516+
* @param callback - {function} 请求返回的回调函数。也可以使用then表达式获取返回结果。<br>
26517+
* 回调参数：error,response。结果存储在response.responses中
2651626518
*/
2651726519

2651826520
}, {
2651926521
key: 'msearch',
2652026522
value: function msearch(params, callback) {
2652126523
var me = this;
26522-
if (me.openGeoFence) {
26523-
return me.client.msearch(params, callback).then(function (resp) {
26524-
me._update(resp.responses);
26525-
}, function (err) {
26526-
me.events.triggerEvent('error', { error: err });
26527-
});
26528-
}
26529-
return me.client.msearch(params, callback);
26524+
26525+
return me.client.msearch(params).then(function (resp) {
26526+
me._update(resp.responses, callback);
26527+
return resp;
26528+
}, function (err) {
26529+
callback(err);
26530+
me.events.triggerEvent('error', { error: err });
26531+
return err;
26532+
});
2653026533
}
2653126534

2653226535
/**
@@ -26670,21 +26673,22 @@ var ElasticSearch = exports.ElasticSearch = function () {
2667026673
* 参数设置参考 https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/api-reference.html#api-search</br>
2667126674
* 更多信息参考 https://www.elastic.co/guide/en/elasticsearch/reference/current/search-search.html</br>
2667226675
* @param params - {Object} 参数。
26673-
* @param callback - {function} 回调函数。
26676+
* @param callback - {function} 请求返回的回调函数。也可以使用then表达式获取返回结果。<br>
26677+
* 回调参数：error,response,结果存储在response.responses中
2667426678
*/
2667526679

2667626680
}, {
2667726681
key: 'search',
2667826682
value: function search(params, callback) {
2667926683
var me = this;
26680-
if (me.openGeoFence) {
26681-
return me.client.search(params, callback).then(function (resp) {
26682-
me._update(resp.responses);
26683-
}, function (err) {
26684-
me.events.triggerEvent('error', { error: err });
26685-
});
26686-
}
26687-
return me.client.search(params, callback);
26684+
return me.client.search(params).then(function (resp) {
26685+
me._update(resp.responses, callback);
26686+
return resp;
26687+
}, function (err) {
26688+
callback(err);
26689+
me.events.triggerEvent('error', { error: err });
26690+
return err;
26691+
});
2668826692
}
2668926693

2669026694
/**
@@ -26778,17 +26782,23 @@ var ElasticSearch = exports.ElasticSearch = function () {
2677826782
}
2677926783
}, {
2678026784
key: '_update',
26781-
value: function _update(data) {
26785+
value: function _update(data, callback) {
2678226786
var me = this;
2678326787
if (!data) {
2678426788
return;
2678526789
}
2678626790
me.data = data;
26787-
if (me.geoFence) {
26791+
if (me.openGeoFence && me.geoFence) {
2678826792
me._validateDatas(data);
2678926793
}
2679026794
me.events.triggerEvent('change', { data: me.data });
26791-
me.change && me.change(data);
26795+
//change方法已废弃，不建议使用。建议使用search方法的第二个参数传入请求成功的回调
26796+
if (me.change) {
26797+
me.change && me.change(data);
26798+
} else {
26799+
//加responses是为了保持跟原来es自身的数据结构一致
26800+
callback && callback(undefined, { responses: data });
26801+
}
2679226802
}
2679326803
}, {
2679426804
key: '_validateDatas',

‎dist/iclient9-mapboxgl.min.js‎

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

0 commit comments

Comments
 (0)