[fix]ISVJ-5321特殊字符字段过滤 review by qiw

luoxiao-supermap · luoxiao-supermap · commit af5d11d646ab · 2023-01-11T14:15:00.000+08:00
diff --git a/src/common/util/FilterCondition.js b/src/common/util/FilterCondition.js
@@ -1,24 +1,52 @@
+function getParseSpecialCharacter() {
+  // 特殊字符字典
+  const directory = ['(', ')', '（', '）', ',', '，'];
+  const res = {};
+  directory.forEach((item, index) => {
+    res[item] = `$${index}`
+  });
+  return res;
+}
+
+function parseSpecialCharacter(str) {
+  const directory = getParseSpecialCharacter();
+  for (let key in directory) {
+    const replaceValue = directory[key];
+    const pattern = new RegExp(`\\${key}`, 'g');
+    // eslint-disable-next-line
+    while (pattern.test(str)) {
+      str = str.replace(pattern, replaceValue);
+    }
+  }
+  return str;
+}
+
 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) {
+    const key = keys.find((val) => val === item);
+    if (startsWithNumber(item) && key) {
       result = result.replace(key, '$' + key);
     }
+    if (key) {
+      const res = parseSpecialCharacter(key);
+      result = result.replace(key, res);
+    }
   });
   return result;
 }
 
 // 处理jsonsqlfeature, 加前缀
 function parseConditionFeature(feature) {
-  const copyValue = {};
-  for (const key in feature) {
+  let copyValue = {};
+  for (let key in feature) {
     let copyKey = key;
     if (startsWithNumber(key)) {
       copyKey = '$' + key;
     }
+    copyKey = parseSpecialCharacter(copyKey);
     copyValue[copyKey] = feature[key];
   }
   return copyValue;
diff --git a/test/mapboxgl/mapping/WebMapSpec.js b/test/mapboxgl/mapping/WebMapSpec.js
@@ -109,6 +109,7 @@ describe('mapboxgl_WebMap', () => {
       datavizWebmap = new WebMap(id, options);
       datavizWebmap.on('mapinitialized', () => {
         datavizWebmap._getFiterFeatures('2020年人口数>20', [{ properties: { '2020年人口数': 30 }}]);
+        datavizWebmap._getFiterFeatures('观测场海拔高度（米）>150', [{ properties: { '观测场海拔高度（米）': 150 }}]);
         done();
       });
     });
diff --git a/test/openlayers/mapping/WebMapSpec.js b/test/openlayers/mapping/WebMapSpec.js
@@ -197,6 +197,7 @@ describe('openlayers_WebMap', () => {
 
       function successCallback() {
         datavizWebmap.getFiterFeatures('2020年人口数> 20', [{ get: () => ({ '2020年人口数': 30 }) }]);
+        datavizWebmap.getFiterFeatures('观测场海拔高度（米）>150', [{ get: () => ({ '观测场海拔高度（米）': 30 }) }]);
         // datavizWebmap.createDataflowLayer({filterCondition:'2020年人口数> 20', pointStyle:{}, wsUrl: 'ws://test/iserver/services/dataflow/dataflow/subscribe'}, [{ get: () => ({ '2020年人口数': 30 }) }]);
         done();
       }

Original file line number	Diff line number	Diff line change
`@@ -197,6 +197,7 @@ describe('openlayers_WebMap', () => {`
`197`	`197`
`198`	`198`	`function successCallback() {`
`199`	`199`	`datavizWebmap.getFiterFeatures('2020年人口数> 20', [{ get: () => ({ '2020年人口数': 30 }) }]);`
	`200`	`+ datavizWebmap.getFiterFeatures('观测场海拔高度（米）>150', [{ get: () => ({ '观测场海拔高度（米）': 30 }) }]);`
`200`	`201`	`// datavizWebmap.createDataflowLayer({filterCondition:'2020年人口数> 20', pointStyle:{}, wsUrl: 'ws://test/iserver/services/dataflow/dataflow/subscribe'}, [{ get: () => ({ '2020年人口数': 30 }) }]);`
`201`	`202`	`done();`
`202`	`203`	`}`