diff --git a/src/common/_utils/util.js b/src/common/_utils/util.js
index d4c61d6a..3bc257ec 100644
--- a/src/common/_utils/util.js
+++ b/src/common/_utils/util.js
@@ -6,6 +6,28 @@ import omit from 'omit.js';
import tinyColor from 'tinycolor2';
import { min, max as statisticsMax, mean, sum, mode, median, variance, standardDeviation } from 'simple-statistics';
+export function escapeHTML(strings) {
+ var result = '';
+ for (var i = 0; i < strings.length; i++) {
+ result += strings[i];
+ if (i + 1 < arguments.length) {
+ var value = arguments[i + 1] || '';
+ result += String(value).replace(/[&<>"'/]/g,
+ function (s) {
+ return {
+ '&': '&',
+ '<': '<',
+ '>': '>',
+ '"': '"',
+ '\'': ''',
+ '/': '/'
+ }[s];
+ });
+ }
+ }
+ return result;
+}
+
export function getDateTime(timeType) {
return geti18n().d(new Date(), timeType.replace(/\+/g, '_'));
}
@@ -245,3 +267,4 @@ export function numberEqual(num1, num2, precision = 10E-6) {
}
export const statisticFunctions = { min, max: statisticsMax, mean, sum, mode, median, variance, standardDeviation, count: fieldValues => fieldValues.length };
+
diff --git a/src/mapboxgl/search/Search.vue b/src/mapboxgl/search/Search.vue
index 6ee17828..30cd1987 100644
--- a/src/mapboxgl/search/Search.vue
+++ b/src/mapboxgl/search/Search.vue
@@ -112,7 +112,7 @@ import SmIcon from 'vue-iclient/src/common/icon/Icon.vue';
import SmInput from 'vue-iclient/src/common/input/Input.vue';
import Message from 'vue-iclient/src/common/message/Message.js';
import TablePopup from 'vue-iclient/src/common/table-popup/TablePopup.vue';
-import { setPopupArrowStyle } from 'vue-iclient/src/common/_utils/util';
+import { setPopupArrowStyle, escapeHTML } from 'vue-iclient/src/common/_utils/util';
import isEqual from 'lodash.isequal';
export default {
@@ -307,7 +307,7 @@ export default {
emitEvent && this.$emit('clear-search-result');
},
searchResultListClicked(data, event) {
- const searchKey = event.target.innerHTML;
+ const searchKey = escapeHTML`${event.target.innerHTML}`;
this.isSuggestion = false;
this.viewModel.getFeatureInfo(searchKey, data);
},
diff --git a/src/mapboxgl/tdt/search/TdtSearchViewModel.js b/src/mapboxgl/tdt/search/TdtSearchViewModel.js
index 05e14a82..277ef854 100644
--- a/src/mapboxgl/tdt/search/TdtSearchViewModel.js
+++ b/src/mapboxgl/tdt/search/TdtSearchViewModel.js
@@ -16,6 +16,7 @@ import {
import bbox from '@turf/bbox';
import transformScale from '@turf/transform-scale';
import { geti18n } from 'vue-iclient/src/common/_lang/index';
+import { escapeHTML } from 'vue-iclient/src/common/_utils/util';
export default class TdtSearchViewModel extends mapboxgl.Evented {
constructor(options) {
@@ -126,25 +127,18 @@ export default class TdtSearchViewModel extends mapboxgl.Evented {
`;
const content = document.createElement('div');
content.className = 'content';
- content.innerHTML = `
- ${
- from === 'Point'
- ? `
-
${geti18n().t('tdtSearch.phone')}： ${data.phone || geti18n().t('tdtSearch.noData')}
-
${geti18n().t('tdtSearch.address')}： ${data.address ||
- geti18n().t('tdtSearch.noData')}
-
-
${geti18n().t('tdtSearch.transport')}： ${data.address ||
- geti18n().t('tdtSearch.noData')}
-
+
${geti18n().t('tdtSearch.phone')}： ${data.phone || geti18n().t('tdtSearch.noData')}
+
${geti18n().t('tdtSearch.address')}： ${
+ data.address || geti18n().t('tdtSearch.noData')
+ }
+
+
${geti18n().t('tdtSearch.transport')}： ${
+ data.address || geti18n().t('tdtSearch.noData')
+ }
+