浏览代码

HUE-7907 [frontend] Improved dropped areas for side widgets and new rows

Enrico Berti 7 年之前
父节点
当前提交
3000dc4
共有 1 个文件被更改,包括 6 次插入0 次删除
  1. 6 0
      desktop/libs/dashboard/src/dashboard/templates/common_search.mako

+ 6 - 0
desktop/libs/dashboard/src/dashboard/templates/common_search.mako

@@ -3963,10 +3963,16 @@ $(document).ready(function () {
           // checks if it has been dropped on an empty row
           // checks if it has been dropped on an empty row
           searchViewModel.gridItems().forEach(function (existingWidget) {
           searchViewModel.gridItems().forEach(function (existingWidget) {
             var existingWidgetFauxRow = parseInt($(existingWidget.gridsterElement).attr('data-row'));
             var existingWidgetFauxRow = parseInt($(existingWidget.gridsterElement).attr('data-row'));
+            var existingWidgetFauxCol = parseInt($(existingWidget.gridsterElement).attr('data-row'));
             var existingWidgetFauxHeight = parseInt($(existingWidget.gridsterElement).attr('data-sizey'));
             var existingWidgetFauxHeight = parseInt($(existingWidget.gridsterElement).attr('data-sizey'));
+            var existingWidgetFauxWidth = parseInt($(existingWidget.gridsterElement).attr('data-sizex'));
             if (dropPosition.row >= existingWidgetFauxRow && dropPosition.row < existingWidgetFauxRow + existingWidgetFauxHeight) {
             if (dropPosition.row >= existingWidgetFauxRow && dropPosition.row < existingWidgetFauxRow + existingWidgetFauxHeight) {
               dropOnEmptyRow = false;
               dropOnEmptyRow = false;
             }
             }
+            if (existingWidgetFauxRow == dropPosition.row + 1 && (dropPosition.col < existingWidgetFauxCol || dropPosition.col >= existingWidgetFauxCol + existingWidgetFauxWidth)) {
+              dropOnEmptyRow = false;
+              restoreWidgetSizes();
+            }
           });
           });
 
 
           if (dropOnEmptyRow) {
           if (dropOnEmptyRow) {