diff --git a/src/views/chart/ContentLayers/components/LayersGroupListItem/index.vue b/src/views/chart/ContentLayers/components/LayersGroupListItem/index.vue index c971276b..8fb6abb1 100644 --- a/src/views/chart/ContentLayers/components/LayersGroupListItem/index.vue +++ b/src/views/chart/ContentLayers/components/LayersGroupListItem/index.vue @@ -2,7 +2,7 @@
- - +
@@ -34,6 +33,7 @@ :key="element.id" :componentData="element" :layer-mode="layerMode" + :isGroup="true" @mousedown="mousedownHandle($event, element, componentGroupData.id)" @mouseenter="mouseenterHandle(element)" @mouseleave="mouseleaveHandle(element)" @@ -53,10 +53,9 @@ import { useContextMenu, divider } from '@/views/chart/hooks/useContextMenu.hook import { MenuOptionsItemType } from '@/views/chart/hooks/useContextMenu.hook.d' import { CreateComponentType, CreateComponentGroupType } from '@/packages/index.d' import { LayersListItem } from '../LayersListItem' +import { LayersStatus } from '../LayersStatus/index' +import { LayerModeEnum } from '../../index.d' import { icon } from '@/plugins' -import { LayerModeEnum } from '../../enums' - -const { LockClosedOutlineIcon, EyeOffOutlineIcon } = icon.ionicons5 const props = defineProps({ componentGroupData: { @@ -64,10 +63,8 @@ const props = defineProps({ required: true }, layerMode: { - type: Object as PropType, - default(): LayerModeEnum { - return 'thumbnail' - } + type: String as PropType, + default: LayerModeEnum.THUMBNAIL } }) @@ -88,6 +85,27 @@ const themeColor = computed(() => { return designStore.getAppTheme }) +// 是否选中文本 +const selectText = computed(() => { + return props.layerMode === LayerModeEnum.TEXT +}) + +// 计算当前选中目标 +const select = computed(() => { + const id = props.componentGroupData.id + return chartEditStore.getTargetChart.selectId.find((e: string) => e === id) +}) + +// 悬浮 +const hover = computed(() => { + return props.componentGroupData.id === chartEditStore.getTargetChart.hoverId +}) + +// 组件状态 隐藏/锁定 +const status = computed(() => { + return props.componentGroupData.status +}) + // 右键 const optionsHandle = ( targetList: MenuOptionsItemType[], @@ -134,21 +152,6 @@ const clickHandle = (e: MouseEvent) => { mousedownHandle(e, props.componentGroupData) } -// 计算当前选中目标 -const select = computed(() => { - const id = props.componentGroupData.id - return chartEditStore.getTargetChart.selectId.find((e: string) => e === id) -}) - -// 悬浮 -const hover = computed(() => { - return props.componentGroupData.id === chartEditStore.getTargetChart.hoverId -}) - -const status = computed(() => { - return props.componentGroupData.status -}) - // 组点击事件 const groupMousedownHandle = (e: MouseEvent) => { onClickOutSide() @@ -206,10 +209,19 @@ $textSize: 10px; margin: 10px 5%; margin-bottom: 5px; @extend .go-transition-quick; + @include deep() { + .go-content-layers-list-item { + margin-right: 0 !important; + width: 95% !important; + } + } - :deep(.go-content-layers-list-item) { - margin-right: 0 !important; - width: 95% !important; + &:hover { + @include deep() { + .icon-item { + opacity: 1; + } + } } .root-item-content { diff --git a/src/views/chart/ContentLayers/components/LayersListItem/index.vue b/src/views/chart/ContentLayers/components/LayersListItem/index.vue index d37d8c63..2b7ecf48 100644 --- a/src/views/chart/ContentLayers/components/LayersListItem/index.vue +++ b/src/views/chart/ContentLayers/components/LayersListItem/index.vue @@ -1,5 +1,5 @@ diff --git a/src/views/chart/ContentLayers/enums.ts b/src/views/chart/ContentLayers/enums.ts index 0cb26ab2..e69de29b 100644 --- a/src/views/chart/ContentLayers/enums.ts +++ b/src/views/chart/ContentLayers/enums.ts @@ -1 +0,0 @@ -export type LayerModeEnum = 'thumbnail' | 'text' diff --git a/src/views/chart/ContentLayers/index.d.ts b/src/views/chart/ContentLayers/index.d.ts new file mode 100644 index 00000000..06596dee --- /dev/null +++ b/src/views/chart/ContentLayers/index.d.ts @@ -0,0 +1,4 @@ +export enum LayerModeEnum { + THUMBNAIL = 'thumbnail', + TEXT = 'text' +} diff --git a/src/views/chart/ContentLayers/index.vue b/src/views/chart/ContentLayers/index.vue index 54efde08..c3323410 100644 --- a/src/views/chart/ContentLayers/index.vue +++ b/src/views/chart/ContentLayers/index.vue @@ -17,7 +17,7 @@ v-for="(item, index) in layerModeEnumList" :key="index" ghost - size="tiny" + size="small" :type="layerMode === item.value ? 'primary' : 'tertiary'" @click="layerMode = item.value as LayerModeEnum" > @@ -77,7 +77,7 @@ import { MenuEnum, MouseEventButton, WinKeyboard, MacKeyboard } from '@/enums/ed import { LayersListItem } from './components/LayersListItem/index' import { LayersGroupListItem } from './components/LayersGroupListItem/index' -import { LayerModeEnum } from './enums' +import { LayerModeEnum } from './index.d' import { icon } from '@/plugins'