diff --git a/packages/components/_private/header/src/types.ts b/packages/components/_private/header/src/types.ts index 8edcdc45b..6469159d3 100644 --- a/packages/components/_private/header/src/types.ts +++ b/packages/components/_private/header/src/types.ts @@ -12,6 +12,6 @@ export interface HeaderProps { closable?: boolean closeIcon?: string | VNode header?: string | IxHeaderProps - size?: 'xl' | 'lg' | 'md' | 'sm' + size?: 'lg' | 'md' | 'sm' onClose?: (evt: Event) => void } diff --git a/packages/components/button/docs/Api.zh.md b/packages/components/button/docs/Api.zh.md index 46f8710a5..bb737ce87 100644 --- a/packages/components/button/docs/Api.zh.md +++ b/packages/components/button/docs/Api.zh.md @@ -11,13 +11,19 @@ | `danger` | 设置危险状态 | `boolean` | - | - |- | | `disabled` | 设置禁用状态 | `boolean` | - | - |- | | `ghost` | 设置幽灵状态 | `boolean` | - | - |- | -| `icon` | 设置图标类型 | `string \| #icon` | - | - | `loading` 为 `true` 时无效 | +| `icon` | 设置图标类型 | `string` | - | - | `loading` 为 `true` 时无效 | | `loading` | 设置加载中状态 | `boolean` | - | - |- | | `mode` | 设置按钮种类 | `'primary' \| 'default' \| 'dashed' \| 'text' \| 'link'` | `'default'` | - |- | | `shape` | 设置按钮形状 | `'square' \| 'circle' \| 'round'` | - | - |- | | `size` | 设置按钮大小 | `'xl' \| 'lg' \| 'md' \| 'sm' \| 'xs'` | `'md'` | - |- | | `type` | 原生 `button` 的 `type` 属性 | `'button' \| 'submit' \| 'reset'` | `'button'` | - | 参考 [HTML 标准](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button#attr-type) | +#### ButtonSlots + +| 名称 | 说明 | 参数类型 | 备注 | +| --- | --- | --- | --- | +| `icon` | 自定义图标 | - | - | + ### IxButtonGroup #### ButtonGroupProps diff --git a/packages/components/button/docs/Theme.zh.md b/packages/components/button/docs/Theme.zh.md index e41bca4c1..b5bfd8b87 100644 --- a/packages/components/button/docs/Theme.zh.md +++ b/packages/components/button/docs/Theme.zh.md @@ -21,7 +21,9 @@ | `@button-padding-lg` | `0 var(--ix-spacing-xl)` | - | - | | `@button-padding-xl` | `0 var(--ix-spacing-2xl)` | - | - | | `@button-color` | `var(--ix-text-color)` | - | - | +| `@button-color-disabled` | `var(--ix-text-color-disabled)` | - | - | | `@button-background-color` | `var(--ix-background-color)` | - | - | +| `@button-background-color-disabled` | `var(--ix-background-color-deep)` | - | - | | `@button-border-color` | `var(--ix-border-color)` | - | - | | `@button-border-radius` | `var(--ix-border-radius-sm)` | - | - | | `@button-primary-color` | `var(--ix-text-color-inverse)` | - | - | @@ -35,7 +37,5 @@ | `@button-ghost-background-color-hover` | `rgba(255, 255, 255, 0.2)` | - | - | | `@button-ghost-background-color-active` | `var(--ix-background-color)` | - | - | | `@button-ghost-background-color-disabled` | `rgba(255, 255, 255, 0.4)` | - | - | -| `@button-disabled-color` | `var(--ix-text-color-disabled)` | - | - | -| `@button-disabled-background-color` | `var(--ix-background-color-deep)` | - | - | | `@button-icon-color` | `inherit` | `var(--ix-text-color-title-secondary)` | - | | `@button-icon-font-size` | `inherit` | `var(--ix-font-size-lg)` | - | diff --git a/packages/components/button/style/index.less b/packages/components/button/style/index.less index 98b74be95..98f182b6c 100644 --- a/packages/components/button/style/index.less +++ b/packages/components/button/style/index.less @@ -244,8 +244,8 @@ &:hover, &:focus, &:active { - color: @button-disabled-color; - background-color: @button-disabled-background-color; + color: @button-color-disabled; + background-color: @button-background-color-disabled; border-color: @button-border-color; } } diff --git a/packages/components/button/style/themes/default.variable.less b/packages/components/button/style/themes/default.variable.less index d9b36f9cb..eb882693a 100644 --- a/packages/components/button/style/themes/default.variable.less +++ b/packages/components/button/style/themes/default.variable.less @@ -23,7 +23,9 @@ @button-padding-xl: 0 var(--ix-spacing-2xl); @button-color: var(--ix-text-color); +@button-color-disabled: var(--ix-text-color-disabled); @button-background-color: var(--ix-background-color); +@button-background-color-disabled: var(--ix-background-color-deep); @button-border-color: var(--ix-border-color); @button-border-radius: var(--ix-border-radius-sm); @@ -41,8 +43,5 @@ @button-ghost-background-color-active: var(--ix-background-color); @button-ghost-background-color-disabled: rgba(255, 255, 255, 0.4); -@button-disabled-color: var(--ix-text-color-disabled); -@button-disabled-background-color: var(--ix-background-color-deep); - @button-icon-color: inherit; @button-icon-font-size: inherit; diff --git a/packages/components/header/demo/PrefixSuffix.vue b/packages/components/header/demo/PrefixSuffix.vue index 4ea397ead..ed0c17a23 100644 --- a/packages/components/header/demo/PrefixSuffix.vue +++ b/packages/components/header/demo/PrefixSuffix.vue @@ -8,11 +8,11 @@ diff --git a/packages/components/header/demo/SizeBar.vue b/packages/components/header/demo/SizeBar.vue index ce4bf43b7..c17e0cf79 100644 --- a/packages/components/header/demo/SizeBar.vue +++ b/packages/components/header/demo/SizeBar.vue @@ -1,5 +1,4 @@