Skip to content

Commit cc35dc1

Browse files
wenzhixinwenzhixin
committed
Merge branch 'develop'
2 parents 8366db2 + 6c428f3 commit cc35dc1

10 files changed

Lines changed: 32 additions & 12 deletions

File tree

‎assets/js/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const isDebug = ['localhost', '127.0.0.1'].includes(location.hostname)
1+
const isDebug = ['localhost', '127.0.0.1', 'test.examples.wenzhixin.net.cn'].includes(location.hostname)
22
const { computed, createApp, onMounted, ref } = window.Vue
33

44
const Utils = {

‎assets/js/template.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
window._config = {
22
isDebug: location.hash.slice(1) === 'is-debug' ||
3-
['localhost', '127.0.0.1', 'dev.bootstrap-table.com'].includes(location.hostname),
4-
cdnUrl: 'https://cdn.jsdelivr.net/npm/bootstrap-table@1.27.2/dist/',
3+
['localhost', '127.0.0.1', 'test.examples.wenzhixin.net.cn'].includes(location.hostname),
4+
cdnUrl: 'https://cdn.jsdelivr.net/npm/bootstrap-table@1.27.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://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/css/bootstrap.min.css">
77
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.5.2/css/all.min.css">
8-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-table@1.27.2/dist/bootstrap-table.min.css">
8+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-table@1.27.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@3.7.1/dist/jquery.min.js"></script>
1818
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js"></script>
1919
<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.min.js"></script>
20-
<script src="https://cdn.jsdelivr.net/npm/bootstrap-table@1.27.2/dist/bootstrap-table.min.js"></script>
20+
<script src="https://cdn.jsdelivr.net/npm/bootstrap-table@1.27.3/dist/bootstrap-table.min.js"></script>
2121
</head>
2222
<body>
2323
<div class="container">

‎methods/show-hide-column.html‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script>
22
init({
33
title: 'Show/Hide Column',
4-
desc: 'Show/Hide the specified column:<br>`$table.bootstrapTable(\'showColumn\', \'name\')`<br>`$table.bootstrapTable(\'hideColumn\', \'name\')`.',
4+
desc: 'Show/Hide the specified column:<br>`$table.bootstrapTable(\'showColumn\', \'name\')`<br>`$table.bootstrapTable(\'hideColumn\', \'name\')`<br><br>Show/Hide multiple columns:<br>`$table.bootstrapTable(\'showColumn\', [\'name\', \'price\'])`<br>`$table.bootstrapTable(\'hideColumn\', [\'name\', \'price\'])`.',
55
links: ['bootstrap-table.min.css'],
66
scripts: ['bootstrap-table.min.js']
77
})
@@ -21,6 +21,18 @@
2121
>
2222
hideColumn
2323
</button>
24+
<button
25+
id="button3"
26+
class="btn btn-secondary"
27+
>
28+
showColumn (batch)
29+
</button>
30+
<button
31+
id="button4"
32+
class="btn btn-secondary"
33+
>
34+
hideColumn (batch)
35+
</button>
2436
</div>
2537
<table
2638
id="table"
@@ -50,6 +62,8 @@
5062
const $table = $('#table')
5163
const $button = $('#button')
5264
const $button2 = $('#button2')
65+
const $button3 = $('#button3')
66+
const $button4 = $('#button4')
5367

5468
function mounted () {
5569
$button.click(function () {
@@ -58,5 +72,11 @@
5872
$button2.click(function () {
5973
$table.bootstrapTable('hideColumn', 'name')
6074
})
75+
$button3.click(function () {
76+
$table.bootstrapTable('showColumn', ['name', 'price'])
77+
})
78+
$button4.click(function () {
79+
$table.bootstrapTable('hideColumn', ['name', 'price'])
80+
})
6181
}
6282
</script>

‎options/table-locale.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
links: ['bootstrap-table.min.css'],
66
scripts: [
77
'bootstrap-table.min.js',
8-
'https://cdn.jsdelivr.net/npm/bootstrap-table@1.27.2/dist/bootstrap-table-locale-all.min.js'
8+
'https://cdn.jsdelivr.net/npm/bootstrap-table@1.27.3/dist/bootstrap-table-locale-all.min.js'
99
]
1010
})
1111
</script>

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bootstrap-table-examples",
3-
"version": "1.27.2",
3+
"version": "1.27.3",
44
"description": "bootstrap-table-examples",
55
"type": "module",
66
"repository": {

‎vue-starter/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"@popperjs/core": "^2.11.8",
1212
"bootstrap": "^5.3.3",
1313
"bootstrap-icons": "^1.11.3",
14-
"bootstrap-table": "^1.27.2",
14+
"bootstrap-table": "^1.27.3",
1515
"jquery": "^3.7.1",
1616
"tableexport.jquery.plugin": "^1.30.0",
1717
"vue": "^3.5.13"

‎webpack-starter/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"dependencies": {
1414
"@popperjs/core": "^2.11.8",
1515
"bootstrap": "^5.3.3",
16-
"bootstrap-table": "^1.27.2",
16+
"bootstrap-table": "^1.27.3",
1717
"jquery": "^3.7.1"
1818
},
1919
"scripts": {

‎welcome.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
scripts: [
99
'https://cdn.jsdelivr.net/npm/tableexport.jquery.plugin@1.29.0/tableExport.min.js',
1010
'bootstrap-table.min.js',
11-
'https://cdn.jsdelivr.net/npm/bootstrap-table@1.27.2/dist/bootstrap-table-locale-all.min.js',
11+
'https://cdn.jsdelivr.net/npm/bootstrap-table@1.27.3/dist/bootstrap-table-locale-all.min.js',
1212
'extensions/export/bootstrap-table-export.min.js'
1313
]
1414
})

‎welcomes/vue-component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
scripts: [
99
'https://unpkg.com/vue@3/dist/vue.global.js',
1010
'bootstrap-table.min.js',
11-
'https://cdn.jsdelivr.net/npm/bootstrap-table@1.27.2/dist/bootstrap-table-vue.umd.js'
11+
'https://cdn.jsdelivr.net/npm/bootstrap-table@1.27.3/dist/bootstrap-table-vue.umd.js'
1212
]
1313
})
1414
</script>

0 commit comments

Comments
 (0)