mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-06-01 20:29:29 +00:00
fix(Dashboard Drag Placeholder): doesn't allow placeholder items to be dragged anymore and keeps the height and width of a widget when resizing the grid of the dashboard
This commit is contained in:
@@ -49,8 +49,18 @@ export default {
|
||||
return 'margin-bottom: 8px;';
|
||||
},
|
||||
items() {
|
||||
|
||||
return this.widgets.map(item => {
|
||||
return { ...item, ...(item.place[this.gridWidth] || {h: 1, w:1, x:0, y:0})};
|
||||
let place;
|
||||
if(!item.place[this.gridWidth]){
|
||||
const nearestIndex = Object.keys(item.place).sort((a,b)=>Math.abs(a-this.gridWidth)-Math.abs(b-this.gridWidth)).pop();
|
||||
if (nearestIndex === null){
|
||||
place = {x:0,y:0,w:1,h:1};
|
||||
}else{
|
||||
place = item.place[nearestIndex];
|
||||
}
|
||||
}
|
||||
return { ...item, ...(item.place[this.gridWidth] || place)};
|
||||
});
|
||||
},
|
||||
items_hashmap() {
|
||||
@@ -201,7 +211,7 @@ export default {
|
||||
<dashboard-item
|
||||
v-if="!item.placeholder"
|
||||
:id="item.widget"
|
||||
:widgetID="item.widgetid"
|
||||
:widgetID="item.id"
|
||||
:width="item.w"
|
||||
:height="item.h"
|
||||
:loading="item.loading"
|
||||
|
||||
@@ -12,7 +12,8 @@ export default {
|
||||
"startResize",
|
||||
"dragging",
|
||||
"endDrag",
|
||||
"dropDrag"
|
||||
"dropDrag",
|
||||
"item"
|
||||
],
|
||||
data() {
|
||||
return {
|
||||
@@ -63,12 +64,12 @@ export default {
|
||||
template: `
|
||||
<div class="drop-grid-item"
|
||||
@mousedown="registerDragAction"
|
||||
@touchstart="tryDragStart($event, item)"
|
||||
@touchstart.prevent="tryDragStart($event, item)"
|
||||
@touchend="touchDragEnd"
|
||||
@dragstart="tryDragStart($event, item)"
|
||||
@drag="$emit('dragging',$event)"
|
||||
@dragend="$emit('endDrag', $event)"
|
||||
:draggable="active">
|
||||
:draggable="active && !item.placeholder">
|
||||
<slot v-bind="item"></slot>
|
||||
</div>`
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user