BUG修改

frontend/saas-web/app/view/core/dbfind/DbfindTrigger.js

@@ -97,7 +97,7 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
     },
     onTriggerClick:function(f){
         //判断dbfindtrigger归属
-        // var form = f.judge(f);//form
+        f.judge(f);//form
         var panel = f.up('core-tab-panel');
         var panelEl = panel.getEl();
         var box = panelEl.getBox();
@@ -131,7 +131,7 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
 
     judge:function(f){
         if(f.ownerCt.xtype.trim().toUpperCase().indexOf('QUERYFORMPANEL')>-1){
-            f.belong = 'query';
+            f.belong = 'form';
             return f.ownerCt.ownerCt
         }else if(f.ownerCt.xtype.trim().toUpperCase().indexOf('FORMPANEL')>-1){
             f.belong = 'form';

frontend/saas-web/app/view/core/dbfind/MultiDbfindTrigger.js

@@ -103,8 +103,13 @@ Ext.define('saas.view.core.dbfind.MultiDbfindTrigger', {
     },
     onTriggerClick:function(f){
         //判断dbfindtrigger归属
-        var form = f.judge(f);
-        var win = form.getController().getView().add(Ext.create('Ext.window.Window', {   
+        f.judge(f);
+        var panel = f.up('core-tab-panel');
+        var panelEl = panel.getEl();
+        var box = panelEl.getBox();
+        var height = box.height;
+        var width = box.width;
+        var win = panel.add(Ext.create('Ext.window.Window', {   
             trigger:f,
             belong:f.ownerCt,  
             modal:true,
@@ -167,7 +172,7 @@ Ext.define('saas.view.core.dbfind.MultiDbfindTrigger', {
 
     judge:function(f){
         if(f.ownerCt.xtype.trim().toUpperCase().indexOf('QUERYFORMPANEL')>-1){
-            f.belong = 'query';
+            f.belong = 'form';
             return f.ownerCt.ownerCt
         }else if(f.ownerCt.xtype.trim().toUpperCase().indexOf('FORMPANEL')>-1){
             f.belong = 'form';

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

@@ -59,6 +59,10 @@ Ext.define('saas.view.core.query.QueryPanel', {
             showDetail = item.showDetail,
             shwoDetailFunc = item.shwoDetailFunc;
 
+            if(!item.columnWidth){
+                item.columnWidth = 0.25;
+            }
+
             // 设置model绑定
             if(!ignore) {
                 if(bind) {