From ead4318163b94f98ff395a868efe862774be0a63 Mon Sep 17 00:00:00 2001
From: xiaoxian521 <1923740402@qq.com>
Date: Sun, 13 Nov 2022 13:15:01 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=B0=E5=AF=8C=E6=B0=B4=E5=8D=B0?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 2 +-
pnpm-lock.yaml | 8 +-
src/views/able/watermark.vue | 156 +++++++++++++++++++++++++++++++++--
3 files changed, 155 insertions(+), 11 deletions(-)
diff --git a/package.json b/package.json
index d41aa0807..82d1124d0 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
"@pureadmin/components": "^1.1.0",
"@pureadmin/descriptions": "^1.1.0",
"@pureadmin/table": "^1.2.0",
- "@pureadmin/utils": "^1.1.5",
+ "@pureadmin/utils": "^1.2.1",
"@vueuse/core": "^9.5.0",
"@vueuse/motion": "2.0.0-beta.12",
"@wangeditor/editor": "^5.1.21",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ab228516b..d70cd417f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -22,7 +22,7 @@ specifiers:
"@pureadmin/descriptions": ^1.1.0
"@pureadmin/table": ^1.2.0
"@pureadmin/theme": ^2.4.0
- "@pureadmin/utils": ^1.1.5
+ "@pureadmin/utils": ^1.2.1
"@types/element-resize-detector": 1.1.3
"@types/js-cookie": ^3.0.1
"@types/lodash": ^4.14.180
@@ -133,7 +133,7 @@ dependencies:
"@pureadmin/components": 1.1.0_vue@3.2.45
"@pureadmin/descriptions": 1.1.1_element-plus@2.2.21
"@pureadmin/table": 1.2.0_element-plus@2.2.21
- "@pureadmin/utils": 1.1.5_aotapuqn7htzdjltsyimavekky
+ "@pureadmin/utils": 1.2.1_aotapuqn7htzdjltsyimavekky
"@vueuse/core": 9.5.0_vue@3.2.45
"@vueuse/motion": 2.0.0-beta.12_vue@3.2.45
"@wangeditor/editor": 5.1.22
@@ -1410,10 +1410,10 @@ packages:
string-hash: 1.1.3
dev: true
- /@pureadmin/utils/1.1.5_aotapuqn7htzdjltsyimavekky:
+ /@pureadmin/utils/1.2.1_aotapuqn7htzdjltsyimavekky:
resolution:
{
- integrity: sha512-5nQZyFAbs59gkMBj0WLox7BlY7llILR/ENo2QNEKW6avMt8sDL1+858EFjEbELl6enPsVvJpoCTxatmZzVjyAw==
+ integrity: sha512-qcuRwW2DoXHCblFcZcYVAypV12I2P5sw0fvBnLfREtQ3Zlx51y4z0hOByncBFrNc9vFc3CoNM9UYlzsIedNP9A==
}
peerDependencies:
dayjs: "*"
diff --git a/src/views/able/watermark.vue b/src/views/able/watermark.vue
index 0198e7d72..078dde93f 100644
--- a/src/views/able/watermark.vue
+++ b/src/views/able/watermark.vue
@@ -1,21 +1,43 @@
请输入要创建水印的值:
@@ -29,10 +51,132 @@ const { setWatermark, clear } = useWatermark();
- 创建
+ 创建整页水印
- 清除
+
+ 创建整页渐变水印
+
+
+ 创建整页渐变且水平90度的水印
+
+
+ 创建整页渐变且有阴影的水印
+
+
+ 创建整页高透明渐变水印
+
+ 清除整页水印
+
+
+
+ 创建局部水印
+
+
+ 创建局部渐变水印
+
+
+ 创建局部渐变且水平90度的水印
+
+
+ 创建局部渐变且有阴影的水印
+
+ 清除局部水印
+
+
-
-