Skip to content

Commit

Permalink
fix(docs): Update form-button-group.md api table (#37)
Browse files Browse the repository at this point in the history
* fix: Update form-button-group.md api table

* fix(ci): chagne branch master to main

---------

Co-authored-by: 方跃明 <[email protected]>
  • Loading branch information
axolo and 方跃明 authored Dec 8, 2023
1 parent 0c0ed3b commit 40772c2
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 18 deletions.
11 changes: 6 additions & 5 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

Hi! I’m really excited that you are interested in contributing to Formily. Before submitting your contribution though, please make sure to take a moment and read through the following guidelines.

- [Issue Reporting Guidelines](#issue-reporting-guidelines)
- [Pull Request Guidelines](#pull-request-guidelines)
- [Git Commit Specific](./GIT_COMMIT_SPECIFIC.md)
- [Contributing Guide](#contributing-guide)
- [Issue Reporting Guidelines](#issue-reporting-guidelines)
- [Pull Request Guidelines](#pull-request-guidelines)
- [Git Commit Specific](#git-commit-specific)

## Issue Reporting Guidelines

Expand All @@ -26,8 +27,8 @@ Hi! I’m really excited that you are interested in contributing to Formily. Bef

## Pull Request Guidelines

- Only code that's ready for release should be committed to the master branch. All development should be done in dedicated branches.
- Checkout a **new** topic branch from master branch, and merge back against master branch.
- Only code that's ready for release should be committed to the main branch. All development should be done in dedicated branches.
- Checkout a **new** topic branch from main branch, and merge back against main branch.
- Work in the `src` folder and **DO NOT** checkin `dist` in the commits.
- Make sure `npm test` passes.
- If adding new feature:
Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
_Before_ submitting a pull request, please make sure the following is done...

- [ ] Ensure the pull request title and commit message follow the [Commit Specific](https://github.com/alibaba/formily/blob/formily_next/.github/GIT_COMMIT_SPECIFIC.md) in **English**.
- [ ] Fork the repo and create your branch from `master` or `formily_next`.
- [ ] Fork the repo and create your branch from `main` or `formily_next`.
- [ ] If you've added code that should be tested, add tests!
- [ ] If you've changed APIs, update the documentation.
- [ ] Ensure the test suite passes (`npm test`).
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-pr-title.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: aslafy-z/conventional-pr-title-action@master
- uses: aslafy-z/conventional-pr-title-action@main
with:
preset: conventional-changelog-angular@^5.0.6
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: Node CI
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main

jobs:
build:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/commitlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ name: Check Commit spec
on:
# Triggers the workflow on push or pull request events but only for the formily_next branch
push:
branches: [master]
branches: [main]
pull_request:
branches: [master]
branches: [main]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ English | [简体中文](./README.zh-CN.md)
<img src="https://img.shields.io/npm/dm/@formily/element-plus"/>
<a href="https://www.npmjs.com/package/@formily/element-plus"><img src="https://img.shields.io/npm/v/@formily/element-plus.svg"></a>
<a href="https://codecov.io/gh/formilyjs/element-plus">
<img src="https://codecov.io/gh/formilyjs/element-plus/branch/master/graph/badge.svg?token=3V9RU8Wh9d"/>
<img src="https://codecov.io/gh/formilyjs/element-plus/branch/main/graph/badge.svg?token=3V9RU8Wh9d"/>
</a>
<img alt="PRs Welcome" src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg"/>
<a href="https://github.com/actions-cool/issues-helper">
Expand Down
2 changes: 1 addition & 1 deletion README.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<img src="https://img.shields.io/npm/dm/@formily/element-plus"/>
<a href="https://www.npmjs.com/package/@formily/element-plus"><img src="https://img.shields.io/npm/v/@formily/element-plus.svg"></a>
<a href="https://codecov.io/gh/formilyjs/element-plus">
<img src="https://codecov.io/gh/formilyjs/element-plus/branch/master/graph/badge.svg?token=3V9RU8Wh9d"/>
<img src="https://codecov.io/gh/formilyjs/element-plus/branch/main/graph/badge.svg?token=3V9RU8Wh9d"/>
</a>
<img alt="PRs Welcome" src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg"/>
<a href="https://github.com/actions-cool/issues-helper">
Expand Down
10 changes: 5 additions & 5 deletions docs/guide/form-button-group.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

## API

| 属性名 | 类型 | 描述 | 默认值 |
| ------------- | ------- | ------------- | -------- | -------- | -------- |
| gutter | number | 间隙大小 | 8px |
| align | `'left' | 'center' | 'right'` | 对齐方式 | `'left'` |
| alignFormItem | boolean | 对齐 FormItem | `false` |
| 属性名 | 类型 | 描述 | 默认值 |
| ------------- | ------- | ----------------------------------- | -------- |
| gutter | number | 间隙大小 | 8px |
| align | string | 对齐方式:`'left'/'center'/'right'` | `'left'` |
| alignFormItem | boolean | 对齐 FormItem | `false` |

0 comments on commit 40772c2

Please sign in to comment.