fix: when opening the tool separately, there is no need to pass the toolbar-tools slot (#4841)

This commit is contained in:
Vben
2024-11-09 14:07:41 +08:00
committed by GitHub
parent 9cf0573921
commit 2c6edafeb2
21 changed files with 66 additions and 30 deletions

View File

@@ -87,3 +87,11 @@
.vxe-table-custom--checkbox-option:hover {
background: none !important;
}
.vxe-toolbar {
padding-top: 0;
}
.vxe-tools--operate:not(:has(button)) {
margin-left: 0;
}

View File

@@ -1,4 +1,4 @@
import type { DeepPartial } from '@vben/types';
import type { ClassType, DeepPartial } from '@vben/types';
import type { VbenFormProps } from '@vben-core/form-ui';
import type {
VxeGridListeners,
@@ -30,11 +30,11 @@ export interface VxeGridProps {
/**
* 组件class
*/
class?: any;
class?: ClassType;
/**
* vxe-grid class
*/
gridClass?: any;
gridClass?: ClassType;
/**
* vxe-grid 配置
*/

View File

@@ -137,10 +137,6 @@ const options = computed(() => {
mergedOptions.proxyConfig.autoLoad = false;
}
if (!showToolbar.value && mergedOptions.toolbarConfig) {
mergedOptions.toolbarConfig.enabled = false;
}
if (mergedOptions.pagerConfig) {
const mobileLayouts = [
'PrevJump',