Commit 5a6db8c640376ca67b451a9647b9958946e5c3ab
1 parent
f96d6b22
fix(table): fix table actionColOptions not work
Showing
4 changed files
with
17 additions
and
13 deletions
src/components/Form/src/BasicForm.vue
| ... | ... | @@ -207,7 +207,11 @@ |
| 207 | 207 | } |
| 208 | 208 | } |
| 209 | 209 | advanceState.actionSpan = (realItemColSum % BASIC_COL_LEN) + unref(getEmptySpanRef); |
| 210 | - getAdvanced(props.actionColOptions || { span: BASIC_COL_LEN }, itemColSum, true); | |
| 210 | + getAdvanced( | |
| 211 | + unref(getActionPropsRef).actionColOptions || { span: BASIC_COL_LEN }, | |
| 212 | + itemColSum, | |
| 213 | + true | |
| 214 | + ); | |
| 211 | 215 | emit('advanced-change'); |
| 212 | 216 | } |
| 213 | 217 | function getAdvanced(itemCol: Partial<ColEx>, itemColSum = 0, isLastAction = false) { | ... | ... |
src/components/Form/src/FormAction.tsx
| ... | ... | @@ -71,8 +71,8 @@ export default defineComponent({ |
| 71 | 71 | const advancedSpanObj = showAdvancedButton ? { span: actionSpan < 6 ? 24 : actionSpan } : {}; |
| 72 | 72 | const actionColOpt: Partial<ColEx> = { |
| 73 | 73 | span: showAdvancedButton ? 6 : 4, |
| 74 | - ...actionColOptions, | |
| 75 | 74 | ...advancedSpanObj, |
| 75 | + ...actionColOptions, | |
| 76 | 76 | }; |
| 77 | 77 | return actionColOpt; |
| 78 | 78 | }); | ... | ... |
src/components/Form/src/types/form.ts
| ... | ... | @@ -48,7 +48,7 @@ export interface FormProps { |
| 48 | 48 | // 空白行span |
| 49 | 49 | emptySpan?: number | Partial<ColEx>; |
| 50 | 50 | // 表单内部组件大小 |
| 51 | - size: 'default' | 'small' | 'large'; | |
| 51 | + size?: 'default' | 'small' | 'large'; | |
| 52 | 52 | // 是否禁用 |
| 53 | 53 | disabled?: boolean; |
| 54 | 54 | // 时间区间字段映射成多个 |
| ... | ... | @@ -62,25 +62,25 @@ export interface FormProps { |
| 62 | 62 | // 超过指定行数自动收起 |
| 63 | 63 | autoAdvancedLine?: number; |
| 64 | 64 | // 是否显示操作按钮 |
| 65 | - showActionButtonGroup: boolean; | |
| 65 | + showActionButtonGroup?: boolean; | |
| 66 | 66 | |
| 67 | 67 | // 重置按钮配置 |
| 68 | - resetButtonOptions: Partial<BasicButtonProps>; | |
| 68 | + resetButtonOptions?: Partial<BasicButtonProps>; | |
| 69 | 69 | |
| 70 | 70 | // 确认按钮配置 |
| 71 | - submitButtonOptions: Partial<BasicButtonProps>; | |
| 71 | + submitButtonOptions?: Partial<BasicButtonProps>; | |
| 72 | 72 | |
| 73 | 73 | // 操作列配置 |
| 74 | - actionColOptions: Partial<ColEx>; | |
| 74 | + actionColOptions?: Partial<ColEx>; | |
| 75 | 75 | |
| 76 | 76 | // 显示重置按钮 |
| 77 | - showResetButton: boolean; | |
| 77 | + showResetButton?: boolean; | |
| 78 | 78 | // 显示确认按钮 |
| 79 | - showSubmitButton: boolean; | |
| 79 | + showSubmitButton?: boolean; | |
| 80 | 80 | |
| 81 | - resetFunc: () => Promise<void>; | |
| 82 | - submitFunc: () => Promise<void>; | |
| 83 | - transformDateFunc: (date: any) => string; | |
| 81 | + resetFunc?: () => Promise<void>; | |
| 82 | + submitFunc?: () => Promise<void>; | |
| 83 | + transformDateFunc?: (date: any) => string; | |
| 84 | 84 | colon?: boolean; |
| 85 | 85 | } |
| 86 | 86 | export interface FormSchema { | ... | ... |
src/components/Table/src/types/table.ts