diff --git a/backend/pom.xml b/backend/pom.xml index 6001402088..05395922d4 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -230,7 +230,7 @@ pentaho-kettle kettle-core - 8.3.0.18-1084 + 8.3.0.18-1112 org.slf4j @@ -241,7 +241,7 @@ pentaho-kettle kettle-engine - 8.3.0.18-1084 + 8.3.0.18-1112 org.slf4j @@ -256,7 +256,7 @@ pentaho metastore - 8.3.0.18-1084 + 8.3.0.18-1112 org.pentaho.di.plugins 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/components/canvas/store/copy.js b/frontend/src/components/canvas/store/copy.js index 3899b48036..0771f09a48 100644 --- a/frontend/src/components/canvas/store/copy.js +++ b/frontend/src/components/canvas/store/copy.js @@ -17,15 +17,21 @@ export default { left: 0 }, x: 1, - y: 108, + y: 216, sizex: 48, sizey: 24 } }, mutations: { copyMultiplexingComponents(state) { + let pYMax = 0 const _this = this state.isCut = false + state.componentData.forEach(item => { + if (item.y > pYMax) { + pYMax = item.y + } + }) const canvasStyleData = state.canvasStyleData const curCanvasScale = state.curCanvasScale const componentGap = state.componentGap @@ -33,7 +39,7 @@ export default { const component = { ...deepCopy(state.curMultiplexingComponents[viewId]), - ...deepCopy(state.viewBase), + ...deepCopy(deepCopy(state.viewBase)), 'auxiliaryMatrix': canvasStyleData.auxiliaryMatrix } @@ -43,6 +49,8 @@ export default { const width = component.sizex * curCanvasScale.matrixStyleOriginWidth // 取余 平铺4个 此处x 位置偏移 component.x = component.x + component.sizex * tilePosition + // Y 方向根据当前应该放置的最大值 加上50矩阵余量 + component.y = pYMax + 50 + state.viewBase.sizex * divisiblePosition component.style.left = (component.x - 1) * curCanvasScale.matrixStyleOriginWidth component.style.top = (component.y - 1) * curCanvasScale.matrixStyleOriginHeight component.style.width = width @@ -85,17 +93,7 @@ export default { data.style.top += 20 data.style.left += 20 } - - // if (isMouse) { - // data.style.top = state.menuTop - // data.style.left = state.menuLeft - // } else { - // data.style.top += 10 - // data.style.left += 10 - // } - data.id = generateID() - // 如果是用户视图 测先进行底层复制 if (data.type === 'view') { chartCopy(data.propValue.viewId, state.panel.panelInfo.id).then(res => { diff --git a/frontend/src/styles/deicon/demo_index.html b/frontend/src/styles/deicon/demo_index.html index a4ac5390dd..f47efb53dc 100644 --- a/frontend/src/styles/deicon/demo_index.html +++ b/frontend/src/styles/deicon/demo_index.html @@ -54,6 +54,84 @@
    +
  • + +
    icon_Batch_outlined
    +
    
    +
    • + +
  • + +
    icon_clear_outlined
    +
    
    +
    • + +
  • + +
    icon_dialpad_outlined
    +
    
    +
    • + +
  • + +
    icon_effects_outlined
    +
    
    +
    • + +
  • + +
    icon_magnify_outlined
    +
    
    +
    • + +
  • + +
    icon_moments-categories_outlined
    +
    
    +
    • + +
  • + +
    icon_pc_outlined
    +
    
    +
    • + +
  • + +
    icon_phone_outlined
    +
    
    +
    • + +
  • + +
    icon_redo_outlined
    +
    
    +
    • + +
  • + +
    icon_undo_outlined
    +
    
    +
    • + +
  • + +
    icon-more
    +
    
    +
    • + +
  • + +
    icon-quicksetting
    +
    
    +
    • + +
  • + +
    square-selected
    +
    
    +
    • +
  • italic
    @@ -648,9 +726,9 @@ 
    @font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1655779264671') format('woff2'),
-       url('iconfont.woff?t=1655779264671') format('woff'),
-       url('iconfont.ttf?t=1655779264671') 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 的样式

    @@ -676,6 +754,123 @@
      +
    • + +
      + icon_Batch_outlined +
      +
      .icon-icon_Batch_outlined +
      +
      • + +
    • + +
      + icon_clear_outlined +
      +
      .icon-icon_clear_outlined +
      +
      • + +
    • + +
      + icon_dialpad_outlined +
      +
      .icon-icon_dialpad_outlined +
      +
      • + +
    • + +
      + icon_effects_outlined +
      +
      .icon-icon_effects_outlined +
      +
      • + +
    • + +
      + icon_magnify_outlined +
      +
      .icon-icon_magnify_outlined +
      +
      • + +
    • + +
      + icon_moments-categories_outlined +
      +
      .icon-icon_moments-categories_outlined +
      +
      • + +
    • + +
      + icon_pc_outlined +
      +
      .icon-icon_pc_outlined +
      +
      • + +
    • + +
      + icon_phone_outlined +
      +
      .icon-icon_phone_outlined +
      +
      • + +
    • + +
      + icon_redo_outlined +
      +
      .icon-icon_redo_outlined +
      +
      • + +
    • + +
      + icon_undo_outlined +
      +
      .icon-icon_undo_outlined +
      +
      • + +
    • + +
      + icon-more +
      +
      .icon-icon-more +
      +
      • + +
    • + +
      + icon-quicksetting +
      +
      .icon-icon-quicksetting +
      +
      • + +
    • + +
      + square-selected +
      +
      .icon-square-selected +
      +
      • +
    • @@ -1567,6 +1762,110 @@
        +
      • + +
        icon_Batch_outlined
        +
        #icon-icon_Batch_outlined
        +
        • + +
      • + +
        icon_clear_outlined
        +
        #icon-icon_clear_outlined
        +
        • + +
      • + +
        icon_dialpad_outlined
        +
        #icon-icon_dialpad_outlined
        +
        • + +
      • + +
        icon_effects_outlined
        +
        #icon-icon_effects_outlined
        +
        • + +
      • + +
        icon_magnify_outlined
        +
        #icon-icon_magnify_outlined
        +
        • + +
      • + +
        icon_moments-categories_outlined
        +
        #icon-icon_moments-categories_outlined
        +
        • + +
      • + +
        icon_pc_outlined
        +
        #icon-icon_pc_outlined
        +
        • + +
      • + +
        icon_phone_outlined
        +
        #icon-icon_phone_outlined
        +
        • + +
      • + +
        icon_redo_outlined
        +
        #icon-icon_redo_outlined
        +
        • + +
      • + +
        icon_undo_outlined
        +
        #icon-icon_undo_outlined
        +
        • + +
      • + +
        icon-more
        +
        #icon-icon-more
        +
        • + +
      • + +
        icon-quicksetting
        +
        #icon-icon-quicksetting
        +
        • + +
      • + +
        square-selected
        +
        #icon-square-selected
        +
        • +
      -
      - +
      {{ 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')