From bee54634167e4b711fa4824cee00fe9199ab83e6 Mon Sep 17 00:00:00 2001 From: TankNee Date: Thu, 8 Jul 2021 21:29:19 +0800 Subject: [PATCH 1/7] fix: fix shortcut --- README | Bin 33497 -> 0 bytes src-electron/main-process/keyboard/shortcut.js | 5 ++--- src/components/ui/editor/Muya.vue | 9 ++------- 3 files changed, 4 insertions(+), 10 deletions(-) delete mode 100644 README diff --git a/README b/README deleted file mode 100644 index 3b5e52de40eca8c295730896bc5686af1d445494..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 33497 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 z zk+x^r_U&$-2M(%^5JoG|@Y=7^>IBJLVI3pO?O~c-h}NECtdqh5n_0S9SdslL4F9Y9 z3+#DVK4iOi+GgLz4>__coU@#y&mYxv$;zue)Y6AAiD8a6iqO^z$w-eQDSGsC=5y`i z{6Y2r*ry3cQYRo4imTe2@Bh=WlcYntF8P9(ZRbK|C`Xoyv9?e8&Fp}(<+SZ7b~_@q zJA$!q(%n5gZaFIEJ|~8a|9;f)NEzLC4)-!4=|w*X1DKcKMYCD1cF7C&_*$jME%Og0N z#^qn};yrokt+W9nb{VTG7T?nYK}0``<(e{aMgG|8FYjUYBC+DZ7W*O2te_F_mWTQ} zVFPl9kW<5sIs8WCFO*!wqLY>1O*dh?4BLW5_>r84_&wt5W8ipItdECe?oA4ddnmKV zVP57@nHQOgk|JF`MN($W8&ajpJlH|`e?|X4hg#h^F8&B(F+^Cdcy33-w{2A-PnHqe z)}~{<;kxmWy0lp6!w8n;1BYBmm%{R|m%m$$30ZAvN3&nz@ymt%5*t%Wg$g%3tO7!x zD&*tWL`to<8M-TRo9SV@Vs z{o?jyC$gW?zW-;LKiMJgQE#6?jyFaJ`mw&^+UG(H>T|Q+fpmr9`*S@o3UhK1YIO#G zb4$JL6>T_f`>6r3PcZhk%1S6 zGAm}P&&uow=6V$umk-M;c38?^I&o8Hs0k`^S^Qas^CpA`OhCHpHT!(x2bhPoO8NA( zcx;rw+C8wtAY8k!4+G4nu?WC#-6UQP!@Gbyz2f&~X#b2+E^ol^n6CHL!4|!Ids^n; z6%tSC)!0D@=N5j3!}>HdVpisC;2s&)U_KURyeB>_tUmIN#bSQ4-#U`fD| zfF%J-0{>qLAUs26&4}zfp`5!C@xh*Gk_8=I{x;_5jh+XtdI5CSxAoq#_1+GU_5$p> z$AbcAghbqplFA4Ym`YAYxV%)-7-8p9NoRy|OC^I9fV8RTVg*QRD!N$#S(=Isz_;C^ z1ts6awg)E;F#7F!mGNzEAm-crKwLoU?IsjkN8cujE~AbDmY#3+0N?zBEwApx^o9&R zO$`DKxAx2=NkO$c?feM9braD@ax@u*#Ql`AfVb6wS)%KM7jrYN=}J6kma zb+<$S#2g`V`C6A(RM_p;wj8UAQlD4 zZ)!ZYgU@;Rl!_Ims>RCRFJ|bvQ)feLyUwX#jPzo$tvXfX3OcZ>4j)Lmd+IPkQ=L!J>J_MR}E;vZXR4yOnf<}$wX(E$H850b9)V> zH@kU|0+{MJY2hw9RdX79`Kp?x?ckA2L`KH|R!=J0GddlmxpZ{L<4HywNJZLXLvdD6 zQ~Ka%LFO@ht(w { - if (!e.srcElement.className.includes('ag-') || helper.isCtrl(e)) return + container.addEventListener('keydown', (e) => { + // if (!e.srcElement.className.includes('ag-') || helper.isCtrl(e)) return const curData = this.contentEditor.getMarkdown() // eslint-disable-next-line eqeqeq if (curData != this.currentNote) { @@ -269,11 +269,6 @@ export default { } else { this.updateNoteState('default') } - this.updateContentsList(this.contentEditor.getTOC()) - const cursor = this.contentEditor.getCursor() - if (cursor.anchor.line >= this.contentEditor.getWordCount(curData).line - 2) { - bus.$emit(events.SCROLL_DOWN) - } }) bus.$on(events.SCROLL_TO_HEADER, this.scrollToHeaderHandler) From e3b5a7e7dbf5633fa62e67b97be915501d68e6a0 Mon Sep 17 00:00:00 2001 From: akashi2333 Date: Thu, 8 Jul 2021 22:14:36 +0800 Subject: [PATCH 2/7] Merge branch 'rebuild/fix' of https://github.com/TankNee/Memocast into rebuild/fix --- package-lock.json | 14 +++ package.json | 3 +- src/components/Header.vue | 1 + src/components/ui/dialog/SettingsDialog.vue | 12 ++- src/components/ui/dialog/UpdateDialog.vue | 32 +++++-- src/components/ui/editor/Monaco.vue | 1 + src/css/style.css | 7 +- src/i18n/en-us/components/ui/RenderToolBar.js | 4 +- src/i18n/en-us/components/ui/UpdateDialog.js | 5 +- src/i18n/en-us/other.js | 4 +- src/i18n/zh-cn/components/ui/UpdateDialog.js | 5 +- src/i18n/zh-cn/other.js | 4 +- src/libs/muya/lib/assets/pngicon/delete/1.png | Bin 465 -> 338 bytes src/libs/muya/lib/assets/pngicon/delete/2.png | Bin 869 -> 591 bytes src/libs/muya/lib/assets/pngicon/delete/3.png | Bin 1680 -> 893 bytes .../render/renderBlock/renderToolBar.js | 2 +- src/pages/Index.vue | 86 +++++++++++------- src/utils/themeColor.js | 2 +- 18 files changed, 126 insertions(+), 56 deletions(-) diff --git a/package-lock.json b/package-lock.json index 185d941..a835641 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,6 +40,7 @@ "node-schedule": "^1.3.2", "os-locale": "^5.0.0", "popper.js": "^1.16.1", + "pretty-bytes": "^5.6.0", "quasar": "^1.0.0", "remark": "^13.0.0", "remark-pangu": "^2.2.0", @@ -16407,6 +16408,14 @@ "node": ">=4" } }, + "node_modules/pretty-bytes": { + "version": "5.6.0", + "resolved": "https://registry.nlark.com/pretty-bytes/download/pretty-bytes-5.6.0.tgz", + "integrity": "sha1-NWJW9kOAR3PIL2RyP+eMksYr6us=", + "engines": { + "node": ">=6" + } + }, "node_modules/pretty-error": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.2.tgz", @@ -38020,6 +38029,11 @@ "dev": true, "optional": true }, + "pretty-bytes": { + "version": "5.6.0", + "resolved": "https://registry.nlark.com/pretty-bytes/download/pretty-bytes-5.6.0.tgz", + "integrity": "sha1-NWJW9kOAR3PIL2RyP+eMksYr6us=" + }, "pretty-error": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.2.tgz", diff --git a/package.json b/package.json index d14f6bb..3bf8e91 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cn.memocast.app", - "version": "2.1.2", + "version": "2.1.3", "description": "An Awesome WizNote Desktop Application", "productName": "Memocast", "author": "tanknee ", @@ -52,6 +52,7 @@ "node-schedule": "^1.3.2", "os-locale": "^5.0.0", "popper.js": "^1.16.1", + "pretty-bytes": "^5.6.0", "quasar": "^1.0.0", "remark": "^13.0.0", "remark-pangu": "^2.2.0", diff --git a/src/components/Header.vue b/src/components/Header.vue index a0404e2..5bfab53 100644 --- a/src/components/Header.vue +++ b/src/components/Header.vue @@ -293,6 +293,7 @@ export default { key: 'noteListVisible', value: !this.noteListVisible }) + this.$refs.sideDrawer.hide() }, clearInputHandler: function () { this.searchText = '' diff --git a/src/components/ui/dialog/SettingsDialog.vue b/src/components/ui/dialog/SettingsDialog.vue index 47292a7..ba2612c 100644 --- a/src/components/ui/dialog/SettingsDialog.vue +++ b/src/components/ui/dialog/SettingsDialog.vue @@ -261,14 +261,22 @@ export default { message: this.$t('checking'), timeout: 0, spinner: true, - color: 'primary' + color: 'primary', + actions: [{ + icon: 'clear', + color: 'white', + handler: () => {} + }] }) }) // this.$refs.updateDialog.toggle() }, updateAvailableHandler: function (info) { console.log(info) - // this.$refs.updateDialog.toggle() + if (this.checkingNotify && this.checkingNotify instanceof Function) { + this.checkingNotify() + this.checkingNotify = null + } this.$q.notify({ caption: this.$t('getNewerVersion', { version: info.version }), message: info.releaseNotes, diff --git a/src/components/ui/dialog/UpdateDialog.vue b/src/components/ui/dialog/UpdateDialog.vue index ade98be..09c5c4f 100644 --- a/src/components/ui/dialog/UpdateDialog.vue +++ b/src/components/ui/dialog/UpdateDialog.vue @@ -14,7 +14,12 @@
-
{{ `${transferred}/${total} ${speed} Kbs` }}
+

+ {{ `${$t('downloadSize')} ${transferred}/${total}` }} +

+

+ {{ `${$t('downloadSpeed')} ${speed}` }} +

@@ -35,6 +40,7 @@