diff --git a/.prefetch b/.prefetch index 76177894d..d4dee0e7b 100644 --- a/.prefetch +++ b/.prefetch @@ -20,3 +20,8 @@ office/7.5.1-23/web-apps/apps/documenteditor/main/resources/css/app.css office/7.5.1-23/web-apps/apps/documenteditor/main/app.js office/7.5.1-23/sdkjs/word/sdk-all-min.js office/7.5.1-23/sdkjs/word/sdk-all.js +drawio/webapp/js/app.min.js +drawio/webapp/js/stencils.min.js +drawio/webapp/js/extensions.min.js +drawio/webapp/js/shapes-14-6-5.min.js +drawio/webapp/math/es5/output/svg/fonts/tex.js diff --git a/resources/assets/js/pages/manage/messenger.vue b/resources/assets/js/pages/manage/messenger.vue index 32423d88f..e6bfb56d1 100644 --- a/resources/assets/js/pages/manage/messenger.vue +++ b/resources/assets/js/pages/manage/messenger.vue @@ -180,7 +180,7 @@ - +
{{ $L('不显示该会话') }} diff --git a/resources/assets/js/store/markdown.js b/resources/assets/js/store/markdown.js index 9f2572744..0ad76430b 100644 --- a/resources/assets/js/store/markdown.js +++ b/resources/assets/js/store/markdown.js @@ -63,7 +63,11 @@ export function isMarkdownFormat(html) { return false } // - const text = html.replace(/<[^>]+?>/g, '') + let el = document.createElement('div') + el.innerHTML = html + const text = el.innerText + el = null + // if ( /(^|\s+)#+\s(.*)$/m.test(text) // 标题 || /\*\*(.*)\*\*/m.test(text) // 粗体 diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss index e3ee9205d..f7a7928c4 100644 --- a/resources/assets/sass/pages/components/dialog-wrapper.scss +++ b/resources/assets/sass/pages/components/dialog-wrapper.scss @@ -941,19 +941,20 @@ .file-percentage { position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; + left: 2px; + right: 2px; + bottom: 2px; + height: 2px; border-radius: 3px; overflow: hidden; + > span { position: absolute; top: 0; - right: 0; + left: 0; bottom: 0; width: 0; - background-color: rgba(170, 170, 170, 0.2); + background-color: $flow-status-end-color; } } @@ -2074,6 +2075,12 @@ body:not(.window-touch) { display: grid; justify-content: space-between; grid-template-columns: repeat(auto-fill, 60px); + &.cancel { + display: flex; + align-items: center; + justify-content: center; + width: auto; + } > li { list-style: none; width: 60px;