github_mirrors/gf-vben-admin
1
0
Fork 0
mirror of https://github.com/vbenjs/gf-vben-admin.git synced 2025-02-03 03:32:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(table): table columns setting will uncheck all render columns #154

Browse Source
This commit is contained in:
vben 2021-01-02 10:04:46 +08:00
parent 0419a07041
commit aa596af608
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/Table/src/components/editable/EditableCell.vue
View File

@ -250,7 +250,7 @@
if (props.record) { if (props.record) {
/* eslint-disable */ /* eslint-disable */
isArray(props.record[cbs]) isArray(props.record[cbs])
? props.record[cbs].push(handle) ? props.record[cbs]?.push(handle)
: (props.record[cbs] = [handle]); : (props.record[cbs] = [handle]);
} }
} }
@ -267,9 +267,9 @@
/* eslint-disable */ /* eslint-disable */
props.record.onSubmitEdit = async () => { props.record.onSubmitEdit = async () => {
if (isArray(props.record?.submitCbs)) { if (isArray(props.record?.submitCbs)) {
const validFns = props.record?.validCbs || []; const validFns = (props.record?.validCbs || []).map((fn) => fn());
const res = await Promise.all(validFns.map((fn) => fn())); const res = await Promise.all(validFns);
const pass = res.every((item) => !!item); const pass = res.every((item) => !!item);
if (!pass) return; if (!pass) return;

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

@ -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) => {

2
src/settings/projectSetting.ts
View File

@ -109,7 +109,7 @@ const setting: ProjectConfig = {
// Switch page to close menu // Switch page to close menu
closeMixSidebarOnChange: false, closeMixSidebarOnChange: false,
// Module opening method ‘click’ |'hover' // Module opening method ‘click’ |'hover'
mixSideTrigger: 'hover', mixSideTrigger: 'click',
}, },
// Multi-label // Multi-label