diff --git a/yudao-ui-admin-vue3/src/components/XButton/index.ts b/yudao-ui-admin-vue3/src/components/XButton/index.ts index 7b13b6072..be0f0d4fe 100644 --- a/yudao-ui-admin-vue3/src/components/XButton/index.ts +++ b/yudao-ui-admin-vue3/src/components/XButton/index.ts @@ -1,3 +1,4 @@ import XButton from './src/XButton.vue' +import XTextButton from './src/XTextButton.vue' -export { XButton } +export { XButton, XTextButton } diff --git a/yudao-ui-admin-vue3/src/components/XButton/src/XButton.vue b/yudao-ui-admin-vue3/src/components/XButton/src/XButton.vue index 5afc6863b..6539e73cd 100644 --- a/yudao-ui-admin-vue3/src/components/XButton/src/XButton.vue +++ b/yudao-ui-admin-vue3/src/components/XButton/src/XButton.vue @@ -7,7 +7,7 @@ const props = defineProps({ loading: propTypes.bool.def(false), preIcon: propTypes.string.def(''), postIcon: propTypes.string.def(''), - title: propTypes.string.def('按钮'), + title: propTypes.string.def(''), type: propTypes.oneOf(['', 'primary', 'success', 'warning', 'danger', 'info']).def(''), link: propTypes.bool.def(false), circle: propTypes.bool.def(false), @@ -31,7 +31,17 @@ const getBindValue = computed(() => { + diff --git a/yudao-ui-admin-vue3/src/components/index.ts b/yudao-ui-admin-vue3/src/components/index.ts index 7775982d5..1700c7ca2 100644 --- a/yudao-ui-admin-vue3/src/components/index.ts +++ b/yudao-ui-admin-vue3/src/components/index.ts @@ -5,7 +5,7 @@ import { Table } from '@/components/Table' import { Search } from '@/components/Search' import { Dialog } from '@/components/Dialog' import { XModal } from '@/components/XModal' -import { XButton } from '@/components/XButton' +import { XButton, XTextButton } from '@/components/XButton' import { DictTag } from '@/components/DictTag' import { ContentWrap } from '@/components/ContentWrap' import { Descriptions } from '@/components/Descriptions' @@ -18,6 +18,7 @@ export const setupGlobCom = (app: App): void => { app.component('Dialog', Dialog) app.component('XModal', XModal) app.component('XButton', XButton) + app.component('XTextButton', XTextButton) app.component('DictTag', DictTag) app.component('ContentWrap', ContentWrap) app.component('Descriptions', Descriptions) diff --git a/yudao-ui-admin-vue3/src/views/system/menu/index.vue b/yudao-ui-admin-vue3/src/views/system/menu/index.vue index ab5276d10..be559893d 100644 --- a/yudao-ui-admin-vue3/src/views/system/menu/index.vue +++ b/yudao-ui-admin-vue3/src/views/system/menu/index.vue @@ -73,17 +73,13 @@