diff --git a/docker-compose.yml b/docker-compose.yml index 5fd83c4e9..4121230e7 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -96,7 +96,7 @@ services: appstore: container_name: "dootask-appstore-${APP_ID}" privileged: true - image: "dootask/appstore:0.2.7" + image: "dootask/appstore:0.2.8" volumes: - shared_data:/usr/share/dootask - /var/run/docker.sock:/var/run/docker.sock diff --git a/electron/render/tabs/assets/css/style.css b/electron/render/tabs/assets/css/style.css index 4a1bc7cac..d93bc9b74 100644 --- a/electron/render/tabs/assets/css/style.css +++ b/electron/render/tabs/assets/css/style.css @@ -243,7 +243,7 @@ body { /* 不同平台样式 */ body.win32 .nav { padding-left: 8px; - padding-right: 186px; + padding-right: 140px; } body.darwin .nav { @@ -275,4 +275,4 @@ body.darwin.full-screen .nav { .tab-icon.background { background-image: url(../image/dark/link_normal_icon.png); } -} \ No newline at end of file +} diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index 78bb8c499..7a5c41669 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -1377,10 +1377,12 @@ export default { if ($A.isIos() && list.length !== historyLength && this.$refs.scroller) { // 隐藏区域,让iOS断触 const scrollEl = this.$refs.scroller.$el - scrollEl.style.visibility = 'hidden' + scrollEl.style.overflowY = 'hidden' + scrollEl.style.webkitOverflowScrolling = 'auto' this.allMsgs = list; - this.$nextTick(_ => { - scrollEl.style.visibility = 'visible' + requestAnimationFrame(_ => { + scrollEl.style.overflowY = 'auto' + scrollEl.style.webkitOverflowScrolling = 'touch' }) } else { this.allMsgs = list;