fastui 0.1.4 → 0.1.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODhjZmNmMWJiNjM0OWQ3ZjlhMjllYzIyMjQ5MGFmM2NmODQ0NDZhMw==
+    N2I3ZWJjNDA0NTUwYWFhMjNmMzg4ZjMwNGM5YTA5YzVjMGVkM2E5NA==
   data.tar.gz: !binary |-
-    NTU2OWI1NjkyOGQwNDI3MThkZWI1NTc3ODNkNzJkYWNmYzllOTUwZA==
+    YWVkNTA3OWI4Yzk5ZTg2MTkwNTY0ZTcwN2E4NDUxOWQyYjMxYWQzZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MTAzODgzYWZjODc4ZmM1ODhkNDFlODQwY2FlMDY2M2VlY2QwYTcyNjM4ODJk
-    NGYyOGQ2MDcxODk0Yzg3ZmE0ZGRkYmYyZWU5MWM0ODVkZjJmNWFkNjI0N2Vj
-    NTM1ZTE4YTlkMTY0MzliNmMzNTcyYWVlZDAxYzFlYTk5Y2EwZTQ=
+    NTM1MmZkOTQwNzc1NDZkYWRjYmI2ZjI1ZTM0NDZlMWQyOWNhNjU4NTczYTcw
+    Njc4MmViY2YzOGJjZTU2MDA3MTZjMGY5YTcwYzMyYzk0NzhkMWI4ZThiZTY2
+    MWIzOTcwMGZjNDdkYTg5YzRhNmIyY2VlMjJjNmE1MzcxMzgzM2Q=
   data.tar.gz: !binary |-
-    MDM2NGZiOWJlYzk2YmYyNmFkMzU4OGRhMGEyY2NmNTlkMjMyMDk5NTk3ZGMx
-    NjJjMzFlMWYxZWQxZDBkNGY2NDM0NzdiNThiZDM0ZmVmYTE1MjM3MWEzZGJl
-    N2MxOWJmNzQ5NjNjMWUzMTAwMzkyYjkxODFlNGM3ODdjMzQ1MjI=
+    ODAxNzdhMGI5Zjg2Yjc1MTViOWJkMGIwNmVmZDQ0YzBhYTZlM2E2NmU4YmI3
+    ZDZjNTMxNmZjNjY1ZWMzNTQ2M2NkNDIwYmEzYzk1NTdlOGFlNmUyZTM4NmJi
+    ZjEyMTNlNDI2NTY2NDA2NmNjYTY0YTkzNTNhODAxOTczMzlhMTQ=

data/app/assets/javascripts/fastui/app/view/DataFieldFactory.js

@@ -3,7 +3,7 @@ Ext.define('FastUI.view.DataFieldFactory', {
 
     buildField:function(fields, field){
         switch (field.datatype) {
-            case 'VTreeCombobox':
+            case 'VTree':
                 fields.push({
                     name: field.name.replace('_id', ''),
                     type: 'auto'

data/app/assets/javascripts/fastui/app/view/GridColumnFactory.js

@@ -4,7 +4,7 @@ Ext.define('FastUI.view.GridColumnFactory', {
     buildColumn: function(columns, column){
         column.datatype = column.datatype || '';
         switch (column.datatype) {
-            case 'VTree':
+            case 'VTreeText':
                 columns.push({
                     text: column.title,
                     dataIndex: column.name,
@@ -13,7 +13,7 @@ Ext.define('FastUI.view.GridColumnFactory', {
                 });
                 break;
 
-            case 'VTreeCombobox':
+            case 'VTree':
                 var entity = column.name.replace('_id', '');
                 columns.push({
                     text: column.title,

data/app/assets/javascripts/fastui/app/view/VCustomForm.js

@@ -1,5 +1,10 @@
 Ext.define('FastUI.view.VCustomForm', {
     extend:'Ext.Panel',
+
+    successText:'Success',
+    failureText:'Failed',
+    invalidText:'Invalid',
+
     tab:{},
     url: 'fastui',
     method: 'POST',
@@ -31,7 +36,7 @@ Ext.define('FastUI.view.VCustomForm', {
                 this.setValues(data);
             },
             failure: function () {
-                Ext.MessageBox.alert("提示", "操作失败！")
+                Ext.MessageBox.alert(this.failureText, "操作失败！")
             },
             scope: this
         });
@@ -47,11 +52,11 @@ Ext.define('FastUI.view.VCustomForm', {
             method : this.method,
             form : this.id,
             success: function () {
-                this.tab.vgrid.store.reload();
-                Ext.MessageBox.alert("提示", "操作成功！")
+                this.tab.vgrid.refresh();
+                Ext.MessageBox.alert(this.successText, "操作成功！")
             },
             failure: function () {
-                Ext.MessageBox.alert("提示", "操作失败！")
+                Ext.MessageBox.alert(this.failureText, "操作失败！")
             },
             scope: this
         });

data/app/assets/javascripts/fastui/app/view/VForm.js

@@ -96,7 +96,7 @@ Ext.define('FastUI.view.VForm', {
         if (form.isValid()) { // make sure the form contains valid data before submitting
             form.submit({
                 success: function (form, action) {
-                    this.tab.vgrid.store.reload();
+                    this.tab.vgrid.refresh();
                     Ext.Msg.alert(this.successText, action.result.msg);
                 },
                 failure: function (form, action) {

data/app/assets/javascripts/fastui/app/view/VGrid.js

@@ -99,5 +99,11 @@ Ext.define('FastUI.view.VGrid', {
             //columns.push(FastUI.view.vfield.VFieldFactory.buildField(column, this.tab.winCtx, this.tab.winId, this.tab.rest).column());
         }, this);
         return columns;
+    },
+
+    refresh:function(){
+        this.store.reload();
     }
+
+
 });

data/app/assets/javascripts/fastui/app/view/VMenu.js

@@ -2,7 +2,7 @@ Ext.define('FastUI.view.VMenu', {
     extend:'Ext.tree.Panel',
     requires:['FastUI.store.MWindowMgr'],
     alias: 'widget.vMenu',
-    title:'菜单',
+    title:'Menu',
     animate:false,
     collapseMode:"mini",
     collapsible:true,
@@ -30,7 +30,8 @@ Ext.define('FastUI.view.VMenu', {
               }
           },
           root:{
-              name:'菜单',
+              name:this.title,
+              id:'',
               expanded:true
           }
       });

data/app/assets/javascripts/fastui/app/view/VTab.js

@@ -7,6 +7,12 @@ Ext.define('FastUI.view.VTab', {
     winCtx: {},
     layout: "card",
     border: false,
+    newText: 'New',
+    editText: 'Edit',
+    listText: 'List',
+    saveText: 'Save',
+    deleteText: 'Delete',
+    helpText: 'Help',
     initComponent: function () {
         this.id = 'tab-' + this.getValue('name');
         this.grid_kind = this.getValue('grid_kind');
@@ -21,7 +27,7 @@ Ext.define('FastUI.view.VTab', {
             items: [
                 {
                     id: this.id + 'new',
-                    text: '新建',
+                    text: this.newText,
                     iconCls: 'fastui-btn-new',
                     handler: function () {
 //                        this.cmdCreate();
@@ -36,7 +42,7 @@ Ext.define('FastUI.view.VTab', {
                 },
                 {
                     id: this.id + 'edit',
-                    text: '编辑',
+                    text: this.editText,
                     disabled: true,
                     iconCls: 'fastui-btn-edit',
                     handler: function () {
@@ -51,7 +57,7 @@ Ext.define('FastUI.view.VTab', {
                 },
                 {
                     id: this.id + 'list',
-                    text: '列表',
+                    text: this.listText,
                     iconCls: 'fastui-btn-list',
                     handler: function () {
                         this.cmdList();
@@ -63,7 +69,7 @@ Ext.define('FastUI.view.VTab', {
                 },
                 {
                     id: this.id + 'save',
-                    text: '保存',
+                    text: this.saveText,
                     disabled: true,
                     iconCls: 'fastui-btn-save',
                     handler: function () {
@@ -78,7 +84,7 @@ Ext.define('FastUI.view.VTab', {
                 },
                 {
                     id: this.id + 'del',
-                    text: '删除',
+                    text: this.deleteText,
                     disabled: true,
                     iconCls: 'fastui-btn-del',
                     handler: function () {
@@ -89,7 +95,7 @@ Ext.define('FastUI.view.VTab', {
                 },
                 {
                     id: this.id + 'help',
-                    text: '帮助',
+                    text: this.helpText,
                     iconCls: 'fastui-btn-help',
                     handler: function () {
                         this.cmdHelp();

data/app/assets/javascripts/fastui/app/view/VTreeGrid.js

@@ -38,7 +38,7 @@ Ext.define('FastUI.view.VTreeGrid', {
 
     getTreeGStore: function () {
         return new Ext.data.TreeStore({
-            autoLoad: true,
+            //autoLoad: true,
             //autoSync: true,
             proxy:{
                 type: 'ajax',
@@ -74,6 +74,10 @@ Ext.define('FastUI.view.VTreeGrid', {
             FastUI.view.GridColumnFactory.buildColumn(columns,column);
         }, this);
         return columns;
+    },
+
+    refresh: function(){
+        this.store.load();
     }
 });
 

data/app/assets/javascripts/fastui/app/view/Viewport.js

@@ -2,6 +2,7 @@ Ext.define('FastUI.view.Viewport', {
     extend:'Ext.container.Viewport',
     id:'port',
     layout:'border',
+
     items:[
         {
             height:43,
@@ -18,7 +19,7 @@ Ext.define('FastUI.view.Viewport', {
             split:true,
             width:295,
             defaults:{border:false},
-            items:[Ext.create('FastUI.view.VMenu'),{title:'帮助',iconCls:'fastui-btn-help'}],
+            items:[Ext.create('FastUI.view.VMenu'),{title:'Help',iconCls:'fastui-btn-help'}],
             xtype:"tabpanel"
         },
         {
@@ -36,7 +37,7 @@ Ext.define('FastUI.view.Viewport', {
             //maskOnDisable: false,
 
                items: [{
-                   title: '首页',
+                   title: 'Home',
                    iconCls:'fastui-home',
                    border:false,
 

data/app/assets/javascripts/fastui/app/view/vfield/VBoolean.js

@@ -10,8 +10,10 @@ Ext.define('FastUI.view.vfield.VBoolean',{
     initComponent:function(){
         this.fieldLabel = this.getFValue('title');
         this.name =  this.rest.getTableName() + '[' + this.getFValue('name') + ']';
-        this.disabled = this.getFValue('readonly');
-        this.allowBlank = true;
+        this.disabled = this.getFValue('readonly') || false;
+        this.allowBlank = this.getFValue('required') || true;
+        this.width = this.getFValue('width') || 650;
+        this.vtype = this.getFValue('vtype');
         this.callParent();
     },
     getFValue:function (key) {

data/app/assets/javascripts/fastui/app/view/vfield/VDate.js

@@ -8,9 +8,11 @@ Ext.define('FastUI.view.vfield.VDate',{
 
     initComponent:function(){
         this.fieldLabel = this.getFValue('title');
-        this.name =  this.rest.getTableName() + '[' + this.getFValue('m_property').name + ']';
-        this.disabled = this.getFValue('is_readonly');
-        this.allowBlank = true;
+        this.name =  this.rest.getTableName() + '[' + this.getFValue('name') + ']';
+        this.disabled = this.getFValue('readonly') || false;
+        this.allowBlank = this.getFValue('required') || true;
+        this.width = this.getFValue('width') || 650;
+        this.vtype = this.getFValue('vtype');
         this.callParent();
     },
     getFValue:function (key) {

data/app/assets/javascripts/fastui/app/view/vfield/VFieldFactory.js

@@ -28,8 +28,8 @@ Ext.define('FastUI.view.vfield.VFieldFactory', {
             case 'VString':
                 return Ext.create('FastUI.view.vfield.VString', {valueObject: field, winCtx: winCtx, winId: winId, rest: rest});
 
-            case 'VTree':
-                return Ext.create('FastUI.view.vfield.VTree', {valueObject: field, winCtx: winCtx, winId: winId, rest: rest});
+            case 'VTreeText':
+                return Ext.create('FastUI.view.vfield.VTreeText', {valueObject: field, winCtx: winCtx, winId: winId, rest: rest});
 
             case 'VDate':
                 return Ext.create('FastUI.view.vfield.VDate', {valueObject: field, winCtx: winCtx, winId: winId, rest: rest});
@@ -79,8 +79,8 @@ Ext.define('FastUI.view.vfield.VFieldFactory', {
             case 'VTable':
                 return Ext.create('FastUI.view.vfield.VTable', {valueObject: field, winCtx: winCtx, winId: winId, rest: rest});
 
-            case 'VTreeCombobox':
-                return Ext.create('FastUI.view.vfield.VTreeCombobox', {valueObject: field, winCtx: winCtx, winId: winId, rest: rest});
+            case 'VTree':
+                return Ext.create('FastUI.view.vfield.VTree', {valueObject: field, winCtx: winCtx, winId: winId, rest: rest});
 
             case 'VGroup':
                 var box = Ext.create('Ext.form.FieldSet',{

data/app/assets/javascripts/fastui/app/view/vfield/VHtml.js

@@ -10,8 +10,9 @@ Ext.define('FastUI.view.vfield.VHtml',{
     initComponent:function(){
         this.fieldLabel = this.getFValue('title');
         this.name =  this.rest.getTableName() + '[' + this.getFValue('name') + ']';
-        this.disabled = this.getFValue('readonly');
-        this.allowBlank = true;
+        this.disabled = this.getFValue('readonly') || false;
+        this.allowBlank = this.getFValue('required') || true;
+        this.width = this.getFValue('width') || 650;
         this.vtype = this.getFValue('vtype');
         this.callParent();
     },

data/app/assets/javascripts/fastui/app/view/vfield/VInteger.js

@@ -9,8 +9,9 @@ Ext.define('FastUI.view.vfield.VInteger',{
     initComponent:function(){
         this.fieldLabel = this.getFValue('title');
         this.name =  this.rest.getTableName() + '[' + this.getFValue('name') + ']';
-        this.disabled = this.getFValue('readonly');
-        this.allowBlank = true;
+        this.disabled = this.getFValue('readonly') || false;
+        this.allowBlank = this.getFValue('required') || true;
+        this.width = this.getFValue('width') || 650;
         this.vtype = this.getFValue('vtype');
         this.callParent();
     },

data/app/assets/javascripts/fastui/app/view/vfield/VList.js

@@ -16,8 +16,10 @@ Ext.define('FastUI.view.vfield.VList', {
     initComponent:function () {
         this.fieldLabel = this.getFValue('title');
         this.name =  this.rest.getTableName() + '[' + this.getFValue('name') + ']';
-        this.disabled = this.getFValue('readonly');
-        this.allowBlank = true;
+        this.disabled = this.getFValue('readonly') || false;
+        this.allowBlank = this.getFValue('required') || true;
+        this.width = this.getFValue('width') || 650;
+        this.vtype = this.getFValue('vtype');
         this.store = FastUI.store.MListMgr.getStore(this.getFValue('name'));
         this.callParent();
     },

data/app/assets/javascripts/fastui/app/view/vfield/VLookup.js

@@ -13,8 +13,10 @@ Ext.define('FastUI.view.vfield.VLookup', {
     initComponent:function () {
         this.fieldLabel = this.getFValue('title');
         this.name =  this.rest.getTableName() + '[' + this.getFValue('name') + ']';
-        this.disabled = this.getFValue('readonly');
-        this.allowBlank = true;
+        this.disabled = this.getFValue('readonly') || false;
+        this.allowBlank = this.getFValue('required') || true;
+        this.width = this.getFValue('width') || 650;
+        this.vtype = this.getFValue('vtype');
         this.store = Ext.create('Ext.data.ArrayStore', {
             fields:['id', 'title'],
             data:[]

data/app/assets/javascripts/fastui/app/view/vfield/VNumber.js

@@ -8,8 +8,9 @@ Ext.define('FastUI.view.vfield.VNumber',{
     initComponent:function(){
         this.fieldLabel = this.getFValue('title');
         this.name =  this.rest.getTableName() + '[' + this.getFValue('name') + ']';
-        this.disabled = this.getFValue('readonly');
-        this.allowBlank = true;
+        this.disabled = this.getFValue('readonly') || false;
+        this.allowBlank = this.getFValue('required') || true;
+        this.width = this.getFValue('width') || 650;
         this.vtype = this.getFValue('vtype');
         this.callParent();
     },

data/app/assets/javascripts/fastui/app/view/vfield/VRadio.js

@@ -8,8 +8,10 @@ Ext.define('FastUI.view.vfield.VRadio',{
 
     initComponent:function(){
         this.fieldLabel = this.getFValue('title');
-        this.disabled = this.getFValue('readonly');
-        this.allowBlank = true;
+        this.disabled = this.getFValue('readonly') || false;
+        this.allowBlank = this.getFValue('required') || true;
+        this.width = this.getFValue('width') || 650;
+        this.vtype = this.getFValue('vtype');
         this.items = this.getFFields();
         this.callParent();
     },

data/app/assets/javascripts/fastui/app/view/vfield/VString.js

@@ -7,8 +7,9 @@ Ext.define('FastUI.view.vfield.VString',{
     initComponent:function(){
         this.fieldLabel = this.getFValue('title');
         this.name =  this.rest.getTableName() + '[' + this.getFValue('name') + ']';
-        this.disabled = this.getFValue('readonly');
-        this.allowBlank = true;
+        this.disabled = this.getFValue('readonly') || false;
+        this.allowBlank = this.getFValue('required') || true;
+        this.width = this.getFValue('width') || 650;
         this.vtype = this.getFValue('vtype');
         this.callParent();
     },

data/app/assets/javascripts/fastui/app/view/vfield/VTable.js

@@ -16,8 +16,10 @@ Ext.define('FastUI.view.vfield.VTable', {
     initComponent:function () {
         this.fieldLabel = this.getFValue('title');
         this.name =  this.rest.getTableName() + '[' + this.getFValue('name') + ']';
-        this.disabled = this.getFValue('readonly');
-        this.allowBlank = true;
+        this.disabled = this.getFValue('readonly') || false;
+        this.allowBlank = this.getFValue('required') || true;
+        this.width = this.getFValue('width') || 650;
+        this.vtype = this.getFValue('vtype');
         this.store = this.getStore();
         this.callParent();
     },

data/app/assets/javascripts/fastui/app/view/vfield/VText.js

@@ -9,8 +9,9 @@ Ext.define('FastUI.view.vfield.VText',{
     initComponent:function(){
         this.fieldLabel = this.getFValue('title');
         this.name =  this.rest.getTableName() + '[' + this.getFValue('name') + ']';
-        this.disabled = this.getFValue('readonly');
-        this.allowBlank = true;
+        this.disabled = this.getFValue('readonly') || false;
+        this.allowBlank = this.getFValue('required') || true;
+        this.width = this.getFValue('width') || 650;
         this.vtype = this.getFValue('vtype');
         this.callParent();
     },

data/app/assets/javascripts/fastui/app/view/vfield/VTree.js

@@ -1,17 +1,78 @@
-Ext.define('FastUI.view.vfield.VTree',{
-    extend: 'Ext.form.field.Text',
+Ext.define('FastUI.view.vfield.VTree', {
+    extend:'Ext.form.field.ComboBox',
+    alias:'widget.vtreetable',
     valueObject: {},
     winCtx:{},
     winId:0,
     rest:{},
-    initComponent:function(){
+
+    editable: false,
+    displayField:'title',
+    valueField:'id',
+    initComponent:function () {
         this.fieldLabel = this.getFValue('title');
         this.name =  this.rest.getTableName() + '[' + this.getFValue('name') + ']';
-        this.disabled = this.getFValue('readonly');
-        this.allowBlank = true;
+        this.disabled = this.getFValue('readonly') || false;
+        this.allowBlank = this.getFValue('required') || true;
+        this.width = this.getFValue('width') || 650;
+        this.vtype = this.getFValue('vtype');
+        this.store = Ext.create('Ext.data.ArrayStore', {
+            fields:['id', 'title'],
+            data:[]
+        });
         this.callParent();
     },
+    createPicker: function() {
+        var rest = Ext.create('FastUI.view.Rest', this.getMEntity());
+        return Ext.create('Ext.tree.Panel', {
+            hidden: true,
+            floating: true,
+            minHeight: 300,
+            autoScroll: true,
+            store: Ext.create('Ext.data.TreeStore', {
+                fields:['id', {name:'text', mapping:'title'}],
+                autoLoad: true,
+                proxy:{
+                    type: 'ajax',
+                    url: rest.indexPath(),
+                    reader:{
+                        type:'json',
+                        root:'',
+                        record:''
+                        //successProperty:''
+                    }
+                },
+                root: {
+                    text:'Root',
+                    id:'',
+                    expanded: true
+                }
+            }),
+            listeners: {
+                itemclick: function (view, record) {
+                    var id = record.get('id');
+                    if (!this.store.getById(id)){
+                        this.store.add({id:id,title:record.get('text')});
+                    }
+                    this.setValue(id);
+                    this.collapse();
+                },
+                scope:this
+            }
+        });
+    },
+    getMEntity:function(){
+        return this.valueObject.ref.entity;
+    },
     getFValue:function (key) {
         return this.valueObject[key];
+    },
+    setValue:function(value){
+        if(value && value.id && value.title){
+            this.store.add(value);
+            this.setValue(value.id);
+        }else{
+            this.callParent(arguments);
+        }
     }
 });

data/app/assets/javascripts/fastui/app/view/vfield/VTreeText.js

@@ -0,0 +1,19 @@
+Ext.define('FastUI.view.vfield.VTreeText',{
+    extend: 'Ext.form.field.Text',
+    valueObject: {},
+    winCtx:{},
+    winId:0,
+    rest:{},
+    initComponent:function(){
+        this.fieldLabel = this.getFValue('title');
+        this.name =  this.rest.getTableName() + '[' + this.getFValue('name') + ']';
+        this.disabled = this.getFValue('readonly') || false;
+        this.allowBlank = this.getFValue('required') || true;
+        this.width = this.getFValue('width') || 650;
+        this.vtype = this.getFValue('vtype');
+        this.callParent();
+    },
+    getFValue:function (key) {
+        return this.valueObject[key];
+    }
+});

data/app/assets/javascripts/fastui/application.js

@@ -12,7 +12,7 @@
 //
 // require ./extjs4/ext-all
 //= require ./app/view/vfield/VType
-//= require ./extjs4/locale/ext-lang-zh_CN
+// require ./extjs4/locale/ext-lang-zh_CN
 //= require ./app/inflection
 //= require ./fastui
 

data/app/assets/javascripts/fastui/extjs4/locale/ext-lang-zh_CN.js

@@ -277,8 +277,30 @@ Ext.define("Ext.locale.zh_CN.VForm", {
     invalidText:'无效'
 });
 
-// This is needed until we can refactor all of the locales into individual files
-Ext.define("Ext.locale.zh_CN.Component", {	
-    override: "Ext.Component"
+Ext.define("Ext.locale.zh_CN.VCustomForm", {
+    override: "FastUI.view.VCustomForm",
+    successText:'成功',
+    failureText:'失败',
+    invalidText:'无效'
+});
+
+Ext.define("Ext.locale.zh_CN.VMenu", {
+    override: "FastUI.view.VMenu",
+    title:'菜单'
+});
+
+Ext.define("Ext.locale.zh_CN.VTab", {
+    override: "FastUI.view.VTab",
+    newText: '新建',
+    editText: '编缉',
+    listText: '列表',
+    saveText: '保存',
+    deleteText: '删除',
+    helpText: '帮助'
 });
 
+// This is needed until we can refactor all of the locales into individual files
+//Ext.define("Ext.locale.zh_CN.Component", {
+//    override: "Ext.Component"
+//});
+

data/app/controllers/fastui/m_menu_items_controller.rb

@@ -6,7 +6,7 @@ module Fastui
     respond_to :html, :xml, :json
 
     def index
-      @m_menu_items = params[:node] == 'root' ? MMenuItem.roots : MMenuItem.where({
+      @m_menu_items = params[:node] == '' ? MMenuItem.roots : MMenuItem.where({
                                                                                     :parent_id => params[:node]
                                                                                 }.delete_if { |k, v| v.blank? })
 

data/lib/fastui/version.rb

@@ -1,3 +1,3 @@
 module Fastui
-  VERSION = "0.1.4"
+  VERSION = "0.1.6"
 end

data/lib/generators/fastui/templates/fastui_config.erb

@@ -1,77 +1,78 @@
 # encoding: utf-8
 Fastui::View.instance.config do |conf|
+  conf.project = 'Fastui Rapid Development Framework'
+  conf.version = "version #{Fastui::VERSION} built on ExtJS 4.2.0"
+  conf.copyright = 'Copyright 2007-2013 ChunTeng Co., Ltd.'
 
-    #conf.project = 'Fastui Rapid Development Framework1111'
-    #conf.version = 'version 0.1.0 built on ExtJS 4.2.0'
-    #conf.copyright = 'Copyright 2007-2013 ChunTeng Co., Ltd.'
+  default = [
+      {name: 'entity_kind', title: 'Entity Kind', datatype: 'VRadio'},
+      {name: 'seq', title: 'Order by', datatype: 'VInteger'},
+      {name: 'is_active', title: 'Actived', datatype: 'VBoolean'},
+      {name: 'note', title: 'Memo', datatype: 'VText'},
+      {name: 'help', title: 'Help', datatype: 'VHtml', display: 'form'},
+      {name: 'createdbyorg_id', title: 'Created By Org', datatype: 'VTable', ref: {entity: 'Fastui::MOrg'}, display: 'grid'},
+      {name: 'createdby_id', title: 'Creator', datatype: 'VLookup', ref: {entity: 'Fastui::MPerson'}, display: 'grid'},
+      {name: 'updatedby_id', title: 'Visitor', datatype: 'VLookup', ref: {entity: 'Fastui::MPerson'}, display: 'grid'}
+  ]
 
-    default = [
-        {name: 'entity_kind', title: '实体种类', datatype: 'VSingleChoice'},
-        {name: 'seq', title: '排序', datatype: 'VNumber'},
-        {name: 'is_active', title: '是否激活', datatype: 'VYesOrNo'},
-        {name: 'note', title: '备注', datatype: 'VTextArea'},
-        {name: 'help', title: '帮助', datatype: 'VTextArea', display: 'form'},
-        {name: 'createdbyorg_id', title: '创建组织', datatype: 'VLookup', ref: {entity: 'Fastui::MOrg'}, display: 'grid'},
-        {name: 'createdby_id', title: '创建人', datatype: 'VLookup', ref: {entity: 'Fastui::MPerson'}, display: 'grid'},
-        {name: 'updatedby_id', title: '更新人', datatype: 'VLookup', ref: {entity: 'Fastui::MPerson'}, display: 'grid'}
-    ]
+  conf.win :m_menu, title: 'Menu', window_kind: 'maintain' do |w|
+    w.tab :m_menu, title: 'Menu', entity: 'Fastui::MMenu', readonly: true, members: [
+        {name: 'id', title: 'ID', datatype: 'VInter', readonly: true},
+        {name: 'title', title: 'Title', datatype: 'VString'},
+        {name: 'print_text', title: 'Print Text', datatype: 'VString'},
+        {name: 'name', title: 'Code', datatype: 'VString'}
+    ] + default
+    w.tab :m_menu_item, title: 'Menu Item', entity: 'Fastui::MMenuItem', included_tab: 'm_menu', grid_kind: 'VTreeGrid', members: [
+        {name: 'id', title: 'ID', datatype: 'VInter', readonly: true},
+        {name: 'title', title: 'Title', datatype: 'VTreeText'},
+        {name: 'print_text', title: 'Print Text', datatype: 'VString'},
+        {name: 'name', title: 'Code', datatype: 'VString'},
+        {name: 'm_menu_id', title: 'Menu', datatype: 'VLookup', ref: {entity: 'Fastui::MMenu'}, default_logic: "{id:${m_menu_id},title:'${m_menu_title}'}"},
+        {name: 'window', title: 'Window', datatype: 'VString'},
+        {name: 'parent_id', title: 'Parent', datatype: 'VTree', ref: {entity: 'Fastui::MMenuItem'}}
+    ] + default
+  end
 
-    conf.win :m_menu, title: '菜单', window_kind: 'maintain' do |w|
-        w.tab :m_menu, title: '菜单', entity: 'Fastui::MMenu', readonly: true, members: [
-            {name: 'id', title: 'ID', datatype: 'VNumber', readonly: true},
-            {name: 'title', title: '标题', datatype: 'VText'},
-            {name: 'print_text', title: '打印文本', datatype: 'VText'},
-            {name: 'name', title: '标识', datatype: 'VText'}
-        ] + default
-        w.tab :m_menu_item, title: '菜单项', entity: 'Fastui::MMenuItem', included_tab: 'm_menu', members: [
-            {name: 'id', title: 'ID', datatype: 'VNumber', readonly: true},
-            {name: 'title', title: '标题', datatype: 'VText'},
-            {name: 'print_text', title: '打印文本', datatype: 'VText'},
-            {name: 'name', title: '标识', datatype: 'VText'},
-            {name: 'm_menu_id', title: '对应菜单', datatype: 'VLookup', ref: {entity: 'Fastui::MMenu'}, default_logic: "{id:${m_menu_id},title:'${m_menu_title}'}"},
-            {name: 'window', title: '对应窗口', datatype: 'VText'}
-        ] + default
-    end
+  conf.win :m_org, title: 'Org', window_kind: 'maintain' do |w|
+    w.tab :m_org, title: 'Org', entity: 'Fastui::MOrg', grid_kind: 'VTreeGrid', members: [
+        {name: 'id', title: 'ID', datatype: 'VInteger', readonly: true, },
+        {name: 'title', title: 'Name', datatype: 'VTreeText'},
+        {name: 'print_text', title: 'Print Text', datatype: 'VString'},
+        {name: 'name', title: 'Code', datatype: 'VString'},
+        {name: 'parent_id', title: 'Parent', datatype: 'VTree', ref: {entity: 'Fastui::MOrg'}, default_logic: "{id:${m_org_id},title:'${m_org_title}'}"}
+    ] + default
+  end
 
-    conf.win :m_org, title: '组织', window_kind: 'maintain' do |w|
-        w.tab :m_org, title: '组织', entity: 'Fastui::MOrg', grid_kind: 'VTreeGrid', members: [
-            {name: 'id', title: 'ID', datatype: 'VNumber', readonly: true},
-            {name: 'title', title: '名称', datatype: 'VTree'},
-            {name: 'print_text', title: '打印文本', datatype: 'VText'},
-            {name: 'name', title: '标识', datatype: 'VText'},
-            {name: 'parent_id', title: '上级组织', datatype: 'VLookup', ref: {entity: 'Fastui::MOrg'}}
-        ] + default
-    end
+  conf.win :m_person, title: 'Person', window_kind: 'maintain' do |w|
+    w.tab :m_person, title: 'Person', entity: 'Fastui::MPerson', members: [
+        {name: 'id', title: 'ID', datatype: 'VInteger', readonly: true},
+        {name: 'title', title: 'Name', datatype: 'VString'},
+        {name: 'print_text', title: 'Print Text', datatype: 'VString', vtype: 'url'},
+        {name: 'name', title: 'Code', datatype: 'VString'},
+        {name: 'access_level', title: 'Access Level', datatype: 'VList'}
+    ] + default
+    w.tab :m_role, title: 'Role', entity: 'Fastui::MRole', included_tab: 'm_person', members: [
+        {name: 'id', title: 'ID', datatype: 'VInteger', readonly: true},
+        {name: 'title', title: 'Name', datatype: 'VString'},
+        {name: 'print_text', title: 'Print Text', datatype: 'VString'},
+        {name: 'name', title: 'Code', datatype: 'VString'}
+    ] + default
+  end
 
-    conf.win :m_person, title: '人员', window_kind: 'maintain' do |w|
-        w.tab :m_person, title: '人员', entity: 'Fastui::MPerson', members: [
-            {name: 'id', title: 'ID', datatype: 'VNumber', readonly: true},
-            {name: 'title', title: '标题', datatype: 'VText'},
-            {name: 'print_text', title: '打印文本', datatype: 'VText'},
-            {name: 'name', title: '标识', datatype: 'VText'},
-            {name: 'access_level', title: '访问级别', datatype: 'VSingleChoice'}
-        ] + default
-        w.tab :m_role, title: '角色', entity: 'Fastui::MRole', included_tab: 'm_person', members: [
-            {name: 'id', title: 'ID', datatype: 'VNumber', readonly: true},
-            {name: 'title', title: '标题', datatype: 'VText'},
-            {name: 'print_text', title: '打印文本', datatype: 'VText'},
-            {name: 'name', title: '标识', datatype: 'VText'}
-        ] + default
-    end
-
-    conf.win :m_list, title: '数据字典', window_kind: 'maintain' do |w|
-        w.tab :m_list, title: '枚举', entity: 'Fastui::MList', members: [
-            {name: 'id', title: 'ID', datatype: 'VNumber', readonly: true},
-            {name: 'title', title: '标题', datatype: 'VText'},
-            {name: 'print_text', title: '打印文本', datatype: 'VText'},
-            {name: 'name', title: '标识', datatype: 'VText'}
-        ] + default
-        w.tab :m_list_item, title: '枚举项', entity: 'Fastui::MListItem', included_tab: 'm_list', members: [
-            {name: 'id', title: 'ID', datatype: 'VNumber', readonly: true},
-            {name: 'title', title: '标题', datatype: 'VText'},
-            {name: 'print_text', title: '打印文本', datatype: 'VText'},
-            {name: 'name', title: '标识', datatype: 'VText'}
-        ] + default
-    end
+  conf.win :m_list, title: 'Enumerate', window_kind: 'maintain' do |w|
+    w.tab :m_list, title: 'Enumerate', entity: 'Fastui::MList', members: [
+        {name: 'id', title: 'ID', datatype: 'VInteger', readonly: true},
+        {name: 'title', title: 'Name', datatype: 'VString'},
+        {name: 'print_text', title: 'Print Text', datatype: 'VString'},
+        {name: 'name', title: 'Code', datatype: 'VString'}
+    ] + default
+    w.tab :m_list_item, title: 'Enumerate Item', entity: 'Fastui::MListItem', included_tab: 'm_list', members: [
+        {name: 'id', title: 'ID', datatype: 'VInteger', readonly: true},
+        {name: 'title', title: 'Name', datatype: 'VString'},
+        {name: 'print_text', title: 'Print Text', datatype: 'VString'},
+        {name: 'name', title: 'Code', datatype: 'VString'},
+        {name: 'm_list_id', title: 'Enumerate', datatype: 'VLookup', ref: {entity: 'Fastui::MList'}}
+    ] + default
+  end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastui
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - sgzhe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -168,7 +168,6 @@ files:
 - app/assets/javascripts/fastui/app/view/vfield/VHtml.js
 - app/assets/javascripts/fastui/app/view/vfield/VInteger.js
 - app/assets/javascripts/fastui/app/view/vfield/VList.js
-- app/assets/javascripts/fastui/app/view/vfield/VLongComboBox.js
 - app/assets/javascripts/fastui/app/view/vfield/VLookup.js
 - app/assets/javascripts/fastui/app/view/vfield/VMultipleChoice.js
 - app/assets/javascripts/fastui/app/view/vfield/VNumber.js
@@ -179,7 +178,7 @@ files:
 - app/assets/javascripts/fastui/app/view/vfield/VTable.js
 - app/assets/javascripts/fastui/app/view/vfield/VText.js
 - app/assets/javascripts/fastui/app/view/vfield/VTree.js
-- app/assets/javascripts/fastui/app/view/vfield/VTreeCombobox.js
+- app/assets/javascripts/fastui/app/view/vfield/VTreeText.js
 - app/assets/javascripts/fastui/app/view/vfield/VType.js
 - app/assets/javascripts/fastui/app/view/vfield/VYesOrNo.js
 - app/assets/javascripts/fastui/app/view/VForm.js

data/app/assets/javascripts/fastui/app/view/vfield/VLongComboBox.js

@@ -1,19 +0,0 @@
-Ext.define('FastUI.view.vfield.VLongCombobox',{
-    extend: 'Ext.form.field.ComboBox',
-
-    valueObject: {},
-    winCtx:{},
-    winId:0,
-    rest:{},
-
-    initComponent:function(){
-        this.fieldLabel = this.getFValue('title');
-        this.name =  this.rest.getTableName() + '[' + this.getFValue('m_property').name + ']';
-        this.disabled = this.getFValue('is_readonly');
-        this.allowBlank = true;
-        this.callParent();
-    },
-    getFValue:function (key) {
-        return this.valueObject[key];
-    }
-});

data/app/assets/javascripts/fastui/app/view/vfield/VTreeCombobox.js

@@ -1,78 +0,0 @@
-Ext.define('FastUI.view.vfield.VTreeCombobox', {
-    extend:'Ext.form.field.ComboBox',
-    alias:'widget.vtreecombobox',
-    valueObject: {},
-    winCtx:{},
-    winId:0,
-    rest:{},
-
-    editable: false,
-//    queryMode: 'local',
-//    select: Ext.emptyFn,
-    displayField:'title',
-    valueField:'id',
-    initComponent:function () {
-        this.fieldLabel = this.getFValue('title');
-        this.name =  this.rest.getTableName() + '[' + this.getFValue('name') + ']';
-        this.disabled = this.getFValue('readonly');
-        this.allowBlank = true;
-        this.store = Ext.create('Ext.data.ArrayStore', {
-            fields:['id', 'title'],
-            data:[]
-        });
-        this.callParent();
-    },
-    createPicker: function() {
-        var rest = Ext.create('FastUI.view.Rest', this.getMEntity());
-        return Ext.create('Ext.tree.Panel', {
-            hidden: true,
-            floating: true,
-            minHeight: 300,
-            autoScroll: true,
-            store: Ext.create('Ext.data.TreeStore', {
-                fields:['id', {name:'text', mapping:'title'}],
-                autoLoad: true,
-                proxy:{
-                    type: 'ajax',
-                    url: rest.indexPath(),
-                    reader:{
-                        type:'json',
-                        root:'',
-                        record:''
-                        //successProperty:''
-                    }
-                },
-                root: {
-                    text:'Root',
-                    id:'',
-                    expanded: true
-                }
-            }),
-            listeners: {
-                itemclick: function (view, record) {
-                    var id = record.get('id');
-                    if (!this.store.getById(id)){
-                        this.store.add({id:id,title:record.get('text')});
-                    }
-                    this.setValue(id);
-                    this.collapse();
-                },
-                scope:this
-            }
-        });
-    },
-    getMEntity:function(){
-        return this.valueObject.ref.entity;
-    },
-    getFValue:function (key) {
-        return this.valueObject[key];
-    },
-    setValue:function(value){
-        if(value && value.id && value.title){
-            this.store.add(value);
-            this.setValue(value.id);
-        }else{
-            this.callParent(arguments);
-        }
-    }
-});