chore: release 0.6.0

README.md

@@ -166,9 +166,11 @@ https://terwer.space/post/start-to-get-started-zi0eyk.html
 
   - PicGO 使用注意事项：
 
-  1. 如果你使用的是浏览器插件可以从这里下载配置 PicGO 客户端：https://github.com/Molunerfinn/PicGo/releases
+  1. 如果你使用的是浏览器插件，需要从这里下载配置 PicGO 客户端：https://github.com/Molunerfinn/PicGo/releases
 
-  2. 挂件版无需此操作
+  2. 如果你使用的是思源笔记挂件，需要自行配置已经集成好的 PicGO，挂件版 PicGO
+     配置文件在：`[思源工作空间]/data/widgets/sy-post-publisher/lib/picgo/picgo.cfg.json`
+     ，请参考 PicGO 官方文档进行配置：https://picgo.github.io/PicGo-Core-Doc/zh/guide/config.html#%E6%89%8B%E5%8A%A8%E7%94%9F%E6%88%90
 
 ## 最近更新
 

components/picgo/PicgoIndex.vue

@@ -25,6 +25,12 @@
 
 <template>
   <div class="picgo-body">
+    <el-alert
+      class="top-version-tip"
+      :title="isElectron ? $t('picgo.siyuan.tip') : $t('picgo.chrome.tip')"
+      type="info"
+      :closable="false"
+    />
     <!--
     <el-upload
       action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
@@ -97,7 +103,7 @@ import { getPageId, inSiyuan } from "~/utils/platform/siyuan/siyuanUtil"
 import { isInSiyuanNewWinBrowser } from "~/utils/otherlib/siyuanBrowserUtil"
 import { SiYuanApi } from "~/utils/platform/siyuan/siYuanApi"
 import { removeBom } from "~/utils/strUtil"
-import { isBrowser } from "~/utils/browserUtil"
+import { isBrowser, isElectron } from "~/utils/browserUtil"
 
 const logger = LogFactory.getLogger("components/picgo/PicgoIndex.vue")
 const { t } = useI18n()

locales/en_US.ts

@@ -303,4 +303,8 @@ export default {
   "anki.siyuan.deck.new": "New deck",
   "anki.siyuan.tag": "Tag",
   "anki.siyuan.tag.new": "New tag",
+  "picgo.chrome.tip":
+    "If you are using a browser plug -in, you need to download the configuration Picgo client from here: https://github.com/Molunerfinn/PicGo/releases",
+  "picgo.siyuan.tip":
+    "If you are using Siyuan notes pendants, you need to configure your own integration of PICGO. The pendant version of the PICGO configuration file is:`[Siyuan Workspace]/data/widgets/sy-post-publisher/lib/picgo/picgo.cfg.json`，Please refer to the official picgo document for configuration：https://picgo.github.io/PicGo-Core-Doc/zh/guide/config.html#%E6%89%8B%E5%8A%A8%E7%94%9F%E6%88%90",
 }

locales/zh_CN.ts

@@ -315,4 +315,8 @@ export default {
   "anki.siyuan.deck.new": "新牌组",
   "anki.siyuan.tag": "标签",
   "anki.siyuan.tag.new": "新标签",
+  "picgo.chrome.tip":
+    "您当前使用的是浏览器插件，需要从这里下载配置 PicGO 客户端：https://github.com/Molunerfinn/PicGo/releases",
+  "picgo.siyuan.tip":
+    "您当前使用的是思源笔记挂件，需要自行配置已经集成好的PicGO，挂件版 PicGO 配置文件在：`[思源工作空间]/data/widgets/sy-post-publisher/lib/picgo/picgo.cfg.json`，请参考PicGO官方文档进行配置：https://picgo.github.io/PicGo-Core-Doc/zh/guide/config.html#%E6%89%8B%E5%8A%A8%E7%94%9F%E6%88%90",
 }

public/lib/picgo/picgo.cfg.json.example

@@ -2,7 +2,6 @@
   "picBed": {
     "current": "github",
     "uploader": "github",
-    "rename": "${random}-${year}-${month}-${day}-${hour}-${minute}-${second}",
     "github": {
       "branch": "main",
       "customUrl": "https://img1.terwer.space/api",
@@ -48,39 +47,5 @@
       }
     ]
   },
-  "settings": {
-    "shortKey": {
-      "picgo:upload": {
-        "enable": true,
-        "key": "CommandOrControl+Shift+P",
-        "name": "upload",
-        "label": "快捷上传"
-      }
-    },
-    "server": {
-      "port": 36677,
-      "host": "127.0.0.1",
-      "enable": true
-    },
-    "privacyEnsure": true,
-    "showUpdateTip": true,
-    "useBuiltinClipboard": false,
-    "autoRename": true,
-    "autoStart": true
-  },
-  "picgoPlugins": {
-    "picgo-plugin-watermark": false
-  },
-  "debug": true,
-  "PICGO_ENV": "GUI",
-  "needReload": false,
-  "picgo-plugin-watermark": {
-    "fontFamily": "/Users/terwer/Documents/code/picgo-plugin-watermark/fonts/Arial-Unicode-MS.ttf",
-    "fontSize": "14px",
-    "image": "/Users/terwer/Documents/code/picgo-plugin-watermark/fonts/terwer.png",
-    "minSize": "100*100",
-    "position": "rt",
-    "text": "terwer",
-    "textColor": "#b2b2b2"
-  }
+  "debug": true
 }

scripts/ext.sh

@@ -31,6 +31,7 @@ cp ./LICENSE ./dist/
 # 删除siyuan挂件专属文件
 rm ./dist/widget.json
 rm ./dist/lib/siyuanhook.js
+rm -rf ./dist/lib/picgo
 
 # 删除火狐配置
 rm -rf ./dist/mv2

scripts/extDev.sh

@@ -31,6 +31,7 @@ cp ./LICENSE ./dist/
 # 删除siyuan挂件专属文件
 rm ./dist/widget.json
 rm ./dist/lib/siyuanhook.js
+rm -rf ./dist/lib/picgo
 
 # 删除火狐配置
 rm -rf ./dist/mv2

scripts/widget.sh

@@ -33,6 +33,9 @@ rm ./dist/manifest*.json
 # 删除Firefox的专属文件
 rm -rf ./dist/mv2
 
+# Picgo配置文件
+cp ./dist/lib/picgo/picgo.cfg.json.example ./dist/lib/picgo/picgo.cfg.json
+
 rm -rf ../my-note-docker/workspace/SiYuan/data/widgets/sy-post-publisher/
 mkdir ../my-note-docker/workspace/SiYuan/data/widgets/sy-post-publisher
 cp -r ./dist/* ../my-note-docker/workspace/SiYuan/data/widgets/sy-post-publisher/