Ver código fonte

HUE-7263 [editor] Resize handle off when scrolled down on editor and variables are present

Enrico Berti 8 anos atrás
pai
commit
8c17af9

+ 2 - 1
desktop/core/src/desktop/static/desktop/js/ko.hue-bindings.js

@@ -2012,6 +2012,7 @@
       var $resizer = $(element);
       var $contentPanel = $(".content-panel");
       var $execStatus = $resizer.prev('.snippet-execution-status');
+      var $variables = $resizer.siblings('.snippet-row').find('.variables');
 
       var lastEditorSize = $.totalStorage('hue.editor.editor.size') || 131;
       var editorHeight = Math.floor(lastEditorSize / 16);
@@ -2062,7 +2063,7 @@
         start: options.onStart ? options.onStart : function(){},
         drag: function (event, ui) {
           autoExpand = false;
-          var currentHeight = ui.offset.top + $contentPanel.scrollTop() - (125 + $execStatus.outerHeight(true));
+          var currentHeight = ui.offset.top + $contentPanel.scrollTop() - (125 + $execStatus.outerHeight(true) + $variables.outerHeight(true));
           $target.css("height", currentHeight + "px");
           ace().resize();
           ui.offset.top = 0;

+ 10 - 8
desktop/libs/notebook/src/notebook/templates/editor_components.mako

@@ -1202,14 +1202,16 @@ ${ sqlSyntaxDropdown.sqlSyntaxDropdown() }
 
 
 <script type="text/html" id="snippet-variables">
-  <ul data-bind="foreach: variables" class="unstyled inline">
-    <li>
-      <div class="input-prepend margin-top-10">
-        <span class="muted add-on" data-bind="text: name"></span>
-        <input class="input-medium" type="text" data-bind="value: value, attr: { placeholder: defaultValue() || '${ _ko('Variable value') }' }, valueUpdate: 'afterkeydown', autogrowInput: { minWidth: 150, maxWidth: 270, comfortZone: 15 }, event: { 'keydown': function (context, e){ if ((e.ctrlKey || e.metaKey) && e.which === 13) { $parent.ace().commands.commands['execute'].exec(); } return true; } }">
-      </div>
-    </li>
-  </ul>
+  <div class="variables">
+    <ul data-bind="foreach: variables" class="unstyled inline">
+      <li>
+        <div class="input-prepend margin-top-10">
+          <span class="muted add-on" data-bind="text: name"></span>
+          <input class="input-medium" type="text" data-bind="value: value, attr: { placeholder: defaultValue() || '${ _ko('Variable value') }' }, valueUpdate: 'afterkeydown', autogrowInput: { minWidth: 150, maxWidth: 270, comfortZone: 15 }, event: { 'keydown': function (context, e){ if ((e.ctrlKey || e.metaKey) && e.which === 13) { $parent.ace().commands.commands['execute'].exec(); } return true; } }">
+        </div>
+      </li>
+    </ul>
+  </div>
 </script>