Skip to content

Commit 8b1c0a6

Browse files
wenzhixinwenzhixin
committed
Merge branch 'develop'
2 parents b5b183a + 5f8bb00 commit 8b1c0a6

25 files changed

+858
-722
lines changed

‎assets/js/template.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
window._config = {
22
isDebug: location.hash.slice(1) === 'is-debug' ||
33
['localhost', '127.0.0.1', 'dev.bootstrap-table.com'].indexOf(location.hostname) > -1,
4-
cdnUrl: 'https://cdn.jsdelivr.net/npm/[email protected].2/dist/',
4+
cdnUrl: 'https://cdn.jsdelivr.net/npm/[email protected].3/dist/',
55
localUrl: '../bootstrap-table/src/',
66
testUrl: '/src/'
77
}

‎crud/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta charset="utf-8">
66
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
77
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.6.3/css/all.css">
8-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected].2/dist/bootstrap-table.min.css">
8+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected].3/dist/bootstrap-table.min.css">
99
<style>
1010
.mr10 { margin-right: 10px; }
1111
.alert {
@@ -17,7 +17,7 @@
1717
<script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
1818
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js"></script>
1919
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"></script>
20-
<script src="https://cdn.jsdelivr.net/npm/[email protected].2/dist/bootstrap-table.min.js"></script>
20+
<script src="https://cdn.jsdelivr.net/npm/[email protected].3/dist/bootstrap-table.min.js"></script>
2121
</head>
2222
<body>
2323
<div class="container">

‎extensions/addrbar-page.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
<table
1616
id="table"
17+
data-sort-reset="true"
1718
data-addrbar="true"
1819
data-pagination="true"
1920
data-search="true"

‎extensions/export.html

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66
'bootstrap-table.min.css'
77
],
88
scripts: [
9-
'https://cdn.jsdelivr.net/npm/[email protected]/tableExport.min.js',
10-
'https://cdn.jsdelivr.net/npm/[email protected]/libs/jsPDF/jspdf.min.js',
11-
'https://cdn.jsdelivr.net/npm/[email protected]/libs/jsPDF-AutoTable/jspdf.plugin.autotable.js',
9+
'https://cdn.jsdelivr.net/npm/[email protected]/tableExport.min.js',
10+
'https://cdn.jsdelivr.net/npm/[email protected]/libs/jsPDF/jspdf.umd.min.js',
1211
'bootstrap-table.min.js',
1312
'extensions/export/bootstrap-table-export.min.js'
1413
]
@@ -57,10 +56,12 @@
5756
{
5857
field: 'id',
5958
title: 'ID'
60-
}, {
59+
},
60+
{
6161
field: 'name',
6262
title: 'Item Name'
63-
}, {
63+
},
64+
{
6465
field: 'price',
6566
title: 'Item Price'
6667
}

‎index.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,9 @@
186186
<li><a href="#options/detail-view-unique-id.html">Detail View Unique ID</a></li>
187187
<li><a href="#options/table-escape.html">Escape</a></li>
188188
<li><a href="#options/table-escape-title.html">Escape Title</a></li>
189-
<li><a href="#options/footer-field.html">Footer Field</a></li>
190189
<li><a href="#options/filter-options.html">Filter Options</a></li>
190+
<li><a href="#options/fixed-scroll.html">Fixed Scroll</a></li>
191+
<li><a href="#options/footer-field.html">Footer Field</a></li>
191192
<li><a href="#options/footer-style.html">Footer Style</a></li>
192193
<li><a href="#options/header-style.html">Header Style</a></li>
193194
<li><a href="#options/table-height.html">Height</a></li>

‎integrate/angular/app.js

Lines changed: 43 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -49,42 +49,49 @@ window.angular.module('app', ['bsTable'])
4949
clickToSelect: false,
5050
showToggle: true,
5151
maintainSelected: true,
52-
columns: [{
53-
field: 'state',
54-
checkbox: true
55-
}, {
56-
field: 'index',
57-
title: '#',
58-
align: 'right',
59-
valign: 'bottom',
60-
sortable: true
61-
}, {
62-
field: 'id',
63-
title: 'Item ID',
64-
align: 'center',
65-
valign: 'bottom',
66-
sortable: true
67-
}, {
68-
field: 'name',
69-
title: 'Item Name',
70-
align: 'center',
71-
valign: 'middle',
72-
sortable: true
73-
}, {
74-
field: 'workspace',
75-
title: 'Workspace',
76-
align: 'left',
77-
valign: 'top',
78-
sortable: true
79-
}, {
80-
field: 'flag',
81-
title: 'Flag',
82-
align: 'center',
83-
valign: 'middle',
84-
clickToSelect: false,
85-
formatter: flagFormatter
86-
// events: flagEvents
87-
}]
52+
columns: [
53+
{
54+
field: 'state',
55+
checkbox: true
56+
},
57+
{
58+
field: 'index',
59+
title: '#',
60+
align: 'right',
61+
valign: 'bottom',
62+
sortable: true
63+
},
64+
{
65+
field: 'id',
66+
title: 'Item ID',
67+
align: 'center',
68+
valign: 'bottom',
69+
sortable: true
70+
},
71+
{
72+
field: 'name',
73+
title: 'Item Name',
74+
align: 'center',
75+
valign: 'middle',
76+
sortable: true
77+
},
78+
{
79+
field: 'workspace',
80+
title: 'Workspace',
81+
align: 'left',
82+
valign: 'top',
83+
sortable: true
84+
},
85+
{
86+
field: 'flag',
87+
title: 'Flag',
88+
align: 'center',
89+
valign: 'middle',
90+
clickToSelect: false,
91+
formatter: flagFormatter
92+
// events: flagEvents
93+
}
94+
]
8895
}
8996
}
9097
})

‎issues/137.html

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,13 @@
2424
var $table = $('#table')
2525
function mounted() {
2626
$table.bootstrapTable({
27-
data: [{
28-
'id': 0,
29-
'name': 'Item 0',
30-
'price': '$0'
31-
}]
27+
data: [
28+
{
29+
id: 0,
30+
name: 'Item 0',
31+
price: '$0'
32+
}
33+
]
3234
})
3335
$('#button').click(function () {
3436
$table.bootstrapTable('refresh', {url: 'json/data1.json'})

‎issues/177.html

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,22 @@
2323
function mounted() {
2424
$('#table').bootstrapTable({
2525
data: data,
26-
columns: [{
27-
field: 'fullName',
28-
title: 'Full Name',
29-
formatter: function (value, row) {
30-
return [row.firstName, row.lastName].join(' ')
26+
columns: [
27+
{
28+
field: 'fullName',
29+
title: 'Full Name',
30+
formatter: function (value, row) {
31+
return [row.firstName, row.lastName].join(' ')
32+
}
33+
},
34+
{
35+
field: 'field',
36+
title: 'Field',
37+
formatter: function (value, row) {
38+
return [row.field1, row.field2, row.field3].join('+')
39+
}
3140
}
32-
}, {
33-
field: 'field',
34-
title: 'Field',
35-
formatter: function (value, row) {
36-
return [row.field1, row.field2, row.field3].join('+')
37-
}
38-
}]
41+
]
3942
})
4043
}
4144
</script>

‎issues/4586.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,12 @@
6161
{
6262
field: 'id',
6363
title: 'ID'
64-
}, {
64+
},
65+
{
6566
field: 'name',
6667
title: 'Item Name'
67-
}, {
68+
},
69+
{
6870
field: 'price',
6971
title: 'Item Price'
7072
}

‎issues/579.html

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,23 @@
2828

2929
function mounted() {
3030
$table.bootstrapTable({
31-
data: [{
32-
name: 'Name 1'
33-
}, {
34-
name: 'Name 2'
35-
}, {
36-
name: 'Name 3'
37-
}, {
38-
name: 'Name 4'
39-
}, {
40-
name: 'Name 5'
41-
}]
31+
data: [
32+
{
33+
name: 'Name 1'
34+
},
35+
{
36+
name: 'Name 2'
37+
},
38+
{
39+
name: 'Name 3'
40+
},
41+
{
42+
name: 'Name 4'
43+
},
44+
{
45+
name: 'Name 5'
46+
}
47+
]
4248
})
4349
}
4450

0 commit comments

Comments
 (0)