diff --git a/src/views/chart/ContentEdit/components/ShapeBox/index.ts b/src/views/chart/ContentEdit/components/ShapeBox/index.ts new file mode 100644 index 00000000..7c8ecffb --- /dev/null +++ b/src/views/chart/ContentEdit/components/ShapeBox/index.ts @@ -0,0 +1,3 @@ +import ShapeBox from './index.vue' + +export { ShapeBox } diff --git a/src/views/chart/ContentEdit/components/ShapeBox/index.vue b/src/views/chart/ContentEdit/components/ShapeBox/index.vue new file mode 100644 index 00000000..52b13709 --- /dev/null +++ b/src/views/chart/ContentEdit/components/ShapeBox/index.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/chart/ContentEdit/hooks/useStyle.hook.ts b/src/views/chart/ContentEdit/hooks/useStyle.hook.ts index a16c9630..4975da91 100644 --- a/src/views/chart/ContentEdit/hooks/useStyle.hook.ts +++ b/src/views/chart/ContentEdit/hooks/useStyle.hook.ts @@ -10,8 +10,13 @@ export const useComponentStyle = (attr: AttrType, index: number) => { zIndex: index, left: `${attr.x}px`, top: `${attr.y}px`, - width: `${attr.w}px`, - height: `${attr.h}px` } return componentStyle } +export const useSizeStyle = (attr: AttrType) => { + const sizeStyle = { + width: `${attr.w}px`, + height: `${attr.h}px` + } + return sizeStyle +} diff --git a/src/views/chart/ContentEdit/index.vue b/src/views/chart/ContentEdit/index.vue index 66b110bf..b83f31f7 100644 --- a/src/views/chart/ContentEdit/index.vue +++ b/src/views/chart/ContentEdit/index.vue @@ -12,14 +12,19 @@
- + > + +
@@ -34,10 +39,11 @@ import { onUnmounted, onMounted, toRefs } from 'vue' import { ContentBox } from '../ContentBox/index' import { EditRange } from './components/EditRange' import { EditBottom } from './components/EditBottom' +import { ShapeBox } from './components/ShapeBox/index' import { useLayout } from './hooks/useLayout.hook' import { handleDrop, handleDragOver } from './hooks/useDrop.hook' import { getChartEditStore } from './hooks/useStore.hook' -import { useComponentStyle } from './hooks/useStyle.hook' +import { useComponentStyle, useSizeStyle } from './hooks/useStyle.hook' const chartEditStore = getChartEditStore() @@ -50,21 +56,19 @@ useLayout() position: relative; width: 100%; overflow: hidden; - @include background-image("background-point"); + @include background-image('background-point'); @extend .go-point-bg; @include goId(chart-edit-content) { - position: relative; - top: 20px; - left: 20px; + margin: 20px; + overflow: hidden; transform-origin: left top; border: 1px solid rgba(0, 0, 0, 0); - overflow: hidden; @extend .go-transition; &.content-resize { border-radius: 15px; - @include hover-border-color("hover-border-color"); + @include hover-border-color('hover-border-color'); } - .edit-content-chart{ + .edit-content-chart { position: absolute; } }