mirrors2/naive-ui-admin
1
0
Fork 0
mirror of https://github.com/jekip/naive-ui-admin.git synced 2026-03-01 00:23:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 基本表格设置列固定时，重复添加action列导致的样式错乱问题

Browse Source
This commit is contained in:
casbal
2021-08-10 17:05:52 +08:00
parent eba3047be2
commit 1cdb02c9d7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/Table/src/hooks/useColumns.ts
View File

@@ -94,7 +94,7 @@ export function useColumns(propsRef: ComputedRef<BasicTableProps>) {
const { actionColumn } = unref(propsRef); const { actionColumn } = unref(propsRef);
if (!actionColumn) return; if (!actionColumn) return;
// @ts-ignore // @ts-ignore
columns.push({ !columns.find((col) => col.key === 'action') && columns.push({
...actionColumn, ...actionColumn,
}); });
} }
@@ -129,7 +129,7 @@ export function useColumns(propsRef: ComputedRef<BasicTableProps>) {
} }
//获取 //获取
function getColumns() { function getColumns(): BasicColumn[] {
const columns = toRaw(unref(getColumnsRef)); const columns = toRaw(unref(getColumnsRef));
return columns.map((item) => { return columns.map((item) => {
return { ...item, title: item.title, key: item.key, fixed: item.fixed || undefined }; return { ...item, title: item.title, key: item.key, fixed: item.fixed || undefined };

2
src/views/list/basicList/index.vue
View File

@@ -231,7 +231,7 @@
name: 'xiaoMa', name: 'xiaoMa',
}, },
actionColumn: { actionColumn: {
width: 140, width: 220,
title: '操作', title: '操作',
key: 'action', key: 'action',
fixed: 'right', fixed: 'right',