diff --git a/apps/web-antd/src/components/global/button.ts b/apps/web-antd/src/components/global/button.ts index bf17b62a..fffd4d9e 100644 --- a/apps/web-antd/src/components/global/button.ts +++ b/apps/web-antd/src/components/global/button.ts @@ -6,8 +6,8 @@ import { omit } from 'lodash-es'; /** * 表格操作列按钮专用 */ -export const GhostButton = defineComponent({ - name: 'GhostButton', +export const ActionButton = defineComponent({ + name: 'ActionButton', props: omit({}, ['type', 'ghost', 'size']), setup(props, { attrs, slots }) { return () => diff --git a/apps/web-antd/src/components/global/index.ts b/apps/web-antd/src/components/global/index.ts index a5eee63e..7f4edee5 100644 --- a/apps/web-antd/src/components/global/index.ts +++ b/apps/web-antd/src/components/global/index.ts @@ -2,7 +2,7 @@ import type { App } from 'vue'; import { Button as AButton } from 'antdv-next'; -import { GhostButton } from './button'; +import { ActionButton } from './button'; /** * 全局组件注册 @@ -10,7 +10,7 @@ import { GhostButton } from './button'; export function setupGlobalComponent(app: App) { app.component('AButton', AButton); // 表格操作列专用按钮 - app.component('GhostButton', GhostButton); + app.component('ActionButton', ActionButton); } export { default as ApiSwitch } from './api-switch.vue'; diff --git a/apps/web-antd/src/views/demo/demo/index.vue b/apps/web-antd/src/views/demo/demo/index.vue index 8c7cb044..5467c30e 100644 --- a/apps/web-antd/src/views/demo/demo/index.vue +++ b/apps/web-antd/src/views/demo/demo/index.vue @@ -137,25 +137,25 @@ function handleMultiDelete() { diff --git a/apps/web-antd/src/views/demo/tree/index.vue b/apps/web-antd/src/views/demo/tree/index.vue index 69d4352f..6d5b8e34 100644 --- a/apps/web-antd/src/views/demo/tree/index.vue +++ b/apps/web-antd/src/views/demo/tree/index.vue @@ -118,25 +118,25 @@ function collapseAll() { diff --git a/apps/web-antd/src/views/monitor/logininfor/index.vue b/apps/web-antd/src/views/monitor/logininfor/index.vue index a4b88311..996a0c7a 100644 --- a/apps/web-antd/src/views/monitor/logininfor/index.vue +++ b/apps/web-antd/src/views/monitor/logininfor/index.vue @@ -184,21 +184,21 @@ function handleDownloadExcel() { diff --git a/apps/web-antd/src/views/monitor/online/index.vue b/apps/web-antd/src/views/monitor/online/index.vue index 9a331c60..89c90773 100644 --- a/apps/web-antd/src/views/monitor/online/index.vue +++ b/apps/web-antd/src/views/monitor/online/index.vue @@ -92,7 +92,7 @@ async function handleForceOffline(row: OnlineUser) { placement="left" @confirm="handleForceOffline(row)" > - 强制下线 + 强制下线 diff --git a/apps/web-antd/src/views/monitor/operlog/index.vue b/apps/web-antd/src/views/monitor/operlog/index.vue index 53d627f8..e2165f4b 100644 --- a/apps/web-antd/src/views/monitor/operlog/index.vue +++ b/apps/web-antd/src/views/monitor/operlog/index.vue @@ -171,12 +171,12 @@ function handleDownloadExcel() { diff --git a/apps/web-antd/src/views/system/client/index.vue b/apps/web-antd/src/views/system/client/index.vue index a3499c68..98d8f96e 100644 --- a/apps/web-antd/src/views/system/client/index.vue +++ b/apps/web-antd/src/views/system/client/index.vue @@ -161,26 +161,26 @@ async function handleChangeStatus(checked: boolean, row: Client) { diff --git a/apps/web-antd/src/views/system/config/index.vue b/apps/web-antd/src/views/system/config/index.vue index ec989689..09ec5dd0 100644 --- a/apps/web-antd/src/views/system/config/index.vue +++ b/apps/web-antd/src/views/system/config/index.vue @@ -148,24 +148,24 @@ async function handleRefreshCache() { diff --git a/apps/web-antd/src/views/system/dept/index.vue b/apps/web-antd/src/views/system/dept/index.vue index 01a53e1f..22df9029 100644 --- a/apps/web-antd/src/views/system/dept/index.vue +++ b/apps/web-antd/src/views/system/dept/index.vue @@ -148,32 +148,32 @@ function setExpandOrCollapse(expand: boolean) { diff --git a/apps/web-antd/src/views/system/dict/data/index.vue b/apps/web-antd/src/views/system/dict/data/index.vue index 2b355f2f..a0fbed1d 100644 --- a/apps/web-antd/src/views/system/dict/data/index.vue +++ b/apps/web-antd/src/views/system/dict/data/index.vue @@ -154,24 +154,24 @@ emitter.on('rowClick', async (value) => { diff --git a/apps/web-antd/src/views/system/dict/type/index.vue b/apps/web-antd/src/views/system/dict/type/index.vue index 99b6728f..87d6b3e4 100644 --- a/apps/web-antd/src/views/system/dict/type/index.vue +++ b/apps/web-antd/src/views/system/dict/type/index.vue @@ -167,24 +167,24 @@ function handleDownloadExcel() { diff --git a/apps/web-antd/src/views/system/menu/index.vue b/apps/web-antd/src/views/system/menu/index.vue index d4de69b2..b45da449 100644 --- a/apps/web-antd/src/views/system/menu/index.vue +++ b/apps/web-antd/src/views/system/menu/index.vue @@ -221,15 +221,15 @@ const isAdmin = computed(() => { diff --git a/apps/web-antd/src/views/system/notice/index.vue b/apps/web-antd/src/views/system/notice/index.vue index 24c49bdb..3048bc87 100644 --- a/apps/web-antd/src/views/system/notice/index.vue +++ b/apps/web-antd/src/views/system/notice/index.vue @@ -119,24 +119,24 @@ function handleMultiDelete() { diff --git a/apps/web-antd/src/views/system/oss-config/index.vue b/apps/web-antd/src/views/system/oss-config/index.vue index d4420c57..28fcc49a 100644 --- a/apps/web-antd/src/views/system/oss-config/index.vue +++ b/apps/web-antd/src/views/system/oss-config/index.vue @@ -145,24 +145,24 @@ async function handleChangeStatus(checked: boolean, row: OssConfig) { diff --git a/apps/web-antd/src/views/system/oss/index.vue b/apps/web-antd/src/views/system/oss/index.vue index 8b27fc09..a3e1d6e3 100644 --- a/apps/web-antd/src/views/system/oss/index.vue +++ b/apps/web-antd/src/views/system/oss/index.vue @@ -289,24 +289,24 @@ const [UploadTestModal, uploadTestApi] = useVbenModal({ diff --git a/apps/web-antd/src/views/system/post/index.vue b/apps/web-antd/src/views/system/post/index.vue index b676a5f8..bfa7bf3c 100644 --- a/apps/web-antd/src/views/system/post/index.vue +++ b/apps/web-antd/src/views/system/post/index.vue @@ -161,24 +161,24 @@ function handleDownloadExcel() { diff --git a/apps/web-antd/src/views/system/role-assign/index.vue b/apps/web-antd/src/views/system/role-assign/index.vue index 79eb1524..ca0ad80e 100644 --- a/apps/web-antd/src/views/system/role-assign/index.vue +++ b/apps/web-antd/src/views/system/role-assign/index.vue @@ -135,13 +135,13 @@ function handleMultipleAuthCancel() { placement="left" @confirm="handleAuthCancel(row)" > - 取消授权 - + diff --git a/apps/web-antd/src/views/system/role/index.vue b/apps/web-antd/src/views/system/role/index.vue index 42576fb7..a2865560 100644 --- a/apps/web-antd/src/views/system/role/index.vue +++ b/apps/web-antd/src/views/system/role/index.vue @@ -201,36 +201,36 @@ async function handleChangeStatus(checked: boolean, row: Role) { " > - {{ $t('pages.common.edit') }} - - + 权限 - - + 分配 - + - {{ $t('pages.common.delete') }} - + diff --git a/apps/web-antd/src/views/system/tenant/index.vue b/apps/web-antd/src/views/system/tenant/index.vue index 360a10a0..b3620404 100644 --- a/apps/web-antd/src/views/system/tenant/index.vue +++ b/apps/web-antd/src/views/system/tenant/index.vue @@ -217,37 +217,37 @@ async function handleChangeStatus(checked: boolean, row: Tenant) { diff --git a/apps/web-antd/src/views/system/tenantPackage/index.vue b/apps/web-antd/src/views/system/tenantPackage/index.vue index 570291d9..4a573414 100644 --- a/apps/web-antd/src/views/system/tenantPackage/index.vue +++ b/apps/web-antd/src/views/system/tenantPackage/index.vue @@ -169,24 +169,24 @@ async function handleChangeStatus(checked: boolean, row: TenantPackage) { diff --git a/apps/web-antd/src/views/system/user/index.vue b/apps/web-antd/src/views/system/user/index.vue index 343c5983..d2d50aee 100644 --- a/apps/web-antd/src/views/system/user/index.vue +++ b/apps/web-antd/src/views/system/user/index.vue @@ -271,24 +271,24 @@ async function handleChangeStatus(checked: boolean, row: User) { diff --git a/apps/web-antd/types/global-components.d.ts b/apps/web-antd/types/global-components.d.ts index 4b97446b..1ad7532d 100644 --- a/apps/web-antd/types/global-components.d.ts +++ b/apps/web-antd/types/global-components.d.ts @@ -5,7 +5,7 @@ import { Button } from 'antdv-next/dist/button/Button'; declare module 'vue' { export interface GlobalComponents { AButton: typeof Button; - GhostButton: typeof Button; + ActionButton: typeof Button; } }