fix default sort orderingg

niiknow · Dec 4, 2018 · a332313 · a332313
1 parent 5852569
commit a332313
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 29 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -342,7 +342,8 @@ __webpack_require__.r(__webpack_exports__);
         name: {
           label: 'Name',
           sortable: true,
-          searchable: true
+          searchable: true,
+          defaultOrder: 'desc'
         },
         username: {
           label: 'Username',
@@ -417,8 +418,6 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 //
 //
 //
@@ -568,7 +567,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
     var vm = this;
     var jq = vm.jq;
     var orders = [];
-    var sort = 0;
+    var startCol = 0;
     var icol = 0; // allow user to override default options
 
     if (vm.opts) {
@@ -618,7 +617,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
         cols.push(col);
 
         if (field.defaultOrder) {
-          orders.push([icol, col.defaultOrder]);
+          orders.push([icol, field.defaultOrder]);
         }
 
         icol++;
@@ -646,29 +645,34 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
       });
 
       if (vm.selectCheckbox == 1) {
-        sort++;
+        startCol++;
       }
     } // handle master details
 
 
     if (vm.details) {
-      var _col2 = _defineProperty({
+      var _col2 = {
         orderable: false,
         name: '_details_control',
         className: 'details-control',
         data: null,
-        defaultContent: ''
-      }, "defaultContent", vm.details.icons || '<span class="details-plus" title="Show details">+</span><span class="details-minus" title="Hide details">-</span>');
-
+        defaultContent: vm.details.icons || '<span class="details-plus" title="Show details">+</span><span class="details-minus" title="Hide details">-</span>'
+      };
       vm.options.columns.splice((vm.details.index || 1) - 1, 0, _col2);
 
-      if ((vm.details.index || 1) > 0) {
-        sort++;
+      if ((vm.details.index || 1) == 1) {
+        startCol++;
       }
     }
 
-    if (sort > 0) {
-      vm.options.order = [[sort, 'asc']];
+    if (startCol > 0) {
+      if (vm.options.order) {
+        vm.options.order.forEach(function (v) {
+          v[0] += startCol;
+        });
+      } else {
+        vm.options.order = [[startCol, 'asc']];
+      }
     } // handle local data loader
 
 

diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/example/App.vue b/example/App.vue
@@ -114,7 +114,7 @@ export default {
           defaultContent: '<a href="javascript:void(0);" data-action="edit" class="btn btn-primary btn-sm"><i class="mdi mdi-square-edit-outline"></i> Edit</a>' +
             '<span data-action="delete" class="btn btn-danger btn-sm"><i class="mdi mdi-delete"></i> Delete</span>'
         },
-        name: { label: 'Name', sortable: true, searchable: true },
+        name: { label: 'Name', sortable: true, searchable: true, defaultOrder: 'desc' },
         username: { label: 'Username', sortable: false, searchable: true  },
         email: { label: 'Email' },
         address: {

diff --git a/lib/index.js b/lib/index.js
diff --git a/lib/index.js.map b/lib/index.js.map
diff --git a/lib/mix-manifest.json b/lib/mix-manifest.json
@@ -1,4 +1,4 @@
 {
-    "/index.js": "/index.js?id=7d78e1d531f475e0ec43",
-    "/index.js.map": "/index.js.map?id=0674e31b844d15842eac"
+    "/index.js": "/index.js?id=38a14d55a59f54e057f6",
+    "/index.js.map": "/index.js.map?id=a560110cdf7ce9aa9f00"
 }
diff --git a/src/VdtnetTable.vue b/src/VdtnetTable.vue
@@ -139,8 +139,8 @@ export default {
     const jq     = vm.jq
     const orders = []
 
-    let sort = 0
-    let icol = 0
+    let startCol = 0
+    let icol     = 0
 
     // allow user to override default options
     if (vm.opts) {
@@ -191,7 +191,7 @@ export default {
         cols.push(col)
 
         if (field.defaultOrder) {
-          orders.push([icol, col.defaultOrder])
+          orders.push([icol, field.defaultOrder])
         }
 
         icol++
@@ -223,7 +223,7 @@ export default {
       )
 
       if (vm.selectCheckbox == 1) {
-        sort++
+        startCol++
       }
     }
 
@@ -234,18 +234,23 @@ export default {
         name: '_details_control',
         className: 'details-control',
         data: null,
-        defaultContent: '',
         defaultContent: vm.details.icons || '<span class="details-plus" title="Show details">+</span><span class="details-minus" title="Hide details">-</span>'
       }
       vm.options.columns.splice((vm.details.index || 1) - 1, 0, col)
 
-      if ((vm.details.index || 1) > 0) {
-        sort++
+      if ((vm.details.index || 1) == 1) {
+        startCol++
       }
     }
 
-    if (sort > 0) {
-      vm.options.order = [[sort, 'asc']]
+    if (startCol > 0) {
+      if (vm.options.order) {
+        vm.options.order.forEach((v) => {
+          v[0] += startCol
+        })
+      } else {
+        vm.options.order = [[startCol, 'asc']]
+      }
     }
 
     // handle local data loader