From b71a1d0a297defcc6e5e97fe6d025b82d06cf647 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 22 Jul 2021 11:44:57 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BB=AA=E8=A1=A8=E6=9D=BF=E7=9F=A9?=
=?UTF-8?q?=E5=BD=A2=E7=BB=84=E4=BB=B6=E5=A2=9E=E5=8A=A0=E9=80=8F=E6=98=8E?=
=?UTF-8?q?=E5=BA=A6=E6=A0=B7=E5=BC=8F=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../canvas/components/RectangleAttr.vue | 26 ++++++++-
frontend/src/lang/tw.js | 2 +-
frontend/src/lang/zh.js | 2 +-
frontend/src/styles/deicon/demo_index.html | 52 +++++++++++++++++-
frontend/src/styles/deicon/iconfont.css | 14 ++++-
frontend/src/styles/deicon/iconfont.js | 2 +-
frontend/src/styles/deicon/iconfont.json | 14 +++++
frontend/src/styles/deicon/iconfont.ttf | Bin 10836 -> 11112 bytes
frontend/src/styles/deicon/iconfont.woff | Bin 6724 -> 6860 bytes
frontend/src/styles/deicon/iconfont.woff2 | Bin 5552 -> 5708 bytes
10 files changed, 101 insertions(+), 11 deletions(-)
diff --git a/frontend/src/components/canvas/components/RectangleAttr.vue b/frontend/src/components/canvas/components/RectangleAttr.vue
index c9ff00a741..8a81315021 100644
--- a/frontend/src/components/canvas/components/RectangleAttr.vue
+++ b/frontend/src/components/canvas/components/RectangleAttr.vue
@@ -32,6 +32,14 @@
+
+
+
+
+
+
+
+
+
@@ -101,7 +110,20 @@ export default {
}, {
value: '5',
label: '5'
- }]
+ }],
+ innerOpacity: 0
+ }
+ },
+ watch: {
+ innerOpacity: {
+ handler(oldVal, newVal) {
+ this.styleInfo['opacity'] = this.innerOpacity / 100
+ }
+ }
+ },
+ mounted() {
+ if (this.styleInfo['opacity']) {
+ this.innerOpacity = this.styleInfo['opacity'] * 100
}
},
computed: {
@@ -173,7 +195,7 @@ export default {
.el-card-main {
height: 34px;
z-index: 1000000000;
- width: 210px;
+ width: 300px;
position: absolute;
}
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 468514f291..c4751bbf79 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -1126,7 +1126,7 @@ export default {
lineHeight: '行高',
letterSpacing: '字間距',
textAlign: '左右對齊',
- opacity: '透明度',
+ opacity: '不透明度',
verticalAlign: '上下對齊',
text_align_left: '左對齊',
text_align_center: '左右居中',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index d759095305..bed437080b 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -1127,7 +1127,7 @@ export default {
lineHeight: '行高',
letterSpacing: '字间距',
textAlign: '左右对齐',
- opacity: '透明度',
+ opacity: '不透明度',
verticalAlign: '上下对齐',
text_align_left: '左对齐',
text_align_center: '左右居中',
diff --git a/frontend/src/styles/deicon/demo_index.html b/frontend/src/styles/deicon/demo_index.html
index 63a3cf281e..f6b2332ee2 100644
--- a/frontend/src/styles/deicon/demo_index.html
+++ b/frontend/src/styles/deicon/demo_index.html
@@ -54,6 +54,18 @@
+ -
+
+
透明
+ 
+
+
+ -
+
+
弧度
+ 
+
+
-
放大
@@ -282,9 +294,9 @@
@font-face {
font-family: 'iconfont';
- src: url('iconfont.woff2?t=1626147352097') format('woff2'),
- url('iconfont.woff?t=1626147352097') format('woff'),
- url('iconfont.ttf?t=1626147352097') format('truetype');
+ src: url('iconfont.woff2?t=1626919869905') format('woff2'),
+ url('iconfont.woff?t=1626919869905') format('woff'),
+ url('iconfont.ttf?t=1626919869905') format('truetype');
}
第二步:定义使用 iconfont 的样式
@@ -310,6 +322,24 @@
+ -
+
+
+ 透明
+
+ .icon-touming
+
+
+
+ -
+
+
+ 弧度
+
+ .icon-fangxing-
+
+
+
-
@@ -652,6 +682,22 @@
+ -
+
+
透明
+ #icon-touming
+
+
+ -
+
+
弧度
+ #icon-fangxing-
+
+
-