blackteay/go-view
1
0
Fork 0
mirror of https://gitee.com/dromara/go-view.git synced 2025-04-06 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' of https://gitee.com/MTrun/go-view into master-fetch

Browse Source
This commit is contained in:
奔跑的面条 2022-07-26 16:12:31 +08:00
commit d3a9f7d60f
4 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/store/modules/chartEditStore/chartEditStore.ts
View File

@ -332,7 +332,7 @@ export const useChartEditStore = defineStore({
// 历史记录 // 历史记录
if (isHistory) { if (isHistory) {
chartHistoryStore.createLaryerHistory( chartHistoryStore.createLayerHistory(
setIndex(targetData, index), setIndex(targetData, index),
isEnd ? HistoryActionTypeEnum.BOTTOM : HistoryActionTypeEnum.TOP isEnd ? HistoryActionTypeEnum.BOTTOM : HistoryActionTypeEnum.TOP
) )
@ -380,7 +380,7 @@ export const useChartEditStore = defineStore({
// 历史记录 // 历史记录
if (isHistory) { if (isHistory) {
chartHistoryStore.createLaryerHistory( chartHistoryStore.createLayerHistory(
targetItem, targetItem,
isDown ? HistoryActionTypeEnum.DOWN : HistoryActionTypeEnum.UP isDown ? HistoryActionTypeEnum.DOWN : HistoryActionTypeEnum.UP
) )

2
src/store/modules/chartHistoryStore/chartHistoryStore.ts
View File

@ -180,7 +180,7 @@ export const useChartHistoryStore = defineStore({
) )
}, },
// * 改变层级组件记录 // * 改变层级组件记录
createLaryerHistory( createLayerHistory(
item: CreateComponentType, item: CreateComponentType,
type: type:
| HistoryActionTypeEnum.TOP | HistoryActionTypeEnum.TOP

18
src/views/chart/ContentEdit/components/EditRange/index.vue
View File

@ -1,9 +1,5 @@
<template> <template>
<div <div class="go-edit-range go-transition" :style="rangeStyle" @mousedown="mousedownHandleUnStop($event, undefined)">
class="go-edit-range go-transition"
:style="rangeStyle"
@mousedown="mousedownHandleUnStop($event, undefined)"
>
<slot></slot> <slot></slot>
<!-- 水印 --> <!-- 水印 -->
<edit-watermark></edit-watermark> <edit-watermark></edit-watermark>
@ -41,18 +37,8 @@ const rangeStyle = computed(() => {
const scale = { const scale = {
transform: `scale(${getEditCanvas.value.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 // @ts-ignore
return { ...useSizeStyle(size.value), ...computedBackground, ...scale } return { ...useSizeStyle(size.value), ...scale }
}) })
// 模态层 // 模态层

2
src/views/chart/ContentEdit/index.vue
View File

@ -113,7 +113,7 @@ const rangeStyle = computed(() => {
const computedBackground = selectColor const computedBackground = selectColor
? { background: backgroundColor } ? { background: backgroundColor }
: { background: `url(${backgroundImage}) no-repeat center/100% !important` } : { background: `url(${backgroundImage}) no-repeat center center / cover !important` }
// @ts-ignore // @ts-ignore
return { return {