diff --git a/playground/src/adapter/vxe-table.ts b/playground/src/adapter/vxe-table.ts index cb24b561..9c0cd73b 100644 --- a/playground/src/adapter/vxe-table.ts +++ b/playground/src/adapter/vxe-table.ts @@ -212,7 +212,12 @@ setupVbenVxeTable({ Popconfirm, { getPopupContainer(el) { - return el.closest('tbody') || document.body; + return ( + el + .closest('.vxe-table--viewport-wrapper') + ?.querySelector('.vxe-table--main-wrapper') + ?.querySelector('tbody') || document.body + ); }, placement: 'topLeft', title: $t('ui.actionTitle.delete', [attrs?.nameTitle || '']), diff --git a/playground/src/views/system/menu/data.ts b/playground/src/views/system/menu/data.ts index 75190b4a..ee787e50 100644 --- a/playground/src/views/system/menu/data.ts +++ b/playground/src/views/system/menu/data.ts @@ -11,7 +11,7 @@ export function getMenuTypeOptions() { value: 'catalog', }, { color: 'default', label: $t('system.menu.typeMenu'), value: 'menu' }, - { color: 'error', label: $t('system.menu.typeButton'), value: 'button' }, + { color: 'error', label: $t('system.menu.typeButton'), value: 'action' }, { color: 'success', label: $t('system.menu.typeEmbedded'), diff --git a/playground/src/views/system/menu/modules/form.vue b/playground/src/views/system/menu/modules/form.vue index 3cf40e35..6701a2e5 100644 --- a/playground/src/views/system/menu/modules/form.vue +++ b/playground/src/views/system/menu/modules/form.vue @@ -241,10 +241,10 @@ const schema: VbenFormSchema[] = [ component: 'Input', dependencies: { rules: (values) => { - return values.type === 'button' ? 'required' : null; + return values.type === 'action' ? 'required' : null; }, show: (values) => { - return ['button', 'catalog', 'embedded', 'menu'].includes(values.type); + return ['action', 'catalog', 'embedded', 'menu'].includes(values.type); }, triggerFields: ['type'], }, @@ -277,7 +277,7 @@ const schema: VbenFormSchema[] = [ }, dependencies: { show: (values) => { - return values.type !== 'button'; + return values.type !== 'action'; }, triggerFields: ['type'], }, @@ -295,7 +295,7 @@ const schema: VbenFormSchema[] = [ }, dependencies: { show: (values) => { - return values.type !== 'button'; + return values.type !== 'action'; }, triggerFields: ['type'], }, @@ -314,7 +314,7 @@ const schema: VbenFormSchema[] = [ }, dependencies: { show: (values) => { - return values.type !== 'button'; + return values.type !== 'action'; }, triggerFields: ['type'], }, @@ -325,7 +325,7 @@ const schema: VbenFormSchema[] = [ component: 'Divider', dependencies: { show: (values) => { - return !['button', 'link'].includes(values.type); + return !['action', 'link'].includes(values.type); }, triggerFields: ['type'], }, @@ -372,7 +372,7 @@ const schema: VbenFormSchema[] = [ component: 'Checkbox', dependencies: { show: (values) => { - return !['button'].includes(values.type); + return !['action'].includes(values.type); }, triggerFields: ['type'], }, @@ -402,7 +402,7 @@ const schema: VbenFormSchema[] = [ component: 'Checkbox', dependencies: { show: (values) => { - return !['button', 'link'].includes(values.type); + return !['action', 'link'].includes(values.type); }, triggerFields: ['type'], }, @@ -417,7 +417,7 @@ const schema: VbenFormSchema[] = [ component: 'Checkbox', dependencies: { show: (values) => { - return !['button', 'link'].includes(values.type); + return !['action', 'link'].includes(values.type); }, triggerFields: ['type'], },