diff --git a/apps/src/components/account-input.vue b/apps/src/components/account-input.vue index 8dcd776..b918bed 100644 --- a/apps/src/components/account-input.vue +++ b/apps/src/components/account-input.vue @@ -5,7 +5,10 @@ import { useAccessStore } from '@vben/stores'; import { Input, Select } from 'antdv-next'; -import { getAllowedSysOrigins } from '#/views/system/shared'; +import { + getAllowedSysOrigins, + getDisplayableSysOriginOptions, +} from '#/views/system/shared'; import SysOriginSelect from '#/components/sys-origin-select.vue'; type AccountSelectType = 'LONG' | 'SHORT'; @@ -44,9 +47,12 @@ const sysOriginType = ref(''); const sysOriginOptions = computed(() => getAllowedSysOrigins(accessStore.accessCodes || []), ); +const displaySysOriginOptions = computed(() => + getDisplayableSysOriginOptions(sysOriginOptions.value), +); const showSysOriginTypeSelect = computed( - () => !props.sysOrigin && sysOriginOptions.value.length > 0, + () => !props.sysOrigin && displaySysOriginOptions.value.length > 0, ); const sysOriginVal = computed(() => props.sysOrigin || sysOriginType.value); @@ -192,7 +198,7 @@ watch( v-if="showSysOriginTypeSelect && selectType !== 'LONG'" v-model:value="sysOriginType" class="account-input__origin" - :options="sysOriginOptions" + :options="displaySysOriginOptions" @change="handleSysOriginTypeChange" /> diff --git a/apps/src/components/sys-origin-label.vue b/apps/src/components/sys-origin-label.vue index 381e581..2d21668 100644 --- a/apps/src/components/sys-origin-label.vue +++ b/apps/src/components/sys-origin-label.vue @@ -1,7 +1,12 @@