Browse Source

fix: some bugs

pull/3993/head
vben 2 years ago
parent
commit
e83adf0697
  1. 1
      .vscode/settings.json
  2. 1
      packages/@vben-core/uikit/layout-ui/src/vben-layout.vue
  3. 2
      packages/@vben-core/uikit/shadcn-ui/src/components/breadcrumb/breadcrumb-background.vue
  4. 10
      packages/@vben-core/uikit/shadcn-ui/src/components/breadcrumb/breadcrumb.vue
  5. 2
      packages/@vben-core/uikit/shadcn-ui/src/components/button/icon-button.vue
  6. 5
      packages/business/common-ui/src/authentication/login.vue
  7. 2
      packages/business/common-ui/src/preference/blocks/select-item.vue
  8. 2
      packages/business/common-ui/src/preference/blocks/switch-item.vue
  9. 2
      packages/business/common-ui/src/preference/blocks/toggle-item.vue

1
.vscode/settings.json

@ -91,6 +91,7 @@
"**/.gitignore": true,
"**/.svn": true,
"**/.DS_Store": true,
"**/.vitepress/cache": true,
"**/.idea": true,
"**/.vscode": false,
"**/.yarn": true,

1
packages/@vben-core/uikit/layout-ui/src/vben-layout.vue

@ -317,6 +317,7 @@ const contentStyle = computed((): CSSProperties => {
(!isHeaderAuto.value || scrollY.value < headerWrapperHeight.value)
? `${headerWrapperHeight.value}px`
: 0,
paddingBottom: `${props.footerVisible ? props.footerHeight : 0}px`,
};
});

2
packages/@vben-core/uikit/shadcn-ui/src/components/breadcrumb/breadcrumb-background.vue

@ -90,7 +90,7 @@ li a::after {
}
li a::before {
@apply -left-7 z-[-1] border-l-transparent;
@apply -left-7 z-10 border-l-transparent;
}
li a::after {

10
packages/@vben-core/uikit/shadcn-ui/src/components/breadcrumb/breadcrumb.vue

@ -45,7 +45,7 @@ function handleClick(path?: string) {
<TransitionGroup name="breadcrumb-transition">
<template
v-for="(item, index) in breadcrumbs"
:key="`${item.title}-${item.path}-${index}`"
:key="`${item.path}-${item.title}-${index}`"
>
<BreadcrumbItem>
<div v-if="item.items?.length ?? 0 > 0">
@ -97,12 +97,10 @@ function handleClick(path?: string) {
{{ item.title }}
</div>
</BreadcrumbPage>
<BreadcrumbSeparator
v-if="index < breadcrumbs.length - 1 && !item.isHome"
/>
</BreadcrumbItem>
<BreadcrumbSeparator
v-if="index < breadcrumbs.length - 1 && !item.isHome"
>
/
</BreadcrumbSeparator>
</template>
</TransitionGroup>
</BreadcrumbList>

2
packages/@vben-core/uikit/shadcn-ui/src/components/button/icon-button.vue

@ -25,7 +25,7 @@ const props = withDefaults(defineProps<Props>(), {
const slots = useSlots();
const showTooltip = computed(() => !!slots.tooltip || props.tooltip);
const showTooltip = computed(() => !!slots.tooltip || !!props.tooltip);
</script>
<template>

5
packages/business/common-ui/src/authentication/login.vue

@ -81,7 +81,7 @@ function handleGo(path: string) {
</script>
<template>
<div>
<div @keypress.enter="handleSubmit">
<Title>
{{ $t('authentication.welcome-back') }} 👋🏻
<template #desc>
@ -99,8 +99,8 @@ function handleGo(path: string) {
name="username"
:placeholder="$t('authentication.username')"
type="text"
required
:autofocus="false"
@keyup.enter="handleSubmit"
/>
<VbenInputPassword
v-model="formState.password"
@ -111,7 +111,6 @@ function handleGo(path: string) {
:placeholder="$t('authentication.password')"
required
type="password"
@keyup.enter="handleSubmit"
/>
<div class="mb-6 mt-4 flex justify-between">

2
packages/business/common-ui/src/preference/blocks/select-item.vue

@ -19,7 +19,7 @@ defineOptions({
withDefaults(
defineProps<{
disabled: boolean;
disabled?: boolean;
items?: SelectListItem[];
placeholder?: string;
}>(),

2
packages/business/common-ui/src/preference/blocks/switch-item.vue

@ -8,7 +8,7 @@ defineOptions({
name: 'PreferenceSwitchItem',
});
withDefaults(defineProps<{ disabled: boolean }>(), {
withDefaults(defineProps<{ disabled?: boolean }>(), {
disabled: false,
});

2
packages/business/common-ui/src/preference/blocks/toggle-item.vue

@ -7,7 +7,7 @@ defineOptions({
name: 'PreferenceToggleItem',
});
withDefaults(defineProps<{ disabled: boolean; items: SelectListItem[] }>(), {
withDefaults(defineProps<{ disabled?: boolean; items: SelectListItem[] }>(), {
disabled: false,
items: () => [],
});

Loading…
Cancel
Save