Merge remote-tracking branch 'main/dev' into dev

This commit is contained in:
陈嘉涵
2017-09-01 10:19:40 +08:00
10 changed files with 392 additions and 15 deletions

View File

@@ -10,6 +10,7 @@ import Checkbox from './checkbox';
import CheckboxGroup from './checkbox-group';
import Col from './col';
import DatetimePicker from './datetime-picker';
import DeepSelect from './deep-select';
import Dialog from './dialog';
import ExpressWay from './express-way';
import Field from './field';
@@ -60,6 +61,7 @@ const components = [
CheckboxGroup,
Col,
DatetimePicker,
DeepSelect,
ExpressWay,
Field,
GoodsAction,
@@ -120,6 +122,7 @@ export {
CheckboxGroup,
Col,
DatetimePicker,
DeepSelect,
Dialog,
ExpressWay,
Field,