Browse Source

Merge remote-tracking branch 'origin/dev' into dev

zhouy 7 years ago
parent
commit
0cb72b56bf
1 changed files with 7 additions and 3 deletions
  1. 7 3
      frontend/saas-web/app/view/core/dbfind/DbfindTrigger.js

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

@@ -108,7 +108,7 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
     },
     onTriggerClick:function(f){
         //判断dbfindtrigger归属
-        f.judge(f);
+        var belong = f.judge(f);
         var win = Ext.create('Ext.window.Window', {   
             trigger:f,
             belong:f.ownerCt,  
@@ -121,7 +121,7 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
             constrain: true,
             closable: true,
             layout:'fit',
-            renderTo:f.ownerCt.getEl(),
+            renderTo:belong=='form'?f.ownerCt.getEl():f.column.ownerCt.ownerCt.ownerCt.getEl(),
             items:[{
                 xtype:'dbfindgridpanel',
                 configUrl: f.configUrl,
@@ -133,10 +133,14 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
     },
 
     judge:function(f){
-        if(f.ownerCt.xtype.indexOf('FormPanel')>-1){
+        if(f.ownerCt.xtype.trim().toUpperCase().indexOf('FORMPANEL')>-1){
             f.belong = 'form';
             return 'form'
         }
+        else if(f.column){
+            f.belong = 'grid';
+            return 'grid'
+        }
     },
 
     listeners: {