Skip to content

Commit a90effc

Browse files
committed
Merge remote-tracking branch 'remotes/origin/master' into master-fork
# Conflicts: # dist/vue-good-table.cjs.css # dist/vue-good-table.cjs.js # dist/vue-good-table.css # dist/vue-good-table.esm.css # dist/vue-good-table.esm.js # dist/vue-good-table.js # dist/vue-good-table.min.css # dist/vue-good-table.min.js # dist/vue-good-table.min.js.map # src/components/Table.vue
2 parents acc0497 + 8c6ca4c commit a90effc

File tree

99 files changed

+1838
-17087
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+1838
-17087
lines changed

dev/App.vue

+13-8
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,11 @@
2424
selectOnCheckboxOnly: false,
2525
disableSelectInfo: true,
2626
}"
27-
theme="nocturnal"
28-
styleClass="vgt-table bordered"
27+
theme="polar-bear"
28+
styleClass="vgt-table"
2929
:sort-options="{
3030
enabled: true,
31+
multipleColumns: false,
3132
}"
3233
:search-options="{
3334
enabled: true,
@@ -54,11 +55,12 @@ export default {
5455
rowStyleClass: 'red',
5556
searchTerm: '',
5657
paginationOptions: {
57-
mode: 'pages',
5858
enabled: true,
59-
perPage: 5,
60-
perPageDropdown: [50, 100, 200, 300, 500, 1000],
61-
perPageDropdownEnabled: false,
59+
mode: 'records',
60+
perPage: 3,
61+
perPageDropdown: [3, 5, 10, 200, 300, 500, 1000],
62+
perPageDropdownEnabled: true,
63+
// infoFn: (params) => `alala ${params.firstRecordOnPage} to ${params.lastRecordOnPage} of ${params.totalRecords}`,
6264
},
6365
columns: [
6466
{
@@ -68,6 +70,7 @@ export default {
6870
filterOptions: {
6971
enabled: true,
7072
placeholder: 'All',
73+
trigger: 'enter',
7174
// filterDropdownItems: ['Chris', 'Dan', 'Susan'],
7275
// filterValue: 'Chris',
7376
},
@@ -76,11 +79,13 @@ export default {
7679
label: 'Age',
7780
field: 'age',
7881
type: 'number',
82+
tooltip: 'Age tooltip',
7983
firstSortType: 'desc',
8084
filterOptions: {
8185
enabled: true,
82-
filterDropdownItems: ['24', '16', '30'],
83-
styleClass: 'class1'
86+
// filterDropdownItems: ['24', '16', '30'],
87+
styleClass: 'class1',
88+
trigger: 'enter',
8489
// filterDropdownItems: [
8590
// {
8691
// value: 24,

dev/remote-table.vue

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
perPage: 5,
1616
perPageDropdown: [20, 50, 100, 200],
1717
dropdownAllowAll: false,
18-
position: 'top',
1918
}"
2019
:search-options="{
2120
enabled: false,

dist/vue-good-table.cjs.css

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

0 commit comments

Comments
 (0)