Skip to content

Commit

Permalink
Merge pull request alibaba-fusion#1 from alibaba-fusion/master
Browse files Browse the repository at this point in the history
update
  • Loading branch information
nianxiongdi authored Mar 20, 2019
2 parents 178fd0d + 4dbe244 commit 064a79e
Show file tree
Hide file tree
Showing 730 changed files with 34,759 additions and 13,128 deletions.
10 changes: 0 additions & 10 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,11 @@ end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

# package.json
[package.json]
indent_size = 2
indent_style = space

# .commitlintrc
[.commitlintrc]
indent_size = 2
indent_style = space

# .eslintrc
[.eslintrc]
indent_size = 2
indent_style = space

# .fusion
[.fusion]
indent_size = 2
Expand Down
16 changes: 11 additions & 5 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
{
"env": {
"es6": true,
"node": true
},
"extends": "@alifd/eslint-config-next"
"env": {
"es6": true,
"node": true
},
"extends": ["@alifd/eslint-config-next", "prettier"],
"rules": {
"valid-jsdoc": "off",
"max-statements": "off",
"max-len": "off",
"no-unused-vars": 1
}
}
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ logs
npm-debug.log*
yarn-debug.log*
yarn-error.log*

package-lock.json
# Runtime data
pids
*.pid
Expand Down Expand Up @@ -60,6 +60,9 @@ typings/
# next.js build output
.next

# special demo file for locally reappear issue
docs/**/demo/issues.md

precss.css
.sass-cache/
scripts/server-remote
Expand Down
4 changes: 4 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
docs/**/*
/index.js
/index-with-locales.js
*.scss
6 changes: 6 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"trailingComma": "es5",
"tabWidth": 4,
"semi": true,
"singleQuote": true
}
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ before_script:
script:
- npm run eslint
- npm run stylelint
- npm run test:a11y
- npm test
- codecov

Expand Down
644 changes: 433 additions & 211 deletions CHANGELOG.md

Large diffs are not rendered by default.

11 changes: 7 additions & 4 deletions LATESTLOG.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
# Latest Log

## [1.11.11](https://github.com/alibaba-fusion/next/compare/1.11.10...1.11.11) (2019-01-22)
## [1.13.9](https://github.com/alibaba-fusion/next/compare/1.13.8...1.13.9) (2019-03-19)


### Bug Fixes

* **Form:** no need form-element-large-size in form ([08420c6](https://github.com/alibaba-fusion/next/commit/08420c6))
* **NumberPicker:** value set to min while next value < min by click + ([6863b9f](https://github.com/alibaba-fusion/next/commit/6863b9f))
* **Select:** double trigger onVisibleChange while click arrow ([20f2e1c](https://github.com/alibaba-fusion/next/commit/20f2e1c))
* **CascaderSelect:** support value not in data ([93e4227](https://github.com/alibaba-fusion/next/commit/93e4227))
* **Overlay:** fix position typo ([71bf7d2](https://github.com/alibaba-fusion/next/commit/71bf7d2))
* **Select:** hasSelectAll bug under controled ([fd5faf4](https://github.com/alibaba-fusion/next/commit/fd5faf4))
* **Select:** select all doesn't work under control mode ([a1519d2](https://github.com/alibaba-fusion/next/commit/a1519d2))
* **Table:** warning when stickyHeader + lock with enough space ([46a38f6](https://github.com/alibaba-fusion/next/commit/46a38f6))
* **Util:** Prevent warning on production ([0fcde5a](https://github.com/alibaba-fusion/next/commit/0fcde5a))


59 changes: 44 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,46 @@
# Next Components
English | [简体中文](./README.zh-cn.md)
<p align="center">
<a href="https://fusion.design/">
<img alt="Fusion" src="https://img.alicdn.com/tfs/TB1YsoiHVzqK1RjSZFCXXbbxVXa-159-99.svg" width="200">
</a>
</p>

`@alifd/next` is a configurable component library for PC in Fusion Design. It is based on React and supports all modern browsers and IE9+.
<p align="center">An enterprise-class UI solution for backend system, amied of settling the problems like cooperation between designers and front-developers, consistency of product experience and development efficiency.</p>

[中文 README](./README.zh-cn.md)
---

[![npm package](https://img.shields.io/npm/v/@alifd/next.svg?style=flat-square)](https://www.npmjs.org/package/@alifd/next)
[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)
[![Build Status](https://travis-ci.com/alibaba-fusion/next.svg?token=KAYresHL1UPaaLzUYyx6&branch=master)](https://travis-ci.com/alibaba-fusion/next)
[![codecov](https://codecov.io/gh/alibaba-fusion/next/branch/master/graph/badge.svg?token=FSufKVDhmT)](https://codecov.io/gh/alibaba-fusion/next)
<p align="center">
<a href="https://www.npmjs.org/package/@alifd/next"><img src="https://img.shields.io/npm/v/@alifd/next.svg"></a>
<a href="https://www.npmjs.org/package/@alifd/next"><img src="https://img.shields.io/npm/dm/@alifd/next.svg"></a>
<a href="https://codecov.io/gh/alibaba-fusion/next"><img src="https://codecov.io/gh/alibaba-fusion/next/branch/master/graph/badge.svg?token=FSufKVDhmT"></a>
<a href="https://travis-ci.com/alibaba-fusion/next"><img src="https://travis-ci.com/alibaba-fusion/next.svg?token=KAYresHL1UPaaLzUYyx6&branch=master"></a>
<a href="http://makeapullrequest.com"><img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg"></a>
<a href="https://github.com/alibaba-fusion/next/blob/master/LICENSE"><img src="https://img.shields.io/badge/license-MIT-brightgreen.svg"></a>
</p>

# Quick Start
You can customize your own DesignSystem via [Collaboration Platform](https://fusion.design).💖 Designers will receive design materials by [Fusion Cool](https://fusion.design/tool?from=github) - an easy to use plugin on sketch. Developers will get code fragment on [IceWorks](https://fusion.design/tool?from=github). At the same time, the consistency between code and visual manuscript is guaranteed. 😍

## Install
![howtouse](https://img.alicdn.com/tfs/TB1dF3BH4TpK1RjSZFMXXbG_VXa-1280-720.gif)


# 🤔 Why use

`@alifd/next` usually used with [Fusion Design](https://fusion.design) to improving designer-developer collaboration and development efficiency. Designer can customize the UI of components and release an npm theme package. Developer can use this theme package directly, and don't need to care about the UI refactoring. It saves the workload of reductive degree review repeatedly with designers, and greatly improves the development efficiency.

![](https://img.alicdn.com/tfs/TB1gia.HkvoK1RjSZFDXXXY3pXa-1286-490.png)


# 💻 Browser Compatibility

![Chrome](https://raw.github.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png) | ![Firefox](https://raw.github.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png) | ![Edge](https://raw.github.com/alrra/browser-logos/master/src/edge/edge_48x48.png) | ![IE](https://raw.github.com/alrra/browser-logos/master/src/archive/internet-explorer_9-11/internet-explorer_9-11_48x48.png) | ![Safari](https://raw.github.com/alrra/browser-logos/master/src/safari/safari_48x48.png) | ![Opera](https://raw.github.com/alrra/browser-logos/master/src/opera/opera_48x48.png) | ![UC](https://raw.github.com/alrra/browser-logos/master/src/uc/uc_48x48.png)
:---: | :---: | :---: | :---: | :---: | :---: | :---:
✔ | ✔ | ✔ | 9+ ✔ | ✔ | ✔ | ✔



# 🚀 Quick Start

## 🛠 Install

### 1.Use NPM ( Recommend )

Expand All @@ -21,7 +50,7 @@ npm install @alifd/next --save

### 2.Import in Browser

Use the script and link tags in the browser to directly import the file and use the global variable Next. We provide files such as next.js/next.min.js and next.css/next.min.css in the `@alifd/next/dist` directory in the npm package, or via [unpkg](https:/ /unpkg.com/@alifd/next/dist/) Download it.
Use the script and link tags in the browser to directly import the file and use the global variable Next. We provide files such as next.js/next.min.js and next.css/next.min.css in the `@alifd/next/dist` directory in the npm package, or via [unpkg](https://unpkg.com/@alifd/next/dist/) Download it.

``` html
<link rel="stylesheet" href="https://unpkg.com/@alifd/next/dist/next.css">
Expand All @@ -35,12 +64,12 @@ Use the script and link tags in the browser to directly import the file and use
<script src="../build/public/@alifd/next.js"></script>
```

## Dependencies
## ☔️ Dependencies

* `@alifd/next` is based on `react@16` development and is currently not compatible with versions below `react@16`. react/react-dom is used as peerDependencies, which requires the user to manually install or import it.
* `@alifd/next` use [moment](https://github.com/moment/moment) library to implement date-time related component. moment is also used as peerDependencies, which requires the user to manually install or import it.

## Import
## 🎯 Import

### Import All

Expand Down Expand Up @@ -90,15 +119,15 @@ import Button from '@alifd/next/lib/button';
import '@alifd/next/lib/button/style';
```

## Advanced
## 🔗 Advanced
- [Use with Theme Package](./site/en-us/theme.md)
- [Internationalization](./site/en-us/i18n.md)
- [Deploy Font File](./site/en-us/font-deploy.md)

## Contributing
## 🌈 Contributing
- [Contributing](./site/en-us/contributing.md)

## Join Group
## 📣 Join Group

Use [Dingtalk App](https://www.dingtalk.com/en) scan the Qrcode to join in _Dingtalk Group_ :

Expand Down
57 changes: 43 additions & 14 deletions README.zh-cn.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,46 @@
# Next Components
[English](./README.md) | 简体中文
<p align="center">
<a href="https://fusion.design/">
<img alt="Fusion" src="https://img.alicdn.com/tfs/TB1YsoiHVzqK1RjSZFCXXbbxVXa-159-99.svg" width="200">
</a>
</p>

`@alifd/next` 是 Fusion Design 中的面向 PC 端可配置组件库,基于 React 实现,支持所有现代浏览器和 IE9+。

[English README](./README.md)
<p align="center">一套企业级中后台UI的解决方案,致力于解决设计师与前端在工作协同、产品体验一致性、开发效率方面的问题</p>

[![npm package](https://img.shields.io/npm/v/@alifd/next.svg?style=flat-square)](https://www.npmjs.org/package/@alifd/next)
[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)
[![Build Status](https://travis-ci.com/alibaba-fusion/next.svg?token=KAYresHL1UPaaLzUYyx6&branch=master)](https://travis-ci.com/alibaba-fusion/next)
[![codecov](https://codecov.io/gh/alibaba-fusion/next/branch/master/graph/badge.svg?token=FSufKVDhmT)](https://codecov.io/gh/alibaba-fusion/next)
---

# 快速开始
<p align="center">
<a href="https://www.npmjs.org/package/@alifd/next"><img src="https://img.shields.io/npm/v/@alifd/next.svg"></a>
<a href="https://www.npmjs.org/package/@alifd/next"><img src="https://img.shields.io/npm/dm/@alifd/next.svg"></a>
<a href="https://codecov.io/gh/alibaba-fusion/next"><img src="https://codecov.io/gh/alibaba-fusion/next/branch/master/graph/badge.svg?token=FSufKVDhmT"></a>
<a href="https://travis-ci.com/alibaba-fusion/next"><img src="https://travis-ci.com/alibaba-fusion/next.svg?token=KAYresHL1UPaaLzUYyx6&branch=master"></a>
<a href="http://makeapullrequest.com"><img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg"></a>
<a href="https://github.com/alibaba-fusion/next/blob/master/LICENSE"><img src="https://img.shields.io/badge/license-MIT-brightgreen.svg"></a>
</p>

## 安装
你可以通过[一站式协作平台](https://fusion.design)灵活地定制自己的DesignSystem,生成设计物料与代码分片到设计师的工具端 [FusionCool](https://fusion.design/tool?from=github) 及开发者的工具端 [Iceworks](https://fusion.design/tool?from=github),同时保证代码和视觉稿之间的一致性

![howtouse](https://img.alicdn.com/tfs/TB1dF3BH4TpK1RjSZFMXXbG_VXa-1280-720.gif)


# 🤔 为什么用

`@alifd/next` 配合 [Fusion Design](https://fusion.design) 解决在页面开发时设计师和前端协同的问题。通过这套体系设计师可以自由的定制组件的 UI 并产出一个 npm 主题包,前端可以直接使用这个主题包不需要关注组件的还原度问题。省去了和设计师反复的去做还原度 Review 的工作量,大幅度的提高了开发效率。

![](https://img.alicdn.com/tfs/TB1MDP6GSzqK1RjSZFpXXakSXXa-1278-458.png)

# 💻 浏览器支持

![Chrome](https://raw.github.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png) | ![Firefox](https://raw.github.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png) | ![Edge](https://raw.github.com/alrra/browser-logos/master/src/edge/edge_48x48.png) | ![IE](https://raw.github.com/alrra/browser-logos/master/src/archive/internet-explorer_9-11/internet-explorer_9-11_48x48.png) | ![Safari](https://raw.github.com/alrra/browser-logos/master/src/safari/safari_48x48.png) | ![Opera](https://raw.github.com/alrra/browser-logos/master/src/opera/opera_48x48.png) | ![UC](https://raw.github.com/alrra/browser-logos/master/src/uc/uc_48x48.png)
:---: | :---: | :---: | :---: | :---: | :---: | :---:
✔ | ✔ | ✔ | 9+ ✔ | ✔ | ✔ | ✔



# 🚀 快速开始

## 🛠 安装

### 1.使用 npm 安装(推荐)

Expand All @@ -35,12 +64,12 @@ npm install @alifd/next --save
<script src="../build/public/@alifd/next.js"></script>
```

## 依赖
## ☔️ 依赖

* `@alifd/next` 基于 `react@16` 开发,目前并不兼容 `react@16` 以下的版本,且将 react/react-dom 作为 peerDependencies,需要用户手动提前安装或引入。
* `@alifd/next` 在处理日期时间相关组件逻辑时,使用了 [moment](https://github.com/moment/moment) 库,且将 moment 作为 peerDependencies,需要用户手动提前安装或引入。

## 引入
## 🎯 引入

### 全量引入

Expand Down Expand Up @@ -93,15 +122,15 @@ babel配置:



## 高级用法
## 🔗 高级用法
- [使用主题包](./site/zh-cn/theme.md)
- [国际化](./site/zh-cn/i18n.md)
- [字体文件私有化部署](./site/zh-cn/font-deploy.md)

## 贡献代码
## 🌈 贡献代码
- [贡献代码](./site/zh-cn/contributing.md)

## 加入社区
## 📣 加入社区

扫码*钉钉群* 加入即刻交流与反馈:

Expand Down
Loading

0 comments on commit 064a79e

Please sign in to comment.