Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
OBKoro1 committed Dec 12, 2022
2 parents 50fa251 + d080eaf commit f96dbc2
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 5 deletions.
5 changes: 4 additions & 1 deletion CHANNGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,14 @@

<!-- TODO: development.md -->

### [V2.1.2]

* fix: 无法自定义添加励志语录的问题 [#19](https://github.com/OBKoro1/stop-mess-around/issues/19)

### [V2.1.1]

* fix: 修复倒计时关闭页面无法关闭的问题。


### [V2.1.0]

* feat: [匹配到网站时倒计时关闭页面](https://github.com/OBKoro1/stop-mess-around/wiki/%E5%8A%9F%E8%83%BD%E7%A4%BA%E4%BE%8B%E4%BB%A5%E5%8F%8A%E4%BD%BF%E7%94%A8%E8%AF%B4%E6%98%8E#%E5%8C%B9%E9%85%8D%E5%88%B0%E6%91%B8%E9%B1%BC%E7%BD%91%E5%9D%80%E5%90%8E%E5%AE%9A%E6%97%B6%E5%85%B3%E9%97%AD),更主动的去杜绝摸鱼的想法。
Expand Down
2 changes: 1 addition & 1 deletion manifest/manifest.production.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"manifest_version": 3,
"name": "stop-mess-around",
"version": "2.1.1",
"version": "2.1.2",
"description": "减少摸鱼的时间和频率的浏览器插件:提醒你正在摸鱼,摸鱼的时候知道自己在摸鱼,提高我们上班和学习的效率,节省时间用于学习提升自己或者享受生活",
"options_page": "options.html",
"short_name": "StopMessAround",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "stop-mess-around",
"description": "减少摸鱼的时间和频率的浏览器插件:提醒你正在摸鱼,摸鱼的时候知道自己在摸鱼,提高我们上班和学习的效率,节省时间用于学习提升自己或者享受生活",
"version": "2.1.1",
"version": "2.1.2",
"publisher": "OBKoro1",
"homepage": "https://github.com/OBKoro1/stop-mess-around",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion src/options/App/tip/AddActive.vue
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export default {
* @description: 保存添加的数据
*/
saveAddFn() {
const arr = this[this.radio]
const arr = this.$attrs[this.radio]
if (!checkContentInArr(arr, this.textarea)) return
arr.unshift(this.textarea)
this.$message.success('添加成功')
Expand Down
6 changes: 5 additions & 1 deletion src/options/App/tip/tabArray.vue
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,11 @@
label="添加"
name="add"
>
<AddActive />
<AddActive
:tip-arr="tipArr"
:title-arr="titleArr"
:confirm-arr="confirmArr"
/>
</el-tab-pane>
</el-tabs>
<EditorContent
Expand Down

0 comments on commit f96dbc2

Please sign in to comment.