diff --git a/.babelrc b/.babelrc deleted file mode 100644 index 1320b9a3..00000000 --- a/.babelrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "presets": ["@babel/preset-env"] -} diff --git a/.eslintignore b/.eslintignore deleted file mode 100644 index 5b8c087e..00000000 --- a/.eslintignore +++ /dev/null @@ -1,4 +0,0 @@ -assets/js/ga.js -dist -node_modules -*.min.js diff --git a/.eslintrc.js b/.eslintrc.js deleted file mode 100644 index a23a0ac2..00000000 --- a/.eslintrc.js +++ /dev/null @@ -1,79 +0,0 @@ -module.exports = { - 'root': true, - 'env': { - 'browser': true, - 'node': true - }, - 'parserOptions': { - 'parser': 'babel-eslint', - 'ecmaVersion': 2017, - 'sourceType': 'module' - }, - 'extends': [ - 'eslint:recommended' - ], - 'plugins': ['html'], - 'settings': { - 'html/html-extensions': ['.html'] - }, - 'rules': { - 'indent': ['error', - 2, - { - 'SwitchCase': 1, - 'MemberExpression': 1, - 'ArrayExpression': 1, - 'FunctionDeclaration': {'parameters': 'first'}, - 'CallExpression': {'arguments': 1}, - 'ImportDeclaration': 'first', - 'ObjectExpression': 1 - } - ], - 'linebreak-style': 'off', - 'quotes': ['error', 'single'], - 'semi': ['error', 'never'], - 'semi-style': ['error', 'last'], - 'semi-spacing': ['error', {'before': false, 'after': true}], - 'camelcase': 'off', - 'default-case': 'error', - 'no-new-func': 'error', - 'no-void': 'error', - 'array-bracket-spacing': ['error', 'never'], - 'no-tabs': 'error', - 'one-var': ['error', 'never'], - 'prefer-const': 'error', - 'no-trailing-spaces': 'error', - 'operator-assignment': ['error', 'always'], - 'dot-location': ['error', 'property'], - 'no-console': ['error', { allow: ['log', 'info', 'warn', 'error'] }], - 'no-else-return': ['error', {allowElseIf: false}], - 'no-case-declarations': 'off', - 'no-unused-vars': 'off', - 'no-multi-spaces': 'error', - 'valid-jsdoc': 'warn', - 'eqeqeq': 'error', - 'guard-for-in': 'warn', - 'no-multi-str': 'error', - 'no-return-await': 'error', - 'no-return-assign': 'error', - 'no-throw-literal': 'error', - 'no-undef-init': 'error', - 'no-use-before-define': 'warn', - 'key-spacing': ['error', {'beforeColon': false, 'afterColon': true, 'mode': 'strict'}], - 'keyword-spacing': ['error', {'before': true, 'after': true}], - 'space-before-blocks': ['error', {'functions': 'always', 'keywords': 'always', 'classes': 'always'}], - 'spaced-comment': ['error', 'always'], - 'space-infix-ops': 'error', - 'arrow-spacing': ['error', { 'before': true, 'after': true }], - 'no-useless-constructor': 'warn', - 'comma-dangle': ['error', 'never'] - }, - 'globals': { - '$': true, - 'sprintf': true, - 'init': true, - 'Vue': true, - 'BootstrapTable': true, - 'marked': true - } -} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 00000000..4623fb9d --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,24 @@ +name: Test + +on: + pull_request: + +jobs: + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - uses: actions/setup-node@v3 + with: + node-version: 20 + + - uses: actions/checkout@v3 + with: + repository: 'wenzhixin/bootstrap-table-examples' + path: './tools/bootstrap-table-examples' + + - name: Lint all + run: | + yarn install + yarn lint diff --git a/assets/js/index.js b/assets/js/index.js index 364aceda..e595f7db 100644 --- a/assets/js/index.js +++ b/assets/js/index.js @@ -5,8 +5,9 @@ window._config = { themes: [] } -function initUrl() { - var href = location.hash.substring(1) +function initUrl () { + let href = location.hash.substring(1) + window._config.isViewSource = false if (href.indexOf('view-source') > -1) { href = href.replace('#view-source', '').replace('view-source', '') @@ -15,7 +16,7 @@ function initUrl() { return href || 'welcome.html' } -function initThemes() { +function initThemes () { $('[data-theme]').each(function () { if ($(this).data('theme')) { window._config.themes.push($(this).data('theme')) @@ -24,7 +25,8 @@ function initThemes() { if (window._config.themes.indexOf(window._config.theme) === -1) { window._config.theme = '' } - var $theme = $('[data-theme="' + window._config.theme + '"]').addClass('active') + const $theme = $(`[data-theme="${window._config.theme}"]`).addClass('active') + $('#theme-title').text($theme.text()) $('[data-show]').each(function () { @@ -32,24 +34,26 @@ function initThemes() { }) } -function loadUrl(url_) { - var template = 'template' +function loadUrl (url_) { + let template = 'template' + if (window._config.themes.indexOf(window._config.theme) > -1) { - template += '-' + window._config.theme + template += `-${window._config.theme}` } - var url = template + '.html?v=VERSION&url=' + url_ + let url = `${template}.html?v=VERSION&url=${url_}` + if (window._config.isDebug) { - url = template + '.html?t=' + (+new Date()) + '&url=' + url_ + url = `${template}.html?t=${+new Date()}&url=${url_}` } if (window._config.isViewSource) { - url = template + '.html?v=VERSION&view-source&url=' + url_ + '#view-source' + url = `${template}.html?v=VERSION&view-source&url=${url_}#view-source` } $('iframe').attr('src', url) } -function initNavigation(href) { - var $el = $('a[href="#' + href + '"]') - var $parent = $el.parent() +function initNavigation (href) { + const $el = $(`a[href="#${href}"]`) + const $parent = $el.parent() if (!$el.length) { return @@ -61,20 +65,21 @@ function initNavigation(href) { } function autoScrollNavigation () { - var $el = $('.bd-sidenav >li.active') + const $el = $('.bd-sidenav >li.active') + $('#bd-docs-nav').scrollTop(0) if ($el.length && $el.offset().top > $(window).height() / 2) { $('#bd-docs-nav').scrollTop($el.offset().top - $(window).height() / 2) } } -function doSearch() { - var searchClient = window.algoliasearch('FXDJ517Z8G', '9b89c4a7048370f4809b0bc77b2564ac') +function doSearch () { + const searchClient = window.algoliasearch('FXDJ517Z8G', '9b89c4a7048370f4809b0bc77b2564ac') - var search = window.instantsearch({ + const search = window.instantsearch({ indexName: 'bootstrap-table-example', - searchClient: searchClient, - searchFunction: function (helper) { + searchClient, + searchFunction (helper) { if (helper.state.query) { helper.clearTags() helper.addTag(window._config.theme) @@ -96,13 +101,14 @@ function doSearch() { window.instantsearch.widgets.hits({ container: '.hits-body', templates: { - item: function (hit) { - var search = '' + item (hit) { + let search = '' + if (window._config.theme) { - search = '?' + window._config.theme + search = `?${window._config.theme}` } return [ - '
', + `
`, '
', hit.anchor.split('/')[0].slice(1), '
', @@ -120,7 +126,8 @@ function doSearch() { ) $(document).on('click', '.ais-Hits-item .link', function (e) { - var href = $(e.currentTarget).data('href') + const href = $(e.currentTarget).data('href') + if ($(e.target).is('a')) { return } @@ -134,7 +141,7 @@ function doSearch() { } function initViewSource () { - var isSource = /view-source$/.test(location.hash) + const isSource = /view-source$/.test(location.hash) if (isSource) { $('.view-example').css('display', 'block') @@ -147,15 +154,13 @@ function initViewSource () { $('.view-example, .view-source').off('click').click(function () { if (isSource) { location.hash = location.hash.replace('#view-source', '') - } else { - if (location.hash.indexOf('view-source') === -1) { - location.hash += '#view-source' - } + } else if (location.hash.indexOf('view-source') === -1) { + location.hash += '#view-source' } }) - $('.view-online').attr('href', 'https://live.bootstrap-table.com/example/' + - (location.hash.slice(1).split('#')[0] || 'welcome.html')) + $('.view-online').attr('href', `https://live.bootstrap-table.com/example/${ + location.hash.slice(1).split('#')[0] || 'welcome.html'}`) } $(function () { @@ -166,14 +171,16 @@ $(function () { $('[data-toggle="tooltip"]').tooltip() $(window).hashchange(function () { - var href = initUrl() + const href = initUrl() + loadUrl(href) initNavigation(href) initViewSource() }) initThemes() - var href = initUrl() + const href = initUrl() + loadUrl(href) initNavigation(href) autoScrollNavigation() diff --git a/assets/js/template.js b/assets/js/template.js index a6118bc2..a7fd34c0 100644 --- a/assets/js/template.js +++ b/assets/js/template.js @@ -6,42 +6,44 @@ window._config = { testUrl: '/src/' } -function _getLink(file) { - var url = file +function _getLink (file) { + let url = file + if (!/^http/.test(file)) { url = window._config.cdnUrl + file if (window._config.isDebug) { - url = (location.href.includes('for-test') ? window._config.testUrl : window._config.localUrl) + - file.replace(/\.min/, '') + '?t=' + (+new Date()) + url = `${(location.href.includes('for-test') ? window._config.testUrl : window._config.localUrl) + + file.replace(/\.min/, '')}?t=${+new Date()}` } } - return '' + return `` } -function _getScript(file, isScriptTag) { - var url = file +function _getScript (file, isScriptTag) { + let url = file + if (!/^http/.test(file)) { url = window._config.cdnUrl + file if (window._config.isDebug) { - url = (location.href.includes('for-test') ? window._config.testUrl : window._config.localUrl) + - file.replace(/\.min/, '') + '?t=' + (+new Date()) + url = `${(location.href.includes('for-test') ? window._config.testUrl : window._config.localUrl) + + file.replace(/\.min/, '')}?t=${+new Date()}` } } if (isScriptTag) { - return '' + return `` } return url } -function _link(file) { +function _link (file) { $('head').append(_getLink(file)) } -function _script(file, callback) { - var head = document.getElementsByTagName('head')[0] - var script = document.createElement('script') +function _script (file, callback) { + const head = document.getElementsByTagName('head')[0] + const script = document.createElement('script') if (window._config.isDebug && !/^http/.test(file)) { script.type = 'module' @@ -49,9 +51,10 @@ function _script(file, callback) { script.src = _getScript(file) - var done = false + let done = false + // Attach handlers for all browsers - script.onload = script.onreadystatechange = function() { + script.onload = script.onreadystatechange = function () { if (!done && (!this.readyState || this.readyState === 'loaded' || this.readyState === 'complete')) { done = true @@ -66,18 +69,19 @@ function _script(file, callback) { head.appendChild(script) } -function _scripts(scripts, callback) { +function _scripts (scripts, callback) { if (!scripts.length) { return callback() } - var eachSeries = function (arr, iterator, callback_) { - var callback = callback_ || function () {} + const eachSeries = function (arr, iterator, callback_) { + let callback = callback_ || function () {} + if (!arr.length) { return callback() } - var completed = 0 - var iterate = function () { + let completed = 0 + const iterate = function () { iterator(arr[completed], function (err) { if (err) { callback(err) @@ -92,6 +96,7 @@ function _scripts(scripts, callback) { } }) } + iterate() } @@ -100,7 +105,9 @@ function _scripts(scripts, callback) { }) } -function _themeUpdate(data) { +function _themeUpdate (_data) { + const data = _data.replace('', '') + if (/bootstrap3.html$/.test(location.pathname)) { return data.replace(/btn-secondary/g, 'btn-default') } @@ -140,19 +147,21 @@ function _themeUpdate(data) { return data } -function _beautifySource(data) { - var lines = data.split('\n') - var scriptStart = lines.indexOf('', scriptStart) - var strings = lines.slice(scriptStart + 1, scriptEnd) +function _beautifySource (data) { + let lines = data.split('\n') + const scriptStart = lines.indexOf('', scriptStart) + let strings = lines.slice(scriptStart + 1, scriptEnd) + strings = $.map(strings, function (s) { return $.trim(s) }) /* eslint-disable no-control-regex */ - var obj = eval('(' + strings.join('').replace(/[^\u0000-\u007E]/g, '') - .replace(/^init\((.*)\)$/, '$1') + ')') + const obj = eval(`(${strings.join('').replace(/[^\u0000-\u007E]/g, '') + .replace(/^init\((.*)\)$/, '$1')})`) + + let result = [] - var result = [] result = result.concat($.map(obj.links, _getLink)) result.push('') result = result.concat($.map(obj.scripts, function (script) { @@ -160,8 +169,9 @@ function _beautifySource(data) { })) lines = result.concat(lines.slice(scriptEnd + 1)) - var mountedStart = lines.indexOf(' function mounted() {') - var mountedEnd = lines.indexOf(' }', mountedStart) + const mountedStart = lines.indexOf(' function mounted() {') + const mountedEnd = lines.indexOf(' }', mountedStart) + lines[mountedStart] = ' $(function() {' lines[mountedEnd] = ' })' @@ -169,24 +179,25 @@ function _beautifySource(data) { } $(function () { - var run = function () { - var query = {} + const run = function () { + const query = {} + location.search.substring(1).split('&').forEach(function (item) { query[item.split('=')[0]] = item.split('=')[1] }) - var url = query.url - var isSource = location.hash.substring(1) === 'view-source' + const url = query.url + const isSource = location.hash.substring(1) === 'view-source' delete query.url $.ajax({ type: 'GET', - url: url + '?' + $.param(query), + url: `${url}?${$.param(query)}`, dataType: 'html', global: false, cache: true, // (warning: setting it to false will cause a timestamp and will call the request twice) - success: function (_data) { - var data = _themeUpdate(_data) + success (_data) { + const data = _themeUpdate(_data) if (isSource) { $('#example').hide().html(data) @@ -197,7 +208,7 @@ $(function () { $('#example').html(data.replace(/ data-toggle="table"/g, ' data-toggle="bootstrap-table"')) } }, - error: function () { + error () { parent.location.href = 'index.html' } }) @@ -208,12 +219,12 @@ $(function () { }) window.init = function (options_) { - var options = $.extend({ + const options = $.extend({ title: '', desc: '', links: [], scripts: [], - callback: function () { + callback () { if ($('[data-toggle="bootstrap-table"]').length) { $('[data-toggle="bootstrap-table"]').bootstrapTable() } @@ -230,7 +241,7 @@ window.init = function (options_) { $('.bd-title span').html(options.title) } if ($('.bd-lead').length) { - $('.bd-lead').html(marked(options.desc)).find('a').attr('target', '_blank') + $('.bd-lead').html(window.marked(options.desc)).find('a').attr('target', '_blank') } $.each(options.links, function (i, file) { _link(file) diff --git a/column-options/checkbox-disabled.html b/column-options/checkbox-disabled.html index fbd90900..93102427 100644 --- a/column-options/checkbox-disabled.html +++ b/column-options/checkbox-disabled.html @@ -23,7 +23,7 @@ data-field="state" data-checkbox="true" data-formatter="stateFormatter" - /> + > ID diff --git a/column-options/checkbox-enabled.html b/column-options/checkbox-enabled.html index 3160965f..dca09a2e 100644 --- a/column-options/checkbox-enabled.html +++ b/column-options/checkbox-enabled.html @@ -19,7 +19,7 @@ + > Item Name diff --git a/column-options/checkbox.html b/column-options/checkbox.html index 9857fdd6..7868872e 100644 --- a/column-options/checkbox.html +++ b/column-options/checkbox.html @@ -16,7 +16,7 @@ > - + Item Name diff --git a/column-options/click-to-select.html b/column-options/click-to-select.html index 5bb6ef53..7bd3581a 100644 --- a/column-options/click-to-select.html +++ b/column-options/click-to-select.html @@ -20,7 +20,7 @@ + > ID diff --git a/column-options/natural-sorting.html b/column-options/natural-sorting.html index 0b14d5a3..d324e159 100644 --- a/column-options/natural-sorting.html +++ b/column-options/natural-sorting.html @@ -30,7 +30,7 @@
- +
diff --git a/for-tests/extensions/filter-control/filter-control-searchOnEnterKey.html b/for-tests/extensions/filter-control/filter-control-searchOnEnterKey.html index d99c3596..50e6b399 100644 --- a/for-tests/extensions/filter-control/filter-control-searchOnEnterKey.html +++ b/for-tests/extensions/filter-control/filter-control-searchOnEnterKey.html @@ -27,7 +27,7 @@ diff --git a/for-tests/extensions/filter-control/filter-control.html b/for-tests/extensions/filter-control/filter-control.html index 832e9f8f..e29e93bb 100644 --- a/for-tests/extensions/filter-control/filter-control.html +++ b/for-tests/extensions/filter-control/filter-control.html @@ -27,7 +27,7 @@ diff --git a/index.html b/index.html index c59d232c..76d54a20 100644 --- a/index.html +++ b/index.html @@ -26,7 +26,9 @@ @@ -594,7 +596,8 @@ - + diff --git a/integrate/angular/app.js b/integrate/angular/app.js index b85defc4..0cf572b3 100644 --- a/integrate/angular/app.js +++ b/integrate/angular/app.js @@ -7,34 +7,36 @@ window.angular.module('app', ['bsTable']) $scope.workspaces.push({ name: 'Workspace 3' }) function makeRandomRows (colData) { - var rows = [] - for (var i = 0; i < 500; i++) { + const rows = [] + + for (let i = 0; i < 500; i++) { rows.push($.extend({ index: i, - id: 'row ' + i, - name: 'GOOG' + i, - flagImage: Math.random() < 0.4 - ? 'img/blueFlag16.png' - : Math.random() < 0.75 - ? 'img/yellowFlag16.png' - : 'img/greenFlag16.png' + id: `row ${i}`, + name: `GOOG${i}`, + flagImage: Math.random() < 0.4 ? + 'img/blueFlag16.png' : + Math.random() < 0.75 ? + 'img/yellowFlag16.png' : + 'img/greenFlag16.png' }, colData)) } return rows } - function flagFormatter(value, row, index) { - return '' + function flagFormatter (value, row, index) { + return `` } - $scope.workspaces.forEach(function (wk,index) { - var colData = {workspace: wk.name} + $scope.workspaces.forEach(function (wk, index) { + const colData = { workspace: wk.name } + wk.rows = makeRandomRows(colData) wk.bsTableControl = { options: { data: wk.rows, - rowStyle: function (row, index) { + rowStyle (row, index) { return { classes: 'none' } }, cache: false, diff --git a/integrate/angular/index.html b/integrate/angular/index.html index 70f3c42a..4f15c296 100644 --- a/integrate/angular/index.html +++ b/integrate/angular/index.html @@ -2,13 +2,13 @@ - + Angular Demo -
+