diff --git a/src/views/chart/ContentEdit/components/EditRange/index.vue b/src/views/chart/ContentEdit/components/EditRange/index.vue index faf35e75..7ea38ad1 100644 --- a/src/views/chart/ContentEdit/components/EditRange/index.vue +++ b/src/views/chart/ContentEdit/components/EditRange/index.vue @@ -4,25 +4,15 @@ :style="rangeStyle" @mousedown="mousedownHandleUnStop($event, undefined)" > - + + + +
@@ -32,8 +22,8 @@ import { useSizeStyle } from '../../hooks/useStyle.hook' import { mousedownHandleUnStop } from '../../hooks/useDrag.hook' import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore' import { EditAlignLine } from '../EditAlignLine' +import { EditWatermark } from '../EditWatermark' import { EditRule } from '../EditRule' -import { watermarkText } from '@/settings/designSetting' const chartEditStore = useChartEditStore() @@ -65,13 +55,30 @@ const rangeStyle = computed(() => { return { ...useSizeStyle(size.value), ...computedBackground, ...scale } }) +// 模态层 +const rangeModelStyle = computed(() => { + const dragStyle = getEditCanvas.value.isCreate && { 'z-index': 99999 } + // @ts-ignore + return { ...useSizeStyle(size.value), ...dragStyle } +}) diff --git a/src/views/chart/ContentEdit/components/EditWatermark/index.ts b/src/views/chart/ContentEdit/components/EditWatermark/index.ts new file mode 100644 index 00000000..77882abc --- /dev/null +++ b/src/views/chart/ContentEdit/components/EditWatermark/index.ts @@ -0,0 +1,3 @@ +import EditWatermark from './index.vue' + +export { EditWatermark } diff --git a/src/views/chart/ContentEdit/components/EditWatermark/index.vue b/src/views/chart/ContentEdit/components/EditWatermark/index.vue new file mode 100644 index 00000000..09dba8d8 --- /dev/null +++ b/src/views/chart/ContentEdit/components/EditWatermark/index.vue @@ -0,0 +1,27 @@ + + + + + \ No newline at end of file