Authored by 陈峰

Merge branch 'hotfix/search' into 'release/10.10'

fix search query key



See merge request !1551
@@ -244,13 +244,14 @@ cHammer.on('tap', function() { @@ -244,13 +244,14 @@ cHammer.on('tap', function() {
244 244
245 $search.on('touchend', function() { 245 $search.on('touchend', function() {
246 let $buriedpoint = $form.find('.buriedpoint'); 246 let $buriedpoint = $form.find('.buriedpoint');
  247 + let inputQuery = $buriedpoint.val();
247 248
248 - if ($buriedpoint.val() === '') {  
249 - $buriedpoint.val($('#default-terms').val()); 249 + if (inputQuery === '') {
  250 + inputQuery = $('#default-terms').val();
250 } 251 }
251 252
252 // 保存搜索的内容 253 // 保存搜索的内容
253 - writeSearch.setHistoryValFun($buriedpoint.val()); 254 + writeSearch.setHistoryValFun(inputQuery);
254 255
255 if (security.hasDangerInput()) { 256 if (security.hasDangerInput()) {
256 return false; 257 return false;
@@ -261,15 +262,14 @@ $search.on('touchend', function() { @@ -261,15 +262,14 @@ $search.on('touchend', function() {
261 op: 'YB_KEYWORD_SEARCH_C', 262 op: 'YB_KEYWORD_SEARCH_C',
262 param: JSON.stringify({ 263 param: JSON.stringify({
263 C_ID: C_ID, 264 C_ID: C_ID,
264 - KEYWORD: $buriedpoint.val(), 265 + KEYWORD: inputQuery,
265 POS_ID: 0, 266 POS_ID: 0,
266 FLR_INDEX: 0 267 FLR_INDEX: 0
267 }) 268 })
268 }, true); 269 }, true);
269 } 270 }
270 271
271 - $(this).closest('form').submit();  
272 - return false; 272 + goSearch(inputQuery);
273 }); 273 });
274 274
275 // 初始化历史搜索的内容 275 // 初始化历史搜索的内容