diff --git a/src/layout/components/NavLeft/index.vue b/src/layout/components/NavLeft/index.vue index d6e67d690..4145cb9ec 100644 --- a/src/layout/components/NavLeft/index.vue +++ b/src/layout/components/NavLeft/index.vue @@ -136,9 +136,9 @@ export default { this.viewShown = true }, handleViewChange() { - setTimeout(() => { - this.setLeastMenuOpen() - }, 500) + // setTimeout(() => { + // this.setLeastMenuOpen() + // }, 500) }, setLeastMenuOpen() { const hasOpened = document.querySelector('.el-submenu-sidebar.submenu-item.el-submenu.is-opened') diff --git a/src/styles/default-theme.scss b/src/styles/default-theme.scss index e62027a1b..7f4c606ba 100644 --- a/src/styles/default-theme.scss +++ b/src/styles/default-theme.scss @@ -8,7 +8,7 @@ --color-text-primary: #292827; --color-icon-primary: #605e5c; --color-input-border: #BBBFC4; - --color-disabled-background: #dcdee2; + --color-disabled-background: #e9ecef; --color-help-text: #8F959E; --banner-bg: #148f76; --submenu-bg: #ffffff; diff --git a/src/views/profile/ProfileInfo.vue b/src/views/profile/ProfileInfo.vue index 3f4116332..d5a9df208 100644 --- a/src/views/profile/ProfileInfo.vue +++ b/src/views/profile/ProfileInfo.vue @@ -194,7 +194,7 @@ export default { attrs: { disabled: true, name: 'site_msg', - model: this.object?.receive_backends.indexOf('site_msg') !== -1 + model: this.object?.receive_backends?.indexOf('site_msg') !== -1 }, callbacks: { change: this.updateUserReceiveBackends @@ -205,7 +205,7 @@ export default { type: 'switch', attrs: { name: 'email', - model: this.object?.receive_backends.indexOf('email') !== -1 + model: this.object?.receive_backends?.indexOf('email') !== -1 }, callbacks: { change: this.updateUserReceiveBackends @@ -216,7 +216,7 @@ export default { type: 'switch', attrs: { name: 'wecom', - model: this.object?.receive_backends.indexOf('wecom') !== -1 + model: this.object?.receive_backends?.indexOf('wecom') !== -1 }, has: this.$store.getters.publicSettings.AUTH_WECOM, callbacks: { diff --git a/src/views/users/User/UserCreateUpdate.vue b/src/views/users/User/UserCreateUpdate.vue index e0333f71d..fb6987c4c 100644 --- a/src/views/users/User/UserCreateUpdate.vue +++ b/src/views/users/User/UserCreateUpdate.vue @@ -93,7 +93,7 @@ export default { if (formValue.source !== 'local') { return true } - if (formValue.password_strategy === 'custom' || formValue.update_password || this.user.can_public_key_auth) { + if (formValue.update_password) { return false } return true