app/assets/javascripts/fastui/app/view/VTreeGrid.js in fastui-0.1.3 vs app/assets/javascripts/fastui/app/view/VTreeGrid.js in fastui-0.1.4

@@ -1,8 +1,8 @@
 Ext.define('FastUI.view.VTreeGrid', {
     extend: 'Ext.tree.Panel',
-    requires: ['FastUI.store.MListMgr'],
+    requires: ['FastUI.store.MListMgr', 'FastUI.view.DataFieldFactory', 'FastUI.view.GridColumnFactory'],
     collapsible: true,
     useArrows: true,
     rootVisible: false,
     multiSelect: false,
     singleExpand: true,
@@ -15,12 +15,12 @@
     },
     listeners:{
         itemclick:function (view, record, item, index, e, eOpts) {
             this.tab.winCtx.setWinCtx(this.tab.winId, this.tab.rest.getKey(), record.get('id'));
             this.tab.winCtx.setWinCtx(this.tab.winId, this.tab.rest.getTitle(), record.get('title'));
-            if (record.get('m_entity_id')) {
-                this.tab.winCtx.setWinCtx(this.tab.winId, 'm_entity_id', record.get('m_entity_id'));
+            if (record.get('entity')) {
+                this.tab.winCtx.setWinCtx(this.tab.winId, 'entity', record.get('entity'));
             }
             this.tab.getBtn('edit').enable();
             this.tab.getBtn('del').enable();
         }
     },
@@ -37,10 +37,11 @@
     },
 
     getTreeGStore: function () {
         return new Ext.data.TreeStore({
             autoLoad: true,
+            //autoSync: true,
             proxy:{
                 type: 'ajax',
                 url: this.tab.rest.indexPath(),
                 reader:{
                     type:'json',
@@ -48,11 +49,12 @@
                     record:''
                     //successProperty:''
                 }
             },
             root: {
-                name:'Root',
+                text:'Root',
+                id:'',
                 expanded: true
             },
             fields: this.getTreeGFields()
         })
     },
@@ -60,96 +62,17 @@
         return this.tab.valueObject.members || [];
     },
     getTreeGFields: function () {
         var fields = [];
         Ext.each(this.getMColumns(), function (column) {
-            var field = {
-                name: column.name,
-                type: 'auto'
-            };
-            switch (column.datatype) {
-                case 'VLookup':
-                    var entity = {
-                        name: column.name.replace('_id', ''),
-                        type: 'auto'
-                    };
-                    fields.push(entity);
-            }
-            fields.push(field);
+            FastUI.view.DataFieldFactory.buildField(fields,column);
         }, this);
         return fields;
     },
     getTreeGColumns: function () {
         var columns = [];
         Ext.each(this.getMColumns(), function (column) {
-            switch (column.datatype) {
-                case 'VTree':
-                    columns.push({
-                        text: column.title,
-                        xtype: 'treecolumn',
-                        flex: 2.5,
-                        dataIndex: column.name
-                    });
-                    break;
-
-                case 'VLookup':
-                    var entity = column.name.replace('_id', '');
-                    columns.push({
-                        text: column.title,
-                        xtype: 'templatecolumn',
-                        dataIndex: column.name,
-                        tpl: new Ext.XTemplate(
-                        '<tpl for="' + entity + '">',
-                        '{title}',
-                        '</tpl>'
-                        )
-                    });
-                    break;
-
-                case 'VSingleChoice':
-                    var list_store = FastUI.store.MListMgr.getStore(column.name);
-                    columns.push({
-                        text: column.title,
-                        dataIndex: column.name,
-                        renderer: function (val) {
-                        var index = list_store.findExact('name', val);
-                        if (index > -1) {
-                            var rs = list_store.getAt(index).data;
-                            return rs.title;
-                        }
-                        return "";
-                        }
-                    });
-                    break;
-
-                case 'VSexSelect':
-                    columns.push({
-                        text: column.title,
-                        dataIndex: column.name,
-                        renderer: function (val) {
-                        return val ? '男' : '女'
-                        }
-                    });
-                    break;
-
-                case 'VYesOrNo':
-                    columns.push({
-                        text: column.title,
-                        dataIndex: column.name,
-                        renderer: function (val) {
-                        return val ? '是' : '否';
-                        }
-                    });
-                    break;
-
-                default:
-                    columns.push({
-                        text: column.title,
-                        dataIndex: column.name
-                    });
-                    break;
-            }
-
+            FastUI.view.GridColumnFactory.buildColumn(columns,column);
         }, this);
         return columns;
     }
 });