diff --git a/resources/assets/js/pages/manage/approve/details.vue b/resources/assets/js/pages/manage/approve/details.vue index 4e55e2c6b..c86d09506 100644 --- a/resources/assets/js/pages/manage/approve/details.vue +++ b/resources/assets/js/pages/manage/approve/details.vue @@ -283,7 +283,7 @@ export default { }, methods: { init() { - this.modalTransferIndex = window.modalTransferIndex = window.modalTransferIndex + 1 + this.modalTransferIndex = ++window.modalTransferIndex if (this.$route.query.id) { this.getInfo() } diff --git a/resources/assets/js/pages/manage/components/ChatInput/index.vue b/resources/assets/js/pages/manage/components/ChatInput/index.vue index 5ae05d0d9..0fad4c713 100755 --- a/resources/assets/js/pages/manage/components/ChatInput/index.vue +++ b/resources/assets/js/pages/manage/components/ChatInput/index.vue @@ -184,7 +184,7 @@
-
+
0 ? { - marginTop: (windowScrollY / 2) + 'px' - } : null + const {windowScrollY, recordIndex} = this; + const style = { + zIndex: recordIndex, + } + if (windowScrollY > 0) { + style.marginTop = windowScrollY + 'px' + } + return style }, boxClass() { const array = []; - if (['ready', 'ing'].includes(this.recordState)) { + if (this.recordShow) { if (this.recordState === 'ing' && this.recordDuration > 0) { array.push('record-progress'); } else { @@ -804,6 +816,18 @@ export default { this.$emit('on-record-state', state) }, + recordShow(show) { + if (show) { + this.recordIndex = ++window.modalTransferIndex + } + }, + + recordConvertIng(show) { + if (show) { + this.recordIndex = ++window.modalTransferIndex + } + }, + fullInput(val) { this.quill?.enable(!val) }, diff --git a/resources/assets/sass/pages/components/chat-input.scss b/resources/assets/sass/pages/components/chat-input.scss index fd0b613be..6ec391b3d 100755 --- a/resources/assets/sass/pages/components/chat-input.scss +++ b/resources/assets/sass/pages/components/chat-input.scss @@ -768,6 +768,10 @@ padding: 18px; border-radius: 14px; transform: translateY(12px); + transition: transform 0.3s; + &.min-hight-mode { + transform: translateY(-12px); + } &:before { content: ""; position: absolute; @@ -785,6 +789,7 @@ box-shadow: none; background: transparent; color: #ffffff; + caret-color: #ffffff; border-radius: 0; outline: none; resize: none;