Browse Source

fix(ux): fixed dropzone display issues, fixes #6598

Torkel Ödegaard 9 năm trước cách đây
mục cha
commit
171335bfef

+ 1 - 0
CHANGELOG.md

@@ -4,6 +4,7 @@
 * **Graph Panel**: Log base scale on right Y-axis had no effect, max value calc was not applied, [#6534](https://github.com/grafana/grafana/issues/6534)
 * **Graph Panel**: Bar width if bars was only used in series override, [#6528](https://github.com/grafana/grafana/issues/6528)
 * **UI/Browser**: Fixed issue with page/view header gradient border not showing in Safari, [#6530](https://github.com/grafana/grafana/issues/6530)
+* **UX**: Panel Drop zone visible after duplicating panel, and when entering fullscreen/edit view, [#6598](https://github.com/grafana/grafana/issues/6598)
 
 # 4.0-beta1 (2016-11-09)
 

+ 1 - 3
public/app/features/dashboard/model.ts

@@ -233,7 +233,6 @@ export class DashboardModel {
   }
 
   duplicatePanel(panel, row) {
-    var rowIndex = _.indexOf(this.rows, row);
     var newPanel = angular.copy(panel);
     newPanel.id = this.getNextPanelId();
 
@@ -242,8 +241,7 @@ export class DashboardModel {
     delete newPanel.repeatPanelId;
     delete newPanel.scopedVars;
 
-    var currentRow = this.rows[rowIndex];
-    currentRow.panels.push(newPanel);
+    row.addPanel(newPanel);
     return newPanel;
   }
 

+ 3 - 0
public/app/features/panel/panel_ctrl.ts

@@ -188,6 +188,9 @@ export class PanelCtrl {
 
   duplicate() {
     this.dashboard.duplicatePanel(this.panel, this.row);
+    this.$timeout(() => {
+      this.$scope.$root.$broadcast('render');
+    });
   }
 
   updateColumnSpan(span) {

+ 6 - 0
public/sass/pages/_dashboard.scss

@@ -172,6 +172,12 @@ div.flot-text {
   }
 }
 
+.panel-in-fullscreen {
+  .panel-drop-zone {
+    display: none !important;
+  }
+}
+
 .panel-time-info {
   font-weight: bold;
   float: right;