Index: ssts-web/src/main/webapp/ext/js/multiSelectComboTop.js
===================================================================
diff -u -r28384 -r33433
--- ssts-web/src/main/webapp/ext/js/multiSelectComboTop.js	(.../multiSelectComboTop.js)	(revision 28384)
+++ ssts-web/src/main/webapp/ext/js/multiSelectComboTop.js	(.../multiSelectComboTop.js)	(revision 33433)
@@ -1,238 +1,207 @@
-if ('function' !== typeof RegExp.escape)   
-{  
-    RegExp.escape = function (s)   
-    {  
-        if ('string' !== typeof s)   
-        {  
-            return s;  
-        }  
-        return s.replace(/([.*+?^=!:${}()|[\]\/\\])/g, '\\$1');  
-    };  
-}  
-  
-top.Ext.ns('top.Ext.form');  
-  
-top.Ext.form.MultiSelect = Ext.extend(top.Ext.form.ComboBox,   
-{  
-    checkField: 'checked',  
-    multi: true,  
-    separator: ',',  
-    initComponent: function ()   
-    {  
-        if (!this.tpl)   
-        {  
-            this.tpl = '<tpl for=".">' + '<div class="x-combo-list-item">'  
-                    + '<img src="' +Ext.BLANK_IMAGE_URL + '" '
-                    + 'class="ux-MultiSelect-icon ux-MultiSelect-icon-'  
-                    + '{[values.' + this.checkField + '?"checked":"unchecked"'  
-                    + ']}">'  
-                    + '{[values.' + this.displayField + ']}'  
-                    + '</div>'  
-                    + '</tpl>';  
-        }  
-  
-        top.Ext.form.MultiSelect.superclass.initComponent.apply(this, arguments);  
-  
-        this.on(  
-        {  
-            scope: this,  
-            beforequery: this.onBeforeQuery,  
-            blur: this.onRealBlur  
-        });  
-  
-        this.onLoad = this.onLoad.createSequence(function ()   
-        {  
-            if (this.el)   
-            {  
-                var v = this.el.dom.value;  
-                this.el.dom.value = '';  
-                this.el.dom.value = v;  
-            }  
-        });  
-    },  
-    initEvents: function ()   
-    {  
-    	top.Ext.form.MultiSelect.superclass.initEvents.apply(this, arguments);  
-        this.keyNav.tab = false;  
-    },  
-    beforeBlur: function ()   
-    {  
-    },  
-    postBlur: function ()   
-    {  
-    },  
-  
-    clearValue: function ()   
-    {  
-        this.value = '';  
-        this.setRawValue(this.value);  
-        this.store.clearFilter();  
-        this.store.each(function (r)   
-        {  
-            r.set(this.checkField, false);  
-        }, this);  
-        if (this.hiddenField)   
-        {  
-            this.hiddenField.value = '';  
-        }  
-        this.applyEmptyText();  
-    },  
-    getCheckedDisplay: function ()   
-    {  
-        var re = new RegExp(this.separator, "g");  
-        return this.getCheckedValue(this.displayField).replace(re, this.separator + ' ');  
-    },  
-    getCheckedValue: function (field)   
-    {  
-        field = field || this.valueField;  
-        var c = [];  
-        var snapshot = this.store.snapshot || this.store.data;  
-        snapshot.each(function (r)   
-        {  
-            if (r.get(this.checkField))   
-            {  
-                c.push(r.get(field));  
-            }  
-        }, this);  
-  
-        return c.join(this.separator);  
-    },
-    getCheckedCount: function ()   
-    {  
-    	var count = 0;
-        var c = [];  
-        var snapshot = this.store.snapshot || this.store.data;  
-        snapshot.each(function (r)   
-        {  
-            if (r.get(this.checkField))   
-            {  
-                ++count; 
-            }  
-        }, this);  
-  
-        return count;  
-    }, 
-    onBeforeQuery: function (qe)   
-    {  
-        qe.query = qe.query.replace(new RegExp(RegExp.escape(this.getCheckedDisplay()) + '[ ' + this.separator + ']*'), '');  
-    },  
-    onRealBlur: function ()   
-    {  
-        this.list.hide();  
-        var rv = this.getRawValue();  
-        var rva = rv.split(new RegExp(RegExp.escape(this.separator) + ' *'));  
-        var va = [];  
-        var snapshot = this.store.snapshot || this.store.data;  
-  
-        top.Ext.each(rva, function (v)   
-        {  
-            snapshot.each(function (r)   
-            {  
-                if (v === r.get(this.displayField))   
-                {  
-                    va.push(r.get(this.valueField));  
-                }  
-            }, this);  
-        }, this);  
-        this.setValue(va.join(this.separator));  
-        this.store.clearFilter();  
-    },  
-    onSelect: function (record, index)   
-    {  
-        if (this.fireEvent('beforeselect', this, record, index) !== false)   
-        {  
-            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))   
-                {  
-                    this.setValue("---");  
-                }  
-                else   
-                {  
-                    this.setValue(this.getCheckedValue());  
-                }  
-            }  
-            else   
-            {  
-                this.clearValue();  
-                this.value = record.get(this.valueField);  
-                this.setRawValue(record.get(this.displayField));  
-                this.list.hide();  
-            }  
-  
-            this.fireEvent('select', this, record, index);  
-        }  
-    },  
-    setValue: function (v)   
-    {  
-        if (v)   
-        {  
-            v = '' + v;  
-            if (this.valueField)   
-            {  
-                this.store.clearFilter();  
-                this.store.each(function (r)   
-                {  
-                    var checked = !(!v.match('(^|' + this.separator + ')'  
-                                + RegExp.escape(r.get(this.valueField))  
-                                + '(' + this.separator + '|$)'));  
-                    r.set(this.checkField, checked);  
-                }, this);  
-                this.value = this.getCheckedValue();  
-                this.setRawValue(this.getCheckedDisplay());  
-                if (this.hiddenField)   
-                {  
-                    this.hiddenField.value = this.value;  
-                }  
-            }  
-            else   
-            {  
-                this.value = v;  
-                this.setRawValue(v);  
-                if (this.hiddenField)   
-                {  
-                    this.hiddenField.value = v;  
-                }  
-            }  
-            if (this.el)   
-            {  
-                this.el.removeClass(this.emptyClass);  
-            }  
-        }  
-        else   
-        {  
-            this.clearValue();  
-        }  
-    },  
-    select: function (v)   
-    {  
-        this.store.each(function (record)   
-        {  
-        	if (v === record.get(this.displayField)) {
-        		record.set(this.checkField, true);
-        	}
-        }, this);  
-        this.setValue(this.getCheckedValue());  
-    },
-    selectAll: function ()   
-    {  
-        this.store.each(function (record)   
-        {  
-            record.set(this.checkField, true);  
-        }, this);  
-        this.doQuery(this.allQuery);  
-        this.setValue(this.getCheckedValue());  
-    },  
-    deselectAll: function ()   
-    {  
-        this.clearValue();  
-    }  
-});  
+if ('function' !== typeof RegExp.escape) {
+    RegExp.escape = function (s) {
+        if ('string' !== typeof s) {
+            return s;
+        }
+        return s.replace(/([.*+?^=!:${}()|[\]\/\\])/g, '\\$1');
+    };
+}
+
+top.Ext.ns('top.Ext.form');
+
+top.Ext.form.MultiSelect = Ext.extend(top.Ext.form.ComboBox,
+    {
+        checkField: 'checked',
+        multi: true,
+        separator: ',',
+        showRawValue: this.showRawValue ? this.showRawValue : true,
+        initComponent: function () {
+            if (!this.tpl) {
+                this.tpl = '<tpl for=".">' + '<div class="x-combo-list-item">'
+                    + '<img src="' + Ext.BLANK_IMAGE_URL + '" '
+                    + 'class="ux-MultiSelect-icon ux-MultiSelect-icon-'
+                    + '{[values.' + this.checkField + '?"checked":"unchecked"'
+                    + ']}">'
+                    + '{[values.' + this.displayField + ']}'
+                    + '</div>'
+                    + '</tpl>';
+            }
+
+            top.Ext.form.MultiSelect.superclass.initComponent.apply(this, arguments);
+
+            this.on(
+                {
+                    scope: this,
+                    beforequery: this.onBeforeQuery,
+                    blur: this.onRealBlur
+                });
+
+            this.onLoad = this.onLoad.createSequence(function () {
+                if (this.el) {
+                    var v = this.el.dom.value;
+                    this.el.dom.value = '';
+                    this.el.dom.value = v;
+                }
+            });
+        },
+        initEvents: function () {
+            top.Ext.form.MultiSelect.superclass.initEvents.apply(this, arguments);
+            this.keyNav.tab = false;
+        },
+        beforeBlur: function () {
+        },
+        postBlur: function () {
+        },
+
+        clearValue: function () {
+            this.value = '';
+            this.setRawValue(this.value);
+            this.store.clearFilter();
+            this.store.each(function (r) {
+                r.set(this.checkField, false);
+            }, this);
+            if (this.hiddenField) {
+                this.hiddenField.value = '';
+            }
+            this.applyEmptyText();
+        },
+        getCheckedDisplay: function () {
+            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 '';
+            }
+        },
+        getCheckedValue: function (field) {
+            field = field || this.valueField;
+            var c = [];
+            var snapshot = this.store.snapshot || this.store.data;
+            snapshot.each(function (r) {
+                if (r.get(this.checkField)) {
+                    c.push(r.get(field));
+                }
+            }, this);
+
+            return c.join(this.separator);
+        },
+        getCheckedCount: function () {
+            var count = 0;
+            var c = [];
+            var snapshot = this.store.snapshot || this.store.data;
+            snapshot.each(function (r) {
+                if (r.get(this.checkField)) {
+                    ++count;
+                }
+            }, this);
+
+            return count;
+        },
+        onBeforeQuery: function (qe) {
+            qe.query = qe.query.replace(new RegExp(RegExp.escape(this.getCheckedDisplay()) + '[ ' + this.separator + ']*'), '');
+        },
+        onRealBlur: function () {
+            this.list.hide();
+            var rv = this.getRawValue();
+            var rva = rv.split(new RegExp(RegExp.escape(this.separator) + ' *'));
+            var va = [];
+            var snapshot = this.store.snapshot || this.store.data;
+
+            top.Ext.each(rva, function (v) {
+                if (v == '全部') {
+                    snapshot.each(function (r) {
+                        va.push(r.get(this.valueField));
+                    }, this);
+                } else {
+                    snapshot.each(function (r) {
+                        if (v === r.get(this.displayField)) {
+                            va.push(r.get(this.valueField));
+                        }
+                    }, this);
+                }
+            }, this);
+            this.setValue(va.join(this.separator));
+            this.store.clearFilter();
+        },
+        onSelect: function (record, index) {
+            if (this.fireEvent('beforeselect', this, record, index) !== false) {
+                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)) {
+                        this.setValue("---");
+                    }
+                    else {
+                        this.setValue(this.getCheckedValue());
+                    }
+                }
+                else {
+                    this.clearValue();
+                    this.value = record.get(this.valueField);
+                    this.setRawValue(record.get(this.displayField));
+                    this.list.hide();
+                }
+
+                this.fireEvent('select', this, record, index);
+            }
+        },
+        setValue: function (v) {
+            if (v) {
+                v = '' + v;
+                if (this.valueField) {
+                    this.store.clearFilter();
+                    this.store.each(function (r) {
+                        var checked = !(!v.match('(^|' + this.separator + ')'
+                            + RegExp.escape(r.get(this.valueField))
+                            + '(' + this.separator + '|$)'));
+                        r.set(this.checkField, checked);
+                    }, this);
+                    this.value = this.getCheckedValue();
+                    this.setRawValue(this.getCheckedDisplay());
+                    if (this.hiddenField) {
+                        this.hiddenField.value = this.value;
+                    }
+                }
+                else {
+                    this.value = v;
+                    this.setRawValue(v);
+                    if (this.hiddenField) {
+                        this.hiddenField.value = v;
+                    }
+                }
+                if (this.el) {
+                    this.el.removeClass(this.emptyClass);
+                }
+            }
+            else {
+                this.clearValue();
+            }
+        },
+        select: function (v) {
+            this.store.each(function (record) {
+                if (v === record.get(this.displayField)) {
+                    record.set(this.checkField, true);
+                }
+            }, this);
+            this.setValue(this.getCheckedValue());
+        },
+        selectAll: function () {
+            this.store.each(function (record) {
+                record.set(this.checkField, true);
+            }, this);
+            this.doQuery(this.allQuery);
+            this.setValue(this.getCheckedValue());
+        },
+        deselectAll: function () {
+            this.clearValue();
+        }
+    });
 top.Ext.reg('multiSelect', top.Ext.form.MultiSelect);
\ No newline at end of file