Browse Source

Merge pull request #5978 from wenzhixin/fix/5952

fix/5952
文翼 4 years ago
parent
commit
fbf8ea9cec
1 changed files with 3 additions and 5 deletions
  1. 3 5
      src/extensions/cookie/bootstrap-table-cookie.js

+ 3 - 5
src/extensions/cookie/bootstrap-table-cookie.js

@@ -511,16 +511,14 @@ $.BootstrapTable = class extends $.BootstrapTable {
       throw new Error('Could not parse the json of the sortPriority cookie!', sortPriorityCookie)
       throw new Error('Could not parse the json of the sortPriority cookie!', sortPriorityCookie)
     }
     }
 
 
-    // sortOrder
-    this.options.sortOrder = undefined
-    // sortName
-    this.options.sortName = undefined
-
     if (!sortPriorityCookie) {
     if (!sortPriorityCookie) {
       // sortOrder
       // sortOrder
       this.options.sortOrder = sortOrderCookie ? sortOrderCookie : this.options.sortOrder
       this.options.sortOrder = sortOrderCookie ? sortOrderCookie : this.options.sortOrder
       // sortName
       // sortName
       this.options.sortName = sortOrderNameCookie ? sortOrderNameCookie : this.options.sortName
       this.options.sortName = sortOrderNameCookie ? sortOrderNameCookie : this.options.sortName
+    } else {
+      this.options.sortOrder = undefined
+      this.options.sortName = undefined
     }
     }
 
 
     // sortPriority
     // sortPriority