From ebcfbdf8500b227c146491dd4a54feccb5974cab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=8C=E8=90=8C=E5=93=92=E8=B5=AB=E8=90=9D?= Date: Fri, 5 May 2023 18:14:35 +0800 Subject: [PATCH] :sparkles: Feature: auto import of manage page can be closed now --- public/i18n/en.yml | 1 + public/i18n/zh-CN.yml | 1 + public/i18n/zh-TW.yml | 2 +- src/renderer/manage/pages/logIn.vue | 4 ++++ src/renderer/pages/PicGoSetting.vue | 16 ++++++++++++++++ src/universal/types/i18n.d.ts | 1 + src/universal/types/view.d.ts | 1 + 7 files changed, 25 insertions(+), 1 deletion(-) diff --git a/public/i18n/en.yml b/public/i18n/en.yml index 5555cd9..650917a 100644 --- a/public/i18n/en.yml +++ b/public/i18n/en.yml @@ -252,6 +252,7 @@ SETTINGS_SYNC_CONFIG_GITEE_BRANCH_PLACEHOLDER: Please enter Gitee branch name SETTINGS_SYNC_CONFIG_GITHUB_TOKEN_PLACEHOLDER: Please enter GitHub Token SETTINGS_SYNC_CONFIG_GITEE_TOKEN_PLACEHOLDER: Please enter Gitee Token SETTINGS_SYNC_CONFIG_PROXY_PLACEHOLDER: Please enter proxy +SETTINGS_AUTO_IMPORT: Auto import config in manage page # shortcut-page BUILTIN_CLIPBOARD_TIPS: Use builtin clipboard function to upload instead of using scripts diff --git a/public/i18n/zh-CN.yml b/public/i18n/zh-CN.yml index 14e1b5e..76629ad 100644 --- a/public/i18n/zh-CN.yml +++ b/public/i18n/zh-CN.yml @@ -255,6 +255,7 @@ SETTINGS_SYNC_CONFIG_GITEE_BRANCH_PLACEHOLDER: 请输入Gitee分支名 SETTINGS_SYNC_CONFIG_GITHUB_TOKEN_PLACEHOLDER: 请输入GitHub Token SETTINGS_SYNC_CONFIG_GITEE_TOKEN_PLACEHOLDER: 请输入Gitee Token SETTINGS_SYNC_CONFIG_PROXY_PLACEHOLDER: 请输入代理地址 +SETTINGS_AUTO_IMPORT: 管理页面自动导入配置 # shortcut-page SHORTCUT_NAME: 快捷键名称 diff --git a/public/i18n/zh-TW.yml b/public/i18n/zh-TW.yml index 1fa1ec7..6097b77 100644 --- a/public/i18n/zh-TW.yml +++ b/public/i18n/zh-TW.yml @@ -253,7 +253,7 @@ SETTINGS_SYNC_CONFIG_GITEE_BRANCH_PLACEHOLDER: 請輸入 Gitee 分支名稱 SETTINGS_SYNC_CONFIG_GITHUB_TOKEN_PLACEHOLDER: 請輸入 GitHub Token SETTINGS_SYNC_CONFIG_GITEE_TOKEN_PLACEHOLDER: 請輸入 Gitee Token SETTINGS_SYNC_CONFIG_PROXY_PLACEHOLDER: 請輸入代理地址 - +SETTINGS_AUTO_IMPORT: 管理頁面自動導入配置 # shortcut-page SHORTCUT_NAME: 快捷鍵名稱 diff --git a/src/renderer/manage/pages/logIn.vue b/src/renderer/manage/pages/logIn.vue index dd954ab..7020c4a 100644 --- a/src/renderer/manage/pages/logIn.vue +++ b/src/renderer/manage/pages/logIn.vue @@ -569,6 +569,10 @@ function isImported (alias: string) { } async function transUpToManage (config: IUploaderConfigListItem, picBedName: string) { + const autoImport = await getConfig('settings.autoImport') || false + if (!autoImport) { + return + } let alias: string = '' const resultMap: IStringKeyMap = {} switch (picBedName) { diff --git a/src/renderer/pages/PicGoSetting.vue b/src/renderer/pages/PicGoSetting.vue index 083b985..4b7a4cd 100644 --- a/src/renderer/pages/PicGoSetting.vue +++ b/src/renderer/pages/PicGoSetting.vue @@ -195,6 +195,16 @@ {{ $T('SETTINGS_CLICK_TO_SET') }} + + + @@ -1196,6 +1206,7 @@ const form = reactive({ isCustomMiniIcon: false, customMiniIcon: '', isHideDock: false, + autoImport: false, encodeOutputURL: true, isAutoListenClipboard: false, useShortUrl: false, @@ -1341,6 +1352,7 @@ async function initData () { form.language = settings.language ?? 'zh-CN' form.encodeOutputURL = settings.encodeOutputURL === undefined ? true : settings.encodeOutputURL form.deleteCloudFile = settings.deleteCloudFile || false + form.autoImport = settings.autoImport || false form.isCustomMiniIcon = settings.isCustomMiniIcon || false form.customMiniIcon = settings.customMiniIcon || '' form.isHideDock = settings.isHideDock || false @@ -1470,6 +1482,10 @@ function updateHelperChange (val: ICheckBoxValueType) { saveConfig('settings.showUpdateTip', val) } +function autoImportChange (val: ICheckBoxValueType) { + saveConfig('settings.autoImport', val) +} + function handleHideDockChange (val: ICheckBoxValueType) { if (val && currentStartMode.value === 'no-tray') { ElMessage.warning($T('SETTINGS_ISHIDEDOCK_TIPS')) diff --git a/src/universal/types/i18n.d.ts b/src/universal/types/i18n.d.ts index dc3b36d..df45647 100644 --- a/src/universal/types/i18n.d.ts +++ b/src/universal/types/i18n.d.ts @@ -248,6 +248,7 @@ interface ILocales { SETTINGS_SYNC_CONFIG_GITHUB_TOKEN_PLACEHOLDER: string SETTINGS_SYNC_CONFIG_GITEE_TOKEN_PLACEHOLDER: string SETTINGS_SYNC_CONFIG_PROXY_PLACEHOLDER: string + SETTINGS_AUTO_IMPORT: string SHORTCUT_NAME: string SHORTCUT_BIND: string SHORTCUT_STATUS: string diff --git a/src/universal/types/view.d.ts b/src/universal/types/view.d.ts index b8f5e57..574ec38 100644 --- a/src/universal/types/view.d.ts +++ b/src/universal/types/view.d.ts @@ -16,6 +16,7 @@ interface ISettingForm { isCustomMiniIcon: boolean, customMiniIcon: string, isHideDock: boolean, + autoImport: boolean, encodeOutputURL: boolean, isAutoListenClipboard: boolean, useShortUrl: boolean,