From bbab16725324b9d19a26fdc9f66fda677c5ca646 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 15 Jun 2022 11:23:56 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E7=94=BB=E5=B8=83=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E6=A0=8F=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/canvas/components/Toolbar.vue | 46 ++++++++-------- frontend/src/lang/en.js | 1 + frontend/src/lang/tw.js | 1 + frontend/src/lang/zh.js | 1 + 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 26788 -> 27140 bytes frontend/src/styles/deicon/iconfont.woff | Bin 16588 -> 16852 bytes frontend/src/styles/deicon/iconfont.woff2 | Bin 14040 -> 14232 bytes frontend/src/views/panel/edit/index.vue | 14 ++--- 12 files changed, 108 insertions(+), 37 deletions(-) diff --git a/frontend/src/components/canvas/components/Toolbar.vue b/frontend/src/components/canvas/components/Toolbar.vue index d235acadd9..4a70cf7612 100644 --- a/frontend/src/components/canvas/components/Toolbar.vue +++ b/frontend/src/components/canvas/components/Toolbar.vue @@ -29,7 +29,7 @@
- + {{ panelInfo.name }} @@ -48,9 +48,7 @@ - - - + {{ $t('panel.more') }} @@ -59,7 +57,7 @@ class="icon iconfont" :class="[canvasStyleData.auxiliaryMatrix?'icon-shujujuzhen':'icon-xuanfuanniu']" /> - {{ $t('panel.new_element_distribution') }} + {{ $t('panel.new_element_distribution') }} @@ -76,24 +74,22 @@ - {{ $t('panel.aided_grid') }} + {{ $t('panel.aided_grid') }} - {{ $t('panel.params_setting') }} + + {{ $t('panel.params_setting') }} - {{ $t('panel.clean_canvas') }} + + {{ $t('panel.clean_canvas') }} - - {{ $t('panel.panel_style') }} - - {{ - $t('panel.batch_opt') }} - + {{ $t('panel.panel_style') }} + {{ $t('panel.batch_opt') }} {{ $t('commons.save') }} @@ -502,8 +498,8 @@ export default { diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index ed45425b06..3a9106e4ec 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1458,6 +1458,7 @@ export default { sure_bt: 'Confirm' }, panel: { + more: 'More', level: 'Level', enlarge: 'Enlarge', panel_style: 'Panel Style', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 49e07cf649..45b0364045 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1459,6 +1459,7 @@ export default { sure_bt: '確定' }, panel: { + more: '更多', level: '层级', enlarge: '放大', panel_style: '仪表板样式', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index e4250bc914..01ddc5c753 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1466,6 +1466,7 @@ export default { sure_bt: '确定' }, panel: { + more: '更多', level: '层级', enlarge: '放大', panel_style: '仪表板样式', diff --git a/frontend/src/styles/deicon/demo_index.html b/frontend/src/styles/deicon/demo_index.html index 5766d02025..189268df16 100644 --- a/frontend/src/styles/deicon/demo_index.html +++ b/frontend/src/styles/deicon/demo_index.html @@ -54,6 +54,18 @@
    +
  • + +
    箭头
    +
    &#xe622;
    +
    • + +
  • + +
    magic-line
    +
    &#xe63a;
    +
    • +
  • 更多
    @@ -630,9 +642,9 @@ 
    @font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1655095335340') format('woff2'),
-       url('iconfont.woff?t=1655095335340') format('woff'),
-       url('iconfont.ttf?t=1655095335340') format('truetype');
+  src: url('iconfont.woff2?t=1655262548061') format('woff2'),
+       url('iconfont.woff?t=1655262548061') format('woff'),
+       url('iconfont.ttf?t=1655262548061') format('truetype');
 }

    第二步：定义使用 iconfont 的样式

    @@ -658,6 +670,24 @@
      +
    • + +
      + 箭头 +
      +
      .icon-jiantou +
      +
      • + +
    • + +
      + magic-line +
      +
      .icon-magic-line +
      +
      • +
    • @@ -1522,6 +1552,22 @@
        +
      • + +
        箭头
        +
        #icon-jiantou
        +
        • + +
      • + +
        magic-line
        +
        #icon-magic-line
        +
        • +