diff --git a/app/Models/User.php b/app/Models/User.php index 615961969..8e93dc187 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -167,7 +167,7 @@ class User extends AbstractModel if (!$this->bot) { return 0; } - $key = "getBotOwner::" . $this->userid; + $key = "userBotOwner::" . $this->userid; return Cache::remember($key, now()->addMonth(), function() { return intval(UserBot::whereBotId($this->userid)->value('userid')) ?: $this->userid; }); diff --git a/docker-compose.yml b/docker-compose.yml index dfa4917f9..d229a696d 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '3' services: php: container_name: "dootask-php-${APP_ID}" - image: "kuaifan/php:swoole-8.0.rc12" + image: "kuaifan/php:swoole-8.0.rc13" shm_size: "2gb" ulimits: core: diff --git a/resources/assets/js/pages/manage/components/ChatInput/index.vue b/resources/assets/js/pages/manage/components/ChatInput/index.vue index 61e5d76eb..68d10996f 100755 --- a/resources/assets/js/pages/manage/components/ChatInput/index.vue +++ b/resources/assets/js/pages/manage/components/ChatInput/index.vue @@ -941,10 +941,19 @@ export default { }, onClickEditor() { - this.$store.state.messengerSearchKey = {dialog: '', contacts: ''} + this.clearSearchKey() this.updateEmojiQuick(this.value) }, + clearSearchKey() { + if (this.$parent.$options.name === 'DialogWrapper' && (this.$store.state.messengerSearchKey.dialog != '' || this.$store.state.messengerSearchKey.contacts != '')) { + setTimeout(_ => { + this.$parent.onActive(); + }, 10) + } + this.$store.state.messengerSearchKey = {dialog: '', contacts: ''} + }, + focus() { this.$nextTick(() => { if (this.quill) { @@ -1005,7 +1014,7 @@ export default { onSend(type) { this.hidePopover('send') this.rangeIndex = 0 - this.$store.state.messengerSearchKey = {dialog: '', contacts: ''} + this.clearSearchKey() if (type) { this.$emit('on-send', null, type) } else {