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

fix(popconfirm-button): remove button excess `title` 

移除PopconfirmButton组件多余的title；修改TableAction的tooltip默认位置
This commit is contained in:
无木 2021-07-02 12:17:07 +08:00
parent 5fab267a69
commit 73654b7862
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Button/src/PopConfirmButton.vue
View File

@ -41,7 +41,7 @@
return () => { return () => {
const bindValues = omit(unref(getBindValues), 'icon'); const bindValues = omit(unref(getBindValues), 'icon');
const Button = h(BasicButton, bindValues, extendSlots(slots)); const Button = h(BasicButton, omit(bindValues, 'title'), extendSlots(slots));
// If it is not enabled, it is a normal button // If it is not enabled, it is a normal button
if (!props.enable) { if (!props.enable) {

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

@ -3,10 +3,8 @@
<template v-for="(action, index) in getActions" :key="`${index}-${action.label}`"> <template v-for="(action, index) in getActions" :key="`${index}-${action.label}`">
<Tooltip v-bind="getTooltip(action.tooltip)"> <Tooltip v-bind="getTooltip(action.tooltip)">
<PopConfirmButton v-bind="action"> <PopConfirmButton v-bind="action">
<Tooltip v-bind="getTooltip(action.tooltip)"> <Icon :icon="action.icon" class="mr-1" v-if="action.icon" />
<Icon :icon="action.icon" class="mr-1" v-if="action.icon" /> {{ action.label }}
{{ action.label }}
</Tooltip>
</PopConfirmButton> </PopConfirmButton>
</Tooltip> </Tooltip>
<Divider <Divider
@ -35,7 +33,7 @@
<script lang="ts"> <script lang="ts">
import { defineComponent, PropType, computed, toRaw } from 'vue'; import { defineComponent, PropType, computed, toRaw } from 'vue';
import { MoreOutlined } from '@ant-design/icons-vue'; import { MoreOutlined } from '@ant-design/icons-vue';
import { Divider, Tooltip } from 'ant-design-vue'; import { Divider, Tooltip, TooltipProps } from 'ant-design-vue';
import Icon from '/@/components/Icon/index'; import Icon from '/@/components/Icon/index';
import { ActionItem, TableActionType } from '/@/components/Table'; import { ActionItem, TableActionType } from '/@/components/Table';
import { PopConfirmButton } from '/@/components/Button'; import { PopConfirmButton } from '/@/components/Button';
@ -129,11 +127,11 @@
}); });
const getTooltip = computed(() => { const getTooltip = computed(() => {
return (data) => { return (data: string | TooltipProps): TooltipProps => {
if (isString(data)) { if (isString(data)) {
return { title: data }; return { title: data, placement: 'bottom' };
} else { } else {
return data; return Object.assign({ placement: 'bottom' }, data);
} }
}; };
}); });