Skip to content

Commit

Permalink
Merge branch 'release/2.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
purocean committed Dec 24, 2019
2 parents 0cd5530 + 1690365 commit 1bef46a
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 16 deletions.
9 changes: 7 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,17 @@ yarn run start

[Windows 商店下载](https://www.microsoft.com/zh-cn/p/yank-note-%e4%b8%80%e6%ac%be%e9%9d%a2%e5%90%91%e7%a8%8b%e5%ba%8f%e5%91%98%e7%9a%84-markdown-%e7%ac%94%e8%ae%b0%e5%ba%94%e7%94%a8/9n08bq8k8681?rtc=1#activetab=pivot:overviewtab)

### [v2.1.0](https://github.com/purocean/yn/releases/tag/v2.1.0) 2019-11-21
1. 增加多标签同时打开多个文件
### [v2.1.1](https://github.com/purocean/yn/releases/tag/v2.1.1) 2019-12-24
1. 增加在当前目录创建文件菜单
1. 限制快捷跳转列表数量以提高性能
1. 标题栏最大化窗口后移除尺寸调节

<details>
<summary>展开查看更多版本记录</summary>

### [v2.1.0](https://github.com/purocean/yn/releases/tag/v2.1.0) 2019-11-29
1. 增加多标签同时打开多个文件

### [v2.0.2](https://github.com/purocean/yn/releases/tag/v2.0.2) 2019-11-21
1. 修复相对链接解析
1. 图片增加背景色便于透明图片的阅读
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/QuickOpen.vue
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ export default {
const list = this.currentTab === 'search' ? this.list : this.filterFiles(this.list, this.searchText.trim(), false)
// 按照最近使用时间排序
return this.sortList(list)
return this.sortList(list).slice(0, 70)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/TitleBar.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div class="title-bar" :style="titleBarStyles">
<div v-if="win" class="resizer"></div>
<div v-if="win && !isMaximized" class="resizer"></div>
<h4 class="title">
<img v-if="win" @dblclick="close" class="logo" src="~@/assets/icon.png" alt="logo">
<span>{{statusText}}</span>
Expand Down
3 changes: 0 additions & 3 deletions frontend/src/components/Tree.vue
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,6 @@ export default {
}
},
watch: {
file (f) {
this.$emit('input', f)
},
currentRepo () {
this.refresh()
}
Expand Down
8 changes: 5 additions & 3 deletions frontend/src/components/TreeNode.vue
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ export default {
additional.push({ id: 'duplicate', label: '重复文件', onClick: () => this.duplicateFile() })
}
this.$contextMenu.show(additional.concat(menu))
this.$contextMenu.show(additional.concat(menu, [{ id: 'create', label: '当前目录创建新文件', onClick: () => this.createFile() }]))
} else {
this.$contextMenu.show(menu)
}
Expand Down Expand Up @@ -158,10 +158,12 @@ export default {
},
async createFile (path = null, content = null) {
if (path === null) {
const currentPath = this.item.type === 'dir' ? this.item.path : File.dirname(this.item.path)
let filename = await this.$modal.input({
title: '创建文件(加密文件以 .c.md 结尾)',
hint: '文件路径',
content: '当前路径:' + this.item.path,
content: '当前路径:' + currentPath,
value: 'new.md'
})
Expand All @@ -173,7 +175,7 @@ export default {
filename = filename.replace(/\/$/, '') + '.md'
}
path = this.item.path.replace(/\/$/, '') + '/' + filename
path = currentPath.replace(/\/$/, '') + '/' + filename
}
if (!path) {
Expand Down
3 changes: 0 additions & 3 deletions frontend/src/pages/Mini.vue

This file was deleted.

2 changes: 0 additions & 2 deletions frontend/src/router.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
import Vue from 'vue'
import Router from 'vue-router'
import Main from './pages/Main'
import Mini from './pages/Mini'

Vue.use(Router)

export default new Router({
mode: 'history',
routes: [
{ path: '/', name: 'main', component: Main },
{ path: '/mini', name: 'mini', component: Mini }
]
})
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "yank.note.yang",
"version": "2.1.0",
"version": "2.1.1",
"description": "Yank Note 一款面向程序员的 Markdown 笔记应用",
"main": "dist/app.js",
"license": "Apache-2.0",
Expand Down

0 comments on commit 1bef46a

Please sign in to comment.