merge

frontend/saas-web/app/view/core/form/FormPanel.js

@@ -5,7 +5,8 @@ Ext.define('saas.view.core.form.FormPanel', {
     FormUtil: Ext.create('saas.util.FormUtil'),
 
     controller: 'core-form-formpanel',
-
+    viewModel: Ext.create('Ext.app.ViewModel'),
+    
     layout: 'column',
     autoScroll: true,
     border: 1,

frontend/saas-web/app/view/core/grid/DbfindGridPanel.js

@@ -1,5 +1,5 @@
 Ext.define('saas.view.core.grid.DbfindGridPanel', {
-    extend: 'Ext.grid.Panel',
+    extend: 'saas.view.core.grid.GridPanel',
     xtype: 'core-dbfindgridpanel',
 
     GridUtil: Ext.create('saas.util.GridUtil'),
@@ -9,9 +9,7 @@ Ext.define('saas.view.core.grid.DbfindGridPanel', {
 
     initComponent: function() {
         var me = this;
-        me.configUrl && me.GridUtil.getGridColumns(me, me.configUrl, function() {
-            me.dataUrl && me.GridUtil.loadData(me, me.dataUrl);
-        });
+        me.configUrl && me.GridUtil.setColumns(me, me.configUrl);
         me.callParent(arguments);
     },
 
@@ -33,6 +31,7 @@ Ext.define('saas.view.core.grid.DbfindGridPanel', {
                 for (let index = 0; index < relatives.length; index++) {
                     var item = relatives[index];
                     var field = me.ownerCt.belong.down('[name='+item.name+']');
+                    debugger
                     if(field){
                         var val = record.get(item.name);
                         if(field.xtype=='dbfindtrigger'){

frontend/saas-web/app/view/main/MainModel.js

@@ -28,7 +28,7 @@ Ext.define('saas.view.main.MainModel', {
                                     {
                                         id: 'purchaseList',
                                         text: '采购单',
-                                        viewType: 'grid',
+                                        viewType: 'purchase-list-gridpanel',
                                         leaf: true
                                     }, {
                                         id: 'list1',
@@ -44,8 +44,8 @@ Ext.define('saas.view.main.MainModel', {
                                     },
                                     {
                                         id: 'form1',
-                                        text: '主从表界面1',
-                                        viewType: 'purchase-order-formpanel',
+                                        text: '测试-采购单明细界面',
+                                        viewType: 'test-order-formpanel',
                                         leaf: true
                                     },
                                     {

frontend/saas-web/app/view/purchase/list/GridPanel.js

@@ -0,0 +1,9 @@
+Ext.define('saas.view.purchase.list.GridPanel', {
+    extend: 'saas.view.core.grid.GridPanel',
+    xtype: 'purchase-list-gridpanel',
+
+    controller: 'purchase-list-listcontroller',
+    
+    configUrl: 'resources/json/gridColumns1.json',
+    dataUrl: 'resources/json/gridData1.json'
+});

frontend/saas-web/app/view/purchase/list/ListController.js

@@ -1,5 +1,5 @@
 Ext.define('saas.view.purchase.list.ListController', {
-    extend: 'Ext.app.ViewController',
+    extend: 'saas.view.core.grid.GridPanelController',
     alias: 'controller.purchase-list-listcontroller',
 
     control: {
@@ -16,7 +16,8 @@ Ext.define('saas.view.purchase.list.ListController', {
                 if (!existingItem) {
                     var form = Ext.create('saas.view.purchase.panel.FormPanel', {
                         id,
-                        title
+                        title,
+                        viewModel: Ext.create('Ext.app.ViewModel')
                     });
                     mainTab.setActiveTab(mainTab.add(form));
                 }

frontend/saas-web/app/view/purchase/order/FormModel.js

@@ -3,6 +3,7 @@ Ext.define('saas.view.purchase.order.FormModel', {
     alias: 'viewmodel.purchase-order-formmodel',
 
     data: {
+        num1:2,
         id: 'TC-1032301'
     },
 

frontend/saas-web/app/view/purchase/panel/FormPanel.js

@@ -2,6 +2,7 @@ Ext.define('saas.view.purchase.panel.FormPanel', {
     extend: 'saas.view.core.form.FormPanel',
     xtype: 'purchase-panel-FormPanel',
     controller: 'purchase-panel-FormPanelController',
+    viewModel: Ext.create('Ext.app.ViewModel'),
 
     frame: true,
     resizable: true,
@@ -19,10 +20,4 @@ Ext.define('saas.view.purchase.panel.FormPanel', {
 
     configUrl: 'resources/json/purchase/formItems.json',
 
-   
-
-    tbar: ['->',
-        { text: '保存' , handler: 'onOK' },
-        { text: '关闭', handler: 'onCancel' }
-    ]
 });

frontend/saas-web/app/view/test/order/FormController.js

@@ -0,0 +1,6 @@
+Ext.define('saas.view.test.order.FormController', {
+    extend: 'saas.view.core.form.FormPanelController',
+    alias: 'controller.test-order-formcontroller',
+
+
+});

frontend/saas-web/app/view/test/order/FormModel.js

@@ -0,0 +1,15 @@
+Ext.define('saas.view.test.order.FormModel', {
+    extend: 'Ext.app.ViewModel',
+    alias: 'viewmodel.test-order-formmodel',
+
+    data: {
+        num1:2,
+        id: 'TC-1032301'
+    },
+
+    formulas: {
+        sum: function(get) {
+            return get('num1') + get('num2');
+        }
+    }
+});

frontend/saas-web/app/view/test/order/FormPanel.js

@@ -0,0 +1,10 @@
+Ext.define('saas.view.test.order.FormPanel', {
+    extend: 'saas.view.core.form.FormPanel',
+    xtype: 'test-order-formpanel',
+
+    controller: 'test-order-formcontroller',
+    viewModel: 'test-order-formmodel',
+
+    configUrl: 'resources/json/formItems.json',
+
+});