From 815ebb0ab3cb0b83bea2b257dffc9874cf1c8a62 Mon Sep 17 00:00:00 2001 From: terwer Date: Wed, 14 Jun 2023 12:33:28 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20PicGO=20=E6=8F=92=E4=BB=B6=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E7=89=88-=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E4=B8=8E=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/PicGoIndex.vue | 5 - src/components/PicgoSetting.vue | 151 +++++++++++++++--------- src/composables/picgo/usePicgoUpload.ts | 18 ++- 3 files changed, 101 insertions(+), 73 deletions(-) diff --git a/src/components/PicGoIndex.vue b/src/components/PicGoIndex.vue index c189ce2..b43921e 100644 --- a/src/components/PicGoIndex.vue +++ b/src/components/PicGoIndex.vue @@ -200,11 +200,6 @@ logger.info("This is picgo index page") Preview Image - - - - -
diff --git a/src/components/PicgoSetting.vue b/src/components/PicgoSetting.vue index 7dcd36c..77f7764 100644 --- a/src/components/PicgoSetting.vue +++ b/src/components/PicgoSetting.vue @@ -28,82 +28,106 @@ import { onBeforeMount, ref } from "vue" import picgoUtil from "~/src/service/picgoUtil.js" import { isInSiyuanOrSiyuanNewWin } from "~/src/utils/utils.ts" import { useVueI18n } from "~/src/composables/useVueI18n.ts" +import { ArrowLeft } from "@element-plus/icons-vue" +import { useRoute, useRouter } from "vue-router" const { t } = useVueI18n() +const router = useRouter() +const { query } = useRoute() + const isReload = ref(false) const picgoVersion = ref("") const isSiyuanOrSiyuanNewWin = isInSiyuanOrSiyuanNewWin() +const showBack = ref(query.showBack === "true") const picgoSettingTabChange = () => { isReload.value = !isReload.value } +const onBack = () => { + router.back() +} + onBeforeMount(() => { picgoVersion.value = picgoUtil.getPicgoVersion() }) @@ -128,4 +152,17 @@ onBeforeMount(() => { .version-tip { margin: 10px 0; } + +#page-body { + min-width: 600px !important; + margin-top: 20px; + margin-bottom: 16px; +} +.page-head{ + margin-bottom: 16px; + margin-left: 20px; +} +.page-content-box { + padding: 0 20px; +} diff --git a/src/composables/picgo/usePicgoUpload.ts b/src/composables/picgo/usePicgoUpload.ts index bcc8cfc..b3944fb 100644 --- a/src/composables/picgo/usePicgoUpload.ts +++ b/src/composables/picgo/usePicgoUpload.ts @@ -29,6 +29,7 @@ import { useVueI18n } from "~/src/composables/useVueI18n.ts" import { createAppLogger } from "~/src/utils/appLogger.ts" import { ImageItem } from "~/src/models/imageItem.ts" import { PicgoApi } from "~/src/service/picgoApi.js" +import { useRouter } from "vue-router" /** * Picgo上传组件 @@ -37,12 +38,11 @@ export const usePicgoUpload = (props, deps, refs) => { // private data const logger = createAppLogger("picgo-upload") const { t } = useVueI18n() + const router = useRouter() const bundledPicgoApi = new PicgoApi() // public data - const picgoUploadData = reactive({ - dialogPicgoSettingFormVisible: false, - }) + const picgoUploadData = reactive({}) // deps const picgoCommonMethods = deps.picgoCommonMethods @@ -84,11 +84,6 @@ export const usePicgoUpload = (props, deps, refs) => { // public methods const picgoUploadMethods = { handlePicgoSetting: async () => { - if (picgoCommonData.showDebugMsg) { - picgoUploadData.dialogPicgoSettingFormVisible = true - return - } - if (!picgoCommonData.isSiyuanOrSiyuanNewWin) { await ElMessageBox.alert(t("picgo.pic.setting.no.tip"), t("main.opt.tip"), { confirmButtonText: t("main.opt.ok"), @@ -96,9 +91,10 @@ export const usePicgoUpload = (props, deps, refs) => { return } - alert(picgoUploadData.dialogPicgoSettingFormVisible) - - picgoUploadData.dialogPicgoSettingFormVisible = true + await router.push({ + path: "/setting", + query: { showBack: "true" }, + }) }, bindFileControl: () => { refSelectedFiles.value.click()