Skip to content

Commit

Permalink
feat: #800 发布配置中的文件规则支持手动设置
Browse files Browse the repository at this point in the history
  • Loading branch information
terwer committed Oct 28, 2023
1 parent 63f90e7 commit 69c527f
Show file tree
Hide file tree
Showing 5 changed files with 73 additions and 76 deletions.
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,15 @@
"vue-i18n": "^9.6.1",
"vue-router": "^4.2.5",
"xmlbuilder2": "^3.1.1",
"zhi-blog-api": "^1.46.4",
"zhi-common": "^1.24.4",
"zhi-blog-api": "^1.46.5",
"zhi-common": "^1.25.0",
"zhi-device": "^2.10.0",
"zhi-fetch-middleware": "^0.7.10",
"zhi-github-middleware": "^0.4.7",
"zhi-gitlab-middleware": "^0.6.17",
"zhi-fetch-middleware": "^0.7.11",
"zhi-github-middleware": "^0.4.8",
"zhi-gitlab-middleware": "^0.6.18",
"zhi-lib-base": "^0.8.0",
"zhi-notion-markdown": "^0.1.4",
"zhi-siyuan-api": "^2.11.4",
"zhi-xmlrpc-middleware": "^0.6.10"
"zhi-siyuan-api": "^2.11.5",
"zhi-xmlrpc-middleware": "^0.6.11"
}
}
111 changes: 56 additions & 55 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,14 @@ const syncDefaultPath = (cfg: any) => {
:placeholder="t('setting.blog.type.github.default.path.tip')"
/>
</el-form-item>
<!-- 文件规则 -->
<el-form-item :label="t('setting.blog.mdFilenameRule')">
<el-input v-model="(main.cfg as any).mdFilenameRule" :placeholder="t('setting.blog.mdFilenameRule.tip')" />
</el-form-item>
<!-- 文章预览规则 -->
<el-form-item :label="t('setting.blog.previewPostUrl')">
<el-input v-model="(main.cfg as any).previewPostUrl" :placeholder="t('setting.blog.previewPostUrl.tip')" />
</el-form-item>
<el-form-item>
<a href="javascript:;" @click="toggleAdvance">{{ formData.advanceBtnText }}</a>
</el-form-item>
Expand All @@ -115,18 +123,6 @@ const syncDefaultPath = (cfg: any) => {
<el-form-item :label="t('setting.blog.type.github.site')">
<el-input v-model="(main.cfg as any).site" :placeholder="t('setting.blog.type.github.site.tip')" />
</el-form-item>
<!-- 文件规则 -->
<el-form-item :label="t('setting.blog.mdFilenameRule')">
<el-input
v-model="(main.cfg as any).mdFilenameRule"
:placeholder="t('setting.blog.mdFilenameRule.tip')"
:disabled="true"
/>
</el-form-item>
<!-- 文章预览规则 -->
<el-form-item :label="t('setting.blog.previewPostUrl')">
<el-input v-model="(main.cfg as any).previewPostUrl" :placeholder="t('setting.blog.previewPostUrl.tip')" />
</el-form-item>
</div>
<slot name="main" :cfg="main.cfg" />
</template>
Expand Down
2 changes: 1 addition & 1 deletion src/locales/en_US.ts
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ export default {
"MD file preview rules (place occupied: [user] [repo] [Branch] [docpath]), for example:/[user]/[repo]/blob/[branch]/[docpath]",
"setting.blog.mdFilenameRule": "File rule",
"setting.blog.mdFilenameRule.tip":
"Markdown File Name Rules (Plasma: [yyyy] [MM] [dd] [slug] [filename]), for example: [filename].md or [yyyy]-[MM]-[dd]-[slug].md",
"Markdown File Name Rules (Plasma: [yyyy] [MM] [dd] [slug] [filename]), for example: [filename].md or [slug].md or [yyyy]-[MM]-[dd]-[slug].md",
"setting.blog.username": "Username",
"setting.blog.password": "Password",
"setting.blog.apiurl": "API Url",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/zh_CN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ export default {
"如果不明白原理,请勿修改此选项。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",
"Markdown文件名规则(占位符:[yyyy] [MM] [dd] [slug] [filename]),例如:[filename].md、[slug].md、[yyyy]-[mm]-[dd]-[slug].md",
"setting.blog.pageType": "发布格式",
"setting.blog.validate": "验证",
"setting.blog.save": "保存",
Expand Down

0 comments on commit 69c527f

Please sign in to comment.