fix: fix the display problem of table icon

vben
1 parent 49827866
Showing 6 changed files with 21 additions and 13 deletions
CHANGELOG.zh_CN.md
src/components/Table/src/components/TableAction.tsx
src/components/Table/src/style/index.less
src/components/Table/src/types/tableAction.ts
src/components/registerGlobComp.ts
src/views/demo/table/FixedColumn.vue
@@ -26,10 +26,11 @@
  
 ### 🐛 Bug Fixes
  
-- 修复 tree 文本超出挡住操作按钮问题
-- 修复通过 useRedo 刷新页面参数丢失问题
-- 修复表单校验先设置在校验及控制台错误信息问题
-- 修复`modal`与`drawer`组件传递数组参数问题
+- tree: 修复文本超出挡住操作按钮问题
+- useRedo: 修复通过 useRedo 刷新页面参数丢失问题
+- form: 修复表单校验先设置在校验及控制台错误信息问题
+- `modal`&`drawer` 修复组件传递数组参数问题
+- form: 修复`updateSchema`赋值含有`[]`时不生效
  
 ### 🎫 Chores
  
@@ -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 = (
         <Button
-          type={type as any}
+          type={type}
           size="small"
           disabled={disabled}
           color={color}
-          {...action}
+          {...actionProps}
           key={`${index}-${label}`}
         >
           {() => (
             <>
+              {icon && <Icon icon={icon} class="mr-1" />}
               {label}
-              {icon && <Icon icon={icon} />}
             </>
           )}
         </Button>
@@ -96,7 +96,7 @@ export default defineComponent({
               return renderPopConfirm(action, index);
             })}
           {dropDownActions && dropDownActions.length && (
-            <Dropdown>
+            <Dropdown overlayClassName="basic-tale-action-dropdown">
               {{
                 default: dropdownDefaultSLot,
                 overlay: () => {
@@ -106,6 +106,7 @@ export default defineComponent({
                         default: () => {
                           return dropDownActions.map((action, index) => {
                             const { disabled = false } = action;
+                            action.ghost = true;
                             return (
                               <Menu.Item key={`${index}`} disabled={disabled}>
                                 {() => {
@@ -24,6 +24,11 @@
  
   &-action {
     display: flex;
+
+    button {
+      display: flex;
+      align-items: center;
+    }
   }
  
   &-toolbar {
-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;
 }
@@ -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);
 }
@@ -6,6 +6,7 @@
           :actions="[
             {
               label: '删除',
+              icon: 'ant-design:area-chart-outlined',
               onClick: handleDelete.bind(null, record),
             },
           ]"