Skip to content

Commit d84185c

Browse files
committed
Merge branch 'dev' of https://github.com/vangleer/es-drager into dev
2 parents c973ca5 + d6455e1 commit d84185c

4 files changed

Lines changed: 18 additions & 5 deletions

File tree

packages/docs/src/examples/basic.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const dragList = ref([
3737
{ color: '#f44336', text: 'examples.rotateAndResize', rotatable: true }
3838
],
3939
[
40-
{ color: '#6A00FF', text: 'examples.skew', skewable: true },
40+
{ color: '#6A00FF', text: 'examples.skew', skewable: true, skew: [10, 10] },
4141
{ color: '#6A00FF', text: 'examples.boundary', boundary: true },
4242
{ color: '#D80073', text: 'examples.checkCollision', checkCollision: true },
4343
{ color: '#1BA1E2', text: 'examples.minSzie', minWidth: 10, minHeight: 10 }

packages/drager/src/drager.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@ export const DragerProps = {
8585
type: Number,
8686
default: 0
8787
},
88+
skew: {
89+
type: Array as PropType<number[]>,
90+
default: () => [0, 0]
91+
},
8892
color: {
8993
type: String,
9094
default: '#3a7afe'

packages/drager/src/drager.vue

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,7 @@ const dragStyle = computed(() => {
140140
141141
if (skew && skew.length) {
142142
let skewStr = `skewX(${skew[0]}deg)`
143-
if (skew[1]) {
144-
skewStr += ` skewY(${skew[1]}deg)`
145-
}
143+
skewStr += ` skewY(${skew[1] ?? 0}deg)`
146144
147145
transform.push(skewStr)
148146
}
@@ -306,6 +304,16 @@ watch(
306304
{ deep: true }
307305
)
308306
307+
watch(
308+
() => props.skew,
309+
(skew, oldSkew) => {
310+
dragData.value.skew = skew ?? []
311+
},
312+
{
313+
deep: true,
314+
}
315+
)
316+
309317
watch(
310318
() => props.selected,
311319
val => {

packages/drager/src/use-drager.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ export function useDrager(
2929
height: props.height,
3030
left: props.left,
3131
top: props.top,
32-
angle: props.angle
32+
angle: props.angle,
33+
skew: props.skew
3334
})
3435
const { marklineEmit } = useMarkline(targetRef, props)
3536
// 限制多个鼠标键按下的情况

0 commit comments

Comments
 (0)