From 644a5e4238a1927d51107411d6514ffb57e08b06 Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Thu, 13 Jun 2024 09:37:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Home/components/FabricSize.vue | 53 +++++++++++++++---------
 src/pages/Home/index.vue                 | 31 ++++++++++----
 2 files changed, 57 insertions(+), 27 deletions(-)

diff --git a/src/pages/Home/components/FabricSize.vue b/src/pages/Home/components/FabricSize.vue
index 8804b6b..707d6ce 100644
--- a/src/pages/Home/components/FabricSize.vue
+++ b/src/pages/Home/components/FabricSize.vue
@@ -2,21 +2,37 @@
   <div>
     <span>坐标：</span>
     <div>
-      <el-button type="primary" @click="changeFabricPosition(true, 'top')">上移</el-button>
-      <el-button type="primary" @click="changeFabricPosition(false, 'top')">下移</el-button>
-      <el-button type="primary" @click="changeFabricPosition(true, 'left')">左移</el-button>
-      <el-button type="primary" @click="changeFabricPosition(false, 'left')">右移</el-button>
+      <el-button type="primary" @click="changeFabricPosition(true, 'top')"
+        >上移</el-button
+      >
+      <el-button type="primary" @click="changeFabricPosition(false, 'top')"
+        >下移</el-button
+      >
+      <el-button type="primary" @click="changeFabricPosition(true, 'left')"
+        >左移</el-button
+      >
+      <el-button type="primary" @click="changeFabricPosition(false, 'left')"
+        >右移</el-button
+      >
     </div>
   </div>
   <div>
     <span>宽度：</span>
-    <el-input-number v-model="fabricPosition.width" :min="1" @change="changeFabricPosition($event, 'width')"
-      :max="fabricPosition.imgDomWidth" />
+    <el-input-number
+      v-model="fabricPosition.width"
+      :min="1"
+      @change="changeFabricPosition($event, 'width')"
+      :max="fabricPosition.imgDomWidth"
+    />
   </div>
   <div>
     <span>高度：</span>
-    <el-input-number v-model="fabricPosition.height" :min="1" @change="changeFabricPosition($event, 'height')"
-      :max="fabricPosition.imgDomHight" />
+    <el-input-number
+      v-model="fabricPosition.height"
+      :min="1"
+      @change="changeFabricPosition($event, 'height')"
+      :max="fabricPosition.imgDomHight"
+    />
   </div>
 </template>
 <script lang="ts" setup>
@@ -28,8 +44,8 @@ const fabricPosition = reactive<any>({
   width: 0,
   height: 0,
   imgDomHight: 1,
-  imgDomWidth: 1
-})
+  imgDomWidth: 1,
+});
 
 const setSize = (data: any, imgDomWidth: number, imgDomHight: number): void => {
   fabricPosition.top = data.top;
@@ -38,23 +54,22 @@ const setSize = (data: any, imgDomWidth: number, imgDomHight: number): void => {
   fabricPosition.height = data.height;
   fabricPosition.imgDomWidth = imgDomWidth;
   fabricPosition.imgDomHight = imgDomHight;
-}
+};
 
 const changeFabricPosition = (value: number | boolean, str: string): void => {
-  if (typeof value === 'boolean') {
-    if (str === 'top') {
-      props.change(value ? fabricPosition.top-- : fabricPosition.top++, str)
+  if (typeof value === "boolean") {
+    if (str === "top") {
+      props.change(value, str);
     } else {
-      props.change(value ? fabricPosition.left-- : fabricPosition.left++, str)
+      props.change(value, str);
     }
   } else {
-    props.change(value, str)
+    props.change(value, str);
   }
-}
+};
 
 defineExpose({
   setSize,
 });
-
 </script>
-<style lang="scss" scoped></style>
\ No newline at end of file
+<style lang="scss" scoped></style>
diff --git a/src/pages/Home/index.vue b/src/pages/Home/index.vue
index 28da0e2..4005b54 100644
--- a/src/pages/Home/index.vue
+++ b/src/pages/Home/index.vue
@@ -271,7 +271,7 @@
             </div>
           </div>
           <FabricSize
-            :change="changeFabricPosition"
+            :change="changeFabricPositionNumber"
             ref="FabricSizeRef"
             v-if="ctx.getActiveObject()"
           />
@@ -403,7 +403,7 @@
             </div>
           </div>
           <FabricSize
-            :change="changeFabricPosition"
+            :change="changeFabricPositionNumber"
             ref="FabricSizeRef"
             v-if="ctx.getActiveObject()"
           />
@@ -482,7 +482,7 @@
             </div>
           </div>
           <FabricSize
-            :change="changeFabricPosition"
+            :change="changeFabricPositionNumber"
             ref="FabricSizeRef"
             v-if="ctx.getActiveObject()"
           />
@@ -1678,6 +1678,22 @@ const cteatedNumber = (): string => {
   return `${Math.floor(Math.random() * 100000000)}+${+new Date()}`;
 };
 
+// 修改尺寸数字
+const changeFabricPositionNumber = (value: number | boolean, str: string): void => {
+  let number = 0;
+  if (typeof value === "boolean") {
+    number = JSON.parse(JSON.stringify(currentFabric.value.target.get(str)));
+    if (value) {
+      number--;
+    } else {
+      number++;
+    }
+  } else {
+    number = value;
+  }
+  changeFabricPosition(number, str);
+};
+
 // 编辑尺寸
 const changeFabricPosition = (value: number, str: string): void => {
   if (value) {
@@ -1730,7 +1746,6 @@ const changeFabricPosition = (value: number, str: string): void => {
         break;
       case "width":
       case "height":
-        maxRect.set(str, value);
         if (str === "width") {
           maxRect.set("left", value / 2 - value);
           currentFabric.value.target.set(str, value);
@@ -2850,7 +2865,7 @@ const changeData = (): any => {
         ...row.customFrom,
         width: row.width,
         height: row.height - 36.16,
-        top: row.top + 16,
+        top: row.top + 17,
         left: row.left,
       };
     });
@@ -2859,7 +2874,7 @@ const changeData = (): any => {
         ...row.customFrom,
         width: row.width,
         height: row.height - 36.16,
-        top: row.top + 16,
+        top: row.top + 17,
         left: row.left,
       };
     });
@@ -2868,7 +2883,7 @@ const changeData = (): any => {
         ...row.customFrom,
         width: row.width,
         height: row.height - 36.16,
-        top: row.top + 16,
+        top: row.top + 17,
         left: row.left,
       };
     });
@@ -2877,7 +2892,7 @@ const changeData = (): any => {
         ...row.customFrom,
         width: row.width,
         height: row.height,
-        top: row.top + 16,
+        top: row.top + 17,
         left: row.left,
       };
     });