fastui 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmUzNDQwZjI2M2FmOWI2MzFjY2E4Y2IxOGY5NWFkMDIxYTNiYzM0Nw==
+    ODhjZmNmMWJiNjM0OWQ3ZjlhMjllYzIyMjQ5MGFmM2NmODQ0NDZhMw==
   data.tar.gz: !binary |-
-    ZDdmNGJlYzE1YzAyZjIwMTRhZmI3OWE4YmM3MzU4MWFkZmQ5ZDRlNQ==
+    NTU2OWI1NjkyOGQwNDI3MThkZWI1NTc3ODNkNzJkYWNmYzllOTUwZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzM4OWQ4NTIzNGRkNmUwM2RiNTRiMTBiNTBmNmRmY2ViYzAwODk5ZjY4MmEx
-    ZDdiZDI1ZDE4ZmVmM2IwNTJlYzUyYTdiZDE3NzQ3NDQyZjE1ODJiMTdhMDY0
-    ZmJhODgwNGU0YmFmOTQ3ZWY0OWIzMDM1ZGIyNDZjMmY1OTMwOGM=
+    MTAzODgzYWZjODc4ZmM1ODhkNDFlODQwY2FlMDY2M2VlY2QwYTcyNjM4ODJk
+    NGYyOGQ2MDcxODk0Yzg3ZmE0ZGRkYmYyZWU5MWM0ODVkZjJmNWFkNjI0N2Vj
+    NTM1ZTE4YTlkMTY0MzliNmMzNTcyYWVlZDAxYzFlYTk5Y2EwZTQ=
   data.tar.gz: !binary |-
-    OTBjMTFkY2MxOWRiY2VmODExNmFkYzk1ZTE0YWZlOGFjN2Y3NDU2M2YyY2Mz
-    YWU4NTU1NGM3MTUzNWI3NzEzMDUwZDZlNWQxMTM0NjZiODdhZDdkNzYzYzdm
-    MDk0MTBmODBhM2M1N2Q1ZGM2ZjViZjEyZmFhZjc4YzkxMjdjNTE=
+    MDM2NGZiOWJlYzk2YmYyNmFkMzU4OGRhMGEyY2NmNTlkMjMyMDk5NTk3ZGMx
+    NjJjMzFlMWYxZWQxZDBkNGY2NDM0NzdiNThiZDM0ZmVmYTE1MjM3MWEzZGJl
+    N2MxOWJmNzQ5NjNjMWUzMTAwMzkyYjkxODFlNGM3ODdjMzQ1MjI=

data/README.md

@@ -13,15 +13,20 @@ By default your view is configured in the file config/initializers/fastui_config
   Fastui::View.instance.config do |conf|
     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:'id', title: 'ID', datatype:'VInteger', readonly: true},
+        {name:'title', title: '标题', datatype:'VString'},
         {name:'print_text', title: '打印文本', datatype:'VText'},
-        {name:'name', title: '标识', datatype:'VText'}
+        {name:'name', title: '标识', datatype:'VString'},
+        {name: 'entity_kind', title: '实体种类', datatype: 'VRadio'},
+        {name: 'seq', title: '排序', datatype: 'VInteger'},
+        {name: 'is_active', title: '是否激活', datatype: 'VBool'},
+        {name: 'note', title: '备注', datatype: 'VText'},
+        {name: 'help', title: '帮助', datatype: 'VHtml', display: 'form'}
       ]
       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:'id', title: 'ID', datatype:'VInteger', readonly: true},
+        {name:'title', title: '标题', datatype:'VString'},
+        {name:'print_text', title: '打印文本', datatype:'VString'},
         {name:'name', title: '标识', datatype:'VText'}
       ]
     end

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

@@ -0,0 +1,61 @@
+Ext.define('FastUI.view.DataFieldFactory', {
+    singleton: true,
+
+    buildField:function(fields, field){
+        switch (field.datatype) {
+            case 'VTreeCombobox':
+                fields.push({
+                    name: field.name.replace('_id', ''),
+                    type: 'auto'
+                });
+                break;
+
+            case 'VTable':
+                fields.push({
+                    name: field.name.replace('_id', ''),
+                    type: 'auto'
+                });
+                break;
+
+            case 'VLookup':
+                fields.push({
+                    name: field.name.replace('_id', ''),
+                    type: 'auto'
+                });
+                break;
+
+            case 'VSingleChoice':
+                fields.push({
+                    name: field.name.replace('_id', ''),
+                    type: 'auto'
+                });
+                break;
+
+            case 'VList':
+                fields.push({
+                    name: field.name.replace('_id', ''),
+                    type: 'auto'
+                });
+                break;
+
+            case 'VGroup':
+                Ext.each(field.members, function(member){
+                    this.buildField(fields,member);
+                },this);
+                break;
+
+
+            default:
+                if(Array.isArray(field)){
+                    Ext.each(field, function(f){
+                        this.buildField(fields,f);
+                    },this);
+                }else{
+                    fields.push({
+                        name: field.name,
+                        type: 'auto'
+                    });
+                }
+        }
+    }
+});

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

@@ -0,0 +1,164 @@
+Ext.define('FastUI.view.GridColumnFactory', {
+    singleton: true,
+
+    buildColumn: function(columns, column){
+        column.datatype = column.datatype || '';
+        switch (column.datatype) {
+            case 'VTree':
+                columns.push({
+                    text: column.title,
+                    dataIndex: column.name,
+                    xtype: 'treecolumn',
+                    flex: 2.5
+                });
+                break;
+
+            case 'VTreeCombobox':
+                var entity = column.name.replace('_id', '');
+                columns.push({
+                    text: column.title,
+                    dataIndex: column.name,
+                    display: column.display || 'all',
+                    xtype:  'templatecolumn',
+                    tpl: new Ext.XTemplate('<tpl for="' + entity + '">', '{title}', '</tpl>')
+                });
+                break;
+
+            case 'VTable':
+                var entity = column.name.replace('_id', '');
+                columns.push({
+                    text: column.title,
+                    dataIndex: column.name,
+                    display: column.display || 'all',
+                    xtype:  'templatecolumn',
+                    tpl: new Ext.XTemplate('<tpl for="' + entity + '">', '{title}', '</tpl>')
+                });
+                break;
+
+            case 'VLookup':
+                var entity = column.name.replace('_id', '');
+                columns.push({
+                    text: column.title,
+                    dataIndex: column.name,
+                    display: column.display || 'all',
+                    xtype:  'templatecolumn',
+                    tpl: new Ext.XTemplate('<tpl for="' + entity + '">', '{title}', '</tpl>')
+                });
+                break;
+
+            case 'MultipleChoice':
+                var plur_entity = column.name.replace('_ids', '').pluralize();
+                columns.push({
+                    text: column.title,
+                    dataIndex: column.name,
+                    display: column.display || 'all',
+                    xtype:  'templatecolumn',
+                    tpl: new Ext.XTemplate('<tpl for="' + plur_entity + '">', '{title}', '</tpl>')
+                });
+                break;
+
+            case 'VSingleChoice':
+                columns.push({
+                    text: column.title,
+                    dataIndex: column.name,
+                    display: column.display || 'all',
+                    renderer: function(val) {
+                        var list_store = FastUI.store.MListMgr.getStore(column.name);
+                        var index = list_store.findExact('name', val);
+                        if (index > -1) {
+                            var rs = list_store.getAt(index).data;
+                            return rs.title;
+                        }
+                        return "";
+                    }
+                });
+                break;
+
+            case 'VList':
+                columns.push({
+                    text: column.title,
+                    dataIndex: column.name,
+                    display: column.display || 'all',
+                    renderer: function(val) {
+                        var list_store = FastUI.store.MListMgr.getStore(column.name);
+                        var index = list_store.findExact('name', val);
+                        if (index > -1) {
+                            var rs = list_store.getAt(index).data;
+                            return rs.title;
+                        }
+                        return "";
+                    }
+                });
+                break;
+
+            case 'VRadio':
+                columns.push({
+                    text: column.title,
+                    dataIndex: column.name,
+                    display: column.display || 'all',
+                    renderer: function(val) {
+                        var list_store = FastUI.store.MListMgr.getStore(column.name);
+                        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,
+                    display: column.display || 'all',
+                    renderer: function (val) {
+                        return val ? '男' : '女'
+                    }
+                });
+                break;
+
+            case 'VBoolean':
+                columns.push({
+                    text: column.title,
+                    dataIndex: column.name,
+                    display: column.display || 'all',
+                    renderer: function (val) {
+                        return val ? '√' : '×';
+                    }
+                });
+                break;
+
+            case 'VYesOrNo':
+                columns.push({
+                    text: column.title,
+                    dataIndex: column.name,
+                    display: column.display || 'all',
+                    renderer: function (val) {
+                        return val ? '是' : '否';
+                    }
+                });
+                break;
+
+            case 'VGroup':
+                Ext.each(column.members, function (member) {
+                    this.buildColumn(columns, member);
+                },this);
+                break;
+
+            default:
+                if(Array.isArray(column)){
+                    Ext.each(column, function(c){
+                        this.buildColumn(columns, c);
+                    },this);
+                }else{
+                    columns.push({
+                        text: column.title,
+                        dataIndex: column.name,
+                        display: column.display || 'all'
+                    });
+                }
+        }
+    }
+});

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

@@ -47,6 +47,7 @@ Ext.define('FastUI.view.VCustomForm', {
             method : this.method,
             form : this.id,
             success: function () {
+                this.tab.vgrid.store.reload();
                 Ext.MessageBox.alert("提示", "操作成功！")
             },
             failure: function () {

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

@@ -1,36 +1,41 @@
 Ext.define('FastUI.view.VForm', {
-    extend:'Ext.form.Panel',
+    extend: 'Ext.form.Panel',
     requires: ['FastUI.view.vfield.VFieldFactory'],
-    tab:{},
-    bodyPadding:5,
-    layout:'anchor',
+    tab: {},
+    successText:'Success',
+    failureText:'Failed',
+    invalidText:'Invalid',
 
+    bodyPadding: 5,
+    layout: 'anchor',
     fieldDefaults: {
         labelAlign: 'right',
         labelWidth: 100,
         //anchor: '60%'
         width: 650
     },
-    defaultType:'textfield',
-    border:false,
-    initComponent:function () {
+    defaultType: 'textfield',
+    border: false,
+    initComponent: function () {
         this.title = this.getValue('title');
         this.items = this.getFFields();
         this.callParent();
     },
-    getValue:function(key){
+    getValue: function (key) {
         return this.tab.valueObject[key];
     },
-    getMEntity:function(){
+    getMEntity: function () {
         return this.tab.valueObject.entity;
     },
-    getFFields:function () {
+    getFFields: function () {
         var fields = [];
         Ext.each(this.getValue('members'), function (member) {
             member.readonly = member.readonly || false;
             member.display = member.display || 'all';
-            if (member.display == 'all' || member.display == 'form'){
-                fields.push(FastUI.view.vfield.VFieldFactory.buildField(member,this.tab.winCtx, this.tab.winId,this.tab.rest));
+            member.vtype = member.vtype || '';
+
+            if (member.display == 'all' || member.display == 'form') {
+                fields.push(FastUI.view.vfield.VFieldFactory.buildField(member, this.tab.winCtx, this.tab.winId, this.tab.rest));
             }
         }, this);
         return fields;
@@ -45,10 +50,10 @@ Ext.define('FastUI.view.VForm', {
     setAutoFields: function (form) {
         var temp = {};
         var logic = "";
-        Ext.each(this.getValue('m_fields'), function (mfield) {
-            if (mfield.default_logic && mfield.default_logic.length > 0) {
-                logic = this.winCtx.parseCtx(this.winId, mfield.default_logic);
-                temp[this.tab.rest.getTableName() + '[' + mfield.m_property.name + ']'] = Ext.decode(logic);
+        Ext.each(this.getValue('members'), function (member) {
+            if (member.default_logic) {
+                logic = this.tab.winCtx.parseCtx(this.tab.winId, member.default_logic);
+                temp[this.tab.rest.getTableName() + '[' + member.name + ']'] = Ext.decode(logic);
             }
         }, this);
         form.setValues(temp);
@@ -68,12 +73,8 @@ Ext.define('FastUI.view.VForm', {
                 var k, o = {};
                 for (k in data) {
                     if (k.match(/_id$/)) {
-                        var attr = data[k.replace('_id', '')];
-                        var title = data[k];
-                        if (attr && attr.title) {
-                            title = attr.title
-                        }
-                        o[this.tab.rest.getTableName() + '[' + k + ']'] = {id: data[k], title: title};
+                        var attr = data[k.replace('_id', '')] || data[k];
+                        o[this.tab.rest.getTableName() + '[' + k + ']'] = attr;
                     } else if (k.match(/_ids$/)) {
                         o[this.tab.rest.getTableName() + '[' + k + '][]'] = data[k];
                     }
@@ -83,35 +84,28 @@ Ext.define('FastUI.view.VForm', {
                 }
 //                alert(Ext.encode(o));
                 form.setValues(o);
-            }, scope: this
+            },
+            failure: function (response,action) {
+                Ext.Msg.alert(this.failureText, action.result.msg);
+            },
+            scope: this
         });
     },
     cmdSave: function () {
-            var form = this.getForm();
-            if (form.isValid()) {
-                this.constructAjaxRequest({
-                    url: form.url,
-                    method: form.method,
-                    params: form.getValues(false, false, false),
-                    success: function () {
-                        Ext.MessageBox.alert("提示", "操作成功！")
-                    },
-                    failure: function () {
-                        Ext.MessageBox.alert("提示", "操作失败！")
-                    },
-                    scope: this
-                });
-            }
-    },
-    constructAjaxRequest: function (options) {
-        return Ext.Ajax.request({
-            url: options.url,
-            method: options.method,
-            params: options.params,
-            success: options.success,
-            failure: options.failure,
-            scope: options.scope
-        });
+        var form = this.getForm();
+        if (form.isValid()) { // make sure the form contains valid data before submitting
+            form.submit({
+                success: function (form, action) {
+                    this.tab.vgrid.store.reload();
+                    Ext.Msg.alert(this.successText, action.result.msg);
+                },
+                failure: function (form, action) {
+                    Ext.Msg.alert(this.failureText, action.result.msg);
+                },
+                scope: this
+            });
+        } else { // display error alert if the data is invalid
+            Ext.Msg.alert(this.invalidText, 'Please correct form errors.')
+        }
     }
-
 });

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

@@ -1,6 +1,6 @@
 Ext.define('FastUI.view.VGrid', {
     extend: 'Ext.grid.Panel',
-    requires: ['FastUI.store.MListMgr'],
+    requires: ['FastUI.store.MListMgr', 'FastUI.view.vfield.VFieldFactory','FastUI.view.DataFieldFactory', 'FastUI.view.GridColumnFactory'],
     tab: {},
     selType: 'rowmodel',
     multiSelect: false,
@@ -30,8 +30,8 @@ Ext.define('FastUI.view.VGrid', {
             //alert(this.tab.rest.getKey() + '='+ record.get('id'));
             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();
@@ -79,137 +79,24 @@ Ext.define('FastUI.view.VGrid', {
     getMColumns: function () {
         return this.tab.valueObject.members || [];
     },
-    buildField:function(fields, field){
-        field.datatype = field.datatype || '';
-        switch (field.datatype) {
-            case 'VLookup':
-                fields.push({
-                    name: field.name.replace('_id', ''),
-                    type: 'auto'
-                });
-                break;
 
-            case 'VSingleChoice':
-                fields.push({
-                    name: field.name.replace('_id', ''),
-                    type: 'auto'
-                });
-                break;
-
-            case 'VGroup':
-                Ext.each(field.members, function(member){
-                    this.buildField(fields,member);
-                },this);
-                break;
-
-            default:
-                if(Array.isArray(field)){
-                    Ext.each(field, function(f){
-                        this.buildField(fields,f);
-                    },this);
-                }else{
-                    fields.push({
-                        name: field.name,
-                        type: 'auto'
-                    });
-                }
-        }
-    },
     getGFields: function () {
         var fields = [];
         Ext.each(this.getMColumns(), function (column) {
-            this.buildField(fields, column);
+            //this.buildField(fields, column);
+            FastUI.view.DataFieldFactory.buildField(fields,column);
+            //fields.push(FastUI.view.vfield.VFieldFactory.buildField(column, this.tab.winCtx, this.tab.winId, this.tab.rest).data());
         }, this);
         return fields;
     },
-    buildColumn: function(columns, column){
-        column.datatype = column.datatype || '';
-        switch (column.datatype) {
-            case 'VLookup':
-                var entity = column.name.replace('_id', '');
-                columns.push({
-                    text: column.title,
-                    dataIndex: column.name,
-                    display: column.display || 'all',
-                    xtype:  'templatecolumn',
-                    tpl: new Ext.XTemplate('<tpl for="' + entity + '">', '{title}', '</tpl>')
-                });
-                break;
-
-            case 'MultipleChoice':
-                var plur_entity = column.name.replace('_ids', '').pluralize();
-                columns.push({
-                    text: column.title,
-                    dataIndex: column.name,
-                    display: column.display || 'all',
-                    xtype:  'templatecolumn',
-                    tpl: new Ext.XTemplate('<tpl for="' + plur_entity + '">', '{title}', '</tpl>')
-                });
-                break;
-
-            case 'VSingleChoice':
-                columns.push({
-                    text: column.title,
-                    dataIndex: column.name,
-                    display: column.display || 'all',
-                    renderer: function(val) {
-                        var list_store = FastUI.store.MListMgr.getStore(column.name);
-                        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,
-                    display: column.display || 'all',
-                    renderer: function (val) {
-                        return val ? '男' : '女'
-                    }
-                });
-                break;
-
-            case 'VYesOrNo':
-                columns.push({
-                    text: column.title,
-                    dataIndex: column.name,
-                    display: column.display || 'all',
-                    renderer: function (val) {
-                        return val ? '是' : '否';
-                    }
-                });
-                break;
-
-            case 'VGroup':
-                Ext.each(column.members, function (member) {
-                    this.buildColumn(columns, member);
-                },this);
-                break;
-
-            default:
-                if(Array.isArray(column)){
-                    Ext.each(column, function(c){
-                        this.buildColumn(columns, c);
-                    },this);
-                }else{
-                    columns.push({
-                        text: column.title,
-                        dataIndex: column.name,
-                        display: column.display || 'all'
-                    });
-                }
-        }
-    },
     getGColumns: function () {
         var columns = [];
         Ext.each(this.getMColumns(), function (column) {
-            this.buildColumn(columns,column);
+            //this.buildColumn(columns,column);
+            FastUI.view.GridColumnFactory.buildColumn(columns, column);
+            //alert('ss');
+            //columns.push(FastUI.view.vfield.VFieldFactory.buildField(column, this.tab.winCtx, this.tab.winId, this.tab.rest).column());
         }, this);
         return columns;
     }

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

@@ -18,7 +18,7 @@ Ext.define('FastUI.view.VMenu', {
     initComponent: function(){
       this.store = Ext.create('Ext.data.TreeStore', {
           autoLoad:true,
-          fields:['id', {name:'text', mapping:'title'},{name:'leaf',mapping:'leaf?'},{name:'expanded',mapping:'child?'}, 'window'],
+          fields:['id', {name:'text', mapping:'title'},'leaf','expanded', 'window'],
           proxy:{
               type:'ajax',
               url:'/fastui/m_menu_items.json',

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

@@ -4,11 +4,11 @@ Ext.define('FastUI.view.VSearchWindow', {
     height:300,
     width:600,
     layout:'fit',
-    vlookup:{},
+    lookup:{},
 
     initComponent:function () {
-
         this.title = this.getValue('title');
+
         this.items = {
             xtype: 'grid',
             border: false,
@@ -16,14 +16,14 @@ Ext.define('FastUI.view.VSearchWindow', {
                 {header:'ID', dataIndex:'id'},
                 {header:'Title', dataIndex:'title'}
             ],
-            store: this.getStore(), // A dummy empty data store
+            store: this.getStore(),
             listeners:{
                 itemclick:function (grid, record, item, index, e, eOpts) {
                     var id = record.get('id');
-                    if (!this.vlookup.store.getById(id)){
-                        this.vlookup.store.add({id:id,title:record.get('title')});
+                    if (!this.lookup.store.getById(id)){
+                        this.lookup.store.add({id:id,title:record.get('title')});
                     }
-                    this.vlookup.setValue(id);
+                    this.lookup.setValue(id);
                 },
                 scope:this
             }
@@ -33,14 +33,14 @@ Ext.define('FastUI.view.VSearchWindow', {
         this.callParent();
     },
     getValue:function (key) {
-        return this.vlookup.valueObject[key];
+        return this.lookup.valueObject[key];
     },
     getMEntity:function(){
-        return this.vlookup.valueObject.ref.entity;
+        return this.lookup.valueObject.ref.entity;
     },
 
 //    getDataType:function(){
-//        return this.this.vlookup.valueObject.class_name
+//        return this.this.lookup.valueObject.class_name
 //    },
 
     searchPanel:function () {
@@ -76,7 +76,7 @@ Ext.define('FastUI.view.VSearchWindow', {
 //        var s = "{m_window_id:${m_window_id}}";
         var s = this.getValue('filter');
         if(s == '') return '';
-        s = this.vlookup.winCtx.parseCtx(this.vlookup.winId,s);
+        s = this.lookup.winCtx.parseCtx(this.lookup.winId,s);
         return Ext.decode(s);
     },
     getStore:function () {

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

@@ -70,7 +70,7 @@ Ext.define('FastUI.view.VTab', {
 //                        this.cmdSave();
                         this.getForm();
                         this.vform.cmdSave();
-                        this.vgrid.store.reload();
+
                         this.getLayout().setActiveItem(this.vgrid.id);
                         this.getBtn('save').disable();
                     },