diff --git a/.babelrc b/.babelrc index e2f43ba0f..fdd3ddebe 100644 --- a/.babelrc +++ b/.babelrc @@ -3,6 +3,7 @@ "plugins": [ "transform-vue-jsx", "transform-object-rest-spread", - "syntax-dynamic-import" + "syntax-dynamic-import", + "transform-decorators-legacy" ] } diff --git a/components/card/Card.vue b/components/card/Card.vue new file mode 100644 index 000000000..218a2d99a --- /dev/null +++ b/components/card/Card.vue @@ -0,0 +1,184 @@ + diff --git a/components/card/Grid.vue b/components/card/Grid.vue index e69de29bb..3ebcd00a4 100644 --- a/components/card/Grid.vue +++ b/components/card/Grid.vue @@ -0,0 +1,19 @@ + diff --git a/components/card/Meta.vue b/components/card/Meta.vue index e69de29bb..3b50f8b9e 100644 --- a/components/card/Meta.vue +++ b/components/card/Meta.vue @@ -0,0 +1,36 @@ + diff --git a/components/card/demo/basic.vue b/components/card/demo/basic.vue new file mode 100644 index 000000000..7ad9fa2f2 --- /dev/null +++ b/components/card/demo/basic.vue @@ -0,0 +1,23 @@ + + + diff --git a/components/card/demo/colRowCard.vue b/components/card/demo/colRowCard.vue new file mode 100644 index 000000000..399e4ce63 --- /dev/null +++ b/components/card/demo/colRowCard.vue @@ -0,0 +1,32 @@ + + + diff --git a/components/card/demo/concise.vue b/components/card/demo/concise.vue new file mode 100644 index 000000000..3a946db83 --- /dev/null +++ b/components/card/demo/concise.vue @@ -0,0 +1,32 @@ + + + diff --git a/components/card/demo/grid.vue b/components/card/demo/grid.vue new file mode 100644 index 000000000..77285fe1f --- /dev/null +++ b/components/card/demo/grid.vue @@ -0,0 +1,27 @@ + + + diff --git a/components/card/demo/index.vue b/components/card/demo/index.vue new file mode 100644 index 000000000..313281dd6 --- /dev/null +++ b/components/card/demo/index.vue @@ -0,0 +1,46 @@ + + diff --git a/components/card/demo/inline.vue b/components/card/demo/inline.vue new file mode 100644 index 000000000..2414d3931 --- /dev/null +++ b/components/card/demo/inline.vue @@ -0,0 +1,39 @@ + + + diff --git a/components/card/demo/loading.vue b/components/card/demo/loading.vue new file mode 100644 index 000000000..1c8a1c840 --- /dev/null +++ b/components/card/demo/loading.vue @@ -0,0 +1,20 @@ + + + diff --git a/components/card/demo/moreConfigs.vue b/components/card/demo/moreConfigs.vue new file mode 100644 index 000000000..649248250 --- /dev/null +++ b/components/card/demo/moreConfigs.vue @@ -0,0 +1,40 @@ + + + diff --git a/components/card/demo/noBorder.vue b/components/card/demo/noBorder.vue new file mode 100644 index 000000000..c3bd607ab --- /dev/null +++ b/components/card/demo/noBorder.vue @@ -0,0 +1,24 @@ + + + diff --git a/components/card/demo/tabsCard.vue b/components/card/demo/tabsCard.vue new file mode 100644 index 000000000..432e66b30 --- /dev/null +++ b/components/card/demo/tabsCard.vue @@ -0,0 +1,74 @@ + + + diff --git a/components/card/index.js b/components/card/index.js new file mode 100644 index 000000000..269939d25 --- /dev/null +++ b/components/card/index.js @@ -0,0 +1,6 @@ +import Card from './Card' +import Meta from './Meta' +import Grid from './Grid' +Card.Meta = Meta +Card.Grid = Grid +export default Card diff --git a/components/card/index.vue b/components/card/index.vue deleted file mode 100644 index e69de29bb..000000000 diff --git a/components/index.js b/components/index.js index d45f7e517..89b5709d7 100644 --- a/components/index.js +++ b/components/index.js @@ -35,3 +35,5 @@ export { default as Popover } from './popover' export { default as Popconfirm } from './popconfirm' export { default as Menu } from './menu' + +export { default as Card } from './card' diff --git a/examples/routes.js b/examples/routes.js index 57afccc23..76c029574 100644 --- a/examples/routes.js +++ b/examples/routes.js @@ -3,7 +3,7 @@ const AsyncComp = () => { const com = pathnameArr[1] || 'button' const demo = pathnameArr[2] || 'index' return { - component: import(`../components/menu/demo/${demo}.vue`), + component: import(`../components/card/demo/${demo}.vue`), } } export default [ diff --git a/package.json b/package.json index 2c9ef6600..664bdf0bc 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,8 @@ "babel-plugin-istanbul": "^4.1.1", "babel-plugin-syntax-dynamic-import": "^6.18.0", "babel-plugin-syntax-jsx": "^6.18.0", + "babel-plugin-transform-decorators": "^6.24.1", + "babel-plugin-transform-decorators-legacy": "^1.3.4", "babel-plugin-transform-object-rest-spread": "^6.26.0", "babel-plugin-transform-vue-jsx": "^3.5.0", "babel-polyfill": "^6.26.0",