Index: ssts-web/src/main/webapp/ext/js/multiSelectCombo.js =================================================================== diff -u -r33045 -r33400 --- ssts-web/src/main/webapp/ext/js/multiSelectCombo.js (.../multiSelectCombo.js) (revision 33045) +++ ssts-web/src/main/webapp/ext/js/multiSelectCombo.js (.../multiSelectCombo.js) (revision 33400) @@ -17,6 +17,7 @@ checkField: 'checked', multi: true, separator: ',', + showRawValue:this.showRawValue ? this.showRawValue : true, initComponent: function () { if (!this.tpl) @@ -79,11 +80,15 @@ }, getCheckedDisplay: function () { - var re = new RegExp(this.separator, "g"); - if(this.getCheckedValue(this.displayField).split(',')[0] !== '全部'){ - return this.getCheckedValue(this.displayField).replace(re, this.separator + ' '); + if(this.showRawValue){ + var re = new RegExp(this.separator, "g"); + if(this.getCheckedValue(this.displayField).split(',')[0] !== '全部'){ + return this.getCheckedValue(this.displayField).replace(re, this.separator + ' '); + }else { + return '全部' + } }else { - return '全部' + return ''; } }, getCheckedValue: function (field) @@ -150,13 +155,11 @@ { if (this.fireEvent('beforeselect', this, record, index) !== false) { - record.set(this.checkField, !record.get(this.checkField)); - + record.set(this.checkField, !record.get(this.checkField)); if (this.store.isFiltered()) { this.doQuery(this.allQuery); } - if (this.multi) { if (record.get("key") == "---" && record.get(this.checkField))