Merge pull request #56 from TankNee/rebuild/develop

v1.0.0
TankNee · Dec 25, 2020 · 10b5c75 · 10b5c75
2 parents 0cb7c24 + cf9dd21
commit 10b5c75
Show file tree

Hide file tree

Showing 41 changed files with 1,044 additions and 163 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # CHANGE LOG
 
+## 2020 12 22 Update 0.0.23
+
+1. 实现更简单的图片上传方式：在编辑器中右键选择图片上传。
+2. 暂时废弃拖拽上传的方式。
+3. 实现标签系统
+
 ## 2020 12 19 Update 0.0.22
 
 1. 添加中文Readme文件

diff --git a/README-zh_cn.md b/README-zh_cn.md
@@ -6,23 +6,21 @@
 
 ### 目录
 
-[目录](#目录)
+- [状态](#状态)
 
-[状态](#状态)
+- [介绍](#介绍)
 
-[介绍](#介绍)
+- [为知社区](#为知社区)
 
-[为知社区](#为知社区)
+- [软件截图](#软件截图)
 
-[软件截图](#软件截图)
+- [下载](#下载)
 
-[下载](#下载)
+- [特色](#特色)
 
-[特色](#特色)
+- [注意事项](#注意事项)
 
-[注意事项](#注意事项)
-
-[更新日志](#更新日志changelogmd)
+- [更新日志](#更新记录)
 
 ### 状态
 
@@ -56,11 +54,13 @@
 
 ![image-20201011103144579](./screenshot/image-20201011103144579.png)
 
-- Arch Linux
+#### Arch Linux
 
 可以通过 [AUR](https://aur.archlinux.org/packages/neeto-vue-bin/) 安装
 
-```
+感谢[yjun123](https://github.com/yjun123)。
+
+```bash
 # AUR helper
 # yay
 yay -S neeto-vue-bin
@@ -73,7 +73,7 @@ pikaur -S neeto-vue-bin
 
 - 更加舒适的设计
 
-- 更加使用的功能
+- 更加实用的功能
 
 - 相对更小的空间占用
 
@@ -89,20 +89,93 @@ pikaur -S neeto-vue-bin
 
 - 快捷键: [vditor 快捷键](https://ld246.com/guide/markdown)
 
+- 支持将笔记发送到 Flomo 浮墨
+
+- 支持笔记锁定模式
 
 ### 注意事项
 
 - 移动笔记时还存在一些问题。暂时不可用。
 - 图片上传还只支持拖拽上传和直接填写图片链接
 - 使用为知官方图片服务时只会显示图片的临时地址
-- 图片上传服务暂时只可用第三方web上传服务。(设置 >> 编辑器 >> 图片上传服务)参数填写方式请参照：[picgo-plugin-web-uploader](https://github.com/yuki-xin/picgo-plugin-web-uploader)
-  - `url`: 图床上传API地址
-  - `paramName`: POST参数名(eg:`image`)
-  - `jsonPath`: 图片URL所在返回值的`JsonPath(eg:data.url)`
-  - `customHeader`: 自定义请求头 标准JSON(eg: `{"key":"value"}`)
-  - `customBody`: 自定义Body 标准JSON(eg: `{"key":"value"}`)
-
-### [更新日志](./CHANGELOG.md)
+- 图片上传服务暂时只可用第三方 web 上传服务。(设置 >> 编辑器 >> 图片上传服务)参数填写方式请参照：[picgo-plugin-web-uploader](https://github.com/yuki-xin/picgo-plugin-web-uploader)
+  - `url`: 图床上传 API 地址
+  - `paramName`: POST 参数名(eg:`image`)
+  - `jsonPath`: 图片 URL 所在返回值的`JsonPath(eg:data.url)`
+  - `customHeader`: 自定义请求头 标准 JSON(eg: `{"key":"value"}`)
+  - `customBody`: 自定义 Body 标准 JSON(eg: `{"key":"value"}`)
+
+### 更新记录
+
+<details>
+<summary>版本变更记录</summary>
+
+## 2020 12 22 Update 1.0.0
+
+1. 实现标签系统
+2. 实现图片右键上传，此功能依赖PicGo
+3. 大量细节优化
+
+## 2020 12 22 Update 0.0.23
+
+1. 实现更简单的图片上传方式：在编辑器中右键选择图片上传。
+2. 暂时废弃拖拽上传的方式。
+
+## 2020 12 19 Update 0.0.22
+
+1. 添加中文 Readme 文件
+2. 完善 readme 描述
+3. 添加笔记锁定功能，实现更方便的笔记查阅。
+
+## 2020 12 17 Update 0.0.21
+
+1. 添加 Flomo Api 的支持。 设置 >> 服务 >> 浮墨. 然后在列表中使用右键菜单即可将笔记发送到 Flomo
+2. 笔记编辑器升级到 v3.7.1
+3. 缓存 key 命名策略调整
+
+## 2020 12 03 Update 0.0.20
+
+1. 修复服务器返回乱序文件夹列表时无法显示文件夹的问题
+
+## 2020 11 30 Update 0.0.19
+
+1. 修复笔记名称中带有非法字符时导出失败
+
+## 2020 11 27 Update 0.0.18
+
+1. 单个文件导出为 Markdown
+2. 导出整个文件夹到指定目录，格式为 Markdown
+
+## 2020 09 27 Update 0.0.6
+
+1. 实现更好的登录体验
+2. 优化无内容时的界面
+3. 优化代码逻辑
+
+## 2020 09 26 Update 0.0.5
+
+1. 添加 github 自动构建
+
+## 2020 09 25 Update 0.0.4
+
+1. 优化 macos 下的 header 显示
+2. 添加 vditor 快捷键，[快捷键查阅地址](https://ld246.com/guide/markdown)
+3. 优化图标
+4. 添加 vditor 右下角的保存按钮，右上角的 outline 按钮还没有实现
+5. 借鉴 wizlite 实现笔记中的链接外部打开
+6. 优化无效代码
+
+## 2020 09 22 Update 0.0.3
+
+1. 版本更新至 0.0.3
+2. 添加图片的拖拽上传
+   1. 将图片直接拖入到编辑器中
+   2. 记得要先点击图片要插入的位置，否则会直接插入到上一次点击的地方，我暂时没找到办法修复
+3. 修复编辑器区域大小的问题
+4. 添加笔记修改日期的显示
+5. 修复了翻译缺失的问题
+
+</details>
 
 ### License
 

diff --git a/README.md b/README.md
@@ -6,23 +6,21 @@
 
 ### Content
 
-[Content](#content)
+- [Status](#status)
 
-[Status](#status)
+- [Installation](#installation)
 
-[Introduction](#introduction)
+- [Wiz Community](#wiz-community)
 
-[Wiz Community](#wiz-community)
+- [ScreenShot](#screenshot)
 
-[ScreenShot](#screenshot)
+- [Installation](#installation)
 
-[Download](#download)
+- [Feature](#feature)
 
-[Feature](#feature)
+- [Attention](#attention)
 
-[Attention](#attention)
-
-[Change Log](#change-logchangelogmd)
+- [Change Log](#change-log)
 
 ### Status
 
@@ -49,19 +47,21 @@ If you intend to prompt the development of Wiz Community，join us pls！
 
 ![image-20200925170327136](./screenshot/image-20200925170327136.png)
 
-### Download
+### Installation
 
 [Releases](https://github.com/TankNee/Neeto-Vue/releases/latest)
 
 You are also be able to check update in Neeto-Vue Settings Dialog
 
 ![image-20201011103144579](./screenshot/image-20201011103144579.png)
 
-- Arch Linux
+#### Arch Linux
 
-install  and upgrade from [AUR](https://aur.archlinux.org/packages/neeto-vue-bin/) 
+Install and upgrade from [AUR](https://aur.archlinux.org/packages/neeto-vue-bin/)
 
-```
+Thanks to [yjun123](https://github.com/yjun123)'s contribution.
+
+```bash
 # AUR helper
 # yay
 yay -S neeto-vue-bin
@@ -90,6 +90,9 @@ pikaur -S neeto-vue-bin
 
 - Keymap: [vditor keymap](https://ld246.com/guide/markdown)
 
+- Support to send note to flomo app
+
+- Support note lock
 
 ### Attention
 
@@ -100,12 +103,81 @@ pikaur -S neeto-vue-bin
   - `url`: Picture upload api url
   - `paramName`: POST parameter name(eg:`image`)
   - `jsonPath`: Jsonpath of the return value of the image URL`(eg:data.url)`
-  - `customHeader`: custom request http headers,using  standard JSON schema(eg: `{"key":"value"}`)
+  - `customHeader`: custom request http headers,using standard JSON schema(eg: `{"key":"value"}`)
   - `customBody`: custom request body, using standard JSON schema(eg: `{"key":"value"}`)
 
-### [Change Log](./CHANGELOG.md)
+### Change Log
+
+<details>
+<summary>Version change log</summary>
+
+## 2020 12 22 Update 1.0.0
+
+1. Realize the label system
+2. Right click to upload pictures, which depends on picgo
+3. Optimize a lot of details
+
+## 2020 12 22 Update 0.0.23
+
+1. To achieve a simpler image upload method: right click in the editor and select the image to upload.
+2. Temporarily abandon the drag upload mode.
+
+## 2020 12 19 Update 0.0.22
+
+1. Add Chinese readme file
+2. Improve the readme description
+3. Add note locking function to make it easier to check notes.
+
+## 2020 12 17 Update 0.0.21
+
+1. Add flomo API support. Set > > Service > > flomo. Then use the right-click menu in the list to send notes to flomo
+2. Upgrade note editor to v3.7.1
+3. Cache key naming policy adjustment
+
+## 2020 12 03 Update 0.0.20
 
+1. Fixed the problem that the server could not display the folder when it returned the out of order folder list
 
+## 2020 11 30 Update 0.0.19
+
+1. Repair the export failure when there are illegal characters in the note name
+
+## 2020 11 27 Update 0.0.18
+
+1. Export a single file to markdown
+2. Export the entire folder to the specified directory in the format of markdown
+
+## 2020 09 27 Update 0.0.6
+
+1. Better login experience
+2. Optimize the interface without content
+3. Optimize code logic
+
+## 2020 09 26 Update 0.0.5
+
+1. Add GitHub to build automatically
+
+## 2020 09 25 Update 0.0.4
+
+1. Optimize the header display in MacOS
+2. Add vditor shortcut key, [shortcut key to check address]（ https://ld246.com/guide/markdown )
+3. Optimization Icon
+4. Add the Save button in the lower right corner of vdtor, but the outline button in the upper right corner has not been implemented
+5. Learn from wizlite to open the links in notes
+6. Optimize invalid code
+
+## 2020 09 22 Update 0.0.3
+
+1. Version updated to 0.0.3
+2. Add drag and drop image upload
+3. Drag the picture directly into the editor
+4. Remember to click the location of the image to be inserted first, otherwise it will be inserted directly into the place where I last clicked. I have no way to fix it for the time being
+5. Fix the size of editor area
+6. Add notes to modify the date display
+7. Fix the problem of missing translation
+
+</details>
 
 ### License
+
 [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FTankNee%2FNeeto-Vue.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2FTankNee%2FNeeto-Vue?ref=badge_large)
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "neeto.vue.electron",
-  "version": "0.0.22",
+  "version": "1.0.0",
   "description": "An Awesome WizNote Desktop Application",
   "productName": "Neeto-Vue",
   "author": "tanknee <[email protected]>",
@@ -36,7 +36,7 @@
     "quasar": "^1.0.0",
     "sanitize-filename": "^1.6.3",
     "turndown": "^6.0.0",
-    "vditor": "^3.7.1",
+    "vditor": "^3.7.3",
     "vue-i18n": "^8.0.0"
   },
   "devDependencies": {

diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/icon.ico b/public/icon.ico
diff --git a/share/channels.js b/share/channels.js
@@ -1,4 +1,6 @@
 export default {
   exportMarkdownFile: 'export-markdown-file',
-  exportMarkdownFiles: 'export-markdown-files'
+  exportMarkdownFiles: 'export-markdown-files',
+  importImages: 'import-images',
+  uploadImages: 'upload-images'
 }
diff --git a/src-electron/main-process/3rd-part/PicGoUtils.js b/src-electron/main-process/3rd-part/PicGoUtils.js
@@ -0,0 +1,10 @@
+const axios = require('axios')
+/**
+ * upload images
+ * @param {string[]} imagePaths
+ * @returns Promise<response>
+ */
+export async function uploadImages (imagePaths) {
+  const result = await axios.post('http://127.0.0.1:36677/upload', { list: imagePaths }, { timeout: 60 * 1000 })
+  return result.data
+}