Commit e4305daf98e30cfd0e87ffa3ae932c90c95af1f3
Committed by
GitHub
GitHub
1 parent
10b59395
perf: remove ant-design-vue@3.0.0-beta.11 .ant-col fix (#1734)
Showing
3 changed files
with
20 additions
and
5 deletions
src/design/ant/index.less
| @@ -2,11 +2,6 @@ | @@ -2,11 +2,6 @@ | ||
| 2 | @import './input.less'; | 2 | @import './input.less'; |
| 3 | @import './btn.less'; | 3 | @import './btn.less'; |
| 4 | 4 | ||
| 5 | -// TODO beta.11 fix | ||
| 6 | -.ant-col { | ||
| 7 | - width: 100%; | ||
| 8 | -} | ||
| 9 | - | ||
| 10 | .ant-image-preview-root { | 5 | .ant-image-preview-root { |
| 11 | img { | 6 | img { |
| 12 | display: unset; | 7 | display: unset; |
src/views/demo/form/index.vue
| @@ -142,6 +142,9 @@ | @@ -142,6 +142,9 @@ | ||
| 142 | field: 'divider-basic', | 142 | field: 'divider-basic', |
| 143 | component: 'Divider', | 143 | component: 'Divider', |
| 144 | label: '基础字段', | 144 | label: '基础字段', |
| 145 | + colProps: { | ||
| 146 | + span: 24, | ||
| 147 | + }, | ||
| 145 | }, | 148 | }, |
| 146 | { | 149 | { |
| 147 | field: 'field1', | 150 | field: 'field1', |
| @@ -340,6 +343,9 @@ | @@ -340,6 +343,9 @@ | ||
| 340 | field: 'divider-api-select', | 343 | field: 'divider-api-select', |
| 341 | component: 'Divider', | 344 | component: 'Divider', |
| 342 | label: '远程下拉演示', | 345 | label: '远程下拉演示', |
| 346 | + colProps: { | ||
| 347 | + span: 24, | ||
| 348 | + }, | ||
| 343 | }, | 349 | }, |
| 344 | { | 350 | { |
| 345 | field: 'field30', | 351 | field: 'field30', |
| @@ -458,6 +464,9 @@ | @@ -458,6 +464,9 @@ | ||
| 458 | field: 'divider-linked', | 464 | field: 'divider-linked', |
| 459 | component: 'Divider', | 465 | component: 'Divider', |
| 460 | label: '字段联动', | 466 | label: '字段联动', |
| 467 | + colProps: { | ||
| 468 | + span: 24, | ||
| 469 | + }, | ||
| 461 | }, | 470 | }, |
| 462 | { | 471 | { |
| 463 | field: 'province', | 472 | field: 'province', |
| @@ -509,6 +518,9 @@ | @@ -509,6 +518,9 @@ | ||
| 509 | component: 'Divider', | 518 | component: 'Divider', |
| 510 | label: '互斥多选', | 519 | label: '互斥多选', |
| 511 | helpMessage: ['两个Select共用数据源', '但不可选择对方已选中的项目'], | 520 | helpMessage: ['两个Select共用数据源', '但不可选择对方已选中的项目'], |
| 521 | + colProps: { | ||
| 522 | + span: 24, | ||
| 523 | + }, | ||
| 512 | }, | 524 | }, |
| 513 | { | 525 | { |
| 514 | field: 'selectA', | 526 | field: 'selectA', |
| @@ -535,6 +547,9 @@ | @@ -535,6 +547,9 @@ | ||
| 535 | component: 'Divider', | 547 | component: 'Divider', |
| 536 | label: '字段解构', | 548 | label: '字段解构', |
| 537 | helpMessage: ['如果组件的值是 array 或者 object', '可以根据 ES6 的解构语法分别取值'], | 549 | helpMessage: ['如果组件的值是 array 或者 object', '可以根据 ES6 的解构语法分别取值'], |
| 550 | + colProps: { | ||
| 551 | + span: 24, | ||
| 552 | + }, | ||
| 538 | }, | 553 | }, |
| 539 | { | 554 | { |
| 540 | field: '[startTime, endTime]', | 555 | field: '[startTime, endTime]', |
| @@ -550,6 +565,9 @@ | @@ -550,6 +565,9 @@ | ||
| 550 | field: 'divider-others', | 565 | field: 'divider-others', |
| 551 | component: 'Divider', | 566 | component: 'Divider', |
| 552 | label: '其它', | 567 | label: '其它', |
| 568 | + colProps: { | ||
| 569 | + span: 24, | ||
| 570 | + }, | ||
| 553 | }, | 571 | }, |
| 554 | { | 572 | { |
| 555 | field: 'field20', | 573 | field: 'field20', |
src/views/demo/page/form/high/index.vue
| @@ -34,6 +34,7 @@ | @@ -34,6 +34,7 @@ | ||
| 34 | const tableRef = ref<{ getDataSource: () => any } | null>(null); | 34 | const tableRef = ref<{ getDataSource: () => any } | null>(null); |
| 35 | 35 | ||
| 36 | const [register, { validate }] = useForm({ | 36 | const [register, { validate }] = useForm({ |
| 37 | + layout: 'vertical', | ||
| 37 | baseColProps: { | 38 | baseColProps: { |
| 38 | span: 6, | 39 | span: 6, |
| 39 | }, | 40 | }, |
| @@ -42,6 +43,7 @@ | @@ -42,6 +43,7 @@ | ||
| 42 | }); | 43 | }); |
| 43 | 44 | ||
| 44 | const [registerTask, { validate: validateTaskForm }] = useForm({ | 45 | const [registerTask, { validate: validateTaskForm }] = useForm({ |
| 46 | + layout: 'vertical', | ||
| 45 | baseColProps: { | 47 | baseColProps: { |
| 46 | span: 6, | 48 | span: 6, |
| 47 | }, | 49 | }, |