diff --git a/src/App.vue b/src/App.vue index bc895099fac79918556c6fe8e8d1f1a29227118b..24088ea0fe0d74b2a5336c8c12a4add76fdff067 100644 --- a/src/App.vue +++ b/src/App.vue @@ -324,6 +324,8 @@ export default { } if (this.callUserList.length) { emitContent.callUserList = this.callUserList; + } else { + emitContent.callUserList = []; } emitContent.filteredTags = this.filteredTags; diff --git a/src/assets/js/utils.js b/src/assets/js/utils.js index bfbd0e450e5c1e71895b81896b47c607c245578f..c62328fca8de3a3c548dd5fad18ab99f8ff09e7e 100644 --- a/src/assets/js/utils.js +++ b/src/assets/js/utils.js @@ -76,7 +76,8 @@ export function initStyle({ contentBgColor, codeBgColor, codeTheme, - helpdocColor + helpdocColor, + itemActiveBgColor }) { // 夜晚模式 if (dark) { @@ -89,6 +90,7 @@ export function initStyle({ codeBgColor = "#777888"; contentBgColor = "#222226"; helpdocColor = "#CCCCD8"; + itemActiveBgColor = "#777888"; } if (frameBgColor) { document.documentElement.style.setProperty( @@ -96,6 +98,12 @@ export function initStyle({ frameBgColor ); } + if (itemActiveBgColor) { + document.documentElement.style.setProperty( + "--md-editor-item-active-bg-color", + itemActiveBgColor + ); + } if (contentBgColor) { document.documentElement.style.setProperty( "--md-editor-content-bg-color", @@ -143,19 +151,19 @@ export function initStyle({ if (codeTheme) { switch (codeTheme) { case "dark": - import("@/assets/style/code/dark.css"); + import("@/assets/style/code/dark.less"); break; case "light": - import("@/assets/style/code/lightfair.css"); + import("@/assets/style/code/lightfair.less"); break; case "atom-one-dark": - import("@/assets/style/code/atom-one-dark.css"); + import("@/assets/style/code/atom-one-dark.less"); break; default: break; } } else { - import("@/assets/style/code/lightfair.css"); + import("@/assets/style/code/lightfair.less"); } } @@ -183,6 +191,13 @@ export function checkBoswer() { ); return agent !== null; } + +export function isAndroid() { + const agent = navigator.userAgent.match( + /(Android)/i + ); + return agent !== null; +} // 去除头部空格行 export function removeBlankLine(val) { if (!val) return ""; diff --git a/src/assets/style/variable.less b/src/assets/style/variable.less index c12a3e5786b882f0d0694883b166e48e24fb5ed4..40f8739711c4ddf598b05f831ba2cfe08c8e18ea 100644 --- a/src/assets/style/variable.less +++ b/src/assets/style/variable.less @@ -7,6 +7,7 @@ --md-editor-content-bg-color: #fff; --md-editor-frame-bg-color-disabled: #f5f7fa; --md-editor-content-bg-color-disabled: #f5f7fa; + --md-editor-item-active-bg-color: #f5f7fa; --md-editor-helpdoc-color: #666666; --md-editor-code-bg-color: #f3f4f5; --md-editor-fullScrren-zIndex: 2000; diff --git a/src/components/content/components/user-select.vue b/src/components/content/components/user-select.vue index de4ba0e7496b5f3294441d94bcab42e9dd855327..c69275b9040994c9f44d20f25d35557ce5267c5d 100644 --- a/src/components/content/components/user-select.vue +++ b/src/components/content/components/user-select.vue @@ -25,6 +25,7 @@