Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
wenzhixin committed Sep 22, 2022
2 parents f6f8ded + 13e3b72 commit 7fabe36
Show file tree
Hide file tree
Showing 118 changed files with 1,375 additions and 1,312 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/1_Bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ body:
id: affected-versions
attributes:
label: Bootstraptable version(s) affected
placeholder: 1.21.0
placeholder: 1.21.1
validations:
required: true
- type: textarea
Expand Down
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
ChangeLog
---------

### 1.21.1

#### Core

- **Update:** Improved `updateCell` to update one HTML cell only.
- **Update:** Updated `fr-FR` locale.
- **Update:** Added missing locales for aria-label.

#### Extensions

- **Update(export):** Added missing locales for aria-label.

### 1.21.0

#### Core
Expand Down
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ algolia:
index_name: bootstrap-table

# Custom variables
current_version: 1.21.0
current_version: 1.21.1
title: "Bootstrap Table"
description: "An extended table to the integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)"
authors: "Zhixin Wen, and Bootstrap Table contributors"
Expand Down
2 changes: 1 addition & 1 deletion bootstrap-table.jquery.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bootstrap-table",
"version": "1.21.0",
"version": "1.21.1",
"title": "Bootstrap Table",
"description": "An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)",
"author": {
Expand Down
1,792 changes: 896 additions & 896 deletions dist/bootstrap-table-locale-all.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/bootstrap-table-locale-all.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/bootstrap-table-vue.esm.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/bootstrap-table-vue.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/bootstrap-table.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @author zhixin wen <[email protected]>
* version: 1.21.0
* version: 1.21.1
* https://github.com/wenzhixin/bootstrap-table/
*/
.bootstrap-table .fixed-table-toolbar::after {
Expand Down
33 changes: 27 additions & 6 deletions dist/bootstrap-table.js
Original file line number Diff line number Diff line change
Expand Up @@ -4773,7 +4773,7 @@
}
};

var VERSION = '1.21.0';
var VERSION = '1.21.1';
var bootstrapVersion = Utils.getBootstrapVersion();
var CONSTANTS = {
3: {
Expand Down Expand Up @@ -6027,7 +6027,7 @@
render: false,
html: function html() {
var html = [];
html.push("<div class=\"keep-open ".concat(_this4.constants.classes.buttonsDropdown, "\" title=\"").concat(opts.formatColumns(), "\">\n <button class=\"").concat(_this4.constants.buttonsClass, " dropdown-toggle\" type=\"button\" ").concat(_this4.constants.dataToggle, "=\"dropdown\"\n aria-label=\"Columns\" title=\"").concat(opts.formatColumns(), "\">\n ").concat(opts.showButtonIcons ? Utils.sprintf(_this4.constants.html.icon, opts.iconsPrefix, opts.icons.columns) : '', "\n ").concat(opts.showButtonText ? opts.formatColumns() : '', "\n ").concat(_this4.constants.html.dropdownCaret, "\n </button>\n ").concat(_this4.constants.html.toolbarDropdown[0]));
html.push("<div class=\"keep-open ".concat(_this4.constants.classes.buttonsDropdown, "\" title=\"").concat(opts.formatColumns(), "\">\n <button class=\"").concat(_this4.constants.buttonsClass, " dropdown-toggle\" type=\"button\" ").concat(_this4.constants.dataToggle, "=\"dropdown\"\n aria-label=\"").concat(opts.formatColumns(), "\" title=\"").concat(opts.formatColumns(), "\">\n ").concat(opts.showButtonIcons ? Utils.sprintf(_this4.constants.html.icon, opts.iconsPrefix, opts.icons.columns) : '', "\n ").concat(opts.showButtonText ? opts.formatColumns() : '', "\n ").concat(_this4.constants.html.dropdownCaret, "\n </button>\n ").concat(_this4.constants.html.toolbarDropdown[0]));

if (opts.showColumnsSearch) {
html.push(Utils.sprintf(_this4.constants.html.toolbarDropdownItem, Utils.sprintf('<input type="text" class="%s" name="columnsSearch" placeholder="%s" autocomplete="off">', _this4.constants.classes.input, opts.formatSearch())));
Expand Down Expand Up @@ -8136,16 +8136,35 @@
this.initPagination();
this.initBody(true);
}
}, {
key: "_updateCellOnly",
value: function _updateCellOnly(field, index) {
var rowHtml = this.initRow(this.options.data[index], index);
var fieldIndex = this.getVisibleFields().indexOf(field);

if (fieldIndex === -1) {
return;
}

fieldIndex += Utils.getDetailViewIndexOffset(this.options);
this.$body.find(">tr[data-index=".concat(index, "]")).find(">td:eq(".concat(fieldIndex, ")")).replaceWith($__default["default"](rowHtml).find(">td:eq(".concat(fieldIndex, ")")));
this.initBodyEvent();
this.initFooter();
this.resetView();
this.updateSelected();
}
}, {
key: "updateCell",
value: function updateCell(params) {
if (!params.hasOwnProperty('index') || !params.hasOwnProperty('field') || !params.hasOwnProperty('value')) {
return;
}

this.data[params.index][params.field] = params.value;
this.options.data[params.index][params.field] = params.value;

if (params.reinit === false) {
this._updateCellOnly(params.field, params.index);

return;
}

Expand All @@ -8163,16 +8182,18 @@
field = _ref6.field,
value = _ref6.value;

var rowId = _this19.options.data.indexOf(_this19.getRowByUniqueId(id));
var index = _this19.options.data.indexOf(_this19.getRowByUniqueId(id));

if (rowId === -1) {
if (index === -1) {
return;
}

_this19.options.data[rowId][field] = value;
_this19.options.data[index][field] = value;
});

if (params.reinit === false) {
this._updateCellOnly(params.field, this.options.data.indexOf(this.getRowByUniqueId(params.id)));

return;
}

Expand Down
2 changes: 1 addition & 1 deletion dist/bootstrap-table.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dist/bootstrap-table.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/extensions/addrbar/bootstrap-table-addrbar.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/extensions/cookie/bootstrap-table-cookie.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/extensions/copy-rows/bootstrap-table-copy-rows.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/extensions/defer-url/bootstrap-table-defer-url.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/extensions/editable/bootstrap-table-editable.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dist/extensions/export/bootstrap-table-export.js
Original file line number Diff line number Diff line change
Expand Up @@ -2803,11 +2803,11 @@
export: {
html: function html() {
if (exportTypes.length === 1) {
return "\n <div class=\"export ".concat(_this.constants.classes.buttonsDropdown, "\"\n data-type=\"").concat(exportTypes[0], "\">\n <button class=\"").concat(_this.constants.buttonsClass, "\"\n aria-label=\"Export\"\n type=\"button\"\n title=\"").concat(o.formatExport(), "\">\n ").concat(o.showButtonIcons ? Utils.sprintf(_this.constants.html.icon, o.iconsPrefix, o.icons.export) : '', "\n ").concat(o.showButtonText ? o.formatExport() : '', "\n </button>\n </div>\n ");
return "\n <div class=\"export ".concat(_this.constants.classes.buttonsDropdown, "\"\n data-type=\"").concat(exportTypes[0], "\">\n <button class=\"").concat(_this.constants.buttonsClass, "\"\n aria-label=\"").concat(o.formatExport(), "\"\n type=\"button\"\n title=\"").concat(o.formatExport(), "\">\n ").concat(o.showButtonIcons ? Utils.sprintf(_this.constants.html.icon, o.iconsPrefix, o.icons.export) : '', "\n ").concat(o.showButtonText ? o.formatExport() : '', "\n </button>\n </div>\n ");
}

var html = [];
html.push("\n <div class=\"export ".concat(_this.constants.classes.buttonsDropdown, "\">\n <button class=\"").concat(_this.constants.buttonsClass, " dropdown-toggle\"\n aria-label=\"Export\"\n ").concat(_this.constants.dataToggle, "=\"dropdown\"\n type=\"button\"\n title=\"").concat(o.formatExport(), "\">\n ").concat(o.showButtonIcons ? Utils.sprintf(_this.constants.html.icon, o.iconsPrefix, o.icons.export) : '', "\n ").concat(o.showButtonText ? o.formatExport() : '', "\n ").concat(_this.constants.html.dropdownCaret, "\n </button>\n ").concat(_this.constants.html.toolbarDropdown[0], "\n "));
html.push("\n <div class=\"export ".concat(_this.constants.classes.buttonsDropdown, "\">\n <button class=\"").concat(_this.constants.buttonsClass, " dropdown-toggle\"\n aria-label=\"").concat(o.formatExport(), "\"\n ").concat(_this.constants.dataToggle, "=\"dropdown\"\n type=\"button\"\n title=\"").concat(o.formatExport(), "\">\n ").concat(o.showButtonIcons ? Utils.sprintf(_this.constants.html.icon, o.iconsPrefix, o.icons.export) : '', "\n ").concat(o.showButtonText ? o.formatExport() : '', "\n ").concat(_this.constants.html.dropdownCaret, "\n </button>\n ").concat(_this.constants.html.toolbarDropdown[0], "\n "));

var _iterator = _createForOfIteratorHelper(exportTypes),
_step;
Expand Down
4 changes: 2 additions & 2 deletions dist/extensions/export/bootstrap-table-export.min.js

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
*
* @version v1.21.0
* @version v1.21.1
* @homepage https://bootstrap-table.com
* @author wenzhixin <[email protected]> (http://wenzhixin.net.cn/)
* @license MIT
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/extensions/filter-control/utils.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
*
* @version v1.21.0
* @version v1.21.1
* @homepage https://bootstrap-table.com
* @author wenzhixin <[email protected]> (http://wenzhixin.net.cn/)
* @license MIT
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
*
* @version v1.21.0
* @version v1.21.1
* @homepage https://bootstrap-table.com
* @author wenzhixin <[email protected]> (http://wenzhixin.net.cn/)
* @license MIT
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/extensions/mobile/bootstrap-table-mobile.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
*
* @version v1.21.0
* @version v1.21.1
* @homepage https://bootstrap-table.com
* @author wenzhixin <[email protected]> (http://wenzhixin.net.cn/)
* @license MIT
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/extensions/pipeline/bootstrap-table-pipeline.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/extensions/print/bootstrap-table-print.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
*
* @version v1.21.0
* @version v1.21.1
* @homepage https://bootstrap-table.com
* @author wenzhixin <[email protected]> (http://wenzhixin.net.cn/)
* @license MIT
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 7fabe36

Please sign in to comment.