Skip to content

Commit 4d52b3b

Browse files
committed
feat: 清除水印
1 parent 4132481 commit 4d52b3b

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

src/components/waterMark.vue

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313
<Modal
1414
v-model="showWaterMadal"
1515
:title="$t('waterMark.modalTitle')"
16+
:cancel-text="`${$t('cleanUp')}${$t('waterMark.text')}`"
1617
@on-ok="onModalOk"
17-
@on-cancel="onMadalCancel"
18+
@on-cancel="onCleanUpWaterMark"
1819
>
1920
<div class="setting-item">
2021
<span class="mr-10px">{{ $t('waterMark.setting.name') }}</span>
@@ -95,6 +96,12 @@ const onMadalCancel = () => {
9596
waterMarkState.isRotate = 0;
9697
};
9798
99+
const onCleanUpWaterMark = () => {
100+
canvasEditor.canvas.overlayImage = null; // 清空覆盖层
101+
canvasEditor.canvas.renderAll();
102+
onMadalCancel();
103+
};
104+
98105
const createCanvas = (width: number, height: number) => {
99106
const waterCanvas = document.createElement('canvas');
100107
waterCanvas.width = width;

src/language/en.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,5 +184,6 @@
184184
"clearTip": "Are you sure you want to clear it?",
185185
"replaceTip": "Are you sure you want to add to the canvas?",
186186
"ok": "ok",
187-
"cancel": "cancel"
187+
"cancel": "cancel",
188+
"cleanUp": "cleanUp"
188189
}

src/language/zh.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,5 +173,6 @@
173173
"clearTip": "确定要清空吗?",
174174
"replaceTip": "确定要添加到画布中吗?",
175175
"ok": "确认",
176-
"cancel": "取消"
176+
"cancel": "取消",
177+
"cleanUp": "清除"
177178
}

0 commit comments

Comments
 (0)