Merge pull request #2065 from Leopoldthecoder/version

update versions.json

examples/components/footer.vue

@@ -2,7 +2,7 @@
   <footer class="footer">
     <div class="container">
       <div class="footer-main">
-        <p class="footer-main-title">Element {{ version }} Hydrogen</p>
+        <p class="footer-main-title">Element {{ version }} Helium</p>
         <a href="https://github.com/ElemeFE/element/issues" class="footer-main-link" target="_blank">{{ langConfig.feedback }}</a>
         <a href="https://github.com/ElemeFE/element/blob/master/.github/CONTRIBUTING.md" class="footer-main-link" target="_blank">{{ langConfig.contribution }}</a>
       </div>

examples/docs/en-US/datetime-picker.md

@@ -193,7 +193,7 @@ Select date and time in one picker.
             }
           }]
         },
-        value3: '',
+        value3: [new Date(2000, 10, 10, 10, 10), new Date(2000, 10, 11, 10, 10)],
         value4: ''
       };
     }

examples/docs/zh-CN/date-picker.md

@@ -310,7 +310,7 @@
 | onClick | 选中后的回调函数，参数是 vm，可通过触发 'pick' 事件设置选择器的值。例如 vm.$emit('pick', new Date()) | function | — | — |
 
 ### Events
-| Event Name | Description | Parameters |
+| 事件名称      | 说明    | 回调参数      |
 |---------|--------|---------|
-| change | 当 input 的值改变时触发，返回值和文本框一致 | formatted value |
+| change | 当 input 的值改变时触发，返回值和文本框一致 | 格式化后的值 |
 

examples/docs/zh-CN/datetime-picker.md

@@ -216,7 +216,7 @@
             }
           }]
         },
-        value3: '',
+        value3: [new Date(2000, 10, 10, 10, 10), new Date(2000, 10, 11, 10, 10)],
         value4: ''
       };
     }

examples/docs/zh-CN/table.md

@@ -76,6 +76,7 @@
           province: '上海',
           city: '普陀区',
           address: '上海市普陀区金沙江路 1518 弄',
+          detailAddress: '金沙江路 1518 弄',
           zip: 200333
         }, {
           date: '2016-05-01',
@@ -1393,10 +1394,19 @@
     data() {
       return {
         tableData3: [{
+          date: '2016-05-03',
+          name: '王小虎',
+          province: '上海',
+          city: '普陀区',
+          address: '上海市普陀区金沙江路 1518 弄',
+          detailAddress: '金沙江路 1518 弄',
+          zip: 200333
+        }, {
           date: '2016-05-02',
           name: '王小虎',
           province: '上海',
           city: '普陀区',
+          address: '上海市普陀区金沙江路 1518 弄',
           detailAddress: '金沙江路 1518 弄',
           zip: 200333
         }, {
@@ -1404,6 +1414,7 @@
           name: '王小虎',
           province: '上海',
           city: '普陀区',
+          address: '上海市普陀区金沙江路 1518 弄',
           detailAddress: '金沙江路 1518 弄',
           zip: 200333
         }, {
@@ -1411,13 +1422,31 @@
           name: '王小虎',
           province: '上海',
           city: '普陀区',
+          address: '上海市普陀区金沙江路 1518 弄',
           detailAddress: '金沙江路 1518 弄',
           zip: 200333
         }, {
-          date: '2016-05-03',
+          date: '2016-05-08',
           name: '王小虎',
           province: '上海',
           city: '普陀区',
+          address: '上海市普陀区金沙江路 1518 弄',
+          detailAddress: '金沙江路 1518 弄',
+          zip: 200333
+        }, {
+          date: '2016-05-06',
+          name: '王小虎',
+          province: '上海',
+          city: '普陀区',
+          address: '上海市普陀区金沙江路 1518 弄',
+          detailAddress: '金沙江路 1518 弄',
+          zip: 200333
+        }, {
+          date: '2016-05-07',
+          name: '王小虎',
+          province: '上海',
+          city: '普陀区',
+          address: '上海市普陀区金沙江路 1518 弄',
           detailAddress: '金沙江路 1518 弄',
           zip: 200333
         }]

examples/versions.json

 {
-  "1.0.9": "1.0"
+  "1.0.9": "1.0",
+  "1.1.0": "1.1"
 }
\ No newline at end of file