Skip to content

Commit 19c9821

Browse files
wenzhixinwenzhixin
committed
Merge branch 'develop'
2 parents c49bbc5 + 34eed7b commit 19c9821

43 files changed

Lines changed: 87 additions & 77 deletions

Some content is hidden

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

‎assets/js/index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const isDebug = ['localhost', '127.0.0.1'].indexOf(location.hostname) > -1
1+
const isDebug = ['localhost', '127.0.0.1'].includes(location.hostname)
22
const { computed, createApp, onMounted, ref } = window.Vue
33

44
const Utils = {
@@ -74,7 +74,7 @@ const Utils = {
7474
$('.view-example, .view-source').off('click').click(function () {
7575
if (isSource) {
7676
location.hash = location.hash.replace('#view-source', '')
77-
} else if (location.hash.indexOf('view-source') === -1) {
77+
} else if (!location.hash.includes('view-source')) {
7878
location.hash += '#view-source'
7979
}
8080
})

‎assets/js/template.js‎

Lines changed: 5 additions & 5 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'].indexOf(location.hostname) > -1,
4-
cdnUrl: 'https://cdn.jsdelivr.net/npm/bootstrap-table@1.26.0/dist/',
3+
['localhost', '127.0.0.1', 'dev.bootstrap-table.com'].includes(location.hostname),
4+
cdnUrl: 'https://cdn.jsdelivr.net/npm/bootstrap-table@1.27.0/dist/',
55
localUrl: '../bootstrap-table/src/',
66
testUrl: '/src/'
77
}
@@ -169,9 +169,9 @@ function _beautifySource (data) {
169169
}
170170
}
171171

172-
result = result.concat($.map(obj.links, _getLink))
172+
result = result.concat(obj.links.map(_getLink))
173173
addEmptyLine()
174-
result = result.concat($.map(obj.scripts, function (script) {
174+
result = result.concat(obj.scripts.map(function (script) {
175175
return _getScript(script, true)
176176
}))
177177
addEmptyLine()
@@ -282,7 +282,7 @@ window.init = function (options_) {
282282
if ($('.bd-lead').length) {
283283
$('.bd-lead').html(window.marked(options.desc)).find('a').attr('target', '_blank')
284284
}
285-
$.each(options.links, function (i, file) {
285+
options.links.forEach(function (file) {
286286
_link(file)
287287
})
288288
_scripts(options.scripts, options.callback)

‎crud/index.html‎

Lines changed: 3 additions & 3 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.26.0/dist/bootstrap-table.min.css">
8+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-table@1.27.0/dist/bootstrap-table.min.css">
99
<style>
1010
.mr10 { margin-right: 10px; }
1111
.alert {
@@ -14,10 +14,10 @@
1414
display: inline-block;
1515
}
1616
</style>
17-
<script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
17+
<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.26.0/dist/bootstrap-table.min.js"></script>
20+
<script src="https://cdn.jsdelivr.net/npm/bootstrap-table@1.27.0/dist/bootstrap-table.min.js"></script>
2121
</head>
2222
<body>
2323
<div class="container">

‎eslint.config.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import vue from 'eslint-plugin-vue'
55
const globals = eslintConfig[eslintConfig.length - 1].languageOptions.globals
66

77
globals.init = true
8+
globals.bootstrap = true
89

910
export default [
1011
{

‎extensions/custom-view.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ <h3 class="mb-0">%SNIPPETS%</h3>
219219
const template = $('#profileTemplate').html()
220220
let view = ''
221221

222-
$.each(data, function (i, row) {
222+
data.forEach(function (row) {
223223
view += template.replace('%NAME%', row.name)
224224
.replace('%IMAGE%', row.image)
225225
.replace('%FOLLOWER%', row.follower)

‎extensions/group-by-v2.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@
2121
function mounted () {
2222
$('#table').bootstrapTable({
2323
url: 'json/data6.json',
24+
search: true,
2425
groupBy: true,
2526
groupByField: 'shape',
27+
groupByToggle: true,
2628
groupByFormatter: value => {
2729
const strong = document.createElement('strong')
2830

‎for-test-bootstrap3.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@3.4.1/dist/css/bootstrap.min.css">
1212
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.5.2/css/all.min.css">
1313

14-
<script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
14+
<script src="https://cdn.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.min.js"></script>
1515
<script src="https://cdn.jsdelivr.net/npm/bootstrap@3.4.1/dist/js/bootstrap.min.js"></script>
1616
<script src="assets/js/template.js?v=VERSION"></script>
1717
</head>

‎for-test-bootstrap4.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/css/bootstrap.min.css">
1212
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.5.2/css/all.min.css">
1313

14-
<script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
14+
<script src="https://cdn.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.min.js"></script>
1515
<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.bundle.min.js"></script>
1616
<script src="assets/js/template.js?v=VERSION"></script>
1717
</head>

‎for-test-bulma.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@1.0.0/css/bulma.min.css">
1212
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.5.2/css/all.min.css">
1313

14-
<script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
14+
<script src="https://cdn.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.min.js"></script>
1515
<script src="assets/js/template.js?v=VERSION"></script>
1616
</head>
1717
<body>

‎for-test-foundation.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/foundation-sites@6.8.1/dist/css/foundation.min.css">
1313
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.5.2/css/all.min.css">
1414

15-
<script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
15+
<script src="https://cdn.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.min.js"></script>
1616
<script src="https://cdn.jsdelivr.net/npm/foundation-sites@6.8.1/dist/js/foundation.min.js"></script>
1717
<script src="assets/js/template.js?v=VERSION"></script>
1818
</head>

0 commit comments

Comments
 (0)