diff --git a/resources/assets/js/directives/longpress.js b/resources/assets/js/directives/longpress.js index 33932ad9b..e2dd941ea 100644 --- a/resources/assets/js/directives/longpress.js +++ b/resources/assets/js/directives/longpress.js @@ -12,17 +12,17 @@ const longpress = { throw 'callback must be a function' } - // 不支持touch时使用右键 + // 菜单键(右键) + el.__longpressContextmenu__ = (e) => { + e.preventDefault() + e.stopPropagation() + callback(e, el) + } + el.addEventListener('contextmenu', el.__longpressContextmenu__); + // 不支持touch if (!isSupportTouch) { - el.__longpressContextmenu__ = (e) => { - e.preventDefault() - e.stopPropagation() - callback(e, el) - } - el.addEventListener('contextmenu', el.__longpressContextmenu__); return } - // 定义变量 let pressTimer = null let isCall = false @@ -64,9 +64,9 @@ const longpress = { }, // 指令与元素解绑的时候,移除事件绑定 unbind(el) { + el.removeEventListener('contextmenu', el.__longpressContextmenu__) + delete el.__longpressContextmenu__ if (!isSupportTouch) { - el.removeEventListener('contextmenu', el.__longpressContextmenu__) - delete el.__longpressContextmenu__ return } el.removeEventListener('touchstart', el.__longpressStart__) diff --git a/resources/assets/sass/pages/page-dashboard.scss b/resources/assets/sass/pages/page-dashboard.scss index e2bbc9a7f..770744432 100644 --- a/resources/assets/sass/pages/page-dashboard.scss +++ b/resources/assets/sass/pages/page-dashboard.scss @@ -286,6 +286,18 @@ opacity: 0; } +body.window-touch { + .page-messenger { + .messenger-wrapper { + .messenger-select { + .messenger-list { + user-select: none; + } + } + } + } +} + body.window-portrait { .page-dashboard { .dashboard-wrapper { @@ -307,6 +319,7 @@ body.window-portrait { } } .dashboard-list { + height: auto; padding-bottom: 2px; .scrollbar-content { overflow: visible; diff --git a/resources/assets/sass/pages/page-file.scss b/resources/assets/sass/pages/page-file.scss index 73eff41af..50db520f5 100644 --- a/resources/assets/sass/pages/page-file.scss +++ b/resources/assets/sass/pages/page-file.scss @@ -753,3 +753,15 @@ body.window-portrait { } } } + +body.window-touch { + .page-file { + .file-wrapper { + .file-drag { + .file-list { + user-select: none; + } + } + } + } +} diff --git a/resources/assets/sass/pages/page-manage.scss b/resources/assets/sass/pages/page-manage.scss index 95bad4566..24e684245 100644 --- a/resources/assets/sass/pages/page-manage.scss +++ b/resources/assets/sass/pages/page-manage.scss @@ -421,6 +421,14 @@ } } +body.window-touch { + .page-manage { + .manage-box-menu { + user-select: none; + } + } +} + body.window-portrait { .page-manage { &.show-tabbar { diff --git a/resources/assets/sass/pages/page-messenger.scss b/resources/assets/sass/pages/page-messenger.scss index a5538acab..adfe38e9a 100644 --- a/resources/assets/sass/pages/page-messenger.scss +++ b/resources/assets/sass/pages/page-messenger.scss @@ -591,6 +591,18 @@ } } +body.window-touch { + .page-messenger { + .messenger-wrapper { + .messenger-select { + .messenger-list { + user-select: none; + } + } + } + } +} + body.window-portrait { .page-messenger { .messenger-wrapper {