diff --git a/resources/assets/js/components/UserSelect.vue b/resources/assets/js/components/UserSelect.vue index 7a28b3692..8f633a86f 100755 --- a/resources/assets/js/components/UserSelect.vue +++ b/resources/assets/js/components/UserSelect.vue @@ -108,10 +108,11 @@ v-for="item in lists" :class="{ selected: selects.includes(item.userid), - disabled: isUncancelable(item.userid) || isDisabled(item.userid) + disabled: isNoChoice(item.userid) }" @click="onSelectItem(item)"> +
@@ -447,6 +448,10 @@ export default { return this.disabledChoice.includes(userid) }, + isNoChoice(userid) { + return this.isUncancelable(userid) || this.isDisabled(userid) + }, + formatSelect(list) { return list.map(userid => { if ($A.leftExists(userid, 'd:')) { diff --git a/resources/assets/sass/components/user-select.scss b/resources/assets/sass/components/user-select.scss index fbb81f708..ab45628cd 100755 --- a/resources/assets/sass/components/user-select.scss +++ b/resources/assets/sass/components/user-select.scss @@ -300,10 +300,16 @@ } } - &.disabled, - &.disabled:hover { + &.disabled { color: #c5c8ce; cursor: not-allowed; + &:hover { + color: #c5c8ce; + cursor: not-allowed; + } + .user-modal-icon { + color: #c5c8ce; + } } .user-modal-icon {