test/amis2
1
0
Fork 0
mirror of https://gitee.com/baidu/amis.git synced 2024-11-30 02:58:05 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix: crud 的 itemActions 在没有配置 bulkActions 时,顶部和单选框都不显示 (#2786)

Browse Source
This commit is contained in:
liaoxuezhi 2021-10-29 10:07:37 +08:00 committed by GitHub
parent bc02df6c28
commit e5bd28d8c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/renderers/CRUD.tsx
View File

@ -1500,15 +1500,11 @@ export default class CRUD extends React.Component<CRUDProps, any> {
hasBulkActions() {
const {bulkActions, itemActions, store} = this.props;
if (
(!bulkActions || !bulkActions.length) &&
(!itemActions || !itemActions.length)
) {
if (!bulkActions || !bulkActions.length) {
return false;
}
let bulkBtns: Array<ActionSchema> = [];
let itemBtns: Array<ActionSchema> = [];
const ctx = store.mergedData;
if (bulkActions && bulkActions.length) {
@ -1520,21 +1516,7 @@ export default class CRUD extends React.Component<CRUDProps, any> {
.filter(item => !item.hidden && item.visible !== false);
}
const itemData = createObject(
store.data,
store.selectedItems.length ? store.selectedItems[0] : {}
);
if (itemActions && itemActions.length) {
itemBtns = itemActions
.map(item => ({
...item,
...getExprProperties(item as Schema, itemData)
}))
.filter(item => !item.hidden && item.visible !== false);
}
return bulkBtns.length || itemBtns.length;
return bulkBtns.length;
}
renderBulkActions(childProps: any) {
@ -1542,11 +1524,7 @@ export default class CRUD extends React.Component<CRUDProps, any> {
const items = childProps.items;
if (
!items.length ||
((!bulkActions || !bulkActions.length) &&
(!itemActions || !itemActions.length))
) {
if (!items.length || !bulkActions || !bulkActions.length) {
return null;
}