From 1d316804e04191a1d5cb9fa39671af16b579a05a Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Fri, 2 Jul 2021 14:25:12 +0800 Subject: [PATCH] =?UTF-8?q?feat(panel):=20=E6=96=87=E4=BB=B6=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E6=8B=96=E6=8B=BD=E6=98=AF=E6=A0=B7=E5=BC=8F=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E6=94=B9=E4=B8=BA=E6=82=AC=E6=B5=AE=E5=BC=8F=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=EF=BC=8C=E5=9C=A8=E7=BC=96=E8=BE=91=E4=BB=AA=E8=A1=A8?= =?UTF-8?q?=E6=9D=BF=E6=98=AF=E5=8F=AF=E4=BB=A5=E7=9C=8B=E5=88=B0=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/DeDrag/index.vue | 2 +- .../canvas/components/Editor/ContextMenu.vue | 2 - .../canvas/custom-component/component-list.js | 6 +- frontend/src/styles/deicon/demo_index.html | 213 +++++++++++++++++- frontend/src/styles/deicon/iconfont.css | 42 +++- frontend/src/styles/deicon/iconfont.js | 2 +- frontend/src/styles/deicon/iconfont.json | 63 ++++++ frontend/src/styles/deicon/iconfont.ttf | Bin 8388 -> 9748 bytes frontend/src/styles/deicon/iconfont.woff | Bin 5144 -> 6052 bytes frontend/src/styles/deicon/iconfont.woff2 | Bin 4216 -> 4996 bytes frontend/src/views/Tinymce/RectangleAttr.vue | 174 ++++++++++++++ frontend/src/views/Tinymce/TextAttr.vue | 171 ++++++++++++++ frontend/src/views/panel/edit/index.vue | 18 +- 13 files changed, 672 insertions(+), 21 deletions(-) create mode 100644 frontend/src/views/Tinymce/RectangleAttr.vue create mode 100644 frontend/src/views/Tinymce/TextAttr.vue diff --git a/frontend/src/components/DeDrag/index.vue b/frontend/src/components/DeDrag/index.vue index 9b1ad5959f..99ad7403ee 100644 --- a/frontend/src/components/DeDrag/index.vue +++ b/frontend/src/components/DeDrag/index.vue @@ -10,7 +10,7 @@ [classNameResizable]: resizable, [classNameRotating]: rotating, [classNameRotatable]: rotatable, - [classNameMouseOn]: mouseOn + [classNameMouseOn]: mouseOn || active }, className ]" diff --git a/frontend/src/components/canvas/components/Editor/ContextMenu.vue b/frontend/src/components/canvas/components/Editor/ContextMenu.vue index bf2f0d42e0..1e9f4ca429 100644 --- a/frontend/src/components/canvas/components/Editor/ContextMenu.vue +++ b/frontend/src/components/canvas/components/Editor/ContextMenu.vue @@ -31,8 +31,6 @@ export default { copyData: null, editFilter: [ 'view', - 'v-text', - 'rect-shape', 'custom' ] } diff --git a/frontend/src/components/canvas/custom-component/component-list.js b/frontend/src/components/canvas/custom-component/component-list.js index 541ae75dbd..a0faccdad4 100644 --- a/frontend/src/components/canvas/custom-component/component-list.js +++ b/frontend/src/components/canvas/custom-component/component-list.js @@ -54,10 +54,10 @@ const list = [ width: 300, height: 100, fontSize: 18, - fontWeight: 500, + fontWeight: 400, lineHeight: '', letterSpacing: 0, - textAlign: '', + textAlign: 'left', color: '#000000' } }, @@ -75,7 +75,7 @@ const list = [ borderColor: '', borderRadius: '', fontSize: 14, - fontWeight: 500, + fontWeight: 400, lineHeight: '', letterSpacing: 0, textAlign: '', diff --git a/frontend/src/styles/deicon/demo_index.html b/frontend/src/styles/deicon/demo_index.html index ebca46335f..4adafd5a93 100644 --- a/frontend/src/styles/deicon/demo_index.html +++ b/frontend/src/styles/deicon/demo_index.html @@ -54,6 +54,60 @@
@font-face {
font-family: 'iconfont';
- src: url('iconfont.woff2?t=1625127498350') format('woff2'),
- url('iconfont.woff?t=1625127498350') format('woff'),
- url('iconfont.ttf?t=1625127498350') format('truetype');
+ src: url('iconfont.woff2?t=1625198204132') format('woff2'),
+ url('iconfont.woff?t=1625198204132') format('woff'),
+ url('iconfont.ttf?t=1625198204132') format('truetype');
}