diff --git a/language/original-web.txt b/language/original-web.txt index 251714f3a..41eaf3bf1 100644 --- a/language/original-web.txt +++ b/language/original-web.txt @@ -2061,3 +2061,6 @@ AI开启新会话失败 客户端 是否在该设备上退出登录？ 登录设备 + +按工作流 +按状态 diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index 54ce65d81..3fe307d53 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -1313,19 +1313,23 @@ export default { }, dialogMsgTransfer: { - handler({time, msgFile, msgRecord, msgText, dialogId}) { - if (time > $A.dayjs().unix() && dialogId == this.dialogId) { - this.$store.state.dialogMsgTransfer.time = 0; - this.$nextTick(() => { - if ($A.isArray(msgFile) && msgFile.length > 0) { - this.sendFileMsg(msgFile); - } else if ($A.isJson(msgRecord) && msgRecord.duration > 0) { - this.sendRecord(msgRecord); - } else if (msgText) { - this.sendMsg(msgText); - } - }); + handler({time, msgFile, msgRecord, msgText, sendType, dialogId}) { + if (time < $A.dayjs().unix()) { + return } + if (dialogId != this.dialogId) { + return; + } + this.$store.state.dialogMsgTransfer.time = 0; + this.$nextTick(() => { + if ($A.isArray(msgFile) && msgFile.length > 0) { + this.sendFileMsg(msgFile); + } else if ($A.isJson(msgRecord) && msgRecord.duration > 0) { + this.sendRecord(msgRecord); + } else if (msgText) { + this.sendMsg(msgText, sendType); + } + }); }, immediate: true }, @@ -1537,11 +1541,10 @@ export default { if (typeof text === "string" && text) { textBody = text; } else { - textBody = this.msgText; + textBody = type === "md" ? this.$refs.input.getText() : this.msgText; emptied = true; } if (type === "md") { - textBody = this.$refs.input.getText() textType = "md" } else if (type === "silence") { silence = "yes" @@ -2258,10 +2261,6 @@ export default { if (e.dataTransfer.effectAllowed === 'move') { return; } - const postFiles = Array.prototype.slice.call(e.dataTransfer.files); - if (postFiles.length === 0) { - return; - } this.dialogDrag = true; } }, diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue index 4e46d87f0..4b0b3181f 100755 --- a/resources/assets/js/pages/manage/components/TaskDetail.vue +++ b/resources/assets/js/pages/manage/components/TaskDetail.vue @@ -427,7 +427,7 @@
-
+
{{$L('任务聊天')}} ({{taskDetail.msg_num > 999 ? '999+' : taskDetail.msg_num}}) @@ -455,7 +455,6 @@ :loading="sendLoad > 0" :maxlength="200000" :placeholder="$L('输入消息...')" - :send-menu="false" @on-focus="onFocus" @on-more="onEventMore" @on-file="onSelectFile" @@ -1617,17 +1616,17 @@ export default { this.$refs.upload.handleClick() }, - msgDialog(msgText = null, onlyOpen = false) { + msgDialog(sendType = null) { if (this.sendLoad > 0 || this.openLoad > 0) { return; } // if (this.taskDetail.dialog_id) { - this.openDialogBefore(this.taskDetail.dialog_id, msgText, onlyOpen) + this.openDialogBefore(this.taskDetail.dialog_id, sendType) return; } // - if (onlyOpen === true) { + if (sendType === true) { this.openLoad++; } else { this.sendLoad++; @@ -1641,11 +1640,11 @@ export default { }).then(async ({data}) => { await this.$store.dispatch("saveTask", {id: data.id, dialog_id: data.dialog_id}); await this.$store.dispatch("saveDialog", data.dialog_data); - await this.openDialogBefore(data.dialog_id, msgText, onlyOpen) + this.openDialogBefore(data.dialog_id, sendType) }).catch(({msg}) => { $A.modalError(msg); }).finally(_ => { - if (onlyOpen === true) { + if (sendType === true) { this.openLoad--; } else { this.sendLoad--; @@ -1653,62 +1652,34 @@ export default { }); }, - async openDialogBefore(dialogId, msgText, onlyOpen) { + openDialogBefore(dialogId, sendType) { + if (sendType !== true) { + const transferData = { + time: $A.dayjs().unix() + 10, + msgRecord: this.msgRecord, + msgFile: this.msgFile, + msgText: sendType === 'md' ? this.$refs.chatInput?.getText() : this.msgText, + sendType, + dialogId, + }; + this.msgRecord = {}; + this.msgFile = []; + this.msgText = ""; + this.$store.state.dialogMsgTransfer = transferData + this.$store.dispatch("saveDialogDraft", {id: `t_${this.taskId}`, content: ""}) + } + if ($A.isSubElectron) { - await this.resizeDialog() - this.sendDialogMsg(msgText); + this.resizeDialog() return } - this.$nextTick(() => { - if (this.windowPortrait) { - const openSuccess = () => { - const transferData = { - time: $A.dayjs().unix() + 10, - msgRecord: this.msgRecord, - msgFile: this.msgFile, - msgText: typeof msgText === 'string' && msgText ? msgText : this.msgText, - dialogId, - }; - this.msgRecord = {}; - this.msgFile = []; - this.msgText = ""; - this.$store.state.dialogMsgTransfer = transferData - } - this.$store.dispatch('openDialog', dialogId).then(_ => { - !onlyOpen && openSuccess() - }).catch(({msg}) => { - $A.modalError(msg); - }) - $A.eeuiAppKeyboardHide(); - } else { - this.sendDialogMsg(msgText); - } - }); - }, - sendDialogMsg(msgText = null) { - if (typeof msgText === 'string' && msgText) { - this.autoSaveTextDraft(); - this.$refs.dialog.sendMsg(msgText); - } else if (this.msgFile.length > 0) { - this.autoSaveTextDraft(); - this.$refs.dialog.sendFileMsg(this.msgFile.map(file => Object.assign(file, { - ajaxExtraData: { - image_attachment: this.imageAttachment ? 1 : 0 - } - }))); - } else if (this.msgText) { - this.$refs.dialog.sendMsg(this.msgText); + if (this.windowPortrait) { + this.$store.dispatch('openDialog', dialogId).catch(({msg}) => { + $A.modalError(msg); + }) + $A.eeuiAppKeyboardHide(); } - this.msgFile = []; - this.msgText = ""; - }, - - autoSaveTextDraft() { - if (!this.msgText) { - return; - } - this.$store.dispatch("saveDialogDraft", {id: this.taskDetail.dialog_id, content: this.msgText}) }, taskPasteDrag(e, type) { @@ -1752,13 +1723,17 @@ export default { this.msgDialog() }, - onSend(msgText) { + onOpen() { this.$refs.chatInput?.hidePopover(); - if (msgText === 'open') { - this.msgDialog(null, true); - } else { - this.msgDialog(msgText); + this.msgDialog(true); + }, + + onSend(text, type) { + this.$refs.chatInput?.hidePopover(); + if (typeof text === "string" && text) { + this.msgText = text; } + this.msgDialog(type); }, deleteFile(file) { diff --git a/resources/assets/sass/pages/common.scss b/resources/assets/sass/pages/common.scss index bd1d72db1..a455ed4ca 100755 --- a/resources/assets/sass/pages/common.scss +++ b/resources/assets/sass/pages/common.scss @@ -123,6 +123,10 @@ body { } } } + + .ivu-select-group-wrap { + padding: 0 8px; + } } .ivu-tooltip-popper {