diff --git a/frontend/src/components/canvas/components/Toolbar.vue b/frontend/src/components/canvas/components/Toolbar.vue index b03945b94b..391a18d0f2 100644 --- a/frontend/src/components/canvas/components/Toolbar.vue +++ b/frontend/src/components/canvas/components/Toolbar.vue @@ -3,10 +3,10 @@
- + - +
@@ -47,14 +47,14 @@ - + {{ $t('panel.more') }} - + {{ $t('panel.new_element_distribution') }} @@ -71,25 +71,25 @@ - + {{ $t('panel.aided_grid') }} - + {{ $t('panel.params_setting') }} - + {{ $t('panel.clean_canvas') }} - + {{ $t('panel.panel_style') }} - {{ $t('panel.batch_opt') }} @@ -137,9 +137,6 @@ import { deepCopy, mobile2MainCanvas } from '@/components/canvas/utils/utils' import { panelUpdate } from '@/api/panel/panel' import { saveLinkage, getPanelAllLinkageInfo } from '@/api/panel/linkage' import bus from '@/utils/bus' -import { - DEFAULT_COMMON_CANVAS_STYLE_STRING -} from '@/views/panel/panel' import { queryPanelJumpInfo } from '@/api/panel/linkJump' export default { @@ -595,7 +592,7 @@ export default { .switch-position { position: absolute; top: 13px; - right: 50%; + left: 48%; width: 100px; } @@ -709,8 +706,12 @@ export default { color: var(--TextPrimary, #1F2329); } +.icon16_only { + font-size: 16px!important; +} + .icon16 { - font-size: 16px; + font-size: 16px!important; color: var(--TextPrimary, #1F2329); } diff --git a/frontend/src/styles/deicon/demo_index.html b/frontend/src/styles/deicon/demo_index.html index 401316c424..f47efb53dc 100644 --- a/frontend/src/styles/deicon/demo_index.html +++ b/frontend/src/styles/deicon/demo_index.html @@ -54,6 +54,12 @@
    +
  • + +
    icon_Batch_outlined
    +
    
    +
    • +
  • icon_clear_outlined
    @@ -720,9 +726,9 @@ 
    @font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1657014969539') format('woff2'),
-       url('iconfont.woff?t=1657014969539') format('woff'),
-       url('iconfont.ttf?t=1657014969539') format('truetype');
+  src: url('iconfont.woff2?t=1657078050131') format('woff2'),
+       url('iconfont.woff?t=1657078050131') format('woff'),
+       url('iconfont.ttf?t=1657078050131') format('truetype');
 }

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

    @@ -748,6 +754,15 @@
      +
    • + +
      + icon_Batch_outlined +
      +
      .icon-icon_Batch_outlined +
      +
      • +
    • @@ -1747,6 +1762,14 @@
        +
      • + +
        icon_Batch_outlined
        +
        #icon-icon_Batch_outlined
        +
        • +
      -
      - +
      {{ subjectItem.name }} -
      +
      @@ -408,10 +407,29 @@ export default { .delete-icon{ position: absolute; + bottom: 8px; right: 8px; - top: 8px; } .delete-icon:hover{ color: red; } +.title-main{ + position: absolute; + left: 0px; + right: 0px; + bottom: 0px; + height: 30px; + float: left +} +.subject-template:hover > .title-main { + width: 115px; +} +.subject-template:hover > .el-icon-delete { + z-index: 10; + display:block; +} + +.subject-template ::v-deep .el-icon-delete { + display:none +} diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue index 26640757b6..46b6c36600 100644 --- a/frontend/src/views/panel/edit/index.vue +++ b/frontend/src/views/panel/edit/index.vue @@ -733,7 +733,7 @@ export default { const parent = evt.target.closest('.button-div-class') const self = evt.target.closest('.el-drawer__wrapper') // 点击样式按钮 排除 - const stick = evt.target.closest('.icon-magic-line') + const stick = evt.target.closest('.icon-icon_effects_outlined') const xuanfuanniu = evt.target.closest('.icon-xuanfuanniu') const shujujuzhen = evt.target.closest('.icon-shujujuzhen') const suffix = evt.target.closest('.el-input__suffix')