From dfbf58c9cf283ba0698ff7d1cd6d4745300a60f6 Mon Sep 17 00:00:00 2001 From: chutingting Date: Fri, 8 Dec 2023 17:07:49 +0800 Subject: [PATCH] edit zindex --- src/components/EditPosition.vue | 8 ++++++-- src/types/auto-imports.d.ts | 2 ++ src/views/createVideo/index.vue | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/components/EditPosition.vue b/src/components/EditPosition.vue index c5efbc8..4be9a41 100644 --- a/src/components/EditPosition.vue +++ b/src/components/EditPosition.vue @@ -224,8 +224,8 @@ 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.4) { - props.materialList.virtual.w = 0.4; + if (props.materialList.virtual.w < 0.1) { + props.materialList.virtual.w = 0.1; return; } props.materialList.virtual.w = (baseLineScale + boxDistance2) / baseLine; @@ -256,6 +256,10 @@ const handleDragSc = (item, index, event) => { realImgUrl.value = item.material; scBorderActive.value= index showBorderActive.value = item.id; + props.materialList.scList.forEach(res => { + res.activeIndex ='' + }) + item.activeIndex = item.id event.preventDefault(); const imageElement = fatherBox.value; const startX = event.clientX; //保存初始值,避免闪烁 diff --git a/src/types/auto-imports.d.ts b/src/types/auto-imports.d.ts index 9ea2d5d..e5c7bdb 100644 --- a/src/types/auto-imports.d.ts +++ b/src/types/auto-imports.d.ts @@ -2,6 +2,7 @@ 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'] @@ -270,6 +271,7 @@ 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 8654187..4124efc 100644 --- a/src/views/createVideo/index.vue +++ b/src/views/createVideo/index.vue @@ -355,7 +355,7 @@ item.id == showImgInfo.value.id + (item) => (item.id == showImgInfo.value.id && item.activeIndex == showImgInfo.value.id) ); } },