From a0174c77e49a940343a1c3659e0766ccdbebfa4f Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 22 Jul 2021 14:05:41 +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=E8=BE=B9=E6=A1=86?=
=?UTF-8?q?=E5=BC=A7=E5=BA=A6=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 | 12 +++-
.../canvas/custom-component/component-list.js | 3 +-
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 11112 -> 11600 bytes
frontend/src/styles/deicon/iconfont.woff | Bin 6860 -> 7100 bytes
frontend/src/styles/deicon/iconfont.woff2 | Bin 5708 -> 5936 bytes
9 files changed, 87 insertions(+), 10 deletions(-)
diff --git a/frontend/src/components/canvas/components/RectangleAttr.vue b/frontend/src/components/canvas/components/RectangleAttr.vue
index 8a81315021..ad64cbef2b 100644
--- a/frontend/src/components/canvas/components/RectangleAttr.vue
+++ b/frontend/src/components/canvas/components/RectangleAttr.vue
@@ -32,6 +32,14 @@
+
+
+
+
+
+
+
+
@@ -194,8 +202,8 @@ export default {
}
.el-card-main {
height: 34px;
- z-index: 1000000000;
- width: 300px;
+ z-index: 10;
+ width: 400px;
position: absolute;
}
diff --git a/frontend/src/components/canvas/custom-component/component-list.js b/frontend/src/components/canvas/custom-component/component-list.js
index a0faccdad4..0e1d8d6a0b 100644
--- a/frontend/src/components/canvas/custom-component/component-list.js
+++ b/frontend/src/components/canvas/custom-component/component-list.js
@@ -122,7 +122,8 @@ const list = [
borderStyle: 'solid',
borderWidth: 1,
borderColor: '#000000',
- backgroundColor: '#ffffff'
+ backgroundColor: '#ffffff',
+ borderRadius: 0
}
},
{
diff --git a/frontend/src/styles/deicon/demo_index.html b/frontend/src/styles/deicon/demo_index.html
index f6b2332ee2..cb7ad72f2f 100644
--- a/frontend/src/styles/deicon/demo_index.html
+++ b/frontend/src/styles/deicon/demo_index.html
@@ -54,6 +54,18 @@
+ -
+
+
弧形框
+ 
+
+
+ -
+
+
弧形框
+ 
+
+
-
透明
@@ -294,9 +306,9 @@
@font-face {
font-family: 'iconfont';
- src: url('iconfont.woff2?t=1626919869905') format('woff2'),
- url('iconfont.woff?t=1626919869905') format('woff'),
- url('iconfont.ttf?t=1626919869905') format('truetype');
+ src: url('iconfont.woff2?t=1626927148990') format('woff2'),
+ url('iconfont.woff?t=1626927148990') format('woff'),
+ url('iconfont.ttf?t=1626927148990') format('truetype');
}
第二步:定义使用 iconfont 的样式
@@ -322,6 +334,24 @@
+ -
+
+
+ 弧形框
+
+ .icon-weibiaoti-1
+
+
+
+ -
+
+
+ 弧形框
+
+ .icon-weibiaoti-
+
+
+
-
@@ -682,6 +712,22 @@
+ -
+
+
弧形框
+ #icon-weibiaoti-1
+
+
+ -
+
+
弧形框
+ #icon-weibiaoti-
+
+
-