|
@@ -185,13 +185,14 @@ export function useColumns(
|
|
const columnKeys = columns as string[];
|
|
const columnKeys = columns as string[];
|
|
const newColumns: BasicColumn[] = [];
|
|
const newColumns: BasicColumn[] = [];
|
|
cacheColumns.forEach((item) => {
|
|
cacheColumns.forEach((item) => {
|
|
- if (columnKeys.includes(`${item.key}`! || item.dataIndex!)) {
|
|
|
|
|
|
+ if (columnKeys.includes(item.dataIndex! || (item.key as string))) {
|
|
newColumns.push({
|
|
newColumns.push({
|
|
...item,
|
|
...item,
|
|
defaultHidden: false,
|
|
defaultHidden: false,
|
|
});
|
|
});
|
|
}
|
|
}
|
|
});
|
|
});
|
|
|
|
+
|
|
// Sort according to another array
|
|
// Sort according to another array
|
|
if (!isEqual(cacheKeys, columns)) {
|
|
if (!isEqual(cacheKeys, columns)) {
|
|
newColumns.sort((prev, next) => {
|
|
newColumns.sort((prev, next) => {
|