X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2Fform%2FComboBoxArray.js;h=bd3abee9f3d02253fa0a11073e619439ea636a4e;hb=6173d56fd23eae0231a91824f12c300f4d2d7b5e;hp=12e43c7db0ca29858b8c611ccb76704f6b3fd5d4;hpb=fce4b4ef1698e7d9b25f58128cc844d8f4728948;p=roojs1 diff --git a/Roo/form/ComboBoxArray.js b/Roo/form/ComboBoxArray.js index 12e43c7db0..bd3abee9f3 100644 --- a/Roo/form/ComboBoxArray.js +++ b/Roo/form/ComboBoxArray.js @@ -49,12 +49,9 @@ Roo.form.ComboBoxArray = function(config) } - Roo.extend(Roo.form.Hidden, Roo.form.TextField, { - - -}); -Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField + +Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, { /** * @cfg {Roo.form.Combo} combo The combo box that is wrapped @@ -86,7 +83,7 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField // private - the hidden field el. hiddenEl : false, - boxWidth : 200, // use to set the box around the entry.. + el : false, //validateValue : function() { return true; }, // all values are ok! //onAddClick: function() { }, @@ -94,28 +91,36 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField onRender : function(ct, position) { - // give fake names to child combo; - Roo.form.ComboBoxArray.superclass.onRender.call(this, ct, position); + // create the standard hidden element + //Roo.form.ComboBoxArray.superclass.onRender.call(this, ct, position); + + // give fake names to child combo; this.combo.hiddenName = this.hiddenName ? (this.hiddenName+'-subcombo') : this.hiddenName; this.combo.name = this.name? (this.name+'-subcombo') : this.name; + this.combo = Roo.factory(this.combo, Roo.form); + this.combo.onRender(ct, position); - this.combo = Roo.factory(this.combo,Roo.form); - + // assigned so form know we need to do this.. + this.store = this.combo.store; + this.valueField = this.combo.valueField; + this.displayField = this.combo.displayField ; - this.combo.onRender(ct, position); this.combo.wrap.addClass('x-cbarray-grp'); var cbwrap = this.combo.wrap.createChild( {tag: 'div', cls: 'x-cbarray-cb'}, - this.el.dom + this.combo.el.dom ); this.hiddenEl = this.combo.wrap.createChild({ - tag: 'input', type:'hidden' , name: this.hiddenListName, value : '' + tag: 'input', type:'hidden' , name: this.hiddenName, value : '' + }); + this.el = this.combo.wrap.createChild({ + tag: 'input', type:'hidden' , name: this.name, value : '' }); // this.el.dom.removeAttribute("name"); @@ -123,12 +128,12 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField this.outerWrap = this.combo.wrap; this.wrap = cbwrap; - this.outerWrap.setWidth(this.boxWidth); + this.outerWrap.setWidth(this.width); this.outerWrap.dom.removeChild(this.el.dom); this.wrap.dom.appendChild(this.el.dom); - this.outerWrap.dom.removeChild(this.trigger.dom); - this.combo.wrap.dom.appendChild(this.trigger.dom); + this.outerWrap.dom.removeChild(this.combo.trigger.dom); + this.combo.wrap.dom.appendChild(this.combo.trigger.dom); this.combo.trigger.setStyle('position','relative'); this.combo.trigger.setStyle('left', '0px'); @@ -171,28 +176,31 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField { // returns hidden if it's set.. if (!this.rendered) {return ''}; - return this.hiddenListName; + return this.hiddenName ? this.hiddenName : this.name; }, onResize: function(w, h){ - Roo.form.ComboBox.superclass.onResize.apply(this, arguments); + + return; + // not sure if this is needed.. + this.combo.onResize(w,h); if(typeof w != 'number'){ // we do not handle it!?!? return; } - var tw = this.trigger.getWidth(); + var tw = this.combo.trigger.getWidth(); tw += this.addicon ? this.addicon.getWidth() : 0; tw += this.editicon ? this.editicon.getWidth() : 0; var x = w - tw; - this.el.setWidth( this.adjustWidth('input', x)); + this.combo.el.setWidth( this.combo.adjustWidth('input', x)); - this.trigger.setStyle('left', '0px'); + this.combo.trigger.setStyle('left', '0px'); if(this.list && this.listWidth === undefined){ - var lw = Math.max(x + this.trigger.getWidth(), this.minListWidth); + var lw = Math.max(x + this.combo.trigger.getWidth(), this.combo.minListWidth); this.list.setWidth(lw); this.innerList.setWidth(lw - this.list.getFrameWidth('lr')); } @@ -203,7 +211,9 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField addItem: function(rec) { - if (this.items.indexOfKey(rec[this.idField]) > -1) { + var idField = this.combo.valueField; + var displayField = this.combo.displayField; + if (this.items.indexOfKey(rec[idField]) > -1) { //console.log("GOT " + rec.data.id); return; } @@ -211,12 +221,12 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField var x = new Roo.form.ComboBoxArray.Item({ //id : rec[this.idField], data : rec, - nameField : this.nameField, - tipField : this.tipField, + nameField : displayField , + tipField : displayField , cb : this }); // use the - this.items.add(rec[this.idField],x); + this.items.add(rec[idField],x); // add it before the element.. this.updateHiddenEl(); x.render(this.outerWrap, this.wrap.dom); @@ -230,7 +240,8 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField return; } var ar = []; - var idField = this.idField; + var idField = this.combo.valueField; + this.items.each(function(f) { ar.push(f.data[idField]); @@ -256,8 +267,13 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField }, setValue: function(v) // not a valid action - must use addItems.. { - if (typeof(v) != 'object') { - return; + + Roo.log(v); + if (this.store.isLocal) { + // then we can use the store to find the values.. + + + } var _this = this; Roo.each(v, function(l) { @@ -265,6 +281,14 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField }); }, + setFromData: function(v) + { + Roo.log(v); + + + }, + + validateValue : function(value){ return Roo.form.ComboBoxArray.superclass.validateValue.call(this, this.getValue()); @@ -293,25 +317,46 @@ Roo.form.ComboBoxArray.Item = function(config) { Roo.extend(Roo.form.ComboBoxArray.Item, Roo.BoxComponent, { data : {}, cb: false, - defaultAutoCreate : {tag: 'div', cls: 'x-cbarray-item', cn : [ + nameField : false, + tipField : false, + + + defaultAutoCreate : { + tag: 'div', + cls: 'x-cbarray-item', + cn : [ { tag: 'div' }, - { tag: 'img', width:16, height : 16, src : Roo.BLANK_IMAGE_URL , align: 'center' } + { + tag: 'img', + width:16, + height : 16, + src : Roo.BLANK_IMAGE_URL , + align: 'center' + } ] }, - onRender : function(ct, position){ + onRender : function(ct, position) + { Roo.form.Field.superclass.onRender.call(this, ct, position); + if(!this.el){ var cfg = this.getAutoCreate(); this.el = ct.createChild(cfg, position); } + this.el.child('img').dom.setAttribute('src', Roo.BLANK_IMAGE_URL); this.el.child('div').dom.innerHTML = this.cb.renderer ? - this.cb.renderer(this.data) : String.format('{0}',this.data[this.nameField]); - this.el.child('div').dom.setAttribute('qtip', String.format('{0}',this.data[this.tipField])); + this.cb.renderer(this.data) : + String.format('{0}',this.data[this.nameField]); + + + this.el.child('div').dom.setAttribute('qtip', + String.format('{0}',this.data[this.tipField]) + ); this.el.child('img').on('click', this.remove, this);