zuaa
/
vue-vben-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: TableAction设置icon显示iconify关键字 (#3608)

This commit is contained in:
Li Kui 2024-02-19 19:44:55 +08:00 committed by GitHub
parent 0cb379e5ab
commit b233973974
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/Table/src/components/TableAction.vue
View File

@ -7,7 +7,7 @@
<template v-if="action.label">{{ action.label }}</template> <template v-if="action.label">{{ action.label }}</template>
</PopConfirmButton> </PopConfirmButton>
</Tooltip> </Tooltip>
<PopConfirmButton v-else v-bind="action"> <PopConfirmButton v-else v-bind="omit(action, 'icon')">
<Icon :icon="action.icon" :class="{ 'mr-1': !!action.label }" v-if="action.icon" /> <Icon :icon="action.icon" :class="{ 'mr-1': !!action.label }" v-if="action.icon" />
<template v-if="action.label">{{ action.label }}</template> <template v-if="action.label">{{ action.label }}</template>
</PopConfirmButton> </PopConfirmButton>
@ -44,6 +44,7 @@
import { isBoolean, isFunction, isString } from '@/utils/is'; import { isBoolean, isFunction, isString } from '@/utils/is';
import { propTypes } from '@/utils/propTypes'; import { propTypes } from '@/utils/propTypes';
import { ACTION_COLUMN_FLAG } from '../const'; import { ACTION_COLUMN_FLAG } from '../const';
import { omit } from 'lodash-es';
defineOptions({ name: 'TableAction' }); defineOptions({ name: 'TableAction' });