Skip to content

Commit bc343fc

Browse files
songyumengsongyumeng
committed
【fix】 密度分析query参数判断逻辑错误 Search微件功能优化
1 parent 54d6f64 commit bc343fc

20 files changed

+578
-405
lines changed

‎dist/classic/iclient-classic-es6.js‎

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,34 @@
4444
/******/ // define getter function for harmony exports
4545
/******/ __webpack_require__.d = function(exports, name, getter) {
4646
/******/ if(!__webpack_require__.o(exports, name)) {
47-
/******/ Object.defineProperty(exports, name, {
48-
/******/ configurable: false,
49-
/******/ enumerable: true,
50-
/******/ get: getter
51-
/******/ });
47+
/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter });
5248
/******/ }
5349
/******/ };
5450
/******/
5551
/******/ // define __esModule on exports
5652
/******/ __webpack_require__.r = function(exports) {
53+
/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
54+
/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
55+
/******/ }
5756
/******/ Object.defineProperty(exports, '__esModule', { value: true });
5857
/******/ };
5958
/******/
59+
/******/ // create a fake namespace object
60+
/******/ // mode & 1: value is a module id, require it
61+
/******/ // mode & 2: merge all properties of value into the ns
62+
/******/ // mode & 4: return value when already ns object
63+
/******/ // mode & 8|1: behave like require
64+
/******/ __webpack_require__.t = function(value, mode) {
65+
/******/ if(mode & 1) value = __webpack_require__(value);
66+
/******/ if(mode & 8) return value;
67+
/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
68+
/******/ var ns = Object.create(null);
69+
/******/ __webpack_require__.r(ns);
70+
/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value });
71+
/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
72+
/******/ return ns;
73+
/******/ };
74+
/******/
6075
/******/ // getDefaultExport function for compatibility with non-harmony modules
6176
/******/ __webpack_require__.n = function(module) {
6277
/******/ var getter = module && module.__esModule ?
@@ -6108,7 +6123,7 @@ class KernelDensityJobParameter_KernelDensityJobParameter {
61086123
this.output.destroy();
61096124
this.output = null;
61106125
}
6111-
if (this.mappingParameters instanceof MappingParameters_MappingParameters){
6126+
if (this.mappingParameters instanceof MappingParameters_MappingParameters) {
61126127
this.mappingParameters.destroy();
61136128
this.mappingParameters = null;
61146129
}
@@ -6128,31 +6143,26 @@ class KernelDensityJobParameter_KernelDensityJobParameter {
61286143
tempObj['input'][name] = kernelDensityJobParameter[name];
61296144
continue;
61306145
}
6131-
if (name === "output"){
6146+
if (name === "output") {
61326147
tempObj['output'] = tempObj['output'] || {};
61336148
tempObj['output'] = kernelDensityJobParameter[name];
61346149
continue;
61356150
}
6136-
6151+
61376152
tempObj['analyst'] = tempObj['analyst'] || {};
6138-
if (name === 'query') {
6139-
if(tempObj['analyst'][name]){
6140-
tempObj['analyst'][name] = kernelDensityJobParameter[name].toBBOX();
6141-
}else{
6142-
tempObj['analyst'][name] = kernelDensityJobParameter[name];
6143-
}
6153+
if (name === 'query' && kernelDensityJobParameter[name]) {
6154+
tempObj['analyst'][name] = kernelDensityJobParameter[name].toBBOX();
61446155
} else {
61456156
tempObj['analyst'][name] = kernelDensityJobParameter[name];
61466157
}
6147-
if(name === 'mappingParameters'){
6158+
if (name === 'mappingParameters') {
61486159
tempObj['analyst'][name] = tempObj['analyst'][name] || {};
61496160
tempObj['analyst']['mappingParameters'] = kernelDensityJobParameter[name];
61506161
}
61516162
}
61526163
}
61536164
}
61546165
SuperMap.KernelDensityJobParameter = KernelDensityJobParameter_KernelDensityJobParameter;
6155-
61566166
// CONCATENATED MODULE: ./src/common/iServer/SingleObjectQueryJobsParameter.js
61576167
/* Copyright© 2000 - 2018 SuperMap Software Co.Ltd. All rights reserved.
61586168
* This program are made available under the terms of the Apache License, Version 2.0

‎dist/classic/iclient-classic-es6.min.js‎

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

‎dist/classic/iclient-classic.js‎

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,34 @@
4444
/******/ // define getter function for harmony exports
4545
/******/ __webpack_require__.d = function(exports, name, getter) {
4646
/******/ if(!__webpack_require__.o(exports, name)) {
47-
/******/ Object.defineProperty(exports, name, {
48-
/******/ configurable: false,
49-
/******/ enumerable: true,
50-
/******/ get: getter
51-
/******/ });
47+
/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter });
5248
/******/ }
5349
/******/ };
5450
/******/
5551
/******/ // define __esModule on exports
5652
/******/ __webpack_require__.r = function(exports) {
53+
/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
54+
/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
55+
/******/ }
5756
/******/ Object.defineProperty(exports, '__esModule', { value: true });
5857
/******/ };
5958
/******/
59+
/******/ // create a fake namespace object
60+
/******/ // mode & 1: value is a module id, require it
61+
/******/ // mode & 2: merge all properties of value into the ns
62+
/******/ // mode & 4: return value when already ns object
63+
/******/ // mode & 8|1: behave like require
64+
/******/ __webpack_require__.t = function(value, mode) {
65+
/******/ if(mode & 1) value = __webpack_require__(value);
66+
/******/ if(mode & 8) return value;
67+
/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
68+
/******/ var ns = Object.create(null);
69+
/******/ __webpack_require__.r(ns);
70+
/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value });
71+
/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
72+
/******/ return ns;
73+
/******/ };
74+
/******/
6075
/******/ // getDefaultExport function for compatibility with non-harmony modules
6176
/******/ __webpack_require__.n = function(module) {
6277
/******/ var getter = module && module.__esModule ?
@@ -6636,12 +6651,8 @@ var KernelDensityJobParameter = exports.KernelDensityJobParameter = function ()
66366651
}
66376652

66386653
tempObj['analyst'] = tempObj['analyst'] || {};
6639-
if (name === 'query') {
6640-
if (tempObj['analyst'][name]) {
6641-
tempObj['analyst'][name] = kernelDensityJobParameter[name].toBBOX();
6642-
} else {
6643-
tempObj['analyst'][name] = kernelDensityJobParameter[name];
6644-
}
6654+
if (name === 'query' && kernelDensityJobParameter[name]) {
6655+
tempObj['analyst'][name] = kernelDensityJobParameter[name].toBBOX();
66456656
} else {
66466657
tempObj['analyst'][name] = kernelDensityJobParameter[name];
66476658
}

‎dist/classic/iclient-classic.min.js‎

Lines changed: 2 additions & 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)