From b8ec879e238eea6efb5371d7264b7a5c47ecea5d Mon Sep 17 00:00:00 2001 From: Molunerfinn Date: Sat, 21 Dec 2019 17:28:29 +0800 Subject: [PATCH] :hammer: Refactor: change vue-js -> vue-ts && add typos --- src/background.ts | 14 ++--- src/main/migrate/shortKeyUpdateHelper.ts | 2 +- src/main/utils/getPicBeds.ts | 4 +- src/main/utils/shortKeyHandler.ts | 4 +- src/main/utils/uploader.ts | 2 +- src/renderer/layouts/SettingPage.vue | 4 +- src/renderer/pages/Gallery.vue | 4 +- src/renderer/pages/MiniPage.vue | 4 +- src/renderer/pages/PicGoSetting.vue | 4 +- src/renderer/pages/ShortCut.vue | 6 +- src/renderer/pages/Upload.vue | 6 +- src/renderer/pages/picbeds/AliYun.vue | 66 ++++++++++---------- src/renderer/pages/picbeds/GitHub.vue | 64 +++++++++---------- src/renderer/pages/picbeds/Imgur.vue | 58 ++++++++---------- src/renderer/pages/picbeds/Others.vue | 78 +++++++++++++----------- src/renderer/pages/picbeds/Qiniu.vue | 68 ++++++++++----------- src/renderer/pages/picbeds/SMMS.vue | 33 +++++----- src/renderer/pages/picbeds/TcYun.vue | 77 +++++++++++------------ src/renderer/pages/picbeds/UpYun.vue | 64 +++++++++---------- src/renderer/pages/picbeds/Weibo.vue | 2 +- src/universal/types/types.d.ts | 69 ++++++++++++++++++--- 21 files changed, 333 insertions(+), 300 deletions(-) diff --git a/src/background.ts b/src/background.ts index 772fe28..908fe60 100644 --- a/src/background.ts +++ b/src/background.ts @@ -252,7 +252,7 @@ const createMiniWidow = () => { if (miniWindow) { return false } - let obj: BrowserWindowOptions = { + let obj: IBrowserWindowOptions = { height: 64, width: 64, show: process.platform === 'linux', @@ -284,7 +284,7 @@ const createMiniWidow = () => { } const createSettingWindow = () => { - const options: BrowserWindowOptions = { + const options: IBrowserWindowOptions = { height: 450, width: 800, show: false, @@ -355,7 +355,7 @@ const createMenu = () => { } } -const toggleWindow = (bounds: Bounds) => { +const toggleWindow = (bounds: IBounds) => { if (window!.isVisible()) { window!.hide() } else { @@ -363,7 +363,7 @@ const toggleWindow = (bounds: Bounds) => { } } -const showWindow = (bounds: Bounds) => { +const showWindow = (bounds: IBounds) => { window!.setPosition(bounds.x - 98 + 11, bounds.y, false) window!.webContents.send('updateFiles') window!.show() @@ -404,7 +404,7 @@ const uploadClipboardFiles = async () => { } } -const uploadChoosedFiles = async (webContents: WebContents, files: FileWithPath[]) => { +const uploadChoosedFiles = async (webContents: WebContents, files: IFileWithPath[]) => { const input = files.map(item => item.path) const imgs = await new Uploader(input, webContents).upload() if (imgs !== false) { @@ -458,11 +458,11 @@ ipcMain.on('uploadClipboardFilesFromUploadPage', () => { uploadClipboardFiles() }) -ipcMain.on('uploadChoosedFiles', async (evt: IpcMainEvent, files: FileWithPath[]) => { +ipcMain.on('uploadChoosedFiles', async (evt: IpcMainEvent, files: IFileWithPath[]) => { return uploadChoosedFiles(evt.sender, files) }) -ipcMain.on('updateShortKey', (evt: IpcMainEvent, item: ShortKeyConfig, oldKey: string) => { +ipcMain.on('updateShortKey', (evt: IpcMainEvent, item: IShortKeyConfig, oldKey: string) => { shortKeyUpdater(globalShortcut, item, oldKey) const notification = new Notification({ title: '操作成功', diff --git a/src/main/migrate/shortKeyUpdateHelper.ts b/src/main/migrate/shortKeyUpdateHelper.ts index f4981a2..5786ce7 100644 --- a/src/main/migrate/shortKeyUpdateHelper.ts +++ b/src/main/migrate/shortKeyUpdateHelper.ts @@ -1,6 +1,6 @@ import DB from '#/datastore' // from v2.1.2 -const updateShortKeyFromVersion212 = (db: typeof DB, shortKeyConfig: ShortKeyConfigs | OldShortKeyConfigs) => { +const updateShortKeyFromVersion212 = (db: typeof DB, shortKeyConfig: IShortKeyConfigs | IOldShortKeyConfigs) => { let needUpgrade = false if (shortKeyConfig.upload) { needUpgrade = true diff --git a/src/main/utils/getPicBeds.ts b/src/main/utils/getPicBeds.ts index b7c5ae6..35c2dec 100644 --- a/src/main/utils/getPicBeds.ts +++ b/src/main/utils/getPicBeds.ts @@ -12,13 +12,13 @@ const getPicBeds = (app: App) => { const picBedTypes = picgo.helper.uploader.getIdList() const picBedFromDB = db.get('picBed.list') || [] const picBeds = picBedTypes.map((item: string) => { - const visible = picBedFromDB.find((i: PicBedType) => i.type === item) // object or undefined + const visible = picBedFromDB.find((i: IPicBedType) => i.type === item) // object or undefined return { type: item, name: picgo.helper.uploader.get(item).name || item, visible: visible ? visible.visible : true } - }) as PicBedType[] + }) as IPicBedType[] picgo.cmd.program.removeAllListeners() return picBeds } diff --git a/src/main/utils/shortKeyHandler.ts b/src/main/utils/shortKeyHandler.ts index 2588950..ef120f2 100644 --- a/src/main/utils/shortKeyHandler.ts +++ b/src/main/utils/shortKeyHandler.ts @@ -24,7 +24,7 @@ const shortKeyHandler = (name: string) => { /** * 用于更新快捷键绑定 */ -const shortKeyUpdater = (globalShortcut: GlobalShortcut, item: ShortKeyConfig, oldKey: string) => { +const shortKeyUpdater = (globalShortcut: GlobalShortcut, item: IShortKeyConfig, oldKey: string) => { // 如果提供了旧key,则解绑 if (oldKey) { globalShortcut.unregister(oldKey) @@ -39,7 +39,7 @@ const shortKeyUpdater = (globalShortcut: GlobalShortcut, item: ShortKeyConfig, o } // 初始化阶段的注册 -const initShortKeyRegister = (globalShortcut: GlobalShortcut, shortKeys: ShortKeyConfig[]) => { +const initShortKeyRegister = (globalShortcut: GlobalShortcut, shortKeys: IShortKeyConfig[]) => { let errorList = [] for (let i in shortKeys) { try { diff --git a/src/main/utils/uploader.ts b/src/main/utils/uploader.ts index 86c3b4a..c7d9019 100644 --- a/src/main/utils/uploader.ts +++ b/src/main/utils/uploader.ts @@ -36,7 +36,7 @@ const renameURL = process.env.NODE_ENV === 'development' // } const createRenameWindow = (win: BrowserWindow) => { - let options: BrowserWindowOptions = { + let options: IBrowserWindowOptions = { height: 175, width: 300, show: true, diff --git a/src/renderer/layouts/SettingPage.vue b/src/renderer/layouts/SettingPage.vue index 40cff5f..dbc0fe1 100644 --- a/src/renderer/layouts/SettingPage.vue +++ b/src/renderer/layouts/SettingPage.vue @@ -174,7 +174,7 @@ export default class extends Vue { shortKey: ShortKeyMap = { upload: db.get('shortKey.upload') } - picBed: PicBedType[] = [] + picBed: IPicBedType[] = [] // for showInputBox showInputBoxVisible = false inputBoxValue = '' @@ -276,7 +276,7 @@ export default class extends Vue { openMiniWindow () { ipcRenderer.send('openMiniWindow') } - getPicBeds (event: IpcRendererEvent, picBeds: PicBedType[]) { + getPicBeds (event: IpcRendererEvent, picBeds: IPicBedType[]) { this.picBed = picBeds } handleInputBoxClose () { diff --git a/src/renderer/pages/Gallery.vue b/src/renderer/pages/Gallery.vue index 93c1568..7131444 100644 --- a/src/renderer/pages/Gallery.vue +++ b/src/renderer/pages/Gallery.vue @@ -143,7 +143,7 @@ export default class extends Vue { UBB: 'UBB', Custom: 'Custom' } - picBed: PicBedType[] = [] + picBed: IPicBedType[] = [] beforeRouteEnter (to: any, from: any, next: any) { next((vm: any) => { vm.getGallery() @@ -166,7 +166,7 @@ export default class extends Vue { set filterList (val) { this.images = val } - getPicBeds (event: IpcRendererEvent, picBeds: PicBedType[]) { + getPicBeds (event: IpcRendererEvent, picBeds: IPicBedType[]) { this.picBed = picBeds } getGallery () { diff --git a/src/renderer/pages/MiniPage.vue b/src/renderer/pages/MiniPage.vue index 0d516da..50bf7ce 100644 --- a/src/renderer/pages/MiniPage.vue +++ b/src/renderer/pages/MiniPage.vue @@ -40,7 +40,7 @@ export default class extends Vue { screenY: number = -1 menu: Electron.Menu | null = null os = '' - picBed: PicBedType[] = [] + picBed: IPicBedType[] = [] created () { this.os = process.platform ipcRenderer.on('uploadProgress', (event: IpcRendererEvent, progress: number) => { @@ -90,7 +90,7 @@ export default class extends Vue { document.getElementById('file-uploader').value = '' } ipcSendFiles (files: FileList) { - let sendFiles: FileWithPath[] = [] + let sendFiles: IFileWithPath[] = [] Array.from(files).forEach((item, index) => { let obj = { name: item.name, diff --git a/src/renderer/pages/PicGoSetting.vue b/src/renderer/pages/PicGoSetting.vue index ed60d1a..ee0966e 100644 --- a/src/renderer/pages/PicGoSetting.vue +++ b/src/renderer/pages/PicGoSetting.vue @@ -283,7 +283,7 @@ export default class extends Vue { miniWindowOntop: db.get('settings.miniWindowOntop') || false, logLevel } - picBed: PicBedType[] = [] + picBed: IPicBedType[] = [] logFileVisible = false keyBindingVisible = false customLinkVisible = false @@ -325,7 +325,7 @@ export default class extends Vue { ipcRenderer.send('getPicBeds') ipcRenderer.on('getPicBeds', this.getPicBeds) } - getPicBeds (event: Event, picBeds: PicBedType[]) { + getPicBeds (event: Event, picBeds: IPicBedType[]) { this.picBed = picBeds this.form.showPicBedList = this.picBed.map(item => { if (item.visible) { diff --git a/src/renderer/pages/ShortCut.vue b/src/renderer/pages/ShortCut.vue index 48d1c11..8ad4c79 100644 --- a/src/renderer/pages/ShortCut.vue +++ b/src/renderer/pages/ShortCut.vue @@ -102,13 +102,13 @@ import { ipcRenderer } from 'electron' name: 'shortcut-page' }) export default class extends Vue { - list: ShortKeyConfig[] = [] + list: IShortKeyConfig[] = [] keyBindingVisible = false shortKeyName = '' shortKey = '' currentIndex = 0 created () { - const shortKeyConfig = this.$db.get('settings.shortKey') as ShortKeyConfigs + const shortKeyConfig = this.$db.get('settings.shortKey') as IShortKeyConfigs this.list = Object.keys(shortKeyConfig).map(item => shortKeyConfig[item]) } @Watch('keyBindingVisible') @@ -119,7 +119,7 @@ export default class extends Vue { const [origin] = item.split(':') return origin } - toggleEnable (item: ShortKeyConfig) { + toggleEnable (item: IShortKeyConfig) { const status = !item.enable item.enable = status this.$db.set(`settings.shortKey.${item.name}.enable`, status) diff --git a/src/renderer/pages/Upload.vue b/src/renderer/pages/Upload.vue index 4020a34..5511043 100644 --- a/src/renderer/pages/Upload.vue +++ b/src/renderer/pages/Upload.vue @@ -72,7 +72,7 @@ export default class extends Vue { showProgress = false showError = false pasteStyle = '' - picBed: PicBedType[] = [] + picBed: IPicBedType[] = [] picBedName = '' menu: Electron.Menu | null= null mounted () { @@ -122,7 +122,7 @@ export default class extends Vue { (document.getElementById('file-uploader') as HTMLInputElement).value = '' } ipcSendFiles (files: FileList) { - let sendFiles: FileWithPath[] = [] + let sendFiles: IFileWithPath[] = [] Array.from(files).forEach((item, index) => { let obj = { name: item.name, @@ -149,7 +149,7 @@ export default class extends Vue { } }) } - getPicBeds (event: Event, picBeds: PicBedType[]) { + getPicBeds (event: Event, picBeds: IPicBedType[]) { this.picBed = picBeds this.getDefaultPicBed() } diff --git a/src/renderer/pages/picbeds/AliYun.vue b/src/renderer/pages/picbeds/AliYun.vue index b0f1bf4..6597b46 100644 --- a/src/renderer/pages/picbeds/AliYun.vue +++ b/src/renderer/pages/picbeds/AliYun.vue @@ -64,47 +64,43 @@ - diff --git a/src/renderer/pages/picbeds/GitHub.vue b/src/renderer/pages/picbeds/GitHub.vue index 816c516..723a6a3 100644 --- a/src/renderer/pages/picbeds/GitHub.vue +++ b/src/renderer/pages/picbeds/GitHub.vue @@ -56,46 +56,42 @@ - diff --git a/src/renderer/pages/picbeds/Imgur.vue b/src/renderer/pages/picbeds/Imgur.vue index 77e57cc..7a4db8a 100644 --- a/src/renderer/pages/picbeds/Imgur.vue +++ b/src/renderer/pages/picbeds/Imgur.vue @@ -36,43 +36,39 @@ - diff --git a/src/renderer/pages/picbeds/Others.vue b/src/renderer/pages/picbeds/Others.vue index bdf5c4b..ad2ae40 100644 --- a/src/renderer/pages/picbeds/Others.vue +++ b/src/renderer/pages/picbeds/Others.vue @@ -27,57 +27,61 @@ - diff --git a/src/renderer/pages/picbeds/Qiniu.vue b/src/renderer/pages/picbeds/Qiniu.vue index b76e007..821a8d6 100644 --- a/src/renderer/pages/picbeds/Qiniu.vue +++ b/src/renderer/pages/picbeds/Qiniu.vue @@ -71,48 +71,44 @@ - diff --git a/src/renderer/pages/picbeds/SMMS.vue b/src/renderer/pages/picbeds/SMMS.vue index 6ae8ab9..7a2e40e 100644 --- a/src/renderer/pages/picbeds/SMMS.vue +++ b/src/renderer/pages/picbeds/SMMS.vue @@ -15,24 +15,23 @@ - diff --git a/src/renderer/pages/picbeds/UpYun.vue b/src/renderer/pages/picbeds/UpYun.vue index 4efadb2..c381ebc 100644 --- a/src/renderer/pages/picbeds/UpYun.vue +++ b/src/renderer/pages/picbeds/UpYun.vue @@ -64,46 +64,42 @@ - diff --git a/src/renderer/pages/picbeds/Weibo.vue b/src/renderer/pages/picbeds/Weibo.vue index acc1ee1..98acb99 100644 --- a/src/renderer/pages/picbeds/Weibo.vue +++ b/src/renderer/pages/picbeds/Weibo.vue @@ -3,7 +3,7 @@
- 微博图床设置 + 微博图床设置[已停止支持]