From c6d954d77643d303fde3333352b023891f5222ef Mon Sep 17 00:00:00 2001 From: Maksim Date: Wed, 9 Oct 2024 14:54:50 +0300 Subject: [PATCH] feat(dynamic): mixin in list --- .../core/composables/useMenuService/index.ts | 2 +- .../vc-app-switcher/vc-app-switcher.vue | 2 +- .../composables/useBladeNavigation/index.ts | 2 +- .../notifications/core/notification.ts | 2 +- .../shared/components/sidebar/sidebar.vue | 2 +- .../components/sign-in/useExternalProvider.ts | 1 + .../dynamic/components/fields/StatusField.ts | 2 +- .../storybook/MultivalueField.stories.ts | 2 +- .../fields/storybook/SelectField.stories.ts | 2 +- .../factories/base/useDetailsFactory.ts | 10 +++--- .../modules/dynamic/helpers/override.ts | 14 ++++++-- framework/shared/modules/dynamic/index.ts | 31 ++++++++++++---- .../dynamic/pages/dynamic-blade-form.vue | 4 +-- .../dynamic/pages/dynamic-blade-list.vue | 36 ++++++++++++++++--- .../shared/modules/dynamic/types/index.ts | 4 +-- .../atoms/vc-card/vc-card.stories.ts | 3 +- .../molecules/vc-input/vc-input.vue | 8 ++--- .../molecules/vc-select/vc-select.stories.ts | 2 +- .../organisms/vc-blade/vc-blade.stories.ts | 2 +- .../vc-table-base-header.vue | 4 +-- .../organisms/vc-table/vc-table.vue | 1 - yarn.lock | 30 ++++++++-------- 22 files changed, 108 insertions(+), 58 deletions(-) diff --git a/framework/core/composables/useMenuService/index.ts b/framework/core/composables/useMenuService/index.ts index 3dfdc967b..ce200c193 100644 --- a/framework/core/composables/useMenuService/index.ts +++ b/framework/core/composables/useMenuService/index.ts @@ -83,7 +83,7 @@ function useMenuServiceFn(): MenuService { menuItems.value = constructedMenu.value .map( - (x, index): MenuItem => ({ + (x): MenuItem => ({ ...x, title: computed(() => t(x.title as string)), id: _.snakeCase(t(x.title as string)), diff --git a/framework/shared/components/app-switcher/components/vc-app-switcher/vc-app-switcher.vue b/framework/shared/components/app-switcher/components/vc-app-switcher/vc-app-switcher.vue index 01aff3e99..4ac4d4945 100644 --- a/framework/shared/components/app-switcher/components/vc-app-switcher/vc-app-switcher.vue +++ b/framework/shared/components/app-switcher/components/vc-app-switcher/vc-app-switcher.vue @@ -62,7 +62,7 @@