diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue index 3e37e0f90..ec316d958 100755 --- a/resources/assets/js/App.vue +++ b/resources/assets/js/App.vue @@ -297,7 +297,7 @@ export default { key: 'manifest', url: $A.apiUrl("../manifest") }) - $A.bindScreenshotKey($A.jsonParse(window.localStorage.getItem("__keyboard:data__")) || {}); + $A.bindScreenshotKey(this.$store.state.cacheKeyboard); // this.$Electron.sendMessage('setMenuLanguage', { openInBrowser: this.$L("在浏览器中打开"), diff --git a/resources/assets/js/pages/manage/components/ChatInput/index.vue b/resources/assets/js/pages/manage/components/ChatInput/index.vue index 2dbafd160..8be5da14b 100755 --- a/resources/assets/js/pages/manage/components/ChatInput/index.vue +++ b/resources/assets/js/pages/manage/components/ChatInput/index.vue @@ -236,10 +236,6 @@ export default { type: Boolean, default: false }, - enterSend: { - type: [String, Boolean], - default: null - }, emojiBottom: { type: Boolean, default: false @@ -386,13 +382,15 @@ export default { 'cacheDialogs', 'dialogMsgs', + + 'cacheKeyboard', ]), - isEnterSend({enterSend}) { - if (typeof enterSend === "boolean") { - return enterSend; + isEnterSend({cacheKeyboard}) { + if (this.$isEEUiApp) { + return cacheKeyboard.send_button_app === 'enter'; } else { - return true; + return cacheKeyboard.send_button_desktop === 'enter'; } }, @@ -495,11 +493,6 @@ export default { } return null; }, - - separateSendButton() { - return $A.jsonParse(window.localStorage.getItem("__keyboard:data__"))?.separate_send_button !== 'close'; - }, - }, watch: { // Watch content change @@ -669,11 +662,6 @@ export default { shortKey: true, handler: _ => { if (!this.isEnterSend) { - if (this.separateSendButton) { - const length = this.quill.getSelection(true).index; - this.quill.insertText(length, "\r\n"); - return false; - } this.onSend(); return false; } @@ -685,11 +673,6 @@ export default { shiftKey: false, handler: _ => { if (this.isEnterSend) { - if (this.separateSendButton) { - const length = this.quill.getSelection(true).index; - this.quill.insertText(length, "\r\n"); - return false; - } this.onSend(); return false; } @@ -798,9 +781,18 @@ export default { if (e.key === '\r\r' && e.keyCode === 229) { const length = this.quill.getSelection(true).index; this.quill.insertText(length, "\r\n"); + // + this.keyTimer && clearTimeout(this.keyTimer) + this.keyTimer = setTimeout(_ => { + this.$refs.editor.firstChild.childNodes.forEach(child => { + if (/^\r+/.test(child.innerHTML)) { + child.innerHTML = child.innerHTML.replace(/^\r+/, "") || "
" + } + }) + }, 200) } }); - if (!this.separateSendButton) { + if (this.$isEEUiApp && this.cacheKeyboard.send_button_app === 'enter') { this.quill.root.setAttribute('enterkeyhint', 'send') } }) diff --git a/resources/assets/js/pages/manage/setting/keyboard.vue b/resources/assets/js/pages/manage/setting/keyboard.vue index c0a6b9786..1d2430238 100644 --- a/resources/assets/js/pages/manage/setting/keyboard.vue +++ b/resources/assets/js/pages/manage/setting/keyboard.vue @@ -28,13 +28,21 @@ - - - {{$L('开启')}} - {{$L('关闭')}} + + + {{$L('开启')}} + {{$L('关闭')}}
{{$L('开启后，发送消息时键盘上的发送按钮会被替换成换行')}}
 + + + Enter {{$L('发送')}} + + {{mateName}}
+
Enter {{$L('发送')}} + + +
@@ -67,7 +75,8 @@ export default { formData: { screenshot_key: '', - separate_send_button: 'open' + send_button_app: '', + send_button_desktop: '', }, ruleData: { @@ -98,29 +107,26 @@ export default { methods: { initData() { - this.formData = Object.assign({ - screenshot_key: '', - separate_send_button: 'open', - }, $A.jsonParse(window.localStorage.getItem("__keyboard:data__")) || {}); - // + this.formData = $A.cloneJSON(this.$store.state.cacheKeyboard); this.formData_bak = $A.cloneJSON(this.formData); }, submitForm() { this.$refs.formData.validate((valid) => { if (valid) { - window.localStorage.setItem("__keyboard:data__", $A.jsonStringify(this.formData)); - if (this.$Electron) { - $A.bindScreenshotKey(this.formData); - } - $A.messageSuccess('保存成功'); + this.$store.dispatch('handleKeyboard', this.formData).then((data) => { + if (this.$Electron) { + $A.bindScreenshotKey(data); + } + $A.messageSuccess('保存成功'); + }); } }) }, resetForm() { this.formData = $A.cloneJSON(this.formData_bak); - } + }, } } diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js index eb452f8e8..327545a07 100644 --- a/resources/assets/js/store/actions.js +++ b/resources/assets/js/store/actions.js @@ -57,6 +57,9 @@ export default { // 主题皮肤 await dispatch("synchTheme") + // Keyboard + await dispatch("handleKeyboard") + // 客户端ID if (!state.clientId) { state.clientId = $A.randomString(6) @@ -826,6 +829,24 @@ export default { }); }, + /** + * 处理快捷键配置 + * @param state + * @param newData + * @returns {Promise} + */ + handleKeyboard({state}, newData) { + return new Promise(resolve => { + const data = $A.isJson(newData) ? newData : ($A.jsonParse(window.localStorage.getItem("__keyboard:data__")) || {}) + data.screenshot_key = (data.screenshot_key || "").trim().toLowerCase() + data.send_button_app = data.send_button_app || 'button' // button, enter 移动端发送按钮，默认 button （页面按钮发送） + data.send_button_desktop = data.send_button_desktop || 'enter' // button, enter 桌面端发送按钮，默认 enter （键盘回车发送） + window.localStorage.setItem("__keyboard:data__", $A.jsonStringify(data)) + state.cacheKeyboard = data + resolve(data) + }) + }, + /** * 清除缓存 * @param state diff --git a/resources/assets/js/store/state.js b/resources/assets/js/store/state.js index f10e65ddf..4fe3ce18e 100644 --- a/resources/assets/js/store/state.js +++ b/resources/assets/js/store/state.js @@ -77,6 +77,9 @@ export default { // ServerUrl cacheServerUrl: "", + // keyboard + cacheKeyboard: {}, + // Ajax ajaxWsReady: false, ajaxWsListener: [],