🔱: [client] sync upgrade with 4 commits [trident-sync]

perf: 单元格支持tooltip
Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/plugin/antdv-async/index.ts
fix: 修复naive-ui下 form-item 的label设置为render会报警告的问题
pull/349/head
GitHub Actions Bot 2025-04-28 19:25:14 +00:00
parent 7bb8e9bdc4
commit f0b5489e3e
5 changed files with 23 additions and 6 deletions

View File

@ -234,5 +234,10 @@ export default {
"ATableSummary",
defineAsyncComponent(() => import("ant-design-vue/es/vc-table/Footer/Summary"))
);
app.component(
"ASlider",
defineAsyncComponent(() => import("ant-design-vue/es/slider/index"))
);
}
};

View File

@ -38,7 +38,8 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps<FirstRo
search: { show: true },
column: {
resizable: true,
width: 200
width: 200,
tooltip: true
}
},
type: {

View File

@ -51,7 +51,6 @@ const createCrudOptions = async function ({}: CreateCrudOptionsProps): Promise<C
return {
//
customExport: {},
crudOptions: {
request: {
pageRequest,
@ -59,6 +58,15 @@ const createCrudOptions = async function ({}: CreateCrudOptionsProps): Promise<C
editRequest,
delRequest
},
actionbar: {
buttons: {
add: {
tooltip: {
title: "tooltip演示"
}
}
}
},
columns: {
name: {
title: "姓名",
@ -66,7 +74,10 @@ const createCrudOptions = async function ({}: CreateCrudOptionsProps): Promise<C
search: { show: true },
column: {
resizable: true,
width: 200
width: 200,
tooltip: {
title: "tooltip演示"
}
}
},
type: {

View File

@ -110,7 +110,7 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti
type: "text",
column: {
ellipsis: true,
showTitle: true
tooltip: true
}
},
search: {

View File

@ -20,7 +20,7 @@
label: '上置'
},
{
value: '',
value: 'horizontal',
label: '左置'
}
]"
@ -41,7 +41,7 @@ export default defineComponent({
name: "FormBase",
setup() {
const labelWidthRef = ref(100);
const labelLayoutRef = ref();
const labelLayoutRef = ref("horizontal");
const context = {
labelWidthRef,
labelLayoutRef