瀏覽代碼

HUE-6786 [metastore] DB configuration list shouldn't overflow into table list

Enrico Berti 8 年之前
父節點
當前提交
5f4f5f7

文件差異過大導致無法顯示
+ 0 - 0
apps/metastore/src/metastore/static/metastore/css/metastore.css


+ 0 - 5
apps/metastore/src/metastore/static/metastore/less/metastore.less

@@ -140,11 +140,6 @@ h2.card-heading {
   font-weight: 400;
 }
 
-.table-description {
-  max-height: 90px;
-  overflow-y: auto;
-}
-
 .acl-panel {
   border-left: 1px solid #e5e5e5;
   padding-top: 6px;

+ 4 - 2
apps/metastore/src/metastore/templates/metastore.mako

@@ -883,8 +883,10 @@ ${ components.menubar(is_embeddable) }
   % if has_write_access:
   <div class="show-inactive-on-hover">
     <a class="inactive-action pointer toggle-editable" title="${ _('Edit the description') }"><i class="fa fa-pencil vertical-align-top"></i></a>
-    <div data-bind="attr:{ title: comment }, editable: comment, editableOptions: {enabled: true, type: 'wysihtml5', toggle: 'manual', toggleElement: '.toggle-editable', placement: 'bottom', placeholder: '${ _ko('Add a description...') }', emptytext: '${ _ko('No description available') }', inputclass:'input-xlarge', rows: 10 }" class="inline-block margin-left-5 table-description">
-      ${ _('Add a description...') }
+    <div data-bind="toggleOverflow: {height: 24}">
+      <div data-bind="attr:{ title: comment }, editable: comment, editableOptions: {enabled: true, type: 'wysihtml5', toggle: 'manual', toggleElement: '.toggle-editable', placement: 'bottom', placeholder: '${ _ko('Add a description...') }', emptytext: '${ _ko('No description available') }', inputclass:'input-xlarge', rows: 10 }" class="inline-block margin-left-5">
+        ${ _('Add a description...') }
+      </div>
     </div>
   </div>
   % else:

文件差異過大導致無法顯示
+ 0 - 0
desktop/core/src/desktop/static/desktop/css/hue.css


文件差異過大導致無法顯示
+ 0 - 0
desktop/core/src/desktop/static/desktop/css/hue3-extra.css


+ 0 - 20
desktop/core/src/desktop/static/desktop/css/hue3.css

@@ -766,26 +766,6 @@ div.navigator .pull-right .nav {
   color: #999;
 }
 
-.toggle-overflow {
-  display: inline-block;
-  overflow: hidden;
-}
-
-.toggle-overflow-gradient {
-  position: relative;
-  z-index: 2;
-  top: -10px;
-  height: 10px;
-  line-height: 10px;
-  background-color: #F6F6F6;
-  cursor: s-resize;
-  text-align: center;
-}
-
-.toggle-overflow-gradient:hover {
-  background-color: #EEE;
-}
-
 .valign-middle {
   vertical-align: middle;
 }

+ 18 - 6
desktop/core/src/desktop/static/desktop/js/ko.hue-bindings.js

@@ -458,19 +458,30 @@
   };
 
   ko.bindingHandlers.toggleOverflow = {
-    render: function ($element) {
+    render: function ($element, options) {
       if (hueUtils.isOverflowing($element.find('.toggle-overflow'))) {
         $('<div>').addClass('toggle-overflow-gradient').html('<i class="fa fa-caret-down muted"></i>').appendTo($element);
         $element.on('click', function () {
-          $element.find('.toggle-overflow-gradient').hide();
-          $element.find('.toggle-overflow').css('height', '');
-          $element.css('cursor', 'default');
+          if ($element.find('.toggle-overflow-gradient i').hasClass('fa-caret-down')){
+            $element.find('.toggle-overflow').css('height', '');
+            $element.css('cursor', 'n-resize');
+            $element.find('.toggle-overflow-gradient').css('cursor', 'n-resize');
+            $element.find('.toggle-overflow-gradient i').removeClass('fa-caret-down').addClass('fa-caret-up');
+          }
+          else {
+            if (options.height) {
+              $element.find('.toggle-overflow').height(options.height);
+            }
+            $element.css('cursor', 's-resize');
+            $element.find('.toggle-overflow-gradient').css('cursor', 's-resize');
+            $element.find('.toggle-overflow-gradient i').removeClass('fa-caret-up').addClass('fa-caret-down');
+          }
         });
       }
     },
     init: function (element, valueAccessor) {
       var $element = $(element);
-      var options = $.extend(valueAccessor(), {});
+      var options = valueAccessor() || {};
       $element.wrapInner('<div class="toggle-overflow"></div>');
       if (options.height) {
         $element.find('.toggle-overflow').height(options.height);
@@ -481,8 +492,9 @@
     },
     update: function (element, valueAccessor) {
       var $element = $(element);
+      var options = valueAccessor() || {};
       window.setTimeout(function () {
-        ko.bindingHandlers.toggleOverflow.render($element);
+        ko.bindingHandlers.toggleOverflow.render($element, options);
       }, 100);
     }
   };

+ 20 - 0
desktop/core/src/desktop/static/desktop/less/hue-cross-version.less

@@ -449,3 +449,23 @@ ul.errorlist {
   border-top-left-radius: 0;
   border-bottom-left-radius: 0;
 }
+
+.toggle-overflow {
+  display: inline-block;
+  overflow: hidden;
+}
+
+.toggle-overflow-gradient {
+  position: relative;
+  z-index: 2;
+  top: -10px;
+  height: 10px;
+  line-height: 10px;
+  background-color: @cui-gray-050;
+  cursor: s-resize;
+  text-align: center;
+}
+
+.toggle-overflow-gradient:hover {
+  background-color: @cui-gray-100;
+}

部分文件因文件數量過多而無法顯示