浏览代码

HUE-6816 [frontend] Fix flexbox sizing of the popover sample tab on Safari

Enrico Berti 8 年之前
父节点
当前提交
d469cd3

文件差异内容过多而无法显示
+ 0 - 0
desktop/core/src/desktop/static/desktop/css/home.css


文件差异内容过多而无法显示
+ 0 - 0
desktop/core/src/desktop/static/desktop/css/hue.css


文件差异内容过多而无法显示
+ 0 - 0
desktop/core/src/desktop/static/desktop/css/hue3-extra.css


+ 0 - 2
desktop/core/src/desktop/static/desktop/less/hue-mixins.less

@@ -118,8 +118,6 @@
 }
 
 .flex(@flex: initial) {
-  -webkit-box-flex: @flex;
-  -moz-box-flex: @flex;
   -ms-flex: @flex;
   -webkit-flex: @flex;
   flex: @flex;

+ 9 - 1
desktop/core/src/desktop/templates/sql_context_popover.mako

@@ -714,7 +714,7 @@ from metadata.conf import has_navigator
             forceInvisible: 10
           });
 
-          $t.parents('.dataTables_wrapper').css('height', '100%');
+          $t.parents('.dataTables_wrapper').height($t.parents('.sample-scroll').parent().height());
 
           $t.jHueTableExtender2({
             fixedHeader: true,
@@ -731,6 +731,11 @@ from metadata.conf import has_navigator
             if ($t.data('plugin_jHueTableExtender2')) {
               $t.data('plugin_jHueTableExtender2').destroy();
             }
+            huePubSub.removeAll('sql.context.popover.resized');
+          });
+
+          huePubSub.subscribe('sql.context.popover.resized', function () {
+            $t.parent().height($t.parents('.context-sample-container').height());
           });
 
           hueUtils.initNiceScroll($t.parents('.dataTables_wrapper'));
@@ -962,6 +967,9 @@ from metadata.conf import has_navigator
             huePubSub.publish('table.extender.redraw', 'sampleTab');
             redrawHeaders = false;
           }
+
+          huePubSub.publish('sql.context.popover.resized');
+
           // Delay or it will close the popover when releasing at the window borders
           window.setTimeout(function () {
             preventHide = false;

部分文件因为文件数量过多而无法显示