Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

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

@@ -17,22 +17,8 @@ Ext.define('saas.view.core.form.FormPanelController', {
 
     add: function(){
         var form = this.getView();
-        var mainTab = Ext.getCmp('main-tab-panel');
-        var title = '新增' + form._title;
         var id = form.xtype + '_add';
-        existingItem = mainTab.down('[id=' + id + ']');
-        lastView = mainTab.getActiveTab();
-        if (!existingItem) {
-            var form = {
-                initId:0,
-                id,
-                title,
-                xtype:form.xtype
-            };
-            mainTab.setActiveTab(mainTab.add(form));
-        }else{
-            mainTab.setActiveTab(existingItem);
-        }
+        openTab(form.xtype,'新增' + form._title,id);
     },
     
     delete: function(){

frontend/saas-web/app/view/core/query/QueryGridPanel.js

@@ -182,20 +182,10 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
     listeners: {
         itemdblClick: function (tableView, record, item, index, e, eOpts) {
             var grid = tableView.up('grid'),
-                mainTab = Ext.getCmp('main-tab-panel'),
-                idValue = record.get(grid.idField),
-                codeValue = record.get(grid.codeField),
-                id = grid.xtype + idValue;
-                existingItem = mainTab.down('[id=' + id + ']');
-            if (!existingItem) {
-                var form = {
-                    xtype:grid.addXtype,
-                    id,
-                    title:grid.addTitle+"("+codeValue+")",
-                    initId:idValue
-                };
-                mainTab.setActiveTab(mainTab.add(form));
-            }
+            idValue = record.get(grid.idField),
+            codeValue = record.get(grid.codeField),
+            id = grid.xtype + idValue;
+            openTab(grid.addXtype,grid.addTitle+"("+codeValue+")",id);
         }
     },
     getFields: function() {
@@ -208,17 +198,8 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
     },
     onAddMore: function (me) {
         var grid = me.up('grid'),
-            mainTab = Ext.getCmp('main-tab-panel'),
-            id = grid.xtype + '_add';
-            existingItem = mainTab.down('[id=' + id + ']');
-        if (!existingItem) {
-            var form = {
-                xtype:grid.addXtype,
-                id,
-                title:'新增'+grid.addTitle
-            };
-            mainTab.setActiveTab(mainTab.add(form));
-        }
+        id = grid.xtype + '_add';
+        openTab(grid.addXtype,'新增'+grid.addTitle,id)
     },
     onAudit: function(me){
         console.log('审核');