From 43ec63cc13e7f235362106b4de9208d0b1abebc0 Mon Sep 17 00:00:00 2001
From: liuyaojun <175765754@qq.com>
Date: Tue, 4 Jun 2024 14:27:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9F=A9=E5=BD=A2=E5=9C=86?=
 =?UTF-8?q?=E8=A7=92=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BB=85=E5=AF=B9=E7=9F=A9?=
 =?UTF-8?q?=E5=BD=A2=E4=BD=9C=E7=94=A8=20(#412)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/attributePostion.vue |  24 +----
 src/components/attributeRounded.vue | 133 ++++++++++++++++++++++++++++
 src/language/en.json                |   3 +-
 src/language/pt.json                |   1 +
 src/language/zh.json                |   3 +-
 src/views/home/index.vue            |   3 +
 6 files changed, 142 insertions(+), 25 deletions(-)
 create mode 100644 src/components/attributeRounded.vue

diff --git a/src/components/attributePostion.vue b/src/components/attributePostion.vue
index 438317bd..253f8c95 100644
--- a/src/components/attributePostion.vue
+++ b/src/components/attributePostion.vue
@@ -27,30 +27,8 @@
           ></InputNumber>
         </Col>
       </Row>
-      <Row :gutter="10">
-        <Col flex="1">
-          <InputNumber
-            v-model="baseAttr.rx"
-            @on-change="(value) => changeCommon('rx', value)"
-            :append="$t('attributes.borderRadiusX')"
-          ></InputNumber>
-        </Col>
-        <Col flex="1">
-          <InputNumber
-            v-model="baseAttr.ry"
-            @on-change="(value) => changeCommon('ry', value)"
-            :append="$t('attributes.borderRadiusY')"
-          ></InputNumber>
-        </Col>
-      </Row>
+
       <Form :label-width="40" class="form-wrap">
-        <FormItem :label="$t('attributes.angle')">
-          <Slider
-            v-model="baseAttr.angle"
-            :max="360"
-            @on-input="(value) => changeCommon('angle', value)"
-          ></Slider>
-        </FormItem>
         <FormItem :label="$t('attributes.angle')">
           <Slider
             v-model="baseAttr.angle"
diff --git a/src/components/attributeRounded.vue b/src/components/attributeRounded.vue
new file mode 100644
index 00000000..c75364ae
--- /dev/null
+++ b/src/components/attributeRounded.vue
@@ -0,0 +1,133 @@
+<!--
+ * @Author: 秦少卫
+ * @Date: 2024-05-21 10:18:57
+ * @LastEditors: 秦少卫
+ * @LastEditTime: 2024-05-26 22:59:26
+ * @Description: 圆角
+-->
+<template>
+  <div
+    class="box attr-item-box"
+    v-if="mixinState.mSelectMode === 'one' && rectType.includes(mixinState.mSelectOneType)"
+  >
+    <!-- <h3>圆角</h3> -->
+    <Divider plain orientation="left"><h4>圆角</h4></Divider>
+    <!-- 通用属性 -->
+    <div>
+      <Row :gutter="10">
+        <Col :span="18" flex="1">
+          <Form :label-width="40" class="form-wrap">
+            <FormItem :label="$t('attributes.rx_ry')">
+              <Slider
+                v-model="baseAttr.rx"
+                :max="300"
+                @on-input="(value) => changeCommon(value)"
+              ></Slider>
+            </FormItem>
+          </Form>
+        </Col>
+        <Col :span="6" flex="1">
+          <InputNumber
+            v-model="baseAttr.rx"
+            min="0"
+            max="300"
+            @on-change="(value) => changeCommon(value)"
+          ></InputNumber>
+        </Col>
+      </Row>
+    </div>
+    <!-- <Divider plain></Divider> -->
+  </div>
+</template>
+
+<script setup name="AttrBute">
+import useSelect from '@/hooks/select';
+
+const update = getCurrentInstance();
+const { mixinState, canvasEditor } = useSelect();
+
+// 矩形元素
+const rectType = ['rect'];
+
+// 属性值
+const baseAttr = reactive({
+  rx: 0,
+  ry: 0,
+});
+
+// 属性获取
+const getObjectAttr = (e) => {
+  const activeObject = canvasEditor.canvas.getActiveObject();
+  // 不是当前obj，跳过
+  if (e && e.target && e.target !== activeObject) return;
+  if (activeObject) {
+    baseAttr.rx = activeObject.get('rx');
+    baseAttr.ry = activeObject.get('ry');
+  }
+};
+
+// 通用属性改变
+const changeCommon = (value) => {
+  const activeObject = canvasEditor.canvas.getActiveObjects()[0];
+  if (activeObject) {
+    activeObject.set('ry', value);
+    activeObject.set('rx', value);
+    canvasEditor.canvas.renderAll();
+  }
+};
+
+const selectCancel = () => {
+  update?.proxy?.$forceUpdate();
+};
+
+onMounted(() => {
+  // 获取圆角数据
+  getObjectAttr();
+  canvasEditor.on('selectCancel', selectCancel);
+  canvasEditor.on('selectOne', getObjectAttr);
+  canvasEditor.canvas.on('object:modified', getObjectAttr);
+});
+
+onBeforeUnmount(() => {
+  canvasEditor.off('selectCancel', selectCancel);
+  canvasEditor.off('selectOne', getObjectAttr);
+  canvasEditor.canvas.off('object:modified', getObjectAttr);
+});
+</script>
+
+<style scoped lang="less">
+:deep(.ivu-input-number) {
+  display: block;
+  width: 100%;
+}
+
+:deep(.ivu-color-picker) {
+  display: block;
+}
+.ivu-row {
+  margin-bottom: 8px;
+  .ivu-col {
+    position: inherit;
+    &__box {
+      display: flex;
+      align-items: center;
+      background: #f8f8f8;
+      border-radius: 4px;
+      gap: 8px;
+    }
+  }
+
+  .label {
+    padding-left: 8px;
+  }
+  .content {
+    flex: 1;
+    :deep(.--input),
+    :deep(.ivu-select-selection) {
+      background-color: transparent;
+      border: none !important;
+      box-shadow: none !important;
+    }
+  }
+}
+</style>
diff --git a/src/language/en.json b/src/language/en.json
index 9457a416..2f269550 100644
--- a/src/language/en.json
+++ b/src/language/en.json
@@ -180,7 +180,8 @@
     "offset_x": "X",
     "offset_y": "Y",
     "borderRadiusX": "Horizontal borderRadius",
-    "borderRadiusY": "Vertical borderRadius"
+    "borderRadiusY": "Vertical borderRadius",
+    "rx_ry": "Rounded"
   },
   "setSizeTip": "Resize canvas",
   "tip": "tip",
diff --git a/src/language/pt.json b/src/language/pt.json
index d1d72d93..ff7aceb4 100644
--- a/src/language/pt.json
+++ b/src/language/pt.json
@@ -122,6 +122,7 @@
     "blur": "Blur",
     "offset_x": "X",
     "offset_y": "Y",
+    "rx_ry": "Rounded",
     "picture_filter": "Filtro"
   }
 }
\ No newline at end of file
diff --git a/src/language/zh.json b/src/language/zh.json
index c95f2b88..e2631e0e 100644
--- a/src/language/zh.json
+++ b/src/language/zh.json
@@ -214,7 +214,8 @@
     "offset_x": "X轴",
     "offset_y": "Y轴",
     "borderRadiusX": "圆角水平半径",
-    "borderRadiusY": "圆角垂直半径"
+    "borderRadiusY": "圆角垂直半径",
+    "rx_ry": "半径"
   },
   "setSizeTip": "调整画布尺寸",
   "tip": "提示",
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index d0004089..6b55a80b 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -139,6 +139,8 @@
               <attributeShadow></attributeShadow>
               <!-- 边框 -->
               <attributeBorder></attributeBorder>
+              <!-- 圆角 -->
+              <attributeRounded></attributeRounded>
               <!-- 关联数据 -->
               <attributeId></attributeId>
             </div>
@@ -204,6 +206,7 @@ import attributePostion from '@/components/attributePostion.vue';
 import attributeId from '@/components/attributeId.vue';
 import attributeShadow from '@/components/attributeShadow.vue';
 import attributeBorder from '@/components/attributeBorder.vue';
+import attributeRounded from '@/components/attributeRounded.vue';
 import attributeFont from '@/components/attributeFont.vue';
 import attributeColor from '@/components/attributeColor.vue';