Merge branch 'dev_vite' into StableVersion
This commit is contained in:
@@ -1,23 +0,0 @@
|
|||||||
1. 初始化事件
|
|
||||||
object:added:当新对象被添加到画布上时触发。
|
|
||||||
object:removed:当对象从画布上移除时触发。
|
|
||||||
selection:created:当选择对象时触发。
|
|
||||||
selection:updated:当选择的对象被更新时触发。
|
|
||||||
selection:cleared:当所有对象都被取消选择时触发。
|
|
||||||
|
|
||||||
2. 鼠标事件
|
|
||||||
mouse:down:鼠标按下时触发。
|
|
||||||
mouse:move:鼠标移动时触发。
|
|
||||||
mouse:up:鼠标释放时触发。
|
|
||||||
mouse:over:鼠标移到画布上时触发。
|
|
||||||
mouse:out:鼠标移出画布时触发。
|
|
||||||
mouse:wheel:鼠标滚轮滚动时触发。
|
|
||||||
|
|
||||||
3. 触摸事件(在触摸屏设备上)
|
|
||||||
touch:start:触摸开始时触发。
|
|
||||||
touch:move:触摸移动时触发。
|
|
||||||
touch:end:触摸结束时触发。
|
|
||||||
|
|
||||||
4. 键盘事件
|
|
||||||
key:down:键盘按键按下时触发。
|
|
||||||
key:up:键盘按键释放时触发。
|
|
||||||
@@ -712,6 +712,7 @@ export default defineComponent({
|
|||||||
left: 50%;
|
left: 50%;
|
||||||
transform: translate(-50%,-50%);
|
transform: translate(-50%,-50%);
|
||||||
float: left;
|
float: left;
|
||||||
|
object-fit: contain;
|
||||||
user-select:none;
|
user-select:none;
|
||||||
-webkit-user-drag: none;
|
-webkit-user-drag: none;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -399,6 +399,7 @@ import {
|
|||||||
createVNode,
|
createVNode,
|
||||||
reactive,
|
reactive,
|
||||||
computed,
|
computed,
|
||||||
|
watch,
|
||||||
useTemplateRef
|
useTemplateRef
|
||||||
} from 'vue'
|
} from 'vue'
|
||||||
import { Https } from '@/tool/https'
|
import { Https } from '@/tool/https'
|
||||||
@@ -548,12 +549,22 @@ export default defineComponent({
|
|||||||
document.removeEventListener('click', openSpeed)
|
document.removeEventListener('click', openSpeed)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
const resetSpeedState = () => {
|
||||||
|
if (!speed.speedState) return
|
||||||
|
speed.speedState = false
|
||||||
|
document.removeEventListener('click', openSpeed)
|
||||||
|
}
|
||||||
const setSpeed = (item: any) => {
|
const setSpeed = (item: any) => {
|
||||||
speed.speedData = item
|
speed.speedData = item
|
||||||
document.removeEventListener('click', openSpeed)
|
document.removeEventListener('click', openSpeed)
|
||||||
speed.speedState = false
|
speed.speedState = false
|
||||||
}
|
}
|
||||||
let scaleImage: any = ref(false)
|
let scaleImage: any = ref(false)
|
||||||
|
watch(scaleImage, value => {
|
||||||
|
if (!value) {
|
||||||
|
resetSpeedState()
|
||||||
|
}
|
||||||
|
})
|
||||||
let loadingShow = ref(false)
|
let loadingShow = ref(false)
|
||||||
let isComparison = ref(false) // home/design组件中修改的,当前组件没有修改
|
let isComparison = ref(false) // home/design组件中修改的,当前组件没有修改
|
||||||
const visible = ref<boolean>(false)
|
const visible = ref<boolean>(false)
|
||||||
@@ -1292,6 +1303,7 @@ export default defineComponent({
|
|||||||
clearInterval(remPrductimgTime)
|
clearInterval(remPrductimgTime)
|
||||||
productimg.productimgIsProductimg = false
|
productimg.productimgIsProductimg = false
|
||||||
productimg.productimgRemProductimg = false
|
productimg.productimgRemProductimg = false
|
||||||
|
resetSpeedState()
|
||||||
})
|
})
|
||||||
return {
|
return {
|
||||||
t,
|
t,
|
||||||
|
|||||||
Reference in New Issue
Block a user