File tree Expand file tree Collapse file tree 3 files changed +12
-3
lines changed Expand file tree Collapse file tree 3 files changed +12
-3
lines changed Original file line number Diff line number Diff line change 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+
98105const createCanvas = (width : number , height : number ) => {
99106 const waterCanvas = document .createElement (' canvas' );
100107 waterCanvas .width = width ;
Original file line number Diff line number Diff line change 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}
Original file line number Diff line number Diff line change 173173 "clearTip" : " 确定要清空吗?" ,
174174 "replaceTip" : " 确定要添加到画布中吗?" ,
175175 "ok" : " 确认" ,
176- "cancel" : " 取消"
176+ "cancel" : " 取消" ,
177+ "cleanUp" : " 清除"
177178}
You can’t perform that action at this time.
0 commit comments