diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index 60f977cd..04d9bf94 100644
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -26,10 +26,11 @@
### 🐛 Bug Fixes
-- 修复 tree 文本超出挡住操作按钮问题
-- 修复通过 useRedo 刷新页面参数丢失问题
-- 修复表单校验先设置在校验及控制台错误信息问题
-- 修复`modal`与`drawer`组件传递数组参数问题
+- tree: 修复文本超出挡住操作按钮问题
+- useRedo: 修复通过 useRedo 刷新页面参数丢失问题
+- form: 修复表单校验先设置在校验及控制台错误信息问题
+- `modal`&`drawer` 修复组件传递数组参数问题
+- form: 修复`updateSchema`赋值含有`[]`时不生效
### 🎫 Chores
diff --git a/src/components/Table/src/components/TableAction.tsx b/src/components/Table/src/components/TableAction.tsx
index 28b2d1bc..a889b617 100644
--- a/src/components/Table/src/components/TableAction.tsx
+++ b/src/components/Table/src/components/TableAction.tsx
@@ -24,20 +24,20 @@ export default defineComponent({
},
setup(props) {
function renderButton(action: ActionItem, index: number) {
- const { disabled = false, label, icon, color = '', type = 'link' } = action;
+ const { disabled = false, label, icon, color = '', type = 'link', ...actionProps } = action;
const button = (
@@ -96,7 +96,7 @@ export default defineComponent({
return renderPopConfirm(action, index);
})}
{dropDownActions && dropDownActions.length && (
-
+
{{
default: dropdownDefaultSLot,
overlay: () => {
@@ -106,6 +106,7 @@ export default defineComponent({
default: () => {
return dropDownActions.map((action, index) => {
const { disabled = false } = action;
+ action.ghost = true;
return (
{() => {
diff --git a/src/components/Table/src/style/index.less b/src/components/Table/src/style/index.less
index e0fd7e37..0716e397 100644
--- a/src/components/Table/src/style/index.less
+++ b/src/components/Table/src/style/index.less
@@ -24,6 +24,11 @@
&-action {
display: flex;
+
+ button {
+ display: flex;
+ align-items: center;
+ }
}
&-toolbar {
diff --git a/src/components/Table/src/types/tableAction.ts b/src/components/Table/src/types/tableAction.ts
index 8a14261e..5c9da2a0 100644
--- a/src/components/Table/src/types/tableAction.ts
+++ b/src/components/Table/src/types/tableAction.ts
@@ -1,10 +1,8 @@
-export interface ActionItem {
+import { ButtonProps } from 'ant-design-vue/es/button/buttonTypes';
+export interface ActionItem extends ButtonProps {
onClick?: any;
label: string;
- disabled?: boolean;
color?: 'success' | 'error' | 'warning';
- type?: string;
- props?: any;
icon?: string;
popConfirm?: PopConfirm;
}
diff --git a/src/components/registerGlobComp.ts b/src/components/registerGlobComp.ts
index 27bfda50..5e95823e 100644
--- a/src/components/registerGlobComp.ts
+++ b/src/components/registerGlobComp.ts
@@ -32,6 +32,7 @@ import {
Result,
Empty,
Avatar,
+ Menu,
} from 'ant-design-vue';
import { getApp } from '/@/setup/App';
@@ -78,5 +79,6 @@ export function registerGlobComp() {
.use(Result)
.use(Empty)
.use(Avatar)
+ .use(Menu)
.use(Tabs);
}
diff --git a/src/views/demo/table/FixedColumn.vue b/src/views/demo/table/FixedColumn.vue
index bf35d712..41a142a0 100644
--- a/src/views/demo/table/FixedColumn.vue
+++ b/src/views/demo/table/FixedColumn.vue
@@ -6,6 +6,7 @@
:actions="[
{
label: '删除',
+ icon: 'ant-design:area-chart-outlined',
onClick: handleDelete.bind(null, record),
},
]"