@@ -7,10 +7,26 @@ let globalSettingsKey = "auditor-global-settings";
7
7
let globalSettings = { } ;
8
8
const resultListDelimiter = ";" ;
9
9
10
- function onlyUnique ( value , index , array ) {
11
- return array . indexOf ( value ) === index ;
10
+ let onlyUnique = ( val , index , array ) => {
11
+ return array . indexOf ( val ) === index ;
12
12
}
13
13
14
+ let convertListToString = ( val ) => {
15
+ return val . join ( resultListDelimiter )
16
+ }
17
+
18
+ let convertStringToList = ( val ) => {
19
+ let ret = [ ] ;
20
+
21
+ val = val . trim ( ) ;
22
+ val . split ( resultListDelimiter ) . forEach ( ( item ) => {
23
+ item = item . trim ( ) ;
24
+ if ( item ) {
25
+ ret . push ( item ) ;
26
+ }
27
+ } )
28
+ return ret
29
+ }
14
30
15
31
// restore settings
16
32
try {
@@ -241,7 +257,8 @@ let refreshTableFilter = () => {
241
257
} ) ;
242
258
break ;
243
259
case "rule" :
244
- reportFilter . push ( { field :fieldName , type :"in" , value :el . val ( ) . split ( resultListDelimiter ) } ) ;
260
+ let valueList = convertStringToList ( el . val ( ) ) ;
261
+ reportFilter . push ( { field :fieldName , type :"in" , value :valueList } ) ;
245
262
break ;
246
263
default :
247
264
reportFilter . push ( { field :fieldName , type :"like" , value :el . val ( ) } ) ;
@@ -326,7 +343,7 @@ table.on("tableBuilt", () => {
326
343
327
344
328
345
let ruleSelectorData = [ ] ;
329
- $ ( "#reportFilterRule" ) . val ( ) . split ( resultListDelimiter ) . forEach ( ( val ) => {
346
+ convertStringToList ( $ ( "#reportFilterRule" ) . val ( ) ) . forEach ( ( val ) => {
330
347
ruleSelectorData . push ( {
331
348
id : val ,
332
349
name : val
@@ -341,7 +358,7 @@ table.on("tableBuilt", () => {
341
358
resultAsStringDelimiter : resultListDelimiter ,
342
359
} ) ;
343
360
$ ( ruleMs ) . on ( 'selectionchange' , function ( e , m ) {
344
- $ ( "#reportFilterRule" ) . val ( this . getValue ( ) . join ( resultListDelimiter ) ) ;
361
+ $ ( "#reportFilterRule" ) . val ( convertListToString ( this . getValue ( ) ) ) ;
345
362
formSaveToHash ( ) ;
346
363
refreshTableFilter ( ) ;
347
364
} ) ;
0 commit comments