Merge branch 'switch' of gitlab.qima-inc.com:fe/oxygen into switch

components.json

@@ -1,5 +1,8 @@
 {
   "sample": "./packages/sample/index.js",
   "button": "./packages/button/index.js",
-  "switch": "./packages/switch/index.js"
+  "switch": "./packages/switch/index.js",
+  "field": "./packages/field/index.js",
+  "radio": "./packages/radio/index.js",
+  "cell": "./packages/cell/index.js"
 }

docs/examples/cell.md

@@ -0,0 +1,15 @@
+## Cell 组件
+
+### API
+
+| 参数       | 说明      | 类型       | 默认值       | 可选值       |
+|-----------|-----------|-----------|-------------|-------------|
+| className | 自定义额外类名 | string  | ''          | ''          |
+
+### Slot
+
+| name       | 描述      |
+|-----------|-----------|
+| - | 自定义显示内容 |
+| icon |  |
+| name |  |

docs/examples/checkbox.md

@@ -0,0 +1 @@
+## Checkbox组件

docs/examples/field.md

@@ -0,0 +1 @@
+## Field组件

docs/examples/radio.md

@@ -0,0 +1 @@
+## Radio组件

docs/nav.config.json

@@ -8,15 +8,41 @@
           "list": [
             {
               "path": "/sample",
-              "title": "Sample组件"
+              "title": "Sample"
             },
             {
               "path": "/button",
-              "title": "Button组件"
+              "title": "Button"
-            },
+            }
+          ]
+        },
+        {
+          "groupName": "CSS组件",
+          "list": [
+            {
+              "path": "/cell",
+              "title": "Cell"
+            }
+          ]
+        },
+        {
+          "groupName": "Form",
+          "list": [
             {
               "path": "/switch",
-              "title": "Switch组件"
+              "title": "Switch"
+            },
+            {
+              "path": "/field",
+              "title": "Field"
+            },
+            {
+              "path": "/radio",
+              "title": "Radio"
+            },
+            {
+              "path": "/checkbox",
+              "title": "Checkbox"
             }
           ]
         }

package.json

@@ -12,7 +12,7 @@
   "scripts": {
     "bootstrap": "npm i --registry=http://registry.npm.qima-inc.com",
     "build:file": "node build/bin/build-entry.js",
-    "build": "npm run clean && npm run build:file && npm run concat:dev && npm run concat:prod",
+    "build": "npm run clean && npm run lint && npm run build:file && npm run concat:dev && npm run concat:prod",
     "dev": "npm run bootstrap && npm run build:file",
     "builddocs": "webpack --progress --hide-modules --config  build/webpack.config.js && set NODE_ENV=production webpack --progress --hide-modules --config  build/webpack.config.js",
     "docs": "npm run dev && webpack-dev-server --inline --hot --config  build/webpack.config.js",

packages/cell/CHANGELOG.md

@@ -0,0 +1,8 @@
+## 0.0.2 (2017-01-20)
+
+* 改了bug A
+* 加了功能B
+
+## 0.0.1 (2017-01-10)
+
+* 第一版

packages/cell/README.md

@@ -0,0 +1,26 @@
+# @youzan/<%= name %>
+
+!!! 请在此处填写你的文档最简单描述 !!!
+
+[![version][version-image]][download-url]
+[![download][download-image]][download-url]
+
+[version-image]: http://npm.qima-inc.com/badge/v/@youzan/<%= name %>.svg?style=flat-square
+[download-image]: http://npm.qima-inc.com/badge/d/@youzan/<%= name %>.svg?style=flat-square
+[download-url]: http://npm.qima-inc.com/package/@youzan/<%= name %>
+
+## Demo
+
+## Usage
+
+## API
+
+| 参数       | 说明      | 类型       | 默认值       | 可选值       |
+|-----------|-----------|-----------|-------------|-------------|
+| className | 自定义额外类名 | string  | ''          | ''          |
+
+
+
+
+## License
+[MIT](https://opensource.org/licenses/MIT)

packages/cell/index.js

@@ -0,0 +1,3 @@
+import Cell from './src/cell';
+
+export default Cell;

packages/cell/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "<%= name %>",
+  "version": "<%= version %>",
+  "description": "<%= description %>",
+  "main": "./lib/index.js",
+  "author": "<%= author %>",
+  "license": "<%= license %>",
+  "devDependencies": {},
+  "dependencies": {}
+}

packages/cell/src/cell.vue

@@ -0,0 +1,28 @@
+<template>
+  <div class="o2-cell">
+    <div class="o2-cell-title">
+      <slot name="icon">
+        <i v-if="icon" class="o2-icon" :class="'o2-icon-' + icon"></i>
+      </slot>
+      <slot name="title">
+      </slot>
+    </div>
+    <div class="o2-cell-value">
+      <slot>
+
+      </slot>
+    </div>
+    <i class="o2-cell-arrow-right"></i>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'o2-cell',
+
+  props: {
+    icon: String,
+    title: String
+  }
+};
+</script>

packages/field/CHANGELOG.md

@@ -0,0 +1,8 @@
+## 0.0.2 (2017-01-20)
+
+* 改了bug A
+* 加了功能B
+
+## 0.0.1 (2017-01-10)
+
+* 第一版

packages/field/README.md

@@ -0,0 +1,26 @@
+# @youzan/<%= name %>
+
+!!! 请在此处填写你的文档最简单描述 !!!
+
+[![version][version-image]][download-url]
+[![download][download-image]][download-url]
+
+[version-image]: http://npm.qima-inc.com/badge/v/@youzan/<%= name %>.svg?style=flat-square
+[download-image]: http://npm.qima-inc.com/badge/d/@youzan/<%= name %>.svg?style=flat-square
+[download-url]: http://npm.qima-inc.com/package/@youzan/<%= name %>
+
+## Demo
+
+## Usage
+
+## API
+
+| 参数       | 说明      | 类型       | 默认值       | 可选值       |
+|-----------|-----------|-----------|-------------|-------------|
+| className | 自定义额外类名 | string  | ''          | ''          |
+
+
+
+
+## License
+[MIT](https://opensource.org/licenses/MIT)

packages/field/index.js

@@ -0,0 +1,3 @@
+import Field from './src/field';
+
+export default Field;

packages/field/package.json

@@ -0,0 +1,3 @@
+{
+  "name": "o2-field"
+}

packages/field/src/field.vue

@@ -0,0 +1,11 @@
+<template>
+  <div>
+    
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'o2-filed'
+};
+</script>

packages/radio/CHANGELOG.md

@@ -0,0 +1,8 @@
+## 0.0.2 (2017-01-20)
+
+* 改了bug A
+* 加了功能B
+
+## 0.0.1 (2017-01-10)
+
+* 第一版

packages/radio/README.md

@@ -0,0 +1,26 @@
+# @youzan/<%= name %>
+
+!!! 请在此处填写你的文档最简单描述 !!!
+
+[![version][version-image]][download-url]
+[![download][download-image]][download-url]
+
+[version-image]: http://npm.qima-inc.com/badge/v/@youzan/<%= name %>.svg?style=flat-square
+[download-image]: http://npm.qima-inc.com/badge/d/@youzan/<%= name %>.svg?style=flat-square
+[download-url]: http://npm.qima-inc.com/package/@youzan/<%= name %>
+
+## Demo
+
+## Usage
+
+## API
+
+| 参数       | 说明      | 类型       | 默认值       | 可选值       |
+|-----------|-----------|-----------|-------------|-------------|
+| className | 自定义额外类名 | string  | ''          | ''          |
+
+
+
+
+## License
+[MIT](https://opensource.org/licenses/MIT)

packages/radio/index.js

@@ -0,0 +1,3 @@
+import Radio from './src/radio';
+
+export default Radio;

packages/radio/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "<%= name %>",
+  "version": "<%= version %>",
+  "description": "<%= description %>",
+  "main": "./lib/index.js",
+  "author": "<%= author %>",
+  "license": "<%= license %>",
+  "devDependencies": {},
+  "dependencies": {}
+}

packages/radio/src/radio.vue

@@ -0,0 +1,11 @@
+<template>
+  <div>
+    
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'o2-radio'
+};
+</script>

src/index.js

@@ -1,6 +1,9 @@
 import Sample from '../packages/sample/index.js';
 import Button from '../packages/button/index.js';
 import Switch from '../packages/switch/index.js';
+import Field from '../packages/field/index.js';
+import Radio from '../packages/radio/index.js';
+import Cell from '../packages/cell/index.js';
 // zenui
 import '../packages/zenui/src/index.pcss';
 
@@ -10,6 +13,9 @@ const install = function(Vue) {
   Vue.component(Sample.name, Sample);
   Vue.component(Button.name, Button);
   Vue.component(Switch.name, Switch);
+  Vue.component(Field.name, Field);
+  Vue.component(Radio.name, Radio);
+  Vue.component(Cell.name, Cell);
 };
 
 // auto install
@@ -22,5 +28,8 @@ module.exports = {
   version: '0.0.1',
   Sample,
   Button,
-  Switch
+  Switch,
+  Field,
+  Radio,
+  Cell
 };