Skip to content

Commit

Permalink
Merge pull request #823 from zhensherlock/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
zhensherlock authored Aug 17, 2024
2 parents 4120bd8 + 0c5a582 commit 06a80a2
Show file tree
Hide file tree
Showing 9 changed files with 85 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## [1.5.3](https://github.com/zhensherlock/watermark-js-plus/compare/v1.5.2...v1.5.3) (2024-08-15)
## [1.5.3](https://github.com/zhensherlock/watermark-js-plus/compare/v1.5.2...v1.5.3) (2024-08-17)


### ✅ Tests | 测试
Expand Down
6 changes: 6 additions & 0 deletions docs/.vitepress/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ export default {
{ text: 'Configs', link: '/guide/custom/configs' },
{ text: 'Decode', link: '/guide/custom/decode' },
]
},
{
text: 'Extra',
items: [
{ text: 'Internet Explorer', link: '/guide/extra/ie' },
]
}
],
'/config': [
Expand Down
6 changes: 6 additions & 0 deletions docs/.vitepress/locales/zh-CN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@ export default {
{ text: '配置', link: '/zh/guide/custom/configs' },
{ text: '解析', link: '/zh/guide/custom/decode' },
]
},
{
text: '扩展',
items: [
{ text: 'Internet Explorer', link: '/zh/guide/extra/ie' },
]
}
],
'/zh/config': [
Expand Down
5 changes: 3 additions & 2 deletions docs/guide/custom/configs.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
---
layout: doc
---

<el-backtop></el-backtop>

# Custom Configs

<script setup lang="ts">
Expand Down Expand Up @@ -66,5 +69,3 @@ watermark.destroy() // remove watermark
<el-button round type="danger" @click="handleRemoveWatermark">Remove Watermark</el-button>
</el-space>
</el-affix>

<el-backtop></el-backtop>
5 changes: 3 additions & 2 deletions docs/guide/custom/decode.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
---
layout: doc
---

<el-backtop></el-backtop>

# Decode Configs

<script setup lang="ts">
Expand Down Expand Up @@ -141,8 +144,6 @@ const handleDecode = () => {
/>
</div>

<el-backtop></el-backtop>

<style scoped>
.title {
color: var(--el-text-color-primary);
Expand Down
30 changes: 30 additions & 0 deletions docs/guide/extra/ie.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
layout: doc
---

<el-backtop></el-backtop>

# Internet Explorer
This plugin supports IE11 and partially supports IE10 and IE9.

## NPM
```ts
import { Watermark } from 'watermark-js-plus/ie'
```

> This ensures compatibility with IE11 and partial support for IE10 and IE9.

## CDN
```html
<!-- import JavaScript -->
<script src="https://www.unpkg.com/[email protected]/dist/ie/index.iife.min.js"></script>
```

> We recommend our users to lock version when using CDN. Please refer to [unpkg.com](https://unpkg.com/) for more information.
<iframe height="300" style="width: 100%;" scrolling="no" title="Untitled" src="https://codepen.io/sunzhenxuan/embed/JjQMryG?default-tab=html&theme-id=light" frameborder="no" loading="lazy" allowtransparency="true" allowfullscreen="true">
See the Pen <a href="https://codepen.io/sunzhenxuan/pen/JjQMryG">
Untitled</a> by zhensherlock (<a href="https://codepen.io/sunzhenxuan">@sunzhenxuan</a>)
on <a href="https://codepen.io">CodePen</a>.
</iframe>
3 changes: 3 additions & 0 deletions docs/guide/what-is-this.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@ This is a *canvas-based* watermark for browser.
| ![Chrome](https://raw.githubusercontent.com/alrra/browser-logos/main/src/chrome/chrome_48x48.png) | ![Firefox](https://raw.githubusercontent.com/alrra/browser-logos/main/src/firefox/firefox_48x48.png) | ![Safari](https://raw.githubusercontent.com/alrra/browser-logos/main/src/safari/safari_48x48.png) | ![Opera](https://raw.githubusercontent.com/alrra/browser-logos/main/src/opera/opera_48x48.png) | ![Edge](https://raw.githubusercontent.com/alrra/browser-logos/main/src/edge/edge_48x48.png) | ![IE](https://raw.githubusercontent.com/alrra/browser-logos/master/src/archive/internet-explorer_9-11/internet-explorer_9-11_48x48.png) |
|:-------------------------------------------------------------------------------------------------:|:----------------------------------------------------------------------------------------------------:|:-------------------------------------------------------------------------------------------------:|:----------------------------------------------------------------------------------------------:|:-------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------------------:|
| Latest ✔ | Latest ✔ | Latest ✔ | Latest ✔ | Latest ✔ | 11 ✔ |

## [Internet Explorer :rocket:](extra/ie.html)
This plugin supports IE11 and partially supports IE10 and IE9.
30 changes: 30 additions & 0 deletions docs/zh/guide/extra/ie.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
layout: doc
---

<el-backtop></el-backtop>

# Internet Explorer
支持e11,部分支持e10和e9。

## NPM
```ts
import { Watermark } from 'watermark-js-plus/ie'
```

> 如果需要支持 Internet Explorer (IE),请使用专门针对 IE 的版本

## CDN
```html
<!-- import JavaScript -->
<script src="https://www.unpkg.com/[email protected]/dist/ie/index.iife.min.js"></script>
```

> 我们建议使用 CDN 引入用户在链接地址上锁定版本,以免将来插件升级时受到非兼容性更新的影响。锁定版本的方法请查看 [unpkg.com](https://unpkg.com/)
<iframe height="300" style="width: 100%;" scrolling="no" title="Untitled" src="https://codepen.io/sunzhenxuan/embed/JjQMryG?default-tab=html&theme-id=light" frameborder="no" loading="lazy" allowtransparency="true" allowfullscreen="true">
See the Pen <a href="https://codepen.io/sunzhenxuan/pen/JjQMryG">
Untitled</a> by zhensherlock (<a href="https://codepen.io/sunzhenxuan">@sunzhenxuan</a>)
on <a href="https://codepen.io">CodePen</a>.
</iframe>
3 changes: 3 additions & 0 deletions docs/zh/guide/what-is-this.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@ layout: doc
| ![Chrome](https://raw.githubusercontent.com/alrra/browser-logos/main/src/chrome/chrome_48x48.png) | ![Firefox](https://raw.githubusercontent.com/alrra/browser-logos/main/src/firefox/firefox_48x48.png) | ![Safari](https://raw.githubusercontent.com/alrra/browser-logos/main/src/safari/safari_48x48.png) | ![Opera](https://raw.githubusercontent.com/alrra/browser-logos/main/src/opera/opera_48x48.png) | ![Edge](https://raw.githubusercontent.com/alrra/browser-logos/main/src/edge/edge_48x48.png) | ![IE](https://raw.githubusercontent.com/alrra/browser-logos/master/src/archive/internet-explorer_9-11/internet-explorer_9-11_48x48.png) |
|:-------------------------------------------------------------------------------------------------:|:----------------------------------------------------------------------------------------------------:|:-------------------------------------------------------------------------------------------------:|:----------------------------------------------------------------------------------------------:|:-------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------------------:|
| Latest ✔ | Latest ✔ | Latest ✔ | Latest ✔ | Latest ✔ | 11 ✔ |

## [Internet Explorer :rocket:](extra/ie.html)
支持e11,部分支持e10和e9。

0 comments on commit 06a80a2

Please sign in to comment.