From ac0dd3516d5b03cfbd8093e329613b4e554dae9f Mon Sep 17 00:00:00 2001
From: AllenFang <ayu780129@hotmail.com>
Date: Thu, 7 Apr 2016 23:04:01 +0800
Subject: [PATCH] support default sort with a properly way

---
 src/BootstrapTable.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/BootstrapTable.js b/src/BootstrapTable.js
index 29d412347..ba5e8643d 100644
--- a/src/BootstrapTable.js
+++ b/src/BootstrapTable.js
@@ -87,10 +87,12 @@ class BootstrapTable extends Component {
   }
 
   getTableData() {
-    const { options, pagination } = this.props;
     let result = [];
-    if (options.sortName && options.sortOrder) {
-      this.store.sort(options.sortOrder, options.sortName);
+    const { options, pagination } = this.props;
+    const sortName = options.defaultSortName || options.sortName;
+    const sortOrder = options.defaultSortOrder || options.sortOrder;
+    if (sortName && sortOrder) {
+      this.store.sort(sortOrder, sortName);
     }
 
     if (pagination) {
@@ -789,6 +791,8 @@ BootstrapTable.propTypes = {
     clearSearch: PropTypes.bool,
     sortName: PropTypes.string,
     sortOrder: PropTypes.string,
+    defaultSortName: PropTypes.string,
+    defaultSortOrder: PropTypes.string,
     sortIndicator: PropTypes.bool,
     afterTableComplete: PropTypes.func,
     afterDeleteRow: PropTypes.func,
@@ -855,6 +859,8 @@ BootstrapTable.defaultProps = {
     clearSearch: false,
     sortName: undefined,
     sortOrder: undefined,
+    defaultSortName: undefined,
+    defaultSortOrder: undefined,
     sortIndicator: true,
     afterTableComplete: undefined,
     afterDeleteRow: undefined,