diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index 18155b8e2..2fdcb9718 100755 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -747,8 +747,7 @@ class UsersController extends AbstractController $builder->whereNull('disable_at'); $builder->where('bot', 0); } - $builder = $keys['department'] == '0' ? $builder->orderByDesc('userid') : $builder; - $list = $builder->paginate(Base::getPaginate(50, 20)); + $list = $builder->orderByDesc('userid')->paginate(Base::getPaginate(50, 20)); // if ($getCheckinMac) { $list->transform(function (User $user) use ($getCheckinMac) { diff --git a/resources/assets/js/pages/manage/components/DialogMarkdown.vue b/resources/assets/js/pages/manage/components/DialogMarkdown.vue index 10a708ff0..5f63d022f 100644 --- a/resources/assets/js/pages/manage/components/DialogMarkdown.vue +++ b/resources/assets/js/pages/manage/components/DialogMarkdown.vue @@ -32,7 +32,10 @@ export default { }, computed: { - html() { + html({text}) { + if (text === '...') { + return '' + } if (this.mdi === null) { const {highlightBlock} = this this.mdi = new MarkdownIt({ @@ -49,7 +52,7 @@ export default { this.mdi.use(mila, {attrs: {target: '_blank', rel: 'noopener'}}) this.mdi.use(mdKatex, {blockClass: 'katexmath-block rounded-md p-[10px]', errorColor: ' #cc0000'}) } - return this.formatMsg(this.mdi.render(this.text)) + return this.formatMsg(this.mdi.render(text)) } }, diff --git a/resources/assets/sass/pages/components/chat-input.scss b/resources/assets/sass/pages/components/chat-input.scss index a34348b29..0f36a3733 100755 --- a/resources/assets/sass/pages/components/chat-input.scss +++ b/resources/assets/sass/pages/components/chat-input.scss @@ -128,6 +128,12 @@ min-width: calc(100% - 170px); font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"; + &.ql-bubble:not(.ql-disabled) { + a { + white-space: normal; + } + } + .ql-editor { font-size: 14px; max-height: 200px; diff --git a/resources/assets/sass/pages/components/dialog-markdown/markdown.less b/resources/assets/sass/pages/components/dialog-markdown/markdown.less index f615a49cc..6368d04b7 100644 --- a/resources/assets/sass/pages/components/dialog-markdown/markdown.less +++ b/resources/assets/sass/pages/components/dialog-markdown/markdown.less @@ -72,6 +72,11 @@ body { } } } + + .input-blink { + width: 3px; + animation: blink-animate 1.2s infinite steps(1,start); + } } .self { @@ -79,4 +84,14 @@ body { color: #ffffff; } } + + @keyframes blink-animate { + 0%,to { + background-color: currentColor + } + + 50% { + background-color: transparent + } + } }