Merge branch 'dev' of https://gitee.com/MTrun/go-view into master-fetch
This commit is contained in:
commit
f379f7652c
@ -332,7 +332,7 @@ export const useChartEditStore = defineStore({
|
||||
|
||||
// 历史记录
|
||||
if (isHistory) {
|
||||
chartHistoryStore.createLaryerHistory(
|
||||
chartHistoryStore.createLayerHistory(
|
||||
setIndex(targetData, index),
|
||||
isEnd ? HistoryActionTypeEnum.BOTTOM : HistoryActionTypeEnum.TOP
|
||||
)
|
||||
@ -380,7 +380,7 @@ export const useChartEditStore = defineStore({
|
||||
|
||||
// 历史记录
|
||||
if (isHistory) {
|
||||
chartHistoryStore.createLaryerHistory(
|
||||
chartHistoryStore.createLayerHistory(
|
||||
targetItem,
|
||||
isDown ? HistoryActionTypeEnum.DOWN : HistoryActionTypeEnum.UP
|
||||
)
|
||||
|
@ -180,7 +180,7 @@ export const useChartHistoryStore = defineStore({
|
||||
)
|
||||
},
|
||||
// * 改变层级组件记录
|
||||
createLaryerHistory(
|
||||
createLayerHistory(
|
||||
item: CreateComponentType,
|
||||
type:
|
||||
| HistoryActionTypeEnum.TOP
|
||||
|
@ -1,9 +1,5 @@
|
||||
<template>
|
||||
<div
|
||||
class="go-edit-range go-transition"
|
||||
:style="rangeStyle"
|
||||
@mousedown="mousedownHandleUnStop($event, undefined)"
|
||||
>
|
||||
<div class="go-edit-range go-transition" :style="rangeStyle" @mousedown="mousedownHandleUnStop($event, undefined)">
|
||||
<slot></slot>
|
||||
<!-- 水印 -->
|
||||
<edit-watermark></edit-watermark>
|
||||
@ -41,18 +37,8 @@ const rangeStyle = computed(() => {
|
||||
const scale = {
|
||||
transform: `scale(${getEditCanvas.value.scale})`
|
||||
}
|
||||
// 设置背景色和图片背景
|
||||
const background = getEditCanvasConfig.value.background
|
||||
const backgroundImage = getEditCanvasConfig.value.backgroundImage
|
||||
const selectColor = getEditCanvasConfig.value.selectColor
|
||||
const backgroundColor = background ? background : undefined
|
||||
|
||||
const computedBackground = selectColor
|
||||
? { background: backgroundColor }
|
||||
: { background: `url(${backgroundImage}) no-repeat center/100% !important` }
|
||||
|
||||
// @ts-ignore
|
||||
return { ...useSizeStyle(size.value), ...computedBackground, ...scale }
|
||||
return { ...useSizeStyle(size.value), ...scale }
|
||||
})
|
||||
|
||||
// 模态层
|
||||
|
@ -113,7 +113,7 @@ const rangeStyle = computed(() => {
|
||||
|
||||
const computedBackground = selectColor
|
||||
? { background: backgroundColor }
|
||||
: { background: `url(${backgroundImage}) no-repeat center/100% !important` }
|
||||
: { background: `url(${backgroundImage}) no-repeat center center / cover !important` }
|
||||
|
||||
// @ts-ignore
|
||||
return {
|
||||
|
Loading…
x
Reference in New Issue
Block a user