diff --git a/assets/js/template.js b/assets/js/template.js index 7e16179f..7cd3def5 100644 --- a/assets/js/template.js +++ b/assets/js/template.js @@ -1,7 +1,7 @@ window._config = { isDebug: location.hash.slice(1) === 'is-debug' || ['localhost', '127.0.0.1', 'dev.bootstrap-table.com'].indexOf(location.hostname) > -1, - cdnUrl: 'https://cdn.jsdelivr.net/npm/bootstrap-table@1.23.2/dist/', + cdnUrl: 'https://cdn.jsdelivr.net/npm/bootstrap-table@1.23.3/dist/', localUrl: '../bootstrap-table/src/', testUrl: '/src/' } diff --git a/column-options/formatter.html b/column-options/formatter.html index 6e763c59..7c3925ba 100644 --- a/column-options/formatter.html +++ b/column-options/formatter.html @@ -3,7 +3,10 @@ title: 'Column Formatter', desc: 'Use `formatter` column option to format the display of bootstrap table column.', links: ['bootstrap-table.min.css'], - scripts: ['bootstrap-table.min.js'] + scripts: [ + 'bootstrap-table.min.js', + 'https://unpkg.com/echarts@5/dist/echarts.simple.min.js' + ] }) @@ -17,6 +20,7 @@ ID Item Name Item Price + Price Chart @@ -35,4 +39,37 @@ value.substring(1) + '' } + + function randomData () { + return new Array(7).fill(0).map(function () { + return Math.round(Math.random() * 20) + }) + } + + function priceChartFormatter() { + const chartDom = document.createElement('div') + + // Size needs to be set because DOM is not mounted immediate and size cannot be obtained. + chartDom.style.width = '300px' + chartDom.style.height = '200px' + + const myChart = echarts.init(chartDom) + + myChart.setOption({ + xAxis: { + type: 'category', + data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'] + }, + yAxis: { + type: 'value' + }, + series: [ + { + data: randomData(), + type: 'line' + } + ] + }) + return chartDom + } diff --git a/crud/index.html b/crud/index.html index 9debbbf4..d013badc 100644 --- a/crud/index.html +++ b/crud/index.html @@ -5,7 +5,7 @@ - + + +
+ Sort by: + + + +
+ + + + + + + + + + +
NameStargazersForksDescription
+ + diff --git a/options/table-locale.html b/options/table-locale.html index 3d813f46..85c31399 100644 --- a/options/table-locale.html +++ b/options/table-locale.html @@ -5,7 +5,7 @@ links: ['bootstrap-table.min.css'], scripts: [ 'bootstrap-table.min.js', - 'https://cdn.jsdelivr.net/npm/bootstrap-table@1.23.2/dist/bootstrap-table-locale-all.min.js' + 'https://cdn.jsdelivr.net/npm/bootstrap-table@1.23.3/dist/bootstrap-table-locale-all.min.js' ] }) diff --git a/package.json b/package.json index fef82699..ab69a504 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bootstrap-table-examples", - "version": "1.23.2", + "version": "1.23.3", "description": "bootstrap-table-examples", "repository": { "type": "git", diff --git a/vue-starter/package.json b/vue-starter/package.json index fa3bd42a..72e25225 100644 --- a/vue-starter/package.json +++ b/vue-starter/package.json @@ -11,7 +11,7 @@ "@popperjs/core": "^2.11.8", "bootstrap": "^5.3.3", "bootstrap-icons": "^1.11.3", - "bootstrap-table": "^1.23.2", + "bootstrap-table": "^1.23.3", "jquery": "^3.7.1", "tableexport.jquery.plugin": "^1.30.0", "vue": "^3.4.27" diff --git a/webpack-starter/package.json b/webpack-starter/package.json index ae1a6aaa..983540df 100644 --- a/webpack-starter/package.json +++ b/webpack-starter/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "bootstrap": "^4.5.0", - "bootstrap-table": "^1.23.2", + "bootstrap-table": "^1.23.3", "jquery": "^3.5.1", "popper.js": "^1.16.1" }, diff --git a/welcome.html b/welcome.html index 356e844a..1c6b99c4 100644 --- a/welcome.html +++ b/welcome.html @@ -8,7 +8,7 @@ scripts: [ 'https://cdn.jsdelivr.net/npm/tableexport.jquery.plugin@1.29.0/tableExport.min.js', 'bootstrap-table.min.js', - 'https://cdn.jsdelivr.net/npm/bootstrap-table@1.23.2/dist/bootstrap-table-locale-all.min.js', + 'https://cdn.jsdelivr.net/npm/bootstrap-table@1.23.3/dist/bootstrap-table-locale-all.min.js', 'extensions/export/bootstrap-table-export.min.js' ] }) diff --git a/welcomes/vue-component.html b/welcomes/vue-component.html index 1beaa037..b2c88265 100644 --- a/welcomes/vue-component.html +++ b/welcomes/vue-component.html @@ -8,7 +8,7 @@ scripts: [ 'https://unpkg.com/vue@3/dist/vue.global.js', 'bootstrap-table.min.js', - 'https://cdn.jsdelivr.net/npm/bootstrap-table@1.23.2/dist/bootstrap-table-vue.umd.js' + 'https://cdn.jsdelivr.net/npm/bootstrap-table@1.23.3/dist/bootstrap-table-vue.umd.js' ] })