Browse Source
fix(BasicTable): ColumnSetting about selectedRowKeys override (#3446)
pull/3464/head
xachary
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
5 additions and
3 deletions
-
src/components/Table/src/components/settings/ColumnSetting.vue
-
src/components/Table/src/components/settings/index.vue
-
src/components/Table/src/types/table.ts
|
|
@ -111,7 +111,7 @@ |
|
|
import { useDesign } from '@/hooks/web/useDesign'; |
|
|
import { useDesign } from '@/hooks/web/useDesign'; |
|
|
import { isFunction, isNil } from '@/utils/is'; |
|
|
import { isFunction, isNil } from '@/utils/is'; |
|
|
import { getPopupContainer as getParentContainer } from '@/utils'; |
|
|
import { getPopupContainer as getParentContainer } from '@/utils'; |
|
|
import { cloneDeep } from 'lodash-es'; |
|
|
import { cloneDeep, omit } from 'lodash-es'; |
|
|
import Sortablejs from 'sortablejs'; |
|
|
import Sortablejs from 'sortablejs'; |
|
|
|
|
|
|
|
|
// 列表设置缓存 |
|
|
// 列表设置缓存 |
|
|
@ -492,7 +492,7 @@ |
|
|
table.setProps({ |
|
|
table.setProps({ |
|
|
rowSelection: showRowSelection |
|
|
rowSelection: showRowSelection |
|
|
? { |
|
|
? { |
|
|
...defaultRowSelection, |
|
|
...omit(defaultRowSelection, ['selectedRowKeys']), |
|
|
fixed: true, |
|
|
fixed: true, |
|
|
} |
|
|
} |
|
|
: undefined, |
|
|
: undefined, |
|
|
|
|
|
@ -6,7 +6,7 @@ |
|
|
v-if="getSetting.setting" |
|
|
v-if="getSetting.setting" |
|
|
@columns-change="handleColumnChange" |
|
|
@columns-change="handleColumnChange" |
|
|
:getPopupContainer="getTableContainer" |
|
|
:getPopupContainer="getTableContainer" |
|
|
:cache="false" |
|
|
:cache="getSetting.settingCache" |
|
|
/> |
|
|
/> |
|
|
<FullScreenSetting v-if="getSetting.fullScreen" :getPopupContainer="getTableContainer" /> |
|
|
<FullScreenSetting v-if="getSetting.fullScreen" :getPopupContainer="getTableContainer" /> |
|
|
</div> |
|
|
</div> |
|
|
@ -39,6 +39,7 @@ |
|
|
redo: true, |
|
|
redo: true, |
|
|
size: true, |
|
|
size: true, |
|
|
setting: true, |
|
|
setting: true, |
|
|
|
|
|
settingCache: false, |
|
|
fullScreen: false, |
|
|
fullScreen: false, |
|
|
...props.setting, |
|
|
...props.setting, |
|
|
}; |
|
|
}; |
|
|
|
|
|
@ -140,6 +140,7 @@ export interface TableSetting { |
|
|
redo?: boolean; |
|
|
redo?: boolean; |
|
|
size?: boolean; |
|
|
size?: boolean; |
|
|
setting?: boolean; |
|
|
setting?: boolean; |
|
|
|
|
|
settingCache?: boolean; |
|
|
fullScreen?: boolean; |
|
|
fullScreen?: boolean; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|