Skip to content

Commit d36a8ed

Browse files
committed
utilize defaultContent
1 parent 719da3f commit d36a8ed

File tree

7 files changed

+18
-19
lines changed

7 files changed

+18
-19
lines changed

Diff for: README.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,8 @@ Use `data-action` attribute to automatically wire up any action button/elements.
113113
```javascript
114114
actions: {
115115
label: 'Actions',
116-
render: () => {
117-
return '<a href="javascript:void(0);" data-action="edit" class="btn btn-primary btn-sm"><i class="mdi mdi-square-edit-outline"></i> Edit</a>' +
116+
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>' +
118117
'<span data-action="delete" class="btn btn-danger btn-sm"><i class="mdi mdi-delete"></i> Delete</span>'
119-
}
120118
}
121119
```
122120

Diff for: dist/build.js

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: example/App.vue

+1-3
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,8 @@ export default {
6868
website: { label: 'Website' },
6969
actions: {
7070
label: 'Actions',
71-
render: () => {
72-
return '<a href="javascript:void(0);" data-action="edit" class="btn btn-primary btn-sm"><i class="mdi mdi-square-edit-outline"></i> Edit</a>' +
71+
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>' +
7372
'<span data-action="delete" class="btn btn-danger btn-sm"><i class="mdi mdi-delete"></i> Delete</span>'
74-
}
7573
}
7674
}
7775
}

Diff for: lib/vue-datatables-net.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: lib/vue-datatables-net.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "vue-datatables-net",
33
"description": "Vue jQuery DataTable.net wrapper component ",
4-
"version": "0.7.5",
4+
"version": "0.7.6",
55
"author": "[email protected]",
66
"license": "MIT",
77
"main": "lib/vue-datatables-net.min.js",
@@ -28,13 +28,13 @@
2828
"devDependencies": {
2929
"babel-core": "^6.26.0",
3030
"babel-eslint": "^10.0.1",
31-
"babel-loader": "^7.1.2",
31+
"babel-loader": "^7.1.5",
3232
"babel-preset-env": "^1.6.0",
3333
"babel-preset-stage-3": "^6.24.1",
3434
"bili": "2.2.6",
3535
"bootstrap": "^4.1.3",
3636
"cross-env": "^5.0.5",
37-
"css-loader": "^0.28.7",
37+
"css-loader": "^0.28.11",
3838
"datatables.net-bs4": "^1.10.19",
3939
"datatables.net-buttons-bs4": "^1.5.4",
4040
"datatables.net-fixedheader-bs4": "^3.1.5",
@@ -45,11 +45,11 @@
4545
"eslint-config-prettier": "^3.1.0",
4646
"eslint-plugin-import": "^2.14.0",
4747
"eslint-plugin-vue": "^4.7.1",
48-
"file-loader": "^1.1.4",
48+
"file-loader": "^1.1.11",
4949
"rollup-plugin-vue": "^4.3.2",
50-
"vue-loader": "^13.0.5",
50+
"vue-loader": "^13.7.3",
5151
"vue-template-compiler": "^2.4.4",
52-
"webpack": "^3.10.0",
53-
"webpack-dev-server": "^2.9.1"
52+
"webpack": "^3.12.0",
53+
"webpack-dev-server": "^2.11.3"
5454
}
5555
}

Diff for: src/VdtnetTable.vue

+4-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ export default {
9191
// generate
9292
let col = {
9393
searchable: field.searchable,
94-
defaultContent: '',
9594
title: field.label || k,
9695
width: field.width,
9796
data: field.name,
@@ -103,6 +102,10 @@ export default {
103102
col.width = field.width
104103
}
105104
105+
if (field.defaultContent) {
106+
col.defaultContent = field.defaultContent
107+
}
108+
106109
if (field.sortable) {
107110
col.orderable = field.sortable
108111
}

0 commit comments

Comments
 (0)