@data-fair/lib-vuetify 1.10.0 → 1.10.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/personal-menu.vue +3 -3
- package/personal-menu.vue.js +4 -2
package/package.json
CHANGED
package/personal-menu.vue
CHANGED
|
@@ -49,8 +49,8 @@
|
|
|
49
49
|
<v-list-item-title>
|
|
50
50
|
{{ account.type === 'user' ? t('personalAccount') : account.name }}
|
|
51
51
|
</v-list-item-title>
|
|
52
|
-
<v-list-item-subtitle v-if="account.department">
|
|
53
|
-
{{ account.departmentName || account.department }}
|
|
52
|
+
<v-list-item-subtitle v-if="account.department || organization?.roleLabel">
|
|
53
|
+
{{ account.departmentName || account.department }} {{ organization?.roleLabel }}
|
|
54
54
|
</v-list-item-subtitle>
|
|
55
55
|
<v-list-item-subtitle>{{ user.name }}</v-list-item-subtitle>
|
|
56
56
|
</v-list-item>
|
|
@@ -208,7 +208,7 @@ import { mdiAlert, mdiShieldAlert, mdiLogout, mdiAccountSwitchOutline } from '@m
|
|
|
208
208
|
const session = useSession()
|
|
209
209
|
|
|
210
210
|
const { t } = useI18n({ useScope: 'local' })
|
|
211
|
-
const { user, account } = toRefs(session.state)
|
|
211
|
+
const { user, account, organization } = toRefs(session.state)
|
|
212
212
|
const switchableOrganizations = computed(() => {
|
|
213
213
|
const { user, account, accountRole } = session.state
|
|
214
214
|
if (!user || !account) return
|
package/personal-menu.vue.js
CHANGED
|
@@ -7,7 +7,7 @@ import { mdiAlert, mdiShieldAlert, mdiLogout, mdiAccountSwitchOutline } from '@m
|
|
|
7
7
|
const { defineProps, defineSlots, defineEmits, defineExpose, defineModel, defineOptions, withDefaults, } = await import('vue');
|
|
8
8
|
const session = useSession();
|
|
9
9
|
const { t } = useI18n({ useScope: 'local' });
|
|
10
|
-
const { user, account } = toRefs(session.state);
|
|
10
|
+
const { user, account, organization } = toRefs(session.state);
|
|
11
11
|
const switchableOrganizations = computed(() => {
|
|
12
12
|
const { user, account, accountRole } = session.state;
|
|
13
13
|
if (!user || !account)
|
|
@@ -104,13 +104,14 @@ function __VLS_template() {
|
|
|
104
104
|
(__VLS_ctx.account.type === 'user' ? __VLS_ctx.t('personalAccount') : __VLS_ctx.account.name);
|
|
105
105
|
__VLS_nonNullable(__VLS_57.slots).default;
|
|
106
106
|
const __VLS_57 = __VLS_pickFunctionalComponentCtx(__VLS_52, __VLS_54);
|
|
107
|
-
if (__VLS_ctx.account.department) {
|
|
107
|
+
if (__VLS_ctx.account.department || __VLS_ctx.organization?.roleLabel) {
|
|
108
108
|
const __VLS_58 = __VLS_resolvedLocalAndGlobalComponents.VListItemSubtitle;
|
|
109
109
|
/** @type { [typeof __VLS_components.VListItemSubtitle, typeof __VLS_components.vListItemSubtitle, typeof __VLS_components.VListItemSubtitle, typeof __VLS_components.vListItemSubtitle, ] } */
|
|
110
110
|
// @ts-ignore
|
|
111
111
|
const __VLS_59 = __VLS_asFunctionalComponent(__VLS_58, new __VLS_58({}));
|
|
112
112
|
const __VLS_60 = __VLS_59({}, ...__VLS_functionalComponentArgsRest(__VLS_59));
|
|
113
113
|
(__VLS_ctx.account.departmentName || __VLS_ctx.account.department);
|
|
114
|
+
(__VLS_ctx.organization?.roleLabel);
|
|
114
115
|
__VLS_nonNullable(__VLS_63.slots).default;
|
|
115
116
|
const __VLS_63 = __VLS_pickFunctionalComponentCtx(__VLS_58, __VLS_60);
|
|
116
117
|
}
|
|
@@ -369,6 +370,7 @@ const __VLS_self = (await import('vue')).defineComponent({
|
|
|
369
370
|
t: t,
|
|
370
371
|
user: user,
|
|
371
372
|
account: account,
|
|
373
|
+
organization: organization,
|
|
372
374
|
switchableOrganizations: switchableOrganizations,
|
|
373
375
|
};
|
|
374
376
|
},
|