diff --git a/packages/devui-vue/devui/button/__tests__/button.spec.ts b/packages/devui-vue/devui/button/__tests__/button.spec.ts index a03789608d..3c60844552 100644 --- a/packages/devui-vue/devui/button/__tests__/button.spec.ts +++ b/packages/devui-vue/devui/button/__tests__/button.spec.ts @@ -2,9 +2,9 @@ import { mount } from '@vue/test-utils'; import Button from '../src/button'; describe('d-button', () => { - it('btnStyle', () => { + it('variant', () => { const wrapper = mount(Button, { - props: { btnStyle: 'danger' }, + props: { variant: 'danger' }, }); expect(wrapper.find('.devui-btn').classes()).toContain('devui-btn-danger'); }); @@ -36,17 +36,17 @@ describe('d-button', () => { }); // 目前还不支持 loading - // it('loading', async () => { - // const handleClick = jest.fn(); - // const wrapper = mount(Button, { - // props: { - // showLoading: true, - // btnClick: handleClick - // }, - // }); - // await wrapper.trigger('click'); - // expect(handleClick).not.toBeCalled(); - // }); + it('loading', async () => { + const handleClick = jest.fn(); + const wrapper = mount(Button, { + props: { + showLoading: true, + btnClick: handleClick + }, + }); + await wrapper.trigger('click'); + expect(handleClick).not.toBeCalled(); + }); it('disabled', async () => { const handleClick = jest.fn(); @@ -64,7 +64,7 @@ describe('d-button', () => { it('slot', () => { const btnText = 'vue3 devui'; const wrapper = mount(Button, { - slots: { + slots: { default: btnText } }); diff --git a/packages/devui-vue/devui/button/src/button-types.ts b/packages/devui-vue/devui/button/src/button-types.ts index e0e117e309..81317ec17d 100644 --- a/packages/devui-vue/devui/button/src/button-types.ts +++ b/packages/devui-vue/devui/button/src/button-types.ts @@ -1,7 +1,7 @@ import { ExtractPropTypes, PropType } from 'vue'; export type IButtonType = 'button' | 'submit' | 'reset'; -export type IButtonStyle = 'common' | 'primary' | 'text' | 'text-dark' | 'danger' | 'success' | 'warning'; +export type IButtonVariant = 'common' | 'primary' | 'text' | 'text-dark' | 'danger' | 'success' | 'warning'; export type IButtonPosition = 'left' | 'right' | 'default'; export type IButtonSize = 'lg' | 'md' | 'sm' | 'xs'; @@ -10,8 +10,8 @@ export const buttonProps = { type: String as PropType, default: 'button' }, - btnStyle: { - type: String as PropType, + variant: { + type: String as PropType, default: 'primary' }, size: { diff --git a/packages/devui-vue/devui/button/src/button.tsx b/packages/devui-vue/devui/button/src/button.tsx index a132922eb4..5a08a4c839 100644 --- a/packages/devui-vue/devui/button/src/button.tsx +++ b/packages/devui-vue/devui/button/src/button.tsx @@ -24,10 +24,10 @@ export default defineComponent({ const hasContent = computed(() => ctx.slots.default); const btnClass = computed(() => { - const { btnStyle, size, position, bordered, icon } = props; - const origin = `devui-btn devui-btn-${btnStyle} devui-btn-${size} devui-btn-${position}`; + const { variant, size, position, bordered, icon } = props; + const origin = `devui-btn devui-btn-${variant} devui-btn-${size} devui-btn-${position}`; const borderedClass = bordered ? 'bordered' : ''; - const btnIcon = !!icon && !hasContent.value && btnStyle !== 'primary' ? 'd-btn-icon' : ''; + const btnIcon = !!icon && !hasContent.value && variant !== 'primary' ? 'd-btn-icon' : ''; const btnIconWrap = !!icon ? 'd-btn-icon-wrap' : ''; return `${origin} ${borderedClass} ${btnIcon} ${btnIconWrap}`; }); diff --git a/packages/devui-vue/devui/gantt/src/gantt-tools/index.tsx b/packages/devui-vue/devui/gantt/src/gantt-tools/index.tsx index 070283dcd2..2557914363 100644 --- a/packages/devui-vue/devui/gantt/src/gantt-tools/index.tsx +++ b/packages/devui-vue/devui/gantt/src/gantt-tools/index.tsx @@ -63,7 +63,7 @@ export default defineComponent({ style={{ position: isFullScreen ? 'fixed' : 'absolute' }} > actionHandle('today')} class="tool" > @@ -77,7 +77,7 @@ export default defineComponent({ > void diff --git a/packages/devui-vue/devui/modal/src/dialog.tsx b/packages/devui-vue/devui/modal/src/dialog.tsx index c493aeac0b..787e3d8b36 100644 --- a/packages/devui-vue/devui/modal/src/dialog.tsx +++ b/packages/devui-vue/devui/modal/src/dialog.tsx @@ -65,12 +65,12 @@ export default defineComponent({ // 处理按钮 const buttonsRef = computed(() => { return props.buttons.map((buttonProps, index) => { - const { btnStyle, disabled, handler, text } = buttonProps; + const { variant, disabled, handler, text } = buttonProps; return ( + diff --git a/packages/devui-vue/devui/tooltip/__tests__/tooltip.spec.ts b/packages/devui-vue/devui/tooltip/__tests__/tooltip.spec.ts index 01a156c186..b8310e5989 100644 --- a/packages/devui-vue/devui/tooltip/__tests__/tooltip.spec.ts +++ b/packages/devui-vue/devui/tooltip/__tests__/tooltip.spec.ts @@ -11,7 +11,7 @@ const globalOption = { } } const defaultslot = { - default: 'tooltip' + default: 'tooltip' } describe('tooltip', () => { @@ -19,7 +19,7 @@ describe('tooltip', () => { jest.useFakeTimers(); }) describe('basic', () => { - it('should be create', async() => { + it('should be create', async () => { const wrapper = mount(Tooltip, { props: { content: 'content' @@ -42,7 +42,7 @@ describe('tooltip', () => { tooltipElement = wrapper.element.querySelector('.tooltip') as HTMLElement; expect(tooltipElement.style.opacity).toBe('0'); }) - it('position should be left', async() => { + it('position should be left', async () => { const wrapper = mount(Tooltip, { props: { content: 'content', @@ -59,7 +59,7 @@ describe('tooltip', () => { console.log(tooltipArrowElement.style); expect(tooltipArrowElement.style.borderLeft).toBe('5px solid rgb(70, 77, 110)'); }) - it('position should be top', async() => { + it('position should be top', async () => { const wrapper = mount(Tooltip, { props: { content: 'content', @@ -76,7 +76,7 @@ describe('tooltip', () => { console.log(tooltipArrowElement.style); expect(tooltipArrowElement.style.borderTop).toBe('5px solid rgb(70, 77, 110)'); }) - it('position should be right', async() => { + it('position should be right', async () => { const wrapper = mount(Tooltip, { props: { content: 'content', @@ -93,7 +93,7 @@ describe('tooltip', () => { console.log(tooltipArrowElement.style); expect(tooltipArrowElement.style.borderRight).toBe('5px solid rgb(70, 77, 110)'); }) - it('position should be bottom', async() => { + it('position should be bottom', async () => { const wrapper = mount(Tooltip, { props: { content: 'content', @@ -112,7 +112,7 @@ describe('tooltip', () => { }) }) describe('delay time', () => { - it('test mouseEnterDelay', async() => { + it('test mouseEnterDelay', async () => { const wrapper = mount(Tooltip, { props: { content: 'content', @@ -132,7 +132,7 @@ describe('tooltip', () => { tooltipElement = wrapper.element.querySelector('.tooltip') as HTMLElement; expect(tooltipElement.style.opacity).toBe('1'); }) - it('test mouseLeaveDelay', async() => { + it('test mouseLeaveDelay', async () => { const wrapper = mount(Tooltip, { props: { content: 'content', @@ -157,7 +157,7 @@ describe('tooltip', () => { tooltipElement = wrapper.element.querySelector('.tooltip') as HTMLElement; expect(tooltipElement.style.opacity).toBe('0'); }) - + }) }) \ No newline at end of file diff --git a/packages/devui-vue/devui/upload/src/single-upload.tsx b/packages/devui-vue/devui/upload/src/single-upload.tsx index ff98a5c460..9dc88c0a9a 100644 --- a/packages/devui-vue/devui/upload/src/single-upload.tsx +++ b/packages/devui-vue/devui/upload/src/single-upload.tsx @@ -268,7 +268,7 @@ export default defineComponent({ {!autoUpload && !withoutBtn && ( diff --git a/packages/devui-vue/devui/upload/src/upload.tsx b/packages/devui-vue/devui/upload/src/upload.tsx index 8678147cf3..3cea263bf3 100644 --- a/packages/devui-vue/devui/upload/src/upload.tsx +++ b/packages/devui-vue/devui/upload/src/upload.tsx @@ -345,7 +345,7 @@ export default defineComponent({ {!autoUpload && !withoutBtn && ( diff --git a/packages/devui-vue/docs/components/button/index.md b/packages/devui-vue/docs/components/button/index.md index 8566e717f4..76870fb7e2 100644 --- a/packages/devui-vue/docs/components/button/index.md +++ b/packages/devui-vue/docs/components/button/index.md @@ -23,8 +23,8 @@ ```vue ``` ::: @@ -34,26 +34,26 @@ :::demo ```vue ``` ::: -### 按钮风格 +### 按钮形态 用于给按钮增加不同的使用场景。 :::demo ```vue ``` @@ -63,9 +63,9 @@ :::demo ```vue ``` ::: @@ -108,8 +108,8 @@ :::demo ```vue ``` ::: @@ -120,37 +120,37 @@ ```vue