Skip to content

Commit

Permalink
Merge branch 'release/3.80.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
purocean committed Jan 13, 2025
2 parents 5e625aa + ae598d2 commit 15ef53f
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 24 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ For more information on how to use the following functions, please see [characte

## Changelogs

### [v3.80.2](https://github.com/purocean/yn/releases/tag/v3.80.2) 2025-01-11
### [v3.80.4](https://github.com/purocean/yn/releases/tag/v3.80.4) 2025-01-13

[Windows](https://github.com/purocean/yn/releases/download/v3.80.2/Yank-Note-win-x64-3.80.2.exe) | [macOS arm64](https://github.com/purocean/yn/releases/download/v3.80.2/Yank-Note-mac-arm64-3.80.2.dmg) | [macOS x64](https://github.com/purocean/yn/releases/download/v3.80.2/Yank-Note-mac-x64-3.80.2.dmg) | [Linux AppImage](https://github.com/purocean/yn/releases/download/v3.80.2/Yank-Note-linux-x86_64-3.80.2.AppImage) | [Linux deb](https://github.com/purocean/yn/releases/download/v3.80.2/Yank-Note-linux-amd64-3.80.2.deb)
[Windows](https://github.com/purocean/yn/releases/download/v3.80.4/Yank-Note-win-x64-3.80.4.exe) | [macOS arm64](https://github.com/purocean/yn/releases/download/v3.80.4/Yank-Note-mac-arm64-3.80.4.dmg) | [macOS x64](https://github.com/purocean/yn/releases/download/v3.80.4/Yank-Note-mac-x64-3.80.4.dmg) | [Linux AppImage](https://github.com/purocean/yn/releases/download/v3.80.4/Yank-Note-linux-x86_64-3.80.4.AppImage) | [Linux deb](https://github.com/purocean/yn/releases/download/v3.80.4/Yank-Note-linux-amd64-3.80.4.deb)

1. feat: Added warehouse search and replace all functionality
2. feat: Added text comparison tool (requires extension installation)
Expand Down
4 changes: 2 additions & 2 deletions README_ZH-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@

## 更新日志

### [v3.80.2](https://github.com/purocean/yn/releases/tag/v3.80.2) 2025-01-11
### [v3.80.4](https://github.com/purocean/yn/releases/tag/v3.80.4) 2025-01-11

[Windows](https://github.com/purocean/yn/releases/download/v3.80.2/Yank-Note-win-x64-3.80.2.exe) | [macOS arm64](https://github.com/purocean/yn/releases/download/v3.80.2/Yank-Note-mac-arm64-3.80.2.dmg) | [macOS x64](https://github.com/purocean/yn/releases/download/v3.80.2/Yank-Note-mac-x64-3.80.2.dmg) | [Linux AppImage](https://github.com/purocean/yn/releases/download/v3.80.2/Yank-Note-linux-x86_64-3.80.2.AppImage) | [Linux deb](https://github.com/purocean/yn/releases/download/v3.80.2/Yank-Note-linux-amd64-3.80.2.deb)
[Windows](https://github.com/purocean/yn/releases/download/v3.80.4/Yank-Note-win-x64-3.80.4.exe) | [macOS arm64](https://github.com/purocean/yn/releases/download/v3.80.4/Yank-Note-mac-arm64-3.80.4.dmg) | [macOS x64](https://github.com/purocean/yn/releases/download/v3.80.4/Yank-Note-mac-x64-3.80.4.dmg) | [Linux AppImage](https://github.com/purocean/yn/releases/download/v3.80.4/Yank-Note-linux-x86_64-3.80.4.AppImage) | [Linux deb](https://github.com/purocean/yn/releases/download/v3.80.4/Yank-Note-linux-amd64-3.80.4.deb)

1. feat: 增加仓库搜索并全部替换功能
2. feat: 增加文本对比工具(需安装扩展)
Expand Down
11 changes: 0 additions & 11 deletions mas-release.sh

This file was deleted.

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",
"version": "3.80.2",
"version": "3.80.4",
"description": "Yank Note: A highly extensible Markdown editor, designed for productivity.",
"main": "dist/main/app.js",
"license": "AGPL-3.0",
Expand Down
15 changes: 9 additions & 6 deletions src/renderer/components/Filter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,28 +23,31 @@ export default defineComponent({
name: 'x-filter',
components: { QuickOpen, XMask },
setup () {
const callback = ref<Function | null>(null)
const callback = ref<((doc: Doc | null) => void) | null>(null)
const onlyCurrentRepo = ref(false)
const filterItem = shallowRef<(item: BaseDoc) => boolean>()
function showQuickOpen () {
onlyCurrentRepo.value = false
callback.value = (f: any) => {
switchDoc(f)
callback.value = (f: Doc | null) => {
if (f) {
switchDoc(f)
}
callback.value = null
filterItem.value = undefined
}
}
function chooseFile (file: any) {
function chooseFile (file: Doc | null) {
if (callback.value) {
callback.value(file)
}
}
function chooseDocument (filter = (item: BaseDoc) => isMarkdownFile(item.path)) {
return new Promise<Doc>(resolve => {
callback.value = (f: Doc) => {
return new Promise<Doc | null>(resolve => {
callback.value = (f: Doc | null) => {
resolve(f)
callback.value = null
filterItem.value = undefined
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/plugins/markdown-code-run.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const RunCode = defineComponent({
}

if (value.length > 32 * 1024) {
value = '------Output too long, truncated to 32KB------\n' + value.slice(-32 * 1024)
value = '------Output too long, truncated to 32K------\n' + value.slice(-32 * 1024)
}

result.value = value
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/support/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ watchEffect(() => {

storage.set('currentFile', data ? pick(data, 'repo', 'path', 'type', 'name', 'extra') : null)

if (data && data.type === 'file' && !isNormalRepoName(data.repo)) { // record recent open time, except for repo starts with '__'
if (data && data.type === 'file' && isNormalRepoName(data.repo)) { // record recent open time, except for repo starts with '__'
const record: Record<string, number> = {
...(state.recentOpenTime || {}),
[`${data.repo}|${data.path}`]: Date.now()
Expand Down

0 comments on commit 15ef53f

Please sign in to comment.