From a72a4a1143e38187b71ce278d87e37a9f1503c55 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 23 Sep 2021 15:37:40 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=BF=E6=8D=A2tabs=E5=9B=BE?= =?UTF-8?q?=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canvas/custom-component/component-list.js | 4 +- frontend/src/styles/deicon/demo.css | 34 ++++++------ 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 13916 -> 15060 bytes frontend/src/styles/deicon/iconfont.woff | Bin 8544 -> 9288 bytes frontend/src/styles/deicon/iconfont.woff2 | Bin 7160 -> 7784 bytes 9 files changed, 94 insertions(+), 26 deletions(-) diff --git a/frontend/src/components/canvas/custom-component/component-list.js b/frontend/src/components/canvas/custom-component/component-list.js index f000f45bf3..fd3799b769 100644 --- a/frontend/src/components/canvas/custom-component/component-list.js +++ b/frontend/src/components/canvas/custom-component/component-list.js @@ -33,7 +33,7 @@ export const assistList = [ component: 'de-tabs', type: 'de-tabs', label: '选项卡', - icon: 'iconfont icon-juxing', + icon: 'iconfont icon-tabs', defaultClass: 'text-filter' } ] @@ -152,7 +152,7 @@ const list = [ component: 'de-tabs', label: '选项卡', propValue: '', - icon: 'juxing', + icon: 'tabs', type: 'de-tabs', style: { width: 200, diff --git a/frontend/src/styles/deicon/demo.css b/frontend/src/styles/deicon/demo.css index 127f5c8dab..a67054a0a0 100644 --- a/frontend/src/styles/deicon/demo.css +++ b/frontend/src/styles/deicon/demo.css @@ -215,35 +215,35 @@ margin: 1em 0; } -.markdown >p, -.markdown >blockquote, -.markdown >.highlight, -.markdown >ol, -.markdown >ul { +.markdown>p, +.markdown>blockquote, +.markdown>.highlight, +.markdown>ol, +.markdown>ul { width: 80%; } -.markdown ul >li { +.markdown ul>li { list-style: circle; } -.markdown >ul li, -.markdown blockquote ul >li { +.markdown>ul li, +.markdown blockquote ul>li { margin-left: 20px; padding-left: 4px; } -.markdown >ul li p, -.markdown >ol li p { +.markdown>ul li p, +.markdown>ol li p { margin: 0.6em 0; } -.markdown ol >li { +.markdown ol>li { list-style: decimal; } -.markdown >ol li, -.markdown blockquote ol >li { +.markdown>ol li, +.markdown blockquote ol>li { margin-left: 20px; padding-left: 4px; } @@ -260,7 +260,7 @@ font-weight: 600; } -.markdown >table { +.markdown>table { border-collapse: collapse; border-spacing: 0px; empty-cells: show; @@ -269,14 +269,14 @@ margin-bottom: 24px; } -.markdown >table th { +.markdown>table th { white-space: nowrap; color: #333; font-weight: 600; } -.markdown >table th, -.markdown >table td { +.markdown>table th, +.markdown>table td { border: 1px solid #e9e9e9; padding: 8px 16px; text-align: left; diff --git a/frontend/src/styles/deicon/demo_index.html b/frontend/src/styles/deicon/demo_index.html index e997334f0c..a854dab0db 100644 --- a/frontend/src/styles/deicon/demo_index.html +++ b/frontend/src/styles/deicon/demo_index.html @@ -54,6 +54,18 @@