disable search and sort for local/utility/actions column

niiknow · Apr 10, 2019 · 78dad9d · 78dad9d
1 parent 83a7c3f
commit 78dad9d
Show file tree

Hide file tree

Showing 8 changed files with 138 additions and 48 deletions.
diff --git a/example/index.js b/example/index.js
@@ -564,15 +564,19 @@ __webpack_require__.r(__webpack_exports__);
 
       for (var k in fields) {
         var field = fields[k];
-        field.name = field.name || k; // generate
+        field.name = field.name || k; // disable search and sort for local field
+
+        if (field.utility) {
+          field.searchable = false;
+          field.orderable = false;
+        } // generate
+
 
         var col = {
-          searchable: field.searchable,
-          title: field.label || k,
+          title: field.label || field.name,
           width: field.width,
           data: field.name,
           name: field.name,
-          visible: field.visible,
           className: field.className
         };
 
@@ -588,6 +592,14 @@ __webpack_require__.r(__webpack_exports__);
           col.orderable = field.sortable;
         }
 
+        if (field.hasOwnProperty('visible')) {
+          col.visible = field.visible;
+        }
+
+        if (field.hasOwnProperty('searchable')) {
+          col.searchable = field.searchable;
+        }
+
         if (field.template) {
           field.render = vm.compileTemplate(field.template);
         }
@@ -611,9 +623,11 @@ __webpack_require__.r(__webpack_exports__);
     vm.options.order = vm.options.order || orders;
 
     if (vm.selectCheckbox) {
-      // expand column
+      vm.selectCheckbox = vm.selectCheckbox || 1; // create checkbox column
+
       var _col = {
         orderable: false,
+        searchable: false,
         name: '_select_checkbox',
         className: 'select-checkbox',
         data: null,
@@ -627,23 +641,26 @@ __webpack_require__.r(__webpack_exports__);
         selector: 'td.select-checkbox'
       });
 
-      if (vm.selectCheckbox == 1) {
+      if (vm.selectCheckbox === 1) {
         startCol++;
       }
     } // handle master details
 
 
     if (vm.details) {
+      vm.details.index = vm.details.index || 1; // create details column
+
       var _col2 = {
         orderable: false,
+        searchable: false,
         name: '_details_control',
         className: 'details-control',
         data: null,
         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);
+      vm.options.columns.splice(vm.details.index - 1, 0, _col2);
 
-      if ((vm.details.index || 1) == 1) {
+      if (vm.details.index === 1) {
         startCol++;
       }
     }

diff --git a/example/index.js.map b/example/index.js.map
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=c08c4f48a07c95268018",
-    "/index.js.map": "/index.js.map?id=b617366060d9755b0741"
+    "/index.js": "/index.js?id=4a6b72e261b73b7deb79",
+    "/index.js.map": "/index.js.map?id=31baa2ad4a62573e0529"
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -34,7 +34,7 @@
     "vue": ">=2.0.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.3.4",
+    "@babel/core": "^7.4.3",
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "babel-eslint": "^10.0.1",
     "bootstrap": "^4.3.1",
@@ -44,7 +44,7 @@
     "css-loader": "^2.1.0",
     "datatables.net-bs4": "^1.10.19",
     "datatables.net-select-bs4": "^1.2.7",
-    "eslint": "^5.14.1",
+    "eslint": "^5.16.0",
     "eslint-config-prettier": "^4.1.0",
     "eslint-friendly-formatter": "^4.0.1",
     "eslint-loader": "^2.1.2",

diff --git a/src/VdtnetTable.vue b/src/VdtnetTable.vue
@@ -155,17 +155,21 @@ export default {
 
       for (let k in fields) {
         const field = fields[k]
-        field.name = field.name || k
+        field.name  = field.name || k
+
+        // disable search and sort for local field
+        if (field.utility) {
+          field.searchable = false
+          field.orderable  = false
+        }
 
         // generate
         let col = {
-          searchable: field.searchable,
-          title: field.label || k,
-          width: field.width,
-          data: field.name,
-          name: field.name,
-          visible: field.visible,
-          className: field.className
+          title:      field.label || field.name,
+          width:      field.width,
+          data:       field.name,
+          name:       field.name,
+          className:  field.className
         }
 
         if (field.width) {
@@ -180,15 +184,23 @@ export default {
           col.orderable = field.sortable
         }
 
+        if (field.hasOwnProperty('visible')) {
+          col.visible = field.visible
+        }
+
+        if (field.hasOwnProperty('searchable')) {
+          col.searchable = field.searchable
+        }
+
         if (field.template) {
           field.render = vm.compileTemplate(field.template)
         }
 
         if (field.render) {
           col.render = field.render
         }
-        // console.log(col)
 
+        // console.log(col)
         cols.push(col)
 
         if (field.defaultOrder) {
@@ -203,9 +215,12 @@ export default {
     vm.options.order = vm.options.order || orders
 
     if (vm.selectCheckbox) {
-      // expand column
+      vm.selectCheckbox = vm.selectCheckbox || 1
+
+      // create checkbox column
       const col = {
         orderable: false,
+        searchable: false,
         name: '_select_checkbox',
         className: 'select-checkbox',
         data: null,
@@ -223,23 +238,27 @@ export default {
         }
       )
 
-      if (vm.selectCheckbox == 1) {
+      if (vm.selectCheckbox === 1) {
         startCol++
       }
     }
 
     // handle master details
     if (vm.details) {
+      vm.details.index = vm.details.index || 1
+
+      // create details column
       const col = {
         orderable: false,
+        searchable: false,
         name: '_details_control',
         className: 'details-control',
         data: null,
         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)
+      vm.options.columns.splice(vm.details.index - 1, 0, col)
 
-      if ((vm.details.index || 1) == 1) {
+      if (vm.details.index === 1) {
         startCol++
       }
     }
@@ -377,6 +396,7 @@ export default {
     if (vm.dataTable) {
       vm.dataTable.destroy(true)
     }
+
     vm.dataTable = null
   },
   methods: {
@@ -450,17 +470,20 @@ export default {
     search(value) {
       const vm = this
       vm.dataTable.search( value ).draw()
+
       return vm
     },
     setPageLength(value) {
       const vm = this
       vm.dataTable.page.len( value )
+
       return vm.reload()
     },
     getServerParams() {
       if (this.dataLoader) {
         return {}
       }
+
       return this.dataTable.ajax.params()
     }
   }