Răsfoiți Sursa

HUE-8167 [dashboard] Dragging/Dropping on an empty widget should remove the dropzone

Enrico Berti 7 ani în urmă
părinte
comite
3a525a6

+ 1 - 1
desktop/core/src/desktop/templates/common_dashboard.mako

@@ -223,7 +223,7 @@
           <a href="javascript:void(0)" class="remove-widget" data-bind="publish: { 'gridster.remove': $data }"><i class="fa fa-times"></i></a>
         </div>
       </h2>
-      <div class="empty-content" data-bind="droppable: { data: function(w) { showAddFacetDemiModal(w, $data); }, options: { greedy:true, hoverClass: 'droppable-hover' }}, css: { 'query-builder': $root.isQueryBuilder }"></div>
+      <div class="empty-content" data-bind="droppable: { data: function(w) { showAddFacetDemiModal(w, $data); }, options: { greedy:true, hoverClass: 'droppable-hover', drop: function(){ huePubSub.publish('gridster.added.widget'); } }}, css: { 'query-builder': $root.isQueryBuilder }"></div>
     </div>
     <!-- /ko -->
   <!-- ko with: widget -->

+ 1 - 1
desktop/libs/dashboard/src/dashboard/templates/common_search.mako

@@ -3931,9 +3931,9 @@ $(document).ready(function () {
           widgetId: parseInt($(this).attr('data-widgetid'))
         }
         var $widget = $(this);
-        isEmptyWidget = $widget.children('.empty-gridster-widget').length > 0;
         isOverSelf = tempDraggableGridsterWidget !== null && tempDraggableGridsterWidget.widgetId() === dimensions.widgetId;
         if (coords.col >= dimensions.col && coords.row >= dimensions.row && coords.col < dimensions.col + dimensions.sizex && coords.row < dimensions.row + dimensions.sizey) {
+          isEmptyWidget = $widget.children('.empty-gridster-widget').length > 0;
           overlaps = true;
           if (!isOverSelf) {
             var sidesWidth = Math.min(Math.floor(dimensions.sizex / 3), 1);