Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: support for changing height or width only #674

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat: support for changing height or width only #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f6ef76
feat: support for changing height or width only
May 29, 2022
9046710
Merge branch 'master' into master
HunterXing Mar 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
<input type="checkbox" v-model="bounded"/> Bounded
<input type="checkbox" v-model="responsive"/> Responsive
<input type="checkbox" v-model="preventCollision"/> Prevent Collision
<input type="checkbox" v-model="isVerticalResize"/> isVerticalResize
<input type="checkbox" v-model="isHorizontalResize"/> isHorizontalResize
<input type="checkbox" v-model="compact"/> Vertical Compact
<div style="margin-top: 10px;margin-bottom: 10px;">
Row Height: <input type="number" v-model="rowHeight"/> Col nums: <input type="number" v-model="colNum"/>
Expand Down Expand Up @@ -78,6 +80,8 @@
:min-y="item.minY"
:max-y="item.maxY"
:preserve-aspect-ratio="item.preserveAspectRatio"
:is-horizontal-resize="isHorizontalResize"
:is-vertical-resize="isVerticalResize"
@resize="resize"
@move="move"
@resized="resized"
Expand Down Expand Up @@ -178,6 +182,9 @@
preventCollision: false,
compact: true,
restoreOnDrag: true,
isHorizontalResize: true,
isVerticalResize: true,
restoreOnDrag: true,
rowHeight: 30,
colNum: 12,
index: 0,
Expand Down
88 changes: 76 additions & 12 deletions src/components/GridItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
:style="style"
>
<slot></slot>
<span v-if="resizableAndNotStatic" ref="handle" :class="resizableHandleClass"></span>
<span @mouseenter="mouseenter($event, 'rightBottom')" v-if="resizableAndNotStatic" ref="handle" :class="resizableHandleClass"></span>
<span @mouseenter="mouseenter($event, 'right')" v-if="resizableAndNotStatic && isHorizontalResize" ref="handleRight" class="vue-resizable-handle vue-resizable-handle-right"></span>
<span @mouseenter="mouseenter($event, 'bottom')" v-if="resizableAndNotStatic && isVerticalResize" ref="handleBottom" class="vue-resizable-handle vue-resizable-handle-bottom"></span>
<!--<span v-if="draggable" ref="dragHandle" class="vue-draggable-handle"></span>-->
</div>
</template>
Expand Down Expand Up @@ -81,6 +83,23 @@
right: auto;
}

.vue-grid-item > .vue-resizable-handle-bottom {
bottom: 0;
right: 50%;
transform: translate(50%, 0);
background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/PjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+PHN2ZyB0PSIxNjUzNzA3NTUxMzE5IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjQwNzUiIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxkZWZzPjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+QGZvbnQtZmFjZSB7IGZvbnQtZmFtaWx5OiBmZWVkYmFjay1pY29uZm9udDsgc3JjOiB1cmwoIi8vYXQuYWxpY2RuLmNvbS90L2ZvbnRfMTAzMTE1OF91Njl3OHloeGR1LndvZmYyP3Q9MTYzMDAzMzc1OTk0NCIpIGZvcm1hdCgid29mZjIiKSwgdXJsKCIvL2F0LmFsaWNkbi5jb20vdC9mb250XzEwMzExNThfdTY5dzh5aHhkdS53b2ZmP3Q9MTYzMDAzMzc1OTk0NCIpIGZvcm1hdCgid29mZiIpLCB1cmwoIi8vYXQuYWxpY2RuLmNvbS90L2ZvbnRfMTAzMTE1OF91Njl3OHloeGR1LnR0Zj90PTE2MzAwMzM3NTk5NDQiKSBmb3JtYXQoInRydWV0eXBlIik7IH0KPC9zdHlsZT48L2RlZnM+PHBhdGggZD0iTTUxMiA2MjRhMTEyIDExMiAwIDEgMCAwLTIyNCAxMTIgMTEyIDAgMCAwIDAgMjI0eiIgcC1pZD0iNDA3NiIgZmlsbD0iIzhlOGU4ZSI+PC9wYXRoPjwvc3ZnPg==);
background-position: center 4px;
cursor: ns-resize;
}
.vue-grid-item > .vue-resizable-handle-right {
bottom: 50%;
right: 0;
transform: translate(0, 50%);
background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/PjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+PHN2ZyB0PSIxNjUzNzA3NTUxMzE5IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjQwNzUiIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxkZWZzPjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+QGZvbnQtZmFjZSB7IGZvbnQtZmFtaWx5OiBmZWVkYmFjay1pY29uZm9udDsgc3JjOiB1cmwoIi8vYXQuYWxpY2RuLmNvbS90L2ZvbnRfMTAzMTE1OF91Njl3OHloeGR1LndvZmYyP3Q9MTYzMDAzMzc1OTk0NCIpIGZvcm1hdCgid29mZjIiKSwgdXJsKCIvL2F0LmFsaWNkbi5jb20vdC9mb250XzEwMzExNThfdTY5dzh5aHhkdS53b2ZmP3Q9MTYzMDAzMzc1OTk0NCIpIGZvcm1hdCgid29mZiIpLCB1cmwoIi8vYXQuYWxpY2RuLmNvbS90L2ZvbnRfMTAzMTE1OF91Njl3OHloeGR1LnR0Zj90PTE2MzAwMzM3NTk5NDQiKSBmb3JtYXQoInRydWV0eXBlIik7IH0KPC9zdHlsZT48L2RlZnM+PHBhdGggZD0iTTUxMiA2MjRhMTEyIDExMiAwIDEgMCAwLTIyNCAxMTIgMTEyIDAgMCAwIDAgMjI0eiIgcC1pZD0iNDA3NiIgZmlsbD0iIzhlOGU4ZSI+PC9wYXRoPjwvc3ZnPg==);
background-position: 4px center;
cursor: ew-resize;
}

.vue-grid-item.disable-userselect {
user-select: none;
}
Expand Down Expand Up @@ -207,6 +226,14 @@
type: Boolean,
required: false,
default: false,
},
isVerticalResize: {
type: Boolean,
default: false
},
isHorizontalResize: {
type: Boolean,
default: false
},
dragOption:{
type:Object,
Expand Down Expand Up @@ -254,7 +281,8 @@
innerX: this.x,
innerY: this.y,
innerW: this.w,
innerH: this.h
innerH: this.h,
cursorType: 'rightBottom'
}
},
created () {
Expand Down Expand Up @@ -481,6 +509,9 @@
}
},
methods: {
mouseenter(e, type) {
this.cursorType = type;
},
createStyle: function () {
if (this.x + this.w > this.cols) {
this.innerX = 0;
Expand Down Expand Up @@ -513,7 +544,14 @@
if (this.renderRtl) {
style = setTransformRtl(pos.top, pos.right, pos.width, pos.height);
} else {
style = setTransform(pos.top, pos.left, pos.width, pos.height);
// style = setTransform(pos.top, pos.left, pos.width, pos.height);
if (this.cursorType === "rightBottom") {
style = setTransform(pos.top, pos.left, pos.width, pos.height);
} else if(this.cursorType === "right") {
style = setTransform(pos.top, pos.left, pos.width, this.style.height);
} else if(this.cursorType === "bottom") {
style = setTransform(pos.top, pos.left, this.style.width, pos.height);
}
}

} else { // top,left (slow)
Expand Down Expand Up @@ -554,8 +592,14 @@
this.previousW = this.innerW;
this.previousH = this.innerH;
pos = this.calcPosition(this.innerX, this.innerY, this.innerW, this.innerH);
newSize.width = pos.width;
newSize.height = pos.height;
if(this.cursorType === "rightBottom") {
newSize.width = pos.width;
newSize.height = pos.height;
} else if(this.cursorType === "right"){
newSize.width = pos.width;
} else if(this.cursorType === "bottom") {
newSize.height = pos.height;
}
this.resizing = newSize;
this.isResizing = true;
break;
Expand All @@ -564,21 +608,34 @@
// console.log("### resize => " + event.type + ", lastW=" + this.lastW + ", lastH=" + this.lastH);
const coreEvent = createCoreData(this.lastW, this.lastH, x, y);
if (this.renderRtl) {
newSize.width = this.resizing.width - coreEvent.deltaX / this.transformScale;
newSize.width = this.resizing.width - coreEvent.deltaX / this.transformScal;
newSize.height = this.resizing.height + coreEvent.deltaY / this.transformScal;
} else {
newSize.width = this.resizing.width + coreEvent.deltaX / this.transformScale;
if(this.cursorType === "rightBottom") {
newSize.width = this.resizing.width + coreEvent.deltaX / this.transformScal;
newSize.height = this.resizing.height + coreEvent.deltaY / this.transformScal;
} else if(this.cursorType === "right"){
newSize.width = this.resizing.width + coreEvent.deltaX / this.transformScal;
} else if(this.cursorType === "bottom") {
newSize.height = this.resizing.height + coreEvent.deltaY / this.transformScal;
}

}
newSize.height = this.resizing.height + coreEvent.deltaY / this.transformScale;

///console.log("### resize => " + event.type + ", deltaX=" + coreEvent.deltaX + ", deltaY=" + coreEvent.deltaY);
this.resizing = newSize;
break;
}
case "resizeend": {
//console.log("### resize end => x=" +this.innerX + " y=" + this.innerY + " w=" + this.innerW + " h=" + this.innerH);
pos = this.calcPosition(this.innerX, this.innerY, this.innerW, this.innerH);
newSize.width = pos.width;
newSize.height = pos.height;
if(this.cursorType === "rightBottom") {
newSize.width = pos.width;
newSize.height = pos.height;
} else if(this.cursorType === "right"){
newSize.width = pos.width;
} else if(this.cursorType === "bottom") {
newSize.height = pos.height;
}
// console.log("### resize end => " + JSON.stringify(newSize));
this.resizing = null;
this.isResizing = false;
Expand Down Expand Up @@ -617,7 +674,14 @@
if (event.type === "resizeend" && (this.previousW !== this.innerW || this.previousH !== this.innerH)) {
this.$emit("resized", this.i, pos.h, pos.w, newSize.height, newSize.width);
}
this.eventBus.$emit("resizeEvent", event.type, this.i, this.innerX, this.innerY, pos.h, pos.w);
// this.eventBus.$emit("resizeEvent", event.type, this.i, this.innerX, this.innerY, pos.h, pos.w);
if (this.cursorType === "rightBottom") {
this.eventBus.$emit("resizeEvent", event.type, this.i, this.innerX, this.innerY, pos.h, pos.w);
} else if(this.cursorType === "right") {
this.eventBus.$emit("resizeEvent", event.type, this.i, this.innerX, this.innerY, this.innerH, pos.w);
} else if(this.cursorType === "bottom") {
this.eventBus.$emit("resizeEvent", event.type, this.i, this.innerX, this.innerY, pos.h, this.innerW);
}
},
handleDrag(event) {
if (this.static) return;
Expand Down
15 changes: 13 additions & 2 deletions src/components/GridLayout.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
:y="placeholder.y"
:w="placeholder.w"
:h="placeholder.h"
:i="placeholder.i"></grid-item>
:i="placeholder.i"
:is-horizontal-resize="isHorizontalResize"
:is-vertical-resize="isVerticalResize"
></grid-item>
</div>
</template>
<style>
Expand Down Expand Up @@ -123,7 +126,15 @@
useStyleCursor: {
type: Boolean,
default: true
}
},
isVerticalResize: {
type: Boolean,
default: false
},
isHorizontalResize: {
type: Boolean,
default: false
},
},
data: function () {
return {
Expand Down