From 6b837643343020852987349ed57088aad0854192 Mon Sep 17 00:00:00 2001 From: chutingting Date: Fri, 8 Dec 2023 20:51:30 +0800 Subject: [PATCH] 0.2-2.0 --- src/components/EditPosition.vue | 16 ++++++++-------- src/types/auto-imports.d.ts | 2 -- src/views/createVideo/index.vue | 5 +++-- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/components/EditPosition.vue b/src/components/EditPosition.vue index 4be9a41..7f4b0c6 100644 --- a/src/components/EditPosition.vue +++ b/src/components/EditPosition.vue @@ -224,14 +224,14 @@ function changeScale(event) { let deltaY = touchStart.pageY - y; let boxDistance2 = Math.sqrt(deltaX ** 2 + deltaY ** 2); if (deltaX < 0) { - if (props.materialList.virtual.w < 0.1) { - props.materialList.virtual.w = 0.1; + if (props.materialList.virtual.w < 0.2) { + props.materialList.virtual.w = 0.2; return; } props.materialList.virtual.w = (baseLineScale + boxDistance2) / baseLine; } else { - if (props.materialList.virtual.w > 1.3) { - props.materialList.virtual.w = 1.3; + if (props.materialList.virtual.w > 2.0) { + props.materialList.virtual.w = 2.0; return; } props.materialList.virtual.w = (baseLineScale - boxDistance2) / baseLine; @@ -298,15 +298,15 @@ function changeScaleSc(index, event) { let deltaY = touchStart.pageY - y; let boxDistance2 = Math.sqrt(deltaX ** 2 + deltaY ** 2); if (deltaX < 0) { - if (props.materialList.scList[index].w < 0.4) { - props.materialList.scList[index].w = 0.4; + if (props.materialList.scList[index].w < 0.2) { + props.materialList.scList[index].w = 0.2; return; } props.materialList.scList[index].w = (baseLineScale + boxDistance2) / baseLine; } else { - if (props.materialList.scList[index].w > 1.3) { - props.materialList.scList[index].w = 1.3; + if (props.materialList.scList[index].w > 2.0) { + props.materialList.scList[index].w = 2.0; return; } props.materialList.scList[index].w = diff --git a/src/types/auto-imports.d.ts b/src/types/auto-imports.d.ts index e5c7bdb..9ea2d5d 100644 --- a/src/types/auto-imports.d.ts +++ b/src/types/auto-imports.d.ts @@ -2,7 +2,6 @@ export {} declare global { const EffectScope: typeof import('vue')['EffectScope'] - const ElForm: typeof import('element-plus/es')['ElForm'] const ElMessage: typeof import('element-plus/es')['ElMessage'] const ElMessageBox: typeof import('element-plus/es')['ElMessageBox'] const asyncComputed: typeof import('@vueuse/core')['asyncComputed'] @@ -271,7 +270,6 @@ import { UnwrapRef } from 'vue' declare module 'vue' { interface ComponentCustomProperties { readonly EffectScope: UnwrapRef - readonly ElForm: UnwrapRef readonly ElMessage: UnwrapRef readonly ElMessageBox: UnwrapRef readonly asyncComputed: UnwrapRef diff --git a/src/views/createVideo/index.vue b/src/views/createVideo/index.vue index 4124efc..7e69618 100644 --- a/src/views/createVideo/index.vue +++ b/src/views/createVideo/index.vue @@ -355,8 +355,9 @@