Merge remote-tracking branch 'origin/basic' into basic

src/components/table/StandardTable.vue

@@ -36,7 +36,18 @@
 <script>
 export default {
   name: 'StandardTable',
-  props: ['bordered', 'loading', 'columns', 'dataSource', 'rowKey', 'pagination', 'selectedRows'],
+  props: {
+    bordered: Boolean,
+    loading: [Boolean, Object],
+    columns: Array,
+    dataSource: Array,
+    rowKey: {
+      type: [String, Function],
+      default: 'key'
+    },
+    pagination: Object,
+    selectedRows: Array
+  },
   data () {
     return {
       needTotalList: [],
@@ -96,7 +107,9 @@ export default {
   },
   computed: {
     selectedRowKeys() {
-      return this.selectedRows.map(row => row.key)
+      return this.selectedRows.map(record => {
+        return (typeof this.rowKey === 'function') ? this.rowKey(record) : record[this.rowKey]
+      })
     }
   }
 }

src/layouts/header/AdminHeader.vue

@@ -13,7 +13,7 @@
       <div :class="['admin-header-right', headerTheme]">
           <header-search class="header-item" />
           <a-tooltip class="header-item" title="帮助文档" placement="bottom" >
-            <a>
+            <a href="https://iczer.github.io/vue-antd-admin/" target="_blank">
               <a-icon type="question-circle-o" />
             </a>
           </a-tooltip>