Index: ssts-web/src/main/webapp/ext/js/multiSelectCombo.js =================================================================== diff -u -r34343 -r35305 --- ssts-web/src/main/webapp/ext/js/multiSelectCombo.js (.../multiSelectCombo.js) (revision 34343) +++ ssts-web/src/main/webapp/ext/js/multiSelectCombo.js (.../multiSelectCombo.js) (revision 35305) @@ -42,7 +42,7 @@ var v = this.el.dom.value; this.el.dom.value = ''; this.el.dom.value = v; - if (v == '全部') { + if (v == '全部' || v == -1 || v == '-1') { var va = []; var snapshot = this.store.snapshot || this.store.data; snapshot.each(function (r) { @@ -77,7 +77,7 @@ getCheckedDisplay: function () { if (this.showRawValue) { var re = new RegExp(this.separator, "g"); - if (this.getCheckedValue(this.displayField).split(',')[0] !== '全部') { + if (this.getCheckedValue(this.displayField).split(',')[0] !== '全部' || this.getCheckedValue(this.displayField).split(',')[0] == -1 || this.getCheckedValue(this.displayField).split(',')[0] == '-1') { return this.getCheckedValue(this.displayField).replace(re, this.separator + ' '); } else { return '全部' @@ -123,7 +123,7 @@ var snapshot = this.store.snapshot || this.store.data; Ext.each(rva, function (v) { - if (v == '全部') { + if (v == '全部' || v == -1 || v == '-1') { snapshot.each(function (r) { va.push(r.get(this.valueField)); }, this); @@ -144,7 +144,7 @@ record.set(this.checkField, !record.get(this.checkField)); var va = []; var snapshot = this.store.snapshot || this.store.data; - if (record.get(this.valueField) == 'all' || record.get(this.valueField) == '全部') { + if (record.get(this.valueField) == 'all' || record.get(this.valueField) == '全部' || record.get(this.valueField) == '-1' || record.get(this.valueField) == -1) { var checkField = record.get(this.checkField); if (checkField) { snapshot.each(function (r) { @@ -162,7 +162,7 @@ this.store.clearFilter(); } else { snapshot.each(function (r) { - if (r.get(this.valueField) !== 'all' && r.get(this.valueField) !== '全部' && r.get('checked')) { + if (r.get(this.valueField) !== 'all' && r.get(this.valueField) !== '全部' && r.get(this.valueField) !== '-1' && r.get(this.valueField) !== -1 && r.get('checked')) { va.push(r.get(this.valueField)); } }, this);