fix: 优化代码格式,合并类型声明

This commit is contained in:
xingyu4j
2026-07-13 18:30:19 +08:00
parent 819ddd4ebb
commit 91a2e80be8
8 changed files with 11 additions and 26 deletions

3
.github/config.yml vendored
View File

@@ -21,12 +21,10 @@ newPRWelcomeComment: |
firstPRMergeComment: > firstPRMergeComment: >
Thanks for your contribution! 🎉🎉🎉 Thanks for your contribution! 🎉🎉🎉
# Comment to be posted to on first time issues # Comment to be posted to on first time issues
newIssueWelcomeComment: > newIssueWelcomeComment: >
Thanks for opening your first issue! Be sure to follow the issue template and provide every bit of information to help the developers! Thanks for opening your first issue! Be sure to follow the issue template and provide every bit of information to help the developers!
# *OPTIONAL* default titles to check against for lack of descriptiveness # *OPTIONAL* default titles to check against for lack of descriptiveness
# MUST BE ALL LOWERCASE # MUST BE ALL LOWERCASE
requestInfoDefaultTitles: requestInfoDefaultTitles:
@@ -36,4 +34,3 @@ requestInfoDefaultTitles:
# *Required* Comment to reply with # *Required* Comment to reply with
requestInfoReplyComment: > requestInfoReplyComment: >
Thanks for filing this issue/PR! It would be much appreciated if you could provide us with more information so we can effectively analyze the situation in context. Thanks for filing this issue/PR! It would be much appreciated if you could provide us with more information so we can effectively analyze the situation in context.

View File

@@ -80,10 +80,7 @@ export type PromptProps<T = any> = {
component?: Component; component?: Component;
componentProps?: Recordable<any>; componentProps?: Recordable<any>;
componentSlots?: componentSlots?:
| (() => any) (() => any) | Recordable<unknown> | VNode | VNodeArrayChildren;
| Recordable<unknown>
| VNode
| VNodeArrayChildren;
defaultValue?: T; defaultValue?: T;
modelPropName?: string; modelPropName?: string;
} & Omit<AlertProps, 'beforeClose'>; } & Omit<AlertProps, 'beforeClose'>;

View File

@@ -9,7 +9,7 @@ const items = [
]; ];
</script> </script>
<template> <template>
<div style="display: flex; flex-direction: column; gap: 16px"> <div class="flex gap-4 flex-col">
<VbenDescriptions <VbenDescriptions
size="small" size="small"
bordered bordered

View File

@@ -1,7 +1,9 @@
<script lang="ts" setup> <script lang="ts" setup>
import type { DescriptionsItemType } from '@vben/common-ui';
import { VbenDescriptions } from '@vben/common-ui'; import { VbenDescriptions } from '@vben/common-ui';
const items = [ const items: DescriptionsItemType[] = [
{ content: '1', label: 'A' }, { content: '1', label: 'A' },
{ content: '2(span: 2)', label: 'B', span: 2 }, { content: '2(span: 2)', label: 'B', span: 2 },
{ content: '3', label: 'C' }, { content: '3', label: 'C' },

View File

@@ -1,7 +1,9 @@
<script lang="ts" setup> <script lang="ts" setup>
import type { DescriptionsItemType } from '@vben/common-ui';
import { VbenDescriptions } from '@vben/common-ui'; import { VbenDescriptions } from '@vben/common-ui';
const items = [ const items: DescriptionsItemType[] = [
{ content: 'Vben', label: '用户名' }, { content: 'Vben', label: '用户名' },
{ content: '13800138000', label: '手机号' }, { content: '13800138000', label: '手机号' },
{ content: '中国 · 杭州', label: '居住地' }, { content: '中国 · 杭州', label: '居住地' },

View File

@@ -66,10 +66,7 @@ export type PromptProps<T = any> = {
component?: Component; component?: Component;
componentProps?: Recordable<any>; componentProps?: Recordable<any>;
componentSlots?: componentSlots?:
| (() => any) (() => any) | Recordable<unknown> | VNode | VNodeArrayChildren;
| Recordable<unknown>
| VNode
| VNodeArrayChildren;
defaultValue?: T; defaultValue?: T;
modelPropName?: string; modelPropName?: string;
} & Omit<AlertProps, 'beforeClose'>; } & Omit<AlertProps, 'beforeClose'>;

View File

@@ -341,12 +341,7 @@ interface RouteMeta {
* Badge color * Badge color
*/ */
badgeVariants?: badgeVariants?:
| 'default' 'default' | 'destructive' | 'primary' | 'success' | 'warning' | string;
| 'destructive'
| 'primary'
| 'success'
| 'warning'
| string;
/** /**
* The children of the current route are not displayed in the menu * The children of the current route are not displayed in the menu
* @default false * @default false

View File

@@ -334,12 +334,7 @@ interface RouteMeta {
* 徽标颜色 * 徽标颜色
*/ */
badgeVariants?: badgeVariants?:
| 'default' 'default' | 'destructive' | 'primary' | 'success' | 'warning' | string;
| 'destructive'
| 'primary'
| 'success'
| 'warning'
| string;
/** /**
* 路由的完整路径作为key(默认true) * 路由的完整路径作为key(默认true)
*/ */