From d571d6e1218cdb77ab1ae9682dd1c236d578df29 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Thu, 30 Mar 2023 15:13:21 +0800 Subject: [PATCH] no message --- electron/package.json | 12 ++++++------ resources/assets/js/components/AutoTip.vue | 2 +- .../assets/js/components/DrawerOverlay/index.vue | 9 +++++++++ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/electron/package.json b/electron/package.json index d3d41ac09..be78cf1e9 100644 --- a/electron/package.json +++ b/electron/package.json @@ -26,13 +26,13 @@ "url": "https://github.com/kuaifan/dootask.git" }, "devDependencies": { - "@electron-forge/cli": "^6.0.5", - "@electron-forge/maker-deb": "^6.0.5", - "@electron-forge/maker-rpm": "^6.0.5", - "@electron-forge/maker-squirrel": "^6.0.5", - "@electron-forge/maker-zip": "^6.0.5", + "@electron-forge/cli": "^6.1.0", + "@electron-forge/maker-deb": "^6.1.0", + "@electron-forge/maker-rpm": "^6.1.0", + "@electron-forge/maker-squirrel": "^6.1.0", + "@electron-forge/maker-zip": "^6.1.0", "dotenv": "^16.0.3", - "electron": "^23.1.4", + "electron": "^23.2.1", "electron-builder": "^23.6.0", "electron-notarize": "^1.2.2", "form-data": "^4.0.0", diff --git a/resources/assets/js/components/AutoTip.vue b/resources/assets/js/components/AutoTip.vue index dfedfe2f2..b32cd0885 100644 --- a/resources/assets/js/components/AutoTip.vue +++ b/resources/assets/js/components/AutoTip.vue @@ -64,7 +64,7 @@ const $content = this.$refs.content; let range = document.createRange(); range.setStart($content, 0); - range.setEnd($content, $content.childNodes.length); + range.setEnd($content, $content.childNodes?.length || 0); const rangeWidth = range.getBoundingClientRect().width; this.showTooltip = Math.floor(rangeWidth) > Math.floor($content.offsetWidth); if (this.showTooltip && this.existSlot) { diff --git a/resources/assets/js/components/DrawerOverlay/index.vue b/resources/assets/js/components/DrawerOverlay/index.vue index 2d126a7a8..1307dd7a5 100644 --- a/resources/assets/js/components/DrawerOverlay/index.vue +++ b/resources/assets/js/components/DrawerOverlay/index.vue @@ -20,6 +20,15 @@ +