From 7c8b3f301c7deab67d1d8fa11874e35141398329 Mon Sep 17 00:00:00 2001 From: terwer Date: Thu, 9 Feb 2023 01:02:39 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20#341=20=E6=95=B4=E5=90=88=E6=89=80?= =?UTF-8?q?=E6=9C=89=E9=85=8D=E7=BD=AE=EF=BC=8C=E6=8F=90=E4=BE=9B=E5=8D=95?= =?UTF-8?q?=E4=B8=80=E7=BB=9F=E4=B8=80=E7=9A=84=E9=85=8D=E7=BD=AE=E5=85=A5?= =?UTF-8?q?=E5=8F=A3=E9=A1=B5=E9=9D=A2-=E6=95=B4=E5=90=88=E6=80=9D?= =?UTF-8?q?=E6=BA=90=E5=9C=B0=E5=9D=80=E9=85=8D=E7=BD=AE=E5=88=B0=E5=BA=95?= =?UTF-8?q?=E9=83=A8=E7=BB=9F=E4=B8=80=E7=9A=84=E5=81=8F=E5=A5=BD=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/style.css | 35 ++- components/blog/BlogMain.vue | 4 +- components/picgo/PicgoSetting.vue | 20 +- components/publish/PublishService.vue | 2 +- components/publish/tab/DynamicPlatform.vue | 4 +- components/publish/tab/PlatformSetting.vue | 2 +- components/publish/tab/ServiceSwitch.vue | 4 +- .../{publish/tab => set}/GeneralSetting.vue | 14 +- components/set/SetIndex.vue | 14 +- .../tab => set}/preference/ChangeLocal.vue | 4 +- .../preference/PreferenceSetting.vue | 2 +- components/set/siyuanApiSetting.vue | 197 +++++++++++++++++ components/transport/TransportSelect.vue | 28 +++ composables/picgo/picgoCommonCom.ts | 4 +- composables/picgo/picgoUploadCom.ts | 4 +- layouts/default/DefaultFooter.vue | 208 ++++-------------- layouts/default/DefaultHeader.vue | 7 +- locales/en_US.ts | 1 + locales/zh_CN.ts | 5 +- pages/index/App.vue | 4 +- public/lib/siyuan/theme.js | 4 +- utils/deviceUtil.ts | 4 +- utils/otherlib/ChromeUtil.js | 4 +- utils/otherlib/confUtil.js | 4 +- utils/otherlib/siyuanBrowserUtil.js | 4 +- .../import/PRE_DEFINED_PLATFORM_CONSTANTS.ts | 0 .../import/platformImportUtil.ts} | 2 +- utils/{ => platform}/import/pre.json | 0 utils/platform/siyuan/siyuanUtil.ts | 2 +- utils/transport/settingExportUtil.ts | 26 +++ utils/transport/settingImportUtil.ts | 26 +++ 31 files changed, 420 insertions(+), 219 deletions(-) rename components/{publish/tab => set}/GeneralSetting.vue (85%) rename components/{publish/tab => set}/preference/ChangeLocal.vue (95%) rename components/{publish/tab => set}/preference/PreferenceSetting.vue (99%) create mode 100644 components/set/siyuanApiSetting.vue create mode 100644 components/transport/TransportSelect.vue rename utils/{ => platform}/import/PRE_DEFINED_PLATFORM_CONSTANTS.ts (100%) rename utils/{import/importUtil.ts => platform/import/platformImportUtil.ts} (98%) rename utils/{ => platform}/import/pre.json (100%) create mode 100644 utils/transport/settingExportUtil.ts create mode 100644 utils/transport/settingImportUtil.ts diff --git a/assets/style.css b/assets/style.css index 1be767e2..713fe318 100644 --- a/assets/style.css +++ b/assets/style.css @@ -141,12 +141,43 @@ code { margin-top: 10px !important; } +.el-card__body { + text-align: left !important; + --el-card-padding: 10px; +} + .el-dialog { --el-dialog-width: 88% !important; --el-dialog-margin-top: 10vh; margin: var(--el-dialog-margin-top, 15vh) auto 0 5.5%; + text-align: left !important; } -.el-card__body { - --el-card-padding: 10px; +.el-dialog__header { + text-align: left !important; +} + +.el-dialog__body { + padding-bottom: 10px !important; +} + +.dialog-action { + margin: calc(var(--el-dialog-padding-primary) + 16px) + var(--el-dialog-padding-primary); + margin-bottom: 0; + padding-bottom: 0; + padding-right: 0; + margin-right: 0; +} + +.dialog-action .el-form-item { + margin-bottom: 0 !important; +} + +.dialog-action .el-form-item__content { + justify-content: flex-end; +} + +.dialog-action .el-form-item__content .el-button { + margin-left: 10px; } diff --git a/components/blog/BlogMain.vue b/components/blog/BlogMain.vue index 08e98b81..b82065ee 100644 --- a/components/blog/BlogMain.vue +++ b/components/blog/BlogMain.vue @@ -185,7 +185,7 @@ import { onMounted, ref } from "vue" import { LogFactory } from "~/utils/logUtil" import { Post } from "~/utils/models/post" import { goToPage } from "~/utils/otherlib/ChromeUtil" -import { getPageId, isInSiyuan } from "~/utils/platform/siyuan/siyuanUtil" +import { getPageId, isInSiyuanWidget } from "~/utils/platform/siyuan/siyuanUtil" import { SiYuanApiAdaptor } from "~/utils/platform/siyuan/siYuanApiAdaptor" import { mdToHtml, removeTitleNumber } from "~/utils/htmlUtil" import { getByLength } from "~/utils/strUtil" @@ -447,7 +447,7 @@ const handleNewWinPicgo = (index, row) => { } const initPage = async () => { - isInSiyuanEnv.value = isInSiyuan() + isInSiyuanEnv.value = isInSiyuanWidget() const publishCfg = getPublishCfg() isNewWin.value = parseBoolean(publishCfg.newWin) diff --git a/components/picgo/PicgoSetting.vue b/components/picgo/PicgoSetting.vue index 03292d1d..bba60478 100644 --- a/components/picgo/PicgoSetting.vue +++ b/components/picgo/PicgoSetting.vue @@ -29,7 +29,9 @@
{{ $t("picgo.siyuan.tip") }} 。 从 0.7.0+ 开始，支持多个配置文件切换，当前系统默认的 PicGO 配置文件为： - 
{{ picgoCfg }}
+ 
{{ picgoUtil.getPicgoCfgPath() }}
。 {{ $t("setting.picgo.refer.to") }}
-

{{ $t("picgo.chrome.tip") }} 。

-

{{ $t("picgo.pic.setting.no.tip") }} 。

+
+

{{ $t("picgo.chrome.tip") }} 。

+

{{ $t("picgo.pic.setting.no.tip") }} 。

+
+ + diff --git a/components/transport/TransportSelect.vue b/components/transport/TransportSelect.vue new file mode 100644 index 00000000..633df424 --- /dev/null +++ b/components/transport/TransportSelect.vue @@ -0,0 +1,28 @@ + + + diff --git a/composables/picgo/picgoCommonCom.ts b/composables/picgo/picgoCommonCom.ts index 3afd3b34..1ca391ca 100644 --- a/composables/picgo/picgoCommonCom.ts +++ b/composables/picgo/picgoCommonCom.ts @@ -24,7 +24,7 @@ */ import { reactive } from "vue" -import { isInSiyuan } from "~/utils/platform/siyuan/siyuanUtil" +import { isInSiyuanWidget } from "~/utils/platform/siyuan/siyuanUtil" import { isInSiyuanNewWinBrowser } from "~/utils/otherlib/siyuanBrowserUtil" import envUtil from "~/utils/envUtil" @@ -36,7 +36,7 @@ import envUtil from "~/utils/envUtil" export const usePicgoCommon = () => { // private data const isDev = envUtil.isDev - const isSiyuanOrSiyuanNewWin = isInSiyuan() || isInSiyuanNewWinBrowser() + const isSiyuanOrSiyuanNewWin = isInSiyuanWidget() || isInSiyuanNewWinBrowser() // public data const picgoCommonData = reactive({ diff --git a/composables/picgo/picgoUploadCom.ts b/composables/picgo/picgoUploadCom.ts index 5a85aecd..2f4a60b6 100644 --- a/composables/picgo/picgoUploadCom.ts +++ b/composables/picgo/picgoUploadCom.ts @@ -27,7 +27,7 @@ import { reactive } from "vue" import { ElMessage, ElMessageBox } from "element-plus" import { useI18n } from "vue-i18n" import { LogFactory } from "~/utils/logUtil" -import { isInSiyuan } from "~/utils/platform/siyuan/siyuanUtil" +import { isInSiyuanWidget } from "~/utils/platform/siyuan/siyuanUtil" import { isInSiyuanNewWinBrowser } from "~/utils/otherlib/siyuanBrowserUtil" import picgoUtil from "~/utils/otherlib/picgoUtil" import { isElectron } from "~/utils/browserUtil" @@ -120,7 +120,7 @@ export const usePicgoUpload = (props, deps, refs) => { return } - if (!isInSiyuan() && !isInSiyuanNewWinBrowser()) { + if (!isInSiyuanWidget() && !isInSiyuanNewWinBrowser()) { ElMessage.error("非electron环境只能通过剪贴板上传") picgoCommonData.isUploadLoading = false return diff --git a/layouts/default/DefaultFooter.vue b/layouts/default/DefaultFooter.vue index 626e7706..5d10bd87 100644 --- a/layouts/default/DefaultFooter.vue +++ b/layouts/default/DefaultFooter.vue @@ -62,88 +62,49 @@ . - {{ $t("service.tab.change.local") }} + {{ $t("setting.blog.index") }} - - + - - - - - - - - - - - - - - - - + + + + + + + + + + + - + @@ -152,27 +113,19 @@ -