X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=resources%2FEditors%2FEditor.Roo.LayoutDialog.js;h=0432b9d32742a319728bdaed7e585bfbac292a49;hb=8c97372348227d161e7f7a626e1930c89b9c66a3;hp=88869f6cfbc8f1398502c8e707734705122761a5;hpb=7dcf598bef317535fd0a6bcbd2b999b9d10d21ff;p=app.Builder.js
diff --git a/resources/Editors/Editor.Roo.LayoutDialog.js b/resources/Editors/Editor.Roo.LayoutDialog.js
index 88869f6cf..0432b9d32 100644
--- a/resources/Editors/Editor.Roo.LayoutDialog.js
+++ b/resources/Editors/Editor.Roo.LayoutDialog.js
@@ -9,15 +9,16 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
_strings : {
'b021df6aac4654c454f46c77646e745f' :"Label",
'793548e77e782c209a78ed67f255b5e2' :"Display Field",
+ '0b6519e9da7898cdc668f6016026e71d' :"To JSON",
'4ce58cbe362a5d7b156992a496d55bf3' :"Database Column",
'189efd19c4153526994a6d7ea5f6f068' :"Field Type",
'2f616612593df62aeed112de4f03110e' :"Edit a Grid",
'0ccc2bf3fb98387c23b6ca5500244d6e' :"Use ",
'c671c787b49f50a3ace9fdc5bd597825' :"core_enum",
- 'dc30ec20708ef7b0f641ef78b7880a15' :"DEBUG",
'32954654ac8fe66a1d09be19001de2d4' :"Width",
'a1fa27779242b4902f7ae3bdd5c6d508' :"Type",
- '6e7376dca68a2386a8737944196ab491' :"Create / Edit Grid"
+ '6e7376dca68a2386a8737944196ab491' :"Create / Edit Grid",
+ 'f541774a08fc687f6e2016c77a6ebca5' :"Load Data"
},
part : ["Editors", "LayoutDialog" ],
@@ -40,7 +41,18 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
],
- fields : [ 'active', 'dataIndex', 'type','title', 'width', 'ftype', 'display_field' ],
+ fields : [
+ 'active',
+ 'dataIndex',
+ 'type',
+ 'title',
+ 'width',
+ 'ftype',
+ 'display_field',
+ 'relates_to_table',
+ 'relates_to_col',
+ 'relates_to_schema'
+ ],
id : 'dataindex',
xns : Roo.data,
xtype : 'SimpleStore'
@@ -63,13 +75,13 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
},
{
'|xns' : 'Roo.Toolbar',
- text : _this._strings['dc30ec20708ef7b0f641ef78b7880a15'],
+ text : _this._strings['f541774a08fc687f6e2016c77a6ebca5'],
xns : Roo.Toolbar,
xtype : 'Button',
listeners : {
click : function (_self, e)
{
-
+ Roo.log(_this.ftype_combo);
var data = {
"manage_scale_id": {
"Field": "manage_scale_id",
@@ -232,6 +244,21 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
Roo.log('debuging...');
_this.panel.loadData(data);
+ }
+ }
+ },
+ {
+ '|xns' : 'Roo.Toolbar',
+ text : _this._strings['0b6519e9da7898cdc668f6016026e71d'],
+ xns : Roo.Toolbar,
+ xtype : 'Button',
+ listeners : {
+ click : function (_self, e)
+ {
+
+ Roo.log('Converting to JSON...');
+ _this.panel.toJson();
+
}
}
}
@@ -368,27 +395,22 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
store : {
'|xns' : 'Roo.data',
data : [
- [ 'ComboBox', "ComboBox"],
- [ 'Text' , "TextField"],
- [ 'Number', "NumberField"],
- [ 'TextArea', "TextArea"],
- [ 'Html', "HtmlEntry"]
-
+ ['id']
],
- fields : [ 'ftype', 'fname'],
+ fields : [ 'dfield'],
xns : Roo.data,
xtype : 'SimpleStore'
},
'|xns' : 'Roo.form',
allowBlank : false,
- displayField : 'fname',
+ displayField : 'dfield',
editable : false,
hiddenName : 'status',
listWidth : 200,
mode : 'local',
name : 'display_field',
triggerAction : 'all',
- valueField : 'ftype',
+ valueField : 'dfield',
width : 150,
xns : Roo.form,
xtype : 'ComboBox',
@@ -447,6 +469,17 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
}
],
listeners : {
+ beforeedit : function (e)
+ {
+ Roo.log('before edit!!!');
+ Roo.log(e);
+
+ if(e.field != 'display_field'){
+ return;
+ }
+
+ _this.grid.colModel.getCellEditor(e.column, e.row).field.store.loadData(e.record.data.relates_to_schema);
+ },
cellclick : function (_self, rowIndex, columnIndex, e)
{
@@ -487,11 +520,44 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
//alert("IPC:TEST:" + JSON.stringify(data,null,4));
- var ar = [];
+ var fields = _this.grid.dataSource.reader.recordType.prototype.fields;
+
+
+ var d = [];
+
for (var k in data) {
var r = data[k];
- var has_s = typeof(r.relates_to_schema) != 'undefined'
- ar.push([ !has_s , r.Field, r.Type, r.Field, 100 , 'TextField', r.Field + '_display_name'] );
+ var has_s = typeof(r.relates_to_schema) != 'undefined';
+
+ var rt = '', rc = '', rs = [];
+
+ if(has_s){
+ for (var kk in r.relates_to_schema) {
+ var rr = r.relates_to_schema[kk];
+
+ rt = r.relates_to_table;
+ rc = r.relates_to_col;
+
+ rs.push([rr.Field]);
+
+ }
+ }
+
+ var o = {
+ active : !has_s,
+ dataIndex : r.Field,
+ type : r.Type,
+ title : r.Field,
+ width : 100,
+ ftype : 'TextField',
+ display_field : rc, //r.Field + '_display_name',
+ relates_to_table : rt,
+ relates_to_col : rc,
+ relates_to_schema : rs
+ };
+
+ d.push(o);
+
if (!has_s) {
continue;
}
@@ -501,11 +567,40 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
if (rr.Field == r.relates_to_col) {
continue;
}
- ar.push([ false, r.Field + '_'+ rr.Field, rr.Type, rr.Field, 100] );
+
+ var o = {
+ active : false,
+ dataIndex : r.Field + '_'+ rr.Field,
+ type : r.Type,
+ title : r.Field,
+ width : 100
+ };
+
+ d.push(o);
}
-
}
+
+ var ar = [];
+
+ Roo.each(d, function(dd){
+
+ var a = [];
+
+ for(var j = 0; j < fields.length; j++){
+ var f = fields.items[j];
+
+ if(dd.hasOwnProperty(f.name)){
+ a.push(dd[f.name]);
+ }
+ }
+
+ ar.push(a);
+ });
+
+
+ Roo.log(ar);
this.schema = data;
+
//alert("IPC:TEST:" + JSON.stringify(ar));
this.grid.dataSource.loadData(ar);
},
@@ -532,7 +627,7 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
var el = {
fieldLabel : rec.data.title,
name : rec.data.dataIndex,
- width : 200, //row.type == 'string' ? 200 : 75,
+ width : r.data.width,
'|xns' : 'Roo.form',
xtype : rec.data.ftype
}
@@ -553,12 +648,15 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
if (xtype == 'Combobox') {
- el.queryParam = 'query[' + combofields_name + ']';// SET WHEN USED
+ el.queryParam = 'query[' + rec.data.display_field + ']';// SET WHEN USED
el.hiddenName = rec.data.dataIndex // SET WHEN USED eg. project_id
- el.displayField = combofields_name; // SET WHEN USED eg. project_id
- el.name = old.name + '_' + combofields_name; // SET WHEN USED eg. project_id_name
- el.tpl = '{' + combofields_name +'}
'; // SET WHEN USED
+ el.name = rec.data.dataIndex + '_' + rec.data.display_field; // SET WHEN USED eg. project_id_name
+
+ el.displayField = rec.data.display_field // SET WHEN USED eg. project_id
+ el.valueField = rec.data.relates_to_col
+
+ el.tpl = '{' + rec.data.display_field +'}
'; // SET WHEN USED
el.items = [
@@ -582,7 +680,7 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
'xtype' : 'HttpProxy',
'method' : 'GET',
'|xns' : 'Roo.data',
- '|url' : "baseURL + '/Roo/" + reftable + ".php'",
+ '|url' : "baseURL + '/Roo/" + rec.data.relates_to_table + ".php'",
},
{
@@ -601,6 +699,21 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
}
+ if (xtype == 'HtmlEditor') {
+ el.height = 100,
+ el.resizable = 's',
+ el.toolbar = [
+ {
+ '|xns' : 'Roo.form.HtmlEditor',
+ 'xtype' : 'ToolbarContext'
+ },
+ {
+ '|xns' : 'Roo.form.HtmlEditor',
+ 'xtype' : 'ToolbarStandard'
+
+ }
+ ]
+ }
formElements.push(el);