[fxi]isvj5238 jsonsql数字字段过滤 review by songym

luoxiao-supermap · luoxiao-supermap · commit 5b7205ab831a · 2022-12-23T15:54:31.000+08:00
diff --git a/src/common/util/FilterCondition.js b/src/common/util/FilterCondition.js
@@ -0,0 +1,31 @@
+function parseCondition(filterCondition, keys) {
+  const str = filterCondition.replace(/&|\||>|<|=|!/g, ' ');
+  const arr = str.split(' ').filter((item) => item);
+  let result = filterCondition;
+  arr.forEach((item) => {
+    const key = startsWithNumber(item) && keys.find((val) => val === item);
+    if (key) {
+      result = result.replace(key, '$' + key);
+    }
+  });
+  return result;
+}
+
+// 处理jsonsqlfeature, 加前缀
+function parseConditionFeature(feature) {
+  let copyValue = {};
+  for (let key in feature) {
+    let copyKey = key;
+    if (startsWithNumber(key)) {
+      copyKey = '$' + key;
+    }
+    copyValue[copyKey] = feature[key];
+  }
+  return copyValue;
+}
+
+function startsWithNumber(str) {
+  return /^\d/.test(str);
+}
+
+export { parseCondition, parseConditionFeature };
diff --git a/src/mapboxgl/mapping/WebMap.js b/src/mapboxgl/mapping/WebMap.js
@@ -13,6 +13,7 @@ import { GetFeaturesBySQLService } from '@supermap/iclient-common/iServer/GetFea
 import { QueryBySQLParameters } from '@supermap/iclient-common/iServer/QueryBySQLParameters';
 import { FilterParameter } from '@supermap/iclient-common/iServer/FilterParameter';
 import { Lang } from '@supermap/iclient-common/lang/Lang';
+import { parseCondition, parseConditionFeature } from '@supermap/iclient-common/util/FilterCondition';
 import { Util } from '../core/Util';
 import { QueryService } from '../services/QueryService';
 import convert from 'xml-js';
@@ -1497,15 +1498,16 @@ export class WebMap extends mapboxgl.Evented {
 			return allFeatures;
 		}
 		let condition = this._replaceFilterCharacter(filterCondition);
-		let sql = 'select * from json where (' + condition + ')';
 		let filterFeatures = [];
 		for (let i = 0; i < allFeatures.length; i++) {
 			let feature = allFeatures[i];
 			let filterResult = false;
 			try {
-				filterResult = window.jsonsql.query(sql, {
-					properties: feature.properties
-				});
+        const properties = feature.properties;
+        const conditions = parseCondition(condition, Object.keys(properties));
+        const filterFeature = parseConditionFeature(properties);
+        const sql = 'select * from json where (' + conditions + ')';
+        filterResult = window.jsonsql.query(sql, { attr: filterFeature });
 			} catch (err) {
 				//必须把要过滤得内容封装成一个对象,主要是处理jsonsql(line : 62)中由于with语句遍历对象造成的问题
 				continue;
diff --git a/src/openlayers/mapping/WebMap.js b/src/openlayers/mapping/WebMap.js
@@ -8,6 +8,7 @@ import { ColorsPickerUtil } from '@supermap/iclient-common/util/ColorsPickerUtil
 import { SecurityManager } from '@supermap/iclient-common/security/SecurityManager';
 import { Events } from '@supermap/iclient-common/commontypes/Events';
 import { Util as CommonUtil} from '@supermap/iclient-common/commontypes/Util';
+import { parseCondition, parseConditionFeature } from '@supermap/iclient-common/util/FilterCondition';
 import {
     Util
 } from '../core/Util';
@@ -2749,15 +2750,16 @@ export class WebMap extends Observable {
      */
     getFiterFeatures(filterCondition, allFeatures) {
         let condition = this.parseFilterCondition(filterCondition);
-        let sql = "select * from json where (" + condition + ")";
         let filterFeatures = [];
         for (let i = 0; i < allFeatures.length; i++) {
             let feature = allFeatures[i];
             let filterResult = false;
             try {
-                filterResult = window.jsonsql.query(sql, {
-                    attributes: feature.get('attributes')
-                });
+              const properties = feature.get('attributes');
+              const conditions = parseCondition(condition, Object.keys(properties));
+              const filterFeature = parseConditionFeature(properties);
+              const sql = 'select * from json where (' + conditions + ')';
+              filterResult = window.jsonsql.query(sql, { attributes: filterFeature });
             } catch (err) {
                 //必须把要过滤得内容封装成一个对象,主要是处理jsonsql(line : 62)中由于with语句遍历对象造成的问题
                 continue;
@@ -3459,11 +3461,12 @@ export class WebMap extends Observable {
                 });
                 if (layerInfo.filterCondition) {
                     //过滤条件
-                    let condition = that.parseFilterCondition(layerInfo.filterCondition);
-                    let sql = "select * from json where (" + condition + ")";
-                    let filterResult = window.jsonsql.query(sql, {
-                        attributes: feature.get('attributes')
-                    });
+                    const condition = that.parseFilterCondition(layerInfo.filterCondition);
+                    const properties = feature.get('attributes');
+                    const conditions = parseCondition(condition, Object.keys(properties));
+                    const filterFeature = parseConditionFeature(properties);
+                    const sql = 'select * from json where (' + conditions + ')';
+                    let filterResult = window.jsonsql.query(sql, { attributes: filterFeature });
                     if (filterResult && filterResult.length > 0) {
                         that.addDataflowFeature(feature, layerInfo.identifyField, {
                             dataflowSource: source,
@@ -3610,10 +3613,11 @@ export class WebMap extends Observable {
                 if (layerInfo.filterCondition) {
                     //过滤条件
                     let condition = that.parseFilterCondition(layerInfo.filterCondition);
-                    let sql = "select * from json where (" + condition + ")";
-                    let filterResult = window.jsonsql.query(sql, {
-                        attributes: feature.get('attributes')
-                    });
+                    const properties = feature.get('attributes');
+                    const conditions = parseCondition(condition, Object.keys(properties));
+                    const filterFeature = parseConditionFeature(properties);
+                    const sql = 'select * from json where (' + conditions + ')';
+                    let filterResult = window.jsonsql.query(sql, { attributes: filterFeature });
                     if (filterResult && filterResult.length > 0) {
                         that.addDataflowFeature(feature, layerInfo.identifyField, {
                             dataflowSource: source,
diff --git a/test/mapboxgl/mapping/WebMapSpec.js b/test/mapboxgl/mapping/WebMapSpec.js
@@ -2,12 +2,8 @@ import mapboxgl from 'mapbox-gl';
 import { WebMap } from '../../../src/mapboxgl/mapping/WebMap';
 import { FetchRequest } from '@supermap/iclient-common/util/FetchRequest';
 import { ArrayStatistic } from '../../../src/common/util/ArrayStatistic';
-import { ColorsPickerUtil } from '../../../src/common/util/ColorsPickerUtil';
 import '../../resources/WebMapV5.js';
-import img from '../../resources/img/baiduTileTest.png';
-import convert from 'xml-js';
-import jsonsql from 'jsonsql';
-import canvg from 'canvg';
+window.jsonsql = { query: () => {} };
 
 describe('mapboxgl_WebMap', () => {
     var originalTimeout, testDiv;
@@ -99,6 +95,23 @@ describe('mapboxgl_WebMap', () => {
             done();
         });
     });
+    it('jsonsql', (done) => {
+      let options = {
+          server: server
+      };
+      spyOn(FetchRequest, 'get').and.callFake((url) => {
+          if (url.indexOf('map.json') > -1) {
+              var mapJson = datavizWebMap_CLOUD;
+              return Promise.resolve(new Response(mapJson));
+          }
+          return Promise.resolve();
+      });
+      datavizWebmap = new WebMap(id, options);
+      datavizWebmap.on('mapinitialized', () => {
+        datavizWebmap._getFiterFeatures('2020年人口数>20', [{ properties: { '2020年人口数': 30 }}]);
+        done();
+      });
+    });
     it('setWebMapOptions', (done) => {
         let options = {
             server: server
diff --git a/test/openlayers/mapping/WebMapSpec.js b/test/openlayers/mapping/WebMapSpec.js
@@ -21,6 +21,8 @@ import * as olControl from 'ol/control';
 import Feature from 'ol/Feature';
 import * as olProj from 'ol/proj';
 
+window.jsonsql = { query: () => {} };
+
 describe('openlayers_WebMap', () => {
     var originalTimeout, testDiv, webMap;
     var server = "http://127.0.0.1:8090/iportal/";
@@ -177,6 +179,28 @@ describe('openlayers_WebMap', () => {
             done();
         }
     });
+
+    it('jsonsql', (done) => {
+      let options = {
+          server: server,
+          successCallback,
+          errorCallback: function () {}
+      };
+      spyOn(FetchRequest, 'get').and.callFake((url) => {
+          if (url.indexOf('map.json') > -1) {
+              var mapJson = datavizWebMap_BAIDU;
+              return Promise.resolve(new Response(mapJson));
+          }
+          return Promise.resolve();
+      });
+      var datavizWebmap = new WebMap(id, options);
+
+      function successCallback() {
+        datavizWebmap.getFiterFeatures('2020年人口数> 20', [{ get: () => ({ '2020年人口数': 30 }) }]);
+        datavizWebmap.createDataflowLayer({filterCondition:'2020年人口数> 20', pointStyle:{}}, [{ get: () => ({ '2020年人口数': 30 }) }]);
+        done();
+      }
+    });
     it('initialize_OPENSTREET', (done) => {
         let options = {
             server: server,
