文件回退

frontend/saas-web/app/view/core/baseform/FormPanel.js → frontend/saas-web/app/view/core/base/BasePanel.js

@@ -1,20 +1,20 @@
-Ext.define('saas.view.core.baseform.FormPanel', {
+Ext.define('saas.view.core.base.BasePanel', {
     extend: 'Ext.form.Panel',
-    xtype: 'core-baseform-formpanel',
-    controller: 'core-baseform-formpanel',
-    viewModel: 'core-baseform-formpanel',
+    xtype: 'core-base-basepanel',
+    
+    controller: 'core-base-basepanel',
+    viewModel: 'core-base-basepanel',
 
     //工具类
     FormUtil: Ext.create('saas.util.FormUtil'),
     BaseUtil: Ext.create('saas.util.BaseUtil'),
 
     //基础属性
-    layout: 'column',
     autoScroll: true,
     border: 1,
     bodyPadding: 5,
-    searchField:[],
-
+    layout: 'fit',
+    
     fieldDefaults: {
         margin: '0 5 5 0',
         labelAlign: 'right',
@@ -22,10 +22,18 @@ Ext.define('saas.view.core.baseform.FormPanel', {
         columnWidth: 0.25,
         blankText: '该字段不能为空'
     },
+    
+    searchField:[],
+    gridColumns: [],
 
     initComponent: function() {
 
-        var me = this;
+        var me = this,
+        gridConfig = me.gridConfig,
+        gridDataUrl = gridConfig.dataUrl,
+        gridIdField = gridConfig.idField,
+        gridCodeField = gridConfig.codeField,
+        gridColumns = gridConfig.columns;
 
         Ext.apply(me, {
             dockedItems: [{
@@ -40,8 +48,16 @@ Ext.define('saas.view.core.baseform.FormPanel', {
                     text: '查询',
                     handler: 'query'
                 }])
+            }],
+            items: [{
+                layout: 'fit',
+                xtype: 'core-base-gridpanel',
+                dataUrl: gridDataUrl,
+                idField: gridIdField,
+                codeField: gridCodeField,
+                columns: gridColumns
             }]
         });
         me.callParent(arguments);
-    }
+    },
 });

frontend/saas-web/app/view/core/baseform/FormPanelController.js → frontend/saas-web/app/view/core/base/BasePanelController.js

@@ -1,13 +1,13 @@
-Ext.define('saas.view.core.baseform.FormPanelController', {
+Ext.define('saas.view.core.base.BasePanelController', {
     extend: 'Ext.app.ViewController',
-    alias: 'controller.core-baseform-formpanel',
+    alias: 'controller.core-base-basepanel',
 
     BaseUtil: Ext.create('saas.util.BaseUtil'),
     FormUtil: Ext.create('saas.util.FormUtil'),
 
     query: function() {
         var form = this.view;
-        var grid = this.view.down('[name=baseGrid]');
+        var grid = form.down('core-baseform-gridpanel');
         grid.condition = '';
         var fields = form.searchField.map(f => f.name);
         var items = [];

frontend/saas-web/app/view/core/base/BasePanelModel.js

@@ -0,0 +1,4 @@
+Ext.define('saas.view.core.base.BasePanelModel', {
+    extend: 'Ext.app.ViewModel',
+    alias: 'viewmodel.core-base-basepanel',
+});

frontend/saas-web/app/view/core/baseform/GridPanel.js → frontend/saas-web/app/view/core/base/GridPanel.js

@@ -1,17 +1,17 @@
-Ext.define('saas.view.core.baseform.GridPanel', {
+Ext.define('saas.view.core.base.GridPanel', {
     extend: 'Ext.grid.Panel',
-    xtype: 'core-baseform-gridpanel',
-    BaseUtil: Ext.create('saas.util.BaseUtil'),
-    dataUrl: '',
-    dbSearchFields: [],
-    condition:'',
+    xtype: 'core-base-gridpanel',
 
     selModel: {
         checkOnly:true,
         type:'checkboxmodel',
         mode : "MULTI" ,
         ignoreRightMouseSelection : false
-	},
+    },
+    
+    dataUrl: '',
+    dbSearchFields: [],
+    condition:'',
 
     initComponent: function() {
         var me = this;
@@ -153,11 +153,11 @@ Ext.define('saas.view.core.baseform.GridPanel', {
                 })
                 .then(function() {
                     showToast('操作成功');
-                    grid.store.load();
                 })
                 .catch(function(response) {
                     showToast('操作失败');
                 });
+                grid.store.load();
         }else{
             showToast('请勾选至少一条明细。');
         }

frontend/saas-web/app/view/core/baseform/FormPanelModel.js

@@ -1,4 +0,0 @@
-Ext.define('saas.view.core.baseform.FormPanelModel', {
-    extend: 'Ext.app.ViewModel',
-    alias: 'viewmodel.core-baseform-formpanel',
-});