Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: antd v5 #2

Merged
merged 38 commits into from
Dec 5, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
7c207c6
feat: 完成form-item组件升级
yiyunwan Nov 26, 2022
92f2829
feat: 完成select接入
yiyunwan Nov 26, 2022
c161833
feat: 其他组件待接入
yiyunwan Nov 26, 2022
a891829
feat: 完成Switch Reset组件文档
yiyunwan Nov 27, 2022
c1907fa
feat: add space
yiyunwan Nov 27, 2022
dac1419
feat: add password
yiyunwan Nov 27, 2022
1a87ba4
feat: add form form-grid date-picker
yiyunwan Nov 27, 2022
b7e9bbf
feat: add Checkbox Cascader
yiyunwan Nov 27, 2022
7df16ab
feat: add Editable
yiyunwan Nov 27, 2022
2c58f76
feat: add Submit
yiyunwan Nov 27, 2022
e6a1576
feat: add TimePicker
yiyunwan Nov 27, 2022
0dee52f
feat: add Transfer
yiyunwan Nov 27, 2022
0896944
feat: add TreeSelect
yiyunwan Nov 27, 2022
bb2b6f4
feat: add Upload
yiyunwan Nov 27, 2022
43643e4
feat: add FormCollapse
yiyunwan Nov 27, 2022
29d2297
feat: add FormButtonGroup
yiyunwan Nov 27, 2022
0eccf6c
feat: add FormDialog
yiyunwan Nov 27, 2022
e8ec3c3
feat: add FormDrawer
yiyunwan Nov 27, 2022
f46e840
fix: form-item Style bug
yiyunwan Nov 27, 2022
73b9001
feat: add FormTab FormStep
yiyunwan Nov 27, 2022
86854d2
fix: add array-tabs array-cards
yiyunwan Nov 28, 2022
9244126
feat: add ArrayCollapse
yiyunwan Nov 28, 2022
5195578
feat: add ArrayItems
yiyunwan Nov 28, 2022
a15fb3a
feat: add array-table
yiyunwan Nov 28, 2022
c2a49f2
fix: fix slow table
yiyunwan Nov 28, 2022
4ca7eb5
feat: add select-table
yiyunwan Nov 28, 2022
8ac3c6f
feat: change github url
yiyunwan Nov 28, 2022
093b2d5
fix: ci error
yiyunwan Nov 28, 2022
5044282
fix: build error
yiyunwan Nov 28, 2022
8f67fe2
chore: update
yiyunwan Nov 28, 2022
2b3c988
fix: ci error
yiyunwan Nov 28, 2022
48c0652
feat: add sort
yiyunwan Nov 28, 2022
9ee3ac7
feat: 拖拽代码优化
yiyunwan Nov 29, 2022
d57cb70
test: add jest
yiyunwan Dec 5, 2022
6179450
fix: 修复拖拽bug
yiyunwan Dec 5, 2022
d29a868
fix: add test case
yiyunwan Dec 5, 2022
e0766dd
Merge branch 'master' of https://github.com/formilyjs/antd into feat/…
yiyunwan Dec 5, 2022
7b2b93c
Merge branch 'master' of https://github.com/formilyjs/antd into feat/…
yiyunwan Dec 5, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"extends": [
"plugin:react/recommended",
"plugin:@typescript-eslint/recommended",
"prettier/@typescript-eslint"
"prettier"
],
"globals": {
"sleep": true,
Expand Down
5 changes: 5 additions & 0 deletions .markdownlint.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"default": true,
"MD033": false,
"MD013": false
}
82 changes: 0 additions & 82 deletions .umirc.js

This file was deleted.

164 changes: 164 additions & 0 deletions .umirc.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
export default {
mode: 'site',
logo: '//img.alicdn.com/imgextra/i2/O1CN01Kq3OHU1fph6LGqjIz_!!6000000004056-55-tps-1141-150.svg',
title: 'Ant Design V5',
hash: true,
favicon:
'//img.alicdn.com/imgextra/i3/O1CN01XtT3Tv1Wd1b5hNVKy_!!6000000002810-55-tps-360-360.svg',
outputPath: './doc-site',
locales: [
['en-US', 'English'],
['zh-CN', '中文'],
],
navs: {
'zh-CN': [
{
title: 'Ant Design V5',
path: '/zh-CN/components',
},
{
title: '主站',
path: 'https://v2.formilyjs.org/',
},
{
title: 'GITHUB',
path: 'https://github.com/formilyjs/antd',
},
],
'en-US': [
{
title: 'Ant Design V5',
path: '/components',
},
{
title: 'Home Site',
path: 'https://formilyjs.org',
},
{
title: 'GITHUB',
path: 'https://github.com/alibaba/formily',
},
],
},

headScripts: [
`
function loadAd(){
var header = document.querySelector('.__dumi-default-layout-content .markdown h1')
if(header && !header.querySelector('#_carbonads_js')){
var script = document.createElement('script')
script.src = '//cdn.carbonads.com/carbon.js?serve=CEAICK3M&placement=formilyjsorg'
script.id = '_carbonads_js'
script.classList.add('head-ad')
header.appendChild(script)
}
}
var request = null
var observer = new MutationObserver(function(){
cancelIdleCallback(request)
request = requestIdleCallback(loadAd)
})
document.addEventListener('DOMContentLoaded',function(){
loadAd()
observer.observe(
document.body,
{
childList:true,
subtree:true
}
)
})
`,
],
styles: [
`.__dumi-default-navbar-logo{
height: 60px !important;
width: 150px !important;
padding-left:0 !important;
color: transparent !important;
}
.__dumi-default-navbar{
padding: 0 28px !important;
}
.__dumi-default-layout-hero{
background-image: url(//img.alicdn.com/imgextra/i4/O1CN01ZcvS4e26XMsdsCkf9_!!6000000007671-2-tps-6001-4001.png);
background-size: cover;
background-repeat: no-repeat;
padding: 120px 0 !important;
}
.__dumi-default-layout-hero h1{
color:#45124e !important;
font-size:80px !important;
padding-bottom: 30px !important;
}
.__dumi-default-dark-switch {
display:none
}
nav a{
text-decoration: none !important;
}
#carbonads * {
margin: initial;
padding: initial;
}
#carbonads {
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', Helvetica, Arial,
sans-serif;
}
#carbonads {
display: flex;
max-width: 330px;
background-color: hsl(0, 0%, 98%);
box-shadow: 0 1px 4px 1px hsla(0, 0%, 0%, 0.1);
z-index: 100;
float:right;
}
#carbonads a {
color: inherit;
text-decoration: none;
}
#carbonads a:hover {
color: inherit;
}
#carbonads span {
position: relative;
display: block;
overflow: hidden;
}
#carbonads .carbon-wrap {
display: flex;
}
#carbonads .carbon-img {
display: block;
margin: 0;
line-height: 1;
}
#carbonads .carbon-img img {
display: block;
}
#carbonads .carbon-text {
font-size: 13px;
padding: 10px;
margin-bottom: 16px;
line-height: 1.5;
text-align: left;
}
#carbonads .carbon-poweredby {
display: block;
padding: 6px 8px;
background: #f1f1f2;
text-align: center;
text-transform: uppercase;
letter-spacing: 0.5px;
font-weight: 600;
font-size: 8px;
line-height: 1;
border-top-left-radius: 3px;
position: absolute;
bottom: 0;
right: 0;
}
`,
],
}
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"editor.formatOnSave": true
}
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# formily antd repository

English | [简体中文](./README.zh-CN.md)

<p align="center">
Expand Down Expand Up @@ -35,7 +37,7 @@ The Awesome Components Library with Formily & Ant Design.

## WebSite

https://antd.formilyjs.org
<https://antd.formilyjs.org>

## Community

Expand Down
28 changes: 22 additions & 6 deletions docs/components/ArrayCards.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export default () => {
x-component="Input"
/>
<SchemaField.Void x-component="ArrayCards.Remove" />
<SchemaField.Void x-component="ArrayCards.Copy" />
<SchemaField.Void x-component="ArrayCards.MoveUp" />
<SchemaField.Void x-component="ArrayCards.MoveDown" />
</SchemaField.Void>
Expand Down Expand Up @@ -436,9 +437,9 @@ export default () => {

## API

### ArrayCards
### ArrayCards API

Reference https://ant.design/components/card-cn/
Reference <https://ant.design/components/card-cn/>

### ArrayCards.Addition

Expand All @@ -452,7 +453,22 @@ Extended attributes
| method | `'push' \|'unshift'` | add method | `'push'` |
| defaultValue | `any` | Default value | |

Other references https://ant.design/components/button-cn/
Other references <https://ant.design/components/button-cn/>

Note: The title attribute can receive the title mapping in the Field model, that is, uploading the title in the Field is also effective

### ArrayCards.Copy

> Copy button

Extended attributes

| Property name | Type | Description | Default value |
| ------------- | -------------------- | ----------- | ------------- |
| title | ReactText | Copywriting | |
| method | `'push' \|'unshift'` | Copy method | `'push'` |

Other references <https://ant.design/components/button-cn/>

Note: The title attribute can receive the title mapping in the Field model, that is, uploading the title in the Field is also effective

Expand All @@ -464,7 +480,7 @@ Note: The title attribute can receive the title mapping in the Field model, that
| ------------- | --------- | ----------- | ------------- |
| title | ReactText | Copywriting | |

Other references https://ant.design/components/icon-cn/
Other references <https://ant.design/components/icon-cn/>

Note: The title attribute can receive the title mapping in the Field model, that is, uploading the title in the Field is also effective

Expand All @@ -476,7 +492,7 @@ Note: The title attribute can receive the title mapping in the Field model, that
| ------------- | --------- | ----------- | ------------- |
| title | ReactText | Copywriting | |

Other references https://ant.design/components/icon-cn/
Other references <https://ant.design/components/icon-cn/>

Note: The title attribute can receive the title mapping in the Field model, that is, uploading the title in the Field is also effective

Expand All @@ -488,7 +504,7 @@ Note: The title attribute can receive the title mapping in the Field model, that
| ------------- | --------- | ----------- | ------------- |
| title | ReactText | Copywriting | |

Other references https://ant.design/components/icon-cn/
Other references <https://ant.design/components/icon-cn/>

Note: The title attribute can receive the title mapping in the Field model, that is, uploading the title in the Field is also effective

Expand Down
Loading