Skip to content

Commit 7bdaad8

Browse files
committed
update new crop style
1 parent edab206 commit 7bdaad8

File tree

3 files changed

+18
-13
lines changed

3 files changed

+18
-13
lines changed

site/client/components/doc/cn/CompressImage.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
<script>
2424
2525
import VueCoreImageUpload from '../../../../src/vue-core-image-upload.vue'
26-
import coreImageCompress from '../../../lib/core-compress-image';
2726
export default {
2827
components: {
2928
VueCoreImageUpload,

site/src/crop.vue

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@
3838
height: 100px;
3939
border:1px solid rgba(255,255,255, .95);
4040
}
41-
.crop-box .reference-line{
41+
.crop-box:after,
42+
.crop-box:before{
43+
content: '';
44+
display: block;
4245
opacity: 0;
4346
position: absolute;
4447
left: 33.3333%;
@@ -48,15 +51,17 @@
4851
background-color: transparent;
4952
border-color: rgba(255,255,255,.7);
5053
border-style: solid;
54+
border-width: 0;
5155
}
52-
.crop-box:active .reference-line{
56+
.crop-box:active::before,
57+
.crop-box:active::after{
5358
opacity: 1;
5459
}
55-
.crop-box .reference-line.v{
60+
.crop-box:before{
5661
border-left-width: 1px;
5762
border-right-width: 1px;
5863
}
59-
.crop-box .reference-line.h{
64+
.crop-box:after{
6065
top: 33.3333%;
6166
left: 0;
6267
height: 33.3334%;
@@ -76,6 +81,7 @@
7681
cursor: se-resize;
7782
border-radius: 10px;
7883
background-color: #fff;
84+
box-shadow: 0 2px 4px -2px rgba(0,0,0,.25);
7985
}
8086
</style>
8187

@@ -190,7 +196,6 @@ export default {
190196
this.container = $container;
191197
const move = function (ev) {
192198
const newCropStyle = resize(ev, self.el, $container, coor, self.ratioW / self.ratioH, helper.isMobile);
193-
console.log(newCropStyle);
194199
if (newCropStyle) {
195200
self.cropCSS.width = newCropStyle.width;
196201
self.cropCSS.height = newCropStyle.height;
@@ -233,6 +238,7 @@ export default {
233238
};
234239
const move = function (ev) {
235240
const newCropStyle = drag(ev, self.el, coor);
241+
console.log(newCropStyle);
236242
if (newCropStyle) {
237243
self.cropCSS.left = newCropStyle.left;
238244
self.cropCSS.top = newCropStyle.top;
@@ -253,7 +259,6 @@ export default {
253259
document.addEventListener('touchend', stopMove, false);
254260
return;
255261
}
256-
console.log(1);
257262
document.addEventListener('mousemove', move, false);
258263
document.addEventListener('mouseup', stopMove, false);
259264
},

site/src/lib/drag.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@ import helper from './helper';
22

33
const isMobile = helper.isMobile;
44
export default function drag(e, el, coor) {
5-
if (el) {
5+
if (!el) {
66
return;
77
}
8-
const aa = isMobile ? e.changedTouches[0]['clientX'] : e.clientX;
9-
const bb = isMobile ? e.changedTouches[0]['clientY'] : e.clientY;
10-
let left = aa - el.parentElement.offsetLeft - document.getElementsByClassName('image-aside')[0].offsetLeft - coor.x;
11-
let top = bb - el.parentElement.offsetTop - document.getElementsByClassName('image-aside')[0].offsetTop - coor.y;
8+
const currentX = isMobile ? e.changedTouches[0]['clientX'] : e.clientX;
9+
const currentY = isMobile ? e.changedTouches[0]['clientY'] : e.clientY;
10+
11+
let left = currentX - el.parentElement.offsetLeft - document.getElementsByClassName('image-aside')[0].offsetLeft - coor.x;
12+
let top = currentY - el.parentElement.offsetTop - document.getElementsByClassName('image-aside')[0].offsetTop - coor.y;
1213
if (left <= 0) {
1314
left = 0;
1415
}
1516
if (left >= coor.maxLeft) {
16-
left = this.coor.maxLeft;
17+
left = coor.maxLeft;
1718
}
1819
if (top <= 0) {
1920
top = 0;

0 commit comments

Comments
 (0)