diff --git a/package.json b/package.json index 1cc43e39..c84bd64e 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "syncWidgetRepo": "python scripts/sync_widget_repo.py" }, "devDependencies": { + "@intlify/vite-plugin-vue-i18n": "^7.0.0", "@terwer/esbuild-config-custom": "^1.0.12", "@terwer/eslint-config-custom": "^1.3.6", "@types/node": "^18.17.3", @@ -61,13 +62,13 @@ "vue-router": "^4.2.4", "xmlbuilder2": "^3.1.1", "zhi-blog-api": "^1.20.11", - "zhi-common": "^1.11.9", + "zhi-common": "^1.11.10", "zhi-device": "^2.3.0", - "zhi-fetch-middleware": "^0.2.9", - "zhi-github-middleware": "^0.1.6", + "zhi-fetch-middleware": "^0.2.10", + "zhi-github-middleware": "^0.1.7", "zhi-lib-base": "^0.4.4", "zhi-notion-markdown": "^0.1.1", - "zhi-siyuan-api": "^2.0.0", - "zhi-xmlrpc-middleware": "^0.4.4" + "zhi-siyuan-api": "^2.0.1", + "zhi-xmlrpc-middleware": "^0.4.5" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ee374f34..4996a340 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -54,17 +54,17 @@ dependencies: specifier: ^1.20.11 version: 1.20.11 zhi-common: - specifier: ^1.11.9 - version: 1.11.9 + specifier: ^1.11.10 + version: 1.11.10 zhi-device: specifier: ^2.3.0 version: 2.3.0 zhi-fetch-middleware: - specifier: ^0.2.9 - version: 0.2.9 + specifier: ^0.2.10 + version: 0.2.10 zhi-github-middleware: - specifier: ^0.1.6 - version: 0.1.6 + specifier: ^0.1.7 + version: 0.1.7 zhi-lib-base: specifier: ^0.4.4 version: 0.4.4 @@ -72,13 +72,16 @@ dependencies: specifier: ^0.1.1 version: 0.1.1 zhi-siyuan-api: - specifier: ^2.0.0 - version: 2.0.0 + specifier: ^2.0.1 + version: 2.0.1 zhi-xmlrpc-middleware: - specifier: ^0.4.4 - version: 0.4.4 + specifier: ^0.4.5 + version: 0.4.5 devDependencies: + '@intlify/vite-plugin-vue-i18n': + specifier: ^7.0.0 + version: 7.0.0(vite@4.4.8)(vue-i18n@9.2.2) '@terwer/esbuild-config-custom': specifier: ^1.0.12 version: 1.0.12(@types/minimist@1.2.2)(dotenv@16.3.1)(esbuild-plugin-copy@2.1.1)(esbuild-plugin-d.ts@1.1.0)(esbuild-plugin-ifdef@1.0.1)(esbuild-plugin-inline-image@0.0.9)(esbuild-plugin-vue3@0.3.2)(esbuild-style-plugin@1.6.2)(esbuild@0.17.19)(minimist@1.2.8)(rimraf@4.4.1)(stylus@0.59.0) @@ -731,6 +734,26 @@ packages: resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==} dev: true + /@intlify/bundle-utils@3.4.0(vue-i18n@9.2.2): + resolution: {integrity: sha512-2UQkqiSAOSPEHMGWlybqWm4G2K0X+FyYho5AwXz6QklSX1EY5EDmOSxZmwscn2qmKBnp6OYsme5kUrnN9xrWzQ==} + engines: {node: '>= 12'} + peerDependencies: + petite-vue-i18n: '*' + vue-i18n: '*' + peerDependenciesMeta: + petite-vue-i18n: + optional: true + vue-i18n: + optional: true + dependencies: + '@intlify/message-compiler': 9.3.0-beta.25 + '@intlify/shared': 9.3.0-beta.25 + jsonc-eslint-parser: 1.4.1 + source-map: 0.6.1 + vue-i18n: 9.2.2(vue@3.3.4) + yaml-eslint-parser: 0.3.2 + dev: true + /@intlify/core-base@9.2.2: resolution: {integrity: sha512-JjUpQtNfn+joMbrXvpR4hTF8iJQ2sEFzzK3KIESOx+f+uwIjgw20igOyaIdhfsVVBCds8ZM64MoeNSx+PHQMkA==} engines: {node: '>= 14'} @@ -739,14 +762,12 @@ packages: '@intlify/message-compiler': 9.2.2 '@intlify/shared': 9.2.2 '@intlify/vue-devtools': 9.2.2 - dev: false /@intlify/devtools-if@9.2.2: resolution: {integrity: sha512-4ttr/FNO29w+kBbU7HZ/U0Lzuh2cRDhP8UlWOtV9ERcjHzuyXVZmjyleESK6eVP60tGC9QtQW9yZE+JeRhDHkg==} engines: {node: '>= 14'} dependencies: '@intlify/shared': 9.2.2 - dev: false /@intlify/message-compiler@9.2.2: resolution: {integrity: sha512-IUrQW7byAKN2fMBe8z6sK6riG1pue95e5jfokn8hA5Q3Bqy4MBJ5lJAofUsawQJYHeoPJ7svMDyBaVJ4d0GTtA==} @@ -754,12 +775,51 @@ packages: dependencies: '@intlify/shared': 9.2.2 source-map: 0.6.1 - dev: false + + /@intlify/message-compiler@9.3.0-beta.25: + resolution: {integrity: sha512-uT7ybqKoDEw1XITQYnTYjWgZnpCDmHv9e3D4MmJDqHl2qCm6anzdUXWKHUhqR87Ha9Z8Rl44v40iSI/4NUbppQ==} + engines: {node: '>= 16'} + dependencies: + '@intlify/shared': 9.3.0-beta.25 + source-map-js: 1.0.2 + dev: true /@intlify/shared@9.2.2: resolution: {integrity: sha512-wRwTpsslgZS5HNyM7uDQYZtxnbI12aGiBZURX3BTR9RFIKKRWpllTsgzHWvj3HKm3Y2Sh5LPC1r0PDCKEhVn9Q==} engines: {node: '>= 14'} - dev: false + + /@intlify/shared@9.3.0-beta.25: + resolution: {integrity: sha512-Zg+ECV9RPdp227tCJOgvPb+S3i651nf4kKHsMojSyWCppVK/4NFuDrBG2lIQSQL6Iq5LKVr5MkezHCW2NBTQRg==} + engines: {node: '>= 16'} + dev: true + + /@intlify/vite-plugin-vue-i18n@7.0.0(vite@4.4.8)(vue-i18n@9.2.2): + resolution: {integrity: sha512-2TbDOQ8XD+vkc0s5OFmr+IY/k4mYMC7pzvx0xGQn+cU/ev314+yi7Z7N7rWcBgiYk1WOUalbGSo3d4nJDxOOyw==} + engines: {node: '>= 14.6'} + deprecated: This plugin support until Vite 3. If you would like to use on Vite 4, please use @intlify/unplugin-vue-i18n + peerDependencies: + petite-vue-i18n: '*' + vite: ^2.9.0 || ^3.0.0 + vue-i18n: '*' + peerDependenciesMeta: + petite-vue-i18n: + optional: true + vite: + optional: true + vue-i18n: + optional: true + dependencies: + '@intlify/bundle-utils': 3.4.0(vue-i18n@9.2.2) + '@intlify/shared': 9.3.0-beta.25 + '@rollup/pluginutils': 4.2.1 + debug: 4.3.4 + fast-glob: 3.3.1 + source-map: 0.6.1 + vite: 4.4.8(@types/node@18.17.3)(stylus@0.59.0) + vue-i18n: 9.2.2(vue@3.3.4) + transitivePeerDependencies: + - supports-color + dev: true /@intlify/vue-devtools@9.2.2: resolution: {integrity: sha512-+dUyqyCHWHb/UcvY1MlIpO87munedm3Gn6E9WWYdWrMuYLcoIoOEVDWSS8xSwtlPU+kA+MEQTP6Q1iI/ocusJg==} @@ -767,7 +827,6 @@ packages: dependencies: '@intlify/core-base': 9.2.2 '@intlify/shared': 9.2.2 - dev: false /@isaacs/cliui@8.0.2: resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} @@ -1754,7 +1813,6 @@ packages: /@vue/devtools-api@6.5.0: resolution: {integrity: sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q==} - dev: false /@vue/language-core@1.8.8(typescript@5.1.6): resolution: {integrity: sha512-i4KMTuPazf48yMdYoebTkgSOJdFraE4pQf0B+FTOFkbB+6hAfjrSou/UmYWRsWyZV6r4Rc6DDZdI39CJwL0rWw==} @@ -1885,6 +1943,14 @@ packages: resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} dev: true + /acorn-jsx@5.3.2(acorn@7.4.1): + resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} + peerDependencies: + acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 + dependencies: + acorn: 7.4.1 + dev: true + /acorn-jsx@5.3.2(acorn@8.10.0): resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} peerDependencies: @@ -1898,6 +1964,12 @@ packages: engines: {node: '>=0.4.0'} dev: true + /acorn@7.4.1: + resolution: {integrity: sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==} + engines: {node: '>=0.4.0'} + hasBin: true + dev: true + /acorn@8.10.0: resolution: {integrity: sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==} engines: {node: '>=0.4.0'} @@ -3471,6 +3543,18 @@ packages: estraverse: 5.3.0 dev: true + /eslint-utils@2.1.0: + resolution: {integrity: sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==} + engines: {node: '>=6'} + dependencies: + eslint-visitor-keys: 1.3.0 + dev: true + + /eslint-visitor-keys@1.3.0: + resolution: {integrity: sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==} + engines: {node: '>=4'} + dev: true + /eslint-visitor-keys@3.4.2: resolution: {integrity: sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -3522,6 +3606,15 @@ packages: - supports-color dev: true + /espree@6.2.1: + resolution: {integrity: sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==} + engines: {node: '>=6.0.0'} + dependencies: + acorn: 7.4.1 + acorn-jsx: 5.3.2(acorn@7.4.1) + eslint-visitor-keys: 1.3.0 + dev: true + /espree@9.6.1: resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -4283,6 +4376,17 @@ packages: resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==} dev: true + /jsonc-eslint-parser@1.4.1: + resolution: {integrity: sha512-hXBrvsR1rdjmB2kQmUjf1rEIa+TqHBGMge8pwi++C+Si1ad7EjZrJcpgwym+QGK/pqTx+K7keFAtLlVNdLRJOg==} + engines: {node: '>=8.10.0'} + dependencies: + acorn: 7.4.1 + eslint-utils: 2.1.0 + eslint-visitor-keys: 1.3.0 + espree: 6.2.1 + semver: 6.3.1 + dev: true + /jsonc-parser@3.2.0: resolution: {integrity: sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==} dev: true @@ -5580,6 +5684,11 @@ packages: hasBin: true dev: true + /semver@6.3.1: + resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==} + hasBin: true + dev: true + /semver@7.3.8: resolution: {integrity: sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==} engines: {node: '>=10'} @@ -6527,7 +6636,6 @@ packages: '@intlify/vue-devtools': 9.2.2 '@vue/devtools-api': 6.5.0 vue: 3.3.4 - dev: false /vue-router@4.2.4(vue@3.3.4): resolution: {integrity: sha512-9PISkmaCO02OzPVOMq2w82ilty6+xJmQrarYZDkjZBfl4RvYAlt4PKnEX21oW4KTtWfa9OuO/b3qk1Od3AEdCQ==} @@ -6692,6 +6800,14 @@ packages: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} dev: true + /yaml-eslint-parser@0.3.2: + resolution: {integrity: sha512-32kYO6kJUuZzqte82t4M/gB6/+11WAuHiEnK7FreMo20xsCKPeFH5tDBU7iWxR7zeJpNnMXfJyXwne48D0hGrg==} + dependencies: + eslint-visitor-keys: 1.3.0 + lodash: 4.17.21 + yaml: 1.10.2 + dev: true + /yaml@1.10.2: resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==} engines: {node: '>= 6'} @@ -6718,8 +6834,8 @@ packages: zhi-lib-base: 0.4.4 dev: false - /zhi-common@1.11.9: - resolution: {integrity: sha512-X5++usNYXKkP6XizdyoFiRwlnqGsCJXr2h/K28vXDFZNgXHkPPEP2cYrywDYKdL2nagAigwVF2hG/tPeQFUS0g==} + /zhi-common@1.11.10: + resolution: {integrity: sha512-uUg5STMDV25jbKTud//LlW+wsmWWVT/Csesn4S+nYKyrmRcf/vHzK5KhCKphqVz6ZQGsxPxi3hCvAnUoPn/Ovw==} dependencies: zhi-lib-base: 0.4.4 dev: false @@ -6728,20 +6844,20 @@ packages: resolution: {integrity: sha512-we04mMt4BEqeKDxoqdJQsDFYImYlcp/yaAIkpxpMGg+9tBURfNeHPHIHkFias9VbM8yuk6xjAX6B2xJjvYE/iw==} dev: false - /zhi-fetch-middleware@0.2.9: - resolution: {integrity: sha512-+nV6+jDG6jIN7JrAgRtMHZ8UY8rpJFPD1CbvuRr9n8H9M2/Kigv6YfxEbgqmR/X1l3L0+WcvNMyYi1TOGLsmRw==} + /zhi-fetch-middleware@0.2.10: + resolution: {integrity: sha512-B+/XIqHhd7Xy3LErR/tiEfwDFW2PdkYy8X7+vYpCwnXbGqGHtjinK3LqDZnOv0/0e/NHsmycVeuEaI4GORMaTw==} dependencies: - zhi-common: 1.11.9 + zhi-common: 1.11.10 zhi-device: 2.3.0 zhi-lib-base: 0.4.4 dev: false - /zhi-github-middleware@0.1.6: - resolution: {integrity: sha512-GUAzrLlMzEaexkvK5DJjtMli9ShLkvX+TtBk7jFWKwHxhjE1EnW6HXFlaXmpFc8AiJt9oO9skzL5VA/sHQOlOg==} + /zhi-github-middleware@0.1.7: + resolution: {integrity: sha512-pnFsxwzFAkSvgH/cPEM73UUVUWWG1MgNWLM38179KDasHj6ipVgyznfnA5u2I0FbrFT/qxZv0muUFqCItjXuVw==} dependencies: '@octokit/core': 5.0.0 js-base64: 3.7.5 - zhi-common: 1.11.9 + zhi-common: 1.11.10 zhi-lib-base: 0.4.4 dev: false @@ -6759,18 +6875,18 @@ packages: - supports-color dev: false - /zhi-siyuan-api@2.0.0: - resolution: {integrity: sha512-kU9tfNJE32I1oio53DNL5g6r/PjiG8Z5C9D9c6+JsIZkb6G8/VIiU7xEuIC7O9bXxX9s10Llff8dK1EGCOw9Lw==} + /zhi-siyuan-api@2.0.1: + resolution: {integrity: sha512-jwd1EVoA7Tr1n0ExxD1Xo8WCZPUG/zl4B48GMkA4s8FeMA55XcPt9qsnGEFky2WbW/QaIxzfx2MwYOfjchtH6A==} dependencies: zhi-blog-api: 1.20.11 - zhi-common: 1.11.9 + zhi-common: 1.11.10 zhi-lib-base: 0.4.4 dev: false - /zhi-xmlrpc-middleware@0.4.4: - resolution: {integrity: sha512-uzKP8ae4YE/ltIYlf6zVotSPtTEt6XlML0QrIj6H2UEFjdYlPgAj5fTiBM+bbQk1vOO5TXCIXfESdg9ZrN4ekA==} + /zhi-xmlrpc-middleware@0.4.5: + resolution: {integrity: sha512-vBFpwOUb2ibBhJCZxoSdftws7IyzXUoXtsF7qm/l851aPj3afBTKLYAcagmh7YHfplGfIYSddbghKqbVAgqEAA==} dependencies: - zhi-common: 1.11.9 + zhi-common: 1.11.10 zhi-device: 2.3.0 zhi-lib-base: 0.4.4 dev: false diff --git a/src/adaptors/api/base/CommonblogConfig.ts b/src/adaptors/api/base/CommonblogConfig.ts index 96904274..8338e747 100644 --- a/src/adaptors/api/base/CommonblogConfig.ts +++ b/src/adaptors/api/base/CommonblogConfig.ts @@ -125,6 +125,11 @@ export class CommonblogConfig extends BlogConfig { */ public usernameEnabled = false + /** + * 是否展示Token设置地址 + */ + public showTokenTip = false + constructor(home: string, apiUrl: string, username: string, password: string, middlewareUrl?: string) { super() this.home = home diff --git a/src/adaptors/api/base/github/CommonGithubConfig.ts b/src/adaptors/api/base/github/CommonGithubConfig.ts index 553084a5..88017b44 100644 --- a/src/adaptors/api/base/github/CommonGithubConfig.ts +++ b/src/adaptors/api/base/github/CommonGithubConfig.ts @@ -50,12 +50,16 @@ class CommonGithubConfig extends CommonblogConfig { githubBranch: string, middlewareUrl?: string ) { - super("https://github.com", "", githubUsername, githubAuthToken, middlewareUrl) + super("https://github.com", "https://api.github.com", githubUsername, githubAuthToken, middlewareUrl) + this.username = githubUsername - this.password = githubAuthToken this.usernameEnabled = true + this.password = githubAuthToken this.passwordType = PasswordType.PasswordType_Token + this.tokenSettingUrl = "https://github.com/settings/tokens" + this.showTokenTip = true + this.previewUrl = "/[user]/[repo]/blob/[branch]/[docpath]" this.githubRepo = githubRepo this.githubBranch = githubBranch this.defaultPath = "/" diff --git a/src/adaptors/api/base/metaweblog/MetaweblogConfig.ts b/src/adaptors/api/base/metaweblog/MetaweblogConfig.ts index 695f1fac..80bc6bfa 100644 --- a/src/adaptors/api/base/metaweblog/MetaweblogConfig.ts +++ b/src/adaptors/api/base/metaweblog/MetaweblogConfig.ts @@ -89,11 +89,6 @@ export class MetaweblogConfig extends CommonblogConfig { */ public override middlewareUrl = "" - /** - * 是否展示Token设置地址 - */ - public showTokenTip = false - constructor(home: string, apiUrl: string, username: string, password: string, middlewareUrl?: string) { super(home, apiUrl, username, password, middlewareUrl) diff --git a/src/adaptors/api/hexo/hexoConfig.ts b/src/adaptors/api/hexo/hexoConfig.ts index 178573cb..f80af73d 100644 --- a/src/adaptors/api/hexo/hexoConfig.ts +++ b/src/adaptors/api/hexo/hexoConfig.ts @@ -43,6 +43,7 @@ class HexoConfig extends CommonGithubConfig { super(githubUsername, githubAuthToken, githubRepo, githubBranch, middlewareUrl) this.tokenSettingUrl = "https://github.com/settings/tokens" + this.showTokenTip = true this.defaultPath = "source/_posts" this.previewUrl = "/[user]/[repo]/blob/[branch]/[docpath]" // this.previewPostUrl = "/post/[postid].html" diff --git a/src/components/set/publish/singleplatform/base/CommonBlogSetting.vue b/src/components/set/publish/singleplatform/base/CommonBlogSetting.vue index 19d02fdc..57d718f9 100644 --- a/src/components/set/publish/singleplatform/base/CommonBlogSetting.vue +++ b/src/components/set/publish/singleplatform/base/CommonBlogSetting.vue @@ -28,7 +28,7 @@ import { createAppLogger } from "~/src/utils/appLogger.ts" import { AppInstance } from "~/src/appInstance.ts" import { useVueI18n } from "~/src/composables/useVueI18n.ts" import { useSettingStore } from "~/src/stores/useSettingStore.ts" -import { onMounted, reactive, ref } from "vue" +import { onMounted, reactive, ref, toRaw } from "vue" import { DynamicConfig, DynamicJsonCfg, getDynCfgByKey, setDynamicJsonCfg } from "~/src/platforms/dynamicConfig.ts" import { SypConfig } from "~/syp.config.ts" import { CommonblogConfig } from "~/src/adaptors/api/base/CommonblogConfig.ts" @@ -159,6 +159,10 @@ const valiConf = async () => { } const saveConf = async (hideTip?: any) => { + logger.debug("prepare to store cfg=>", { + cfg: toRaw(formData.cfg), + }) + logger.debug("Commonblog通用Setting保存配置") // 平台使用配置 formData.setting[props.apiType] = formData.cfg @@ -246,6 +250,7 @@ onMounted(async () => { class="top-tip" type="info" /> + { :placeholder="props.cfg.placeholder.passwordPlaceholder" /> {{ t("setting.common.token.gen") }}：{{ props.cfg.tokenSettingUrl }}333{{ t("setting.common.token.gen") }}：{{ props.cfg.tokenSettingUrl }} + @@ -345,6 +351,7 @@ onMounted(async () => { {{ t("setting.blog.save") }} {{ t("setting.blog.cancel") }} + diff --git a/src/components/set/publish/singleplatform/base/impl/CommonGithubSetting.vue b/src/components/set/publish/singleplatform/base/impl/CommonGithubSetting.vue index b8ff4dbb..c7439305 100644 --- a/src/components/set/publish/singleplatform/base/impl/CommonGithubSetting.vue +++ b/src/components/set/publish/singleplatform/base/impl/CommonGithubSetting.vue @@ -24,9 +24,9 @@ --> diff --git a/src/locales/en_US.ts b/src/locales/en_US.ts index e21a302b..5a1858ad 100644 --- a/src/locales/en_US.ts +++ b/src/locales/en_US.ts @@ -146,6 +146,8 @@ export default { "setting.blog.type.github.email": "Email", "setting.blog.type.github.email.tip": "Email", "setting.blog.url": "Blog addr", + "setting.blog.github.url.tip": "Github homepage address", + "setting.blog.github.apiurl.tip": "Github's REST API address, typically: https://api.github.com", "setting.blog.previewUrl": "Preview rule", "setting.blog.previewUrl.tip": "Preview Rules (place occupied: [yyyy] [mm] [dd] [postid]), for example:/post/[postid].html or /[cats]/[yyyy]/[mm]/[dd]/[[dd]/[postid].html", @@ -415,6 +417,7 @@ export default { "setting.conf.password.tip": "Confluence access token, you can go to your Atlassian account to get", "setting.conf.apiUrl.tip": "You can go to https://developper.atlassian.com/Cloud/confluence/rest/v1/1/1/", "setting.conf.previewUrl.tip": "CONFLUENCE platform articles preview rules, usually:/pages/[postid]", + "setting.picgo.refer.to": "For details, please refer to:", "setting.picgo.refer.to.online.doc": "Picgo configuration online documentation", "setting.picgo.picbed": "Picbed setting", diff --git a/src/locales/zh_CN.ts b/src/locales/zh_CN.ts index 315573fa..60c3c055 100644 --- a/src/locales/zh_CN.ts +++ b/src/locales/zh_CN.ts @@ -148,15 +148,17 @@ export default { "setting.blog.type.github.email": "邮箱", "setting.blog.type.github.email.tip": "邮箱", "setting.blog.url": "博客网址", + "setting.blog.github.url.tip": "Github首页地址", "setting.blog.username": "账号", "setting.blog.password": "密码/Token", "setting.blog.apiurl": "API地址", + "setting.blog.github.apiurl.tip": "Github 的 REST API 地址，通常是：https://api.github.com", "setting.blog.previewUrl": "预览规则", "setting.blog.previewUrl.tip": "预览规则（占位符：[yyyy] [MM] [dd] [postid]），例如：/post/[postid].html 或者 /[cats]/[yyyy]/[mm]/[dd]/[postid].html", "setting.blog.previewMdUrl": "MD预览规则", "setting.blog.previewMdUrl.tip": - "MD文件预览规则（占位符：[user] [repo] [branch] [docpath]），例如：/[user]/[repo]/blob/[branch]/[docpath]", + "MD文件预览规则（占位符：[user] [repo] [branch] [docpath]），通常是：/[user]/[repo]/blob/[branch]/[docpath]", "setting.blog.mdFilenameRule": "文件规则", "setting.blog.mdFilenameRule.tip": "Markdown文件名规则（占位符：[yyyy] [MM] [dd] [slug] [filename] ），例如：[filename].md 或者 [yyyy]-[mm]-[dd]-[slug].md", @@ -404,12 +406,14 @@ export default { "setting.jvue.password.tip": "JVue平台密码", "setting.jvue.apiUrl.tip": "JVue平台的xmlrpc远程发布地址，通常固定是：https://<平台地址>/xmlrpc", "setting.jvue.previewUrl.tip": "JVue平台的文章预览规则，通常是：/post/[postid].html", + "setting.conf.home.tip": "Confluence Cloud，首页，通常是：https://<您的用户名>.atlassian.net/wiki/spaces/<空间名>", "setting.conf.username.tip": "Confluence登录名，可前往您的atlassian账户获取", "setting.conf.password.tip": "Confluence访问令牌，可前往您的atlassian账户获取", "setting.conf.apiUrl.tip": "可前往 https://developer.atlassian.com/cloud/confluence/rest/v1/#api-wiki-rest-api-content-get 查看文档", "setting.conf.previewUrl.tip": "Confluence平台文章预览规则，通常是：/pages/[postid]", + "setting.picgo.refer.to": "详情请参考：", "setting.picgo.refer.to.online.doc": "PicGO配置在线文档", "setting.picgo.picbed": "图床设置", @@ -523,5 +527,6 @@ export default { "main.publish.remove": "批量删除", "setting.blog.knowledge.space": "知识空间/知识库", "main.data.empty": "暂无数据", - "enableKnowledgeSpace.Tips": "验证通过之后，将列出可用的 [[knowledge-space-title]] 列表，您可以根据需要修改默认 [[knowledge-space-title]] 并保存", + "enableKnowledgeSpace.Tips": + "验证通过之后，将列出可用的 [[knowledge-space-title]] 列表，您可以根据需要修改默认 [[knowledge-space-title]] 并保存", } diff --git a/vite.config.ts b/vite.config.ts index 947c0261..67412f68 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -9,6 +9,7 @@ import AutoImport from "unplugin-auto-import/vite" import Components from "unplugin-vue-components/vite" import { ElementPlusResolver } from "unplugin-vue-components/resolvers" import { nodePolyfills } from "vite-plugin-node-polyfills" +import vueI18n from "@intlify/vite-plugin-vue-i18n" // methods start const getAppBase = (isSiyuanBuild: boolean, isWidgetBuild: boolean, isStaticBuild: boolean): string => { @@ -88,6 +89,9 @@ console.log("isStaticBuild=>", isStaticBuild) export default defineConfig({ plugins: [ vue(), + vueI18n({ + include: path.resolve(__dirname, "./path/to/src/locales/**"), + }), AutoImport({ resolvers: [ElementPlusResolver()], @@ -165,6 +169,7 @@ export default defineConfig({ resolve: { alias: { "~": path.resolve(__dirname, "./"), + "vue-i18n": "vue-i18n/dist/vue-i18n.runtime.esm-bundler.js", }, },