瀏覽代碼

Merge branch 'ctt_dev' into dev

dev
chutingting 1 年之前
父節點
當前提交
35d2f84af5
共有 3 個文件被更改,包括 11 次插入12 次删除
  1. +8
    -8
      src/components/EditPosition.vue
  2. +0
    -2
      src/types/auto-imports.d.ts
  3. +3
    -2
      src/views/createVideo/index.vue

+ 8
- 8
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 =


+ 0
- 2
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<typeof import('vue')['EffectScope']>
readonly ElForm: UnwrapRef<typeof import('element-plus/es')['ElForm']>
readonly ElMessage: UnwrapRef<typeof import('element-plus/es')['ElMessage']>
readonly ElMessageBox: UnwrapRef<typeof import('element-plus/es')['ElMessageBox']>
readonly asyncComputed: UnwrapRef<typeof import('@vueuse/core')['asyncComputed']>


+ 3
- 2
src/views/createVideo/index.vue 查看文件

@@ -355,8 +355,9 @@
<el-input-number
:precision="2"
v-model="showImgInfo.data.w"
:min="0.1"
:max="1.3"
:min="0.2"
:max="2"
:step="0.01"
size="large"
controls-position="right"
/>


Loading…
取消
儲存