diff --git a/src/main/utils/handleUploaderConfig.ts b/src/main/utils/handleUploaderConfig.ts index 197aab75..41f8c439 100644 --- a/src/main/utils/handleUploaderConfig.ts +++ b/src/main/utils/handleUploaderConfig.ts @@ -136,7 +136,6 @@ export const duplicateUploaderConfig = (type: string, id: string, newName: strin } const updatedConfigList = [...configList, duplicatedConfig] - console.log('updatedConfigList', updatedConfigList) picgo.saveConfig({ [`uploader.${type}.configList`]: updatedConfigList, diff --git a/src/renderer/components/ImageProcessSetting.vue b/src/renderer/components/ImageProcessSetting.vue index 9d9e8982..512f4e2b 100644 --- a/src/renderer/components/ImageProcessSetting.vue +++ b/src/renderer/components/ImageProcessSetting.vue @@ -161,9 +161,8 @@ -

{{ t('pages.imageProcess.perPicBed.description') }}

+

+ {{ + t('pages.imageProcess.perPicBed.defaultValue', { + value: globalValue !== undefined ? globalValue : defaultValue, + }) + }} +

@@ -113,6 +119,7 @@ import { computed, ref } from 'vue' import { useI18n } from 'vue-i18n' import { usePicBed } from '@/hooks/useGlobal' +import { getRawData } from '@/utils/common' const { t } = useI18n() const { picBedG } = usePicBed() @@ -130,7 +137,7 @@ interface RadioOption { const { mapField, defaultValue, - globalValue, + globalValue = undefined, inputType, rangeMin = 0, rangeMax = 100, @@ -147,7 +154,7 @@ interface Props { mapField: Record | undefined defaultValue: any fieldName: string - globalValue: any + globalValue?: any inputType: 'checkbox' | 'range' | 'number' | 'text' | 'color' | 'select' | 'radio' rangeMin?: number rangeMax?: number @@ -175,7 +182,10 @@ const availablePicbeds = computed(() => { function getMapValue(mapObj: Record | undefined, picbedType: string, defaultValue: any) { if (!mapObj) return defaultValue - return mapObj[picbedType] !== undefined ? mapObj[picbedType] : globalValue !== undefined ? globalValue : defaultValue + const rawMapObj = getRawData(mapObj) + const value = + rawMapObj[picbedType] !== undefined ? rawMapObj[picbedType] : globalValue !== undefined ? globalValue : defaultValue + return typeof value === 'object' ? JSON.stringify(getRawData(value)) : value } function handleMapChange(picbedType: string, value: any) { diff --git a/src/renderer/hooks/useGlobal.ts b/src/renderer/hooks/useGlobal.ts index d7302477..0d4ebf1e 100644 --- a/src/renderer/hooks/useGlobal.ts +++ b/src/renderer/hooks/useGlobal.ts @@ -19,7 +19,6 @@ const _defaultPicBedId = ref('') export function usePicBed() { const updatePicBeds = async () => { - console.log('Updating pic beds in global hook...') const result = await window.electron.triggerRPC(IRPCActionType.MAIN_GET_PICBED) if (result) { _picBeds.value = result.picBeds diff --git a/src/renderer/i18n/locales/en.json b/src/renderer/i18n/locales/en.json index 9dec7406..0b9edf3b 100644 --- a/src/renderer/i18n/locales/en.json +++ b/src/renderer/i18n/locales/en.json @@ -104,6 +104,7 @@ }, "generalSettings": "General", "perPicBed": { + "defaultValue": "Default Value: {value}", "description": "Configure settings for each PicBed individually", "title": "Per-PicBed Settings" }, diff --git a/src/renderer/i18n/locales/zh-CN.json b/src/renderer/i18n/locales/zh-CN.json index f71c754f..d9adb85c 100644 --- a/src/renderer/i18n/locales/zh-CN.json +++ b/src/renderer/i18n/locales/zh-CN.json @@ -104,6 +104,7 @@ }, "generalSettings": "常规", "perPicBed": { + "defaultValue": "默认值: {value}", "description": "为每个图床单独配置设置", "title": "图床独立设置" }, diff --git a/src/renderer/i18n/locales/zh-TW.json b/src/renderer/i18n/locales/zh-TW.json index 44e0058e..e2016404 100644 --- a/src/renderer/i18n/locales/zh-TW.json +++ b/src/renderer/i18n/locales/zh-TW.json @@ -104,6 +104,7 @@ }, "generalSettings": "常規", "perPicBed": { + "defaultValue": "默認值: {value}", "description": "為每個圖床單獨配置設置", "title": "圖床獨立設置" }, diff --git a/src/renderer/manage/pages/BucketPage.vue b/src/renderer/manage/pages/BucketPage.vue index 0d622673..66206b7c 100644 --- a/src/renderer/manage/pages/BucketPage.vue +++ b/src/renderer/manage/pages/BucketPage.vue @@ -3033,7 +3033,6 @@ function toggleCopyDropdown(index: number, event?: MouseEvent) { const container = bucketContainerRef.value const containerRect = container?.getBoundingClientRect() - console.log('containerRect', containerRect) const dropdownWidth = 160 const shouldShowLeft = rect.right > viewportWidth - dropdownWidth || diff --git a/src/renderer/pages/Plugin.vue b/src/renderer/pages/Plugin.vue index 2d968b24..90fb7afd 100644 --- a/src/renderer/pages/Plugin.vue +++ b/src/renderer/pages/Plugin.vue @@ -465,7 +465,6 @@ function _getSearchResult(val: string) { fetch(`https://registry.npmjs.com/-/v1/search?text=${val}`) .then(async (res: Response) => { const data = await res.json() - console.log(data) pluginList.value = data.objects .filter((item: INPMSearchResultObject) => { return strictSearch.value diff --git a/src/renderer/utils/getLatestVersion.ts b/src/renderer/utils/getLatestVersion.ts index 8496dd7a..07ac5f06 100644 --- a/src/renderer/utils/getLatestVersion.ts +++ b/src/renderer/utils/getLatestVersion.ts @@ -7,8 +7,6 @@ export const getLatestVersion = async (): Promise => { throw new Error(`HTTP error! status: ${response.status}`) } const normalList = await response.json() - console.log('Fetched latest version info: ', normalList) - console.log('Latest version is: ', normalList[0].name) return normalList[0].name } catch (err) { console.error('Error fetching latest version: ', err)