orga0063
/
BootstrapAdmin11
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor: bootstrap-table 升级到1.15.4 

#Comment
comment #BUGID

#Issue
close link fix https://gitee.com/LongbowEnterprise/dashboard/issues?id=BUGID

#     样式 :    feat(location): 接入登录API
#
#                  登录功能与服务器对接
#
<type>(<scope>): <subject>

<body>

<footer>

#其中 type 的值可以有
#    feat: 新功能
#    fix: 修复bug
#    doc: 文档改变
#    style: 代码格式改变
#    refactor: 某个已有功能重构
#    perf: 性能优化
#    test: 增加测试
#    build: 改变了build工具 如 grunt 换成了 npm
#    revert: 撤销上一次的 commit
#    db: 数据库文件或者脚本更改
#
#scope: 用来说明此次修改的影响范围
#     all: 表示影响面大 ，如修改了网络框架  会对真个程序产生影响
#     location: 表示影响小，某个小小的功能
#     module: 表示会影响某个模块 如登录模块、首页模块 、用户管理模块等等
#
#subject: 用来简要描述本次改动，概述就好了
#
#body: 具体的修改信息 应该尽量详细
#
#footer: 放置写备注啥的，如果是 bug ，可以把bug id放入
#
This commit is contained in:
Argo Zhang 2019-08-19 10:10:37 +08:00
parent f3fac8d8ce
commit bbbd6a82ce
No known key found for this signature in database
GPG Key ID: 152E398953DDF19F
4 changed files with 45 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Bootstrap.Admin/wwwroot/lib/bootstrap-table/bootstrap-table.css vendored
View File

@ -1,7 +1,7 @@
@charset "UTF-8"; @charset "UTF-8";
/** /**
* @author zhixin wen <wenzhixin2010@gmail.com> * @author zhixin wen <wenzhixin2010@gmail.com>
* version: 1.15.3 * version: 1.15.4
* https://github.com/wenzhixin/bootstrap-table/ * https://github.com/wenzhixin/bootstrap-table/
*/ */
.bootstrap-table .fixed-table-toolbar::after { .bootstrap-table .fixed-table-toolbar::after {
@ -119,6 +119,9 @@
.bootstrap-table .fixed-table-container .table .bs-checkbox { .bootstrap-table .fixed-table-container .table .bs-checkbox {
text-align: center; text-align: center;
} }
.bootstrap-table .fixed-table-container .table .bs-checkbox label {
margin-bottom: 0;
}
.bootstrap-table .fixed-table-container .table input[type=radio], .bootstrap-table .fixed-table-container .table input[type=radio],
.bootstrap-table .fixed-table-container .table input[type=checkbox] { .bootstrap-table .fixed-table-container .table input[type=checkbox] {
margin: 0 auto !important; margin: 0 auto !important;

65
Bootstrap.Admin/wwwroot/lib/bootstrap-table/bootstrap-table.js vendored
View File

@ -2634,7 +2634,7 @@
throw new TypeError("Invalid attempt to destructure non-iterable instance"); throw new TypeError("Invalid attempt to destructure non-iterable instance");
} }
var VERSION = '1.15.3'; var VERSION = '1.15.4';
var bootstrapVersion = 4; var bootstrapVersion = 4;
try { try {
@ -2689,8 +2689,8 @@
icon: '<i class="%s %s"></i>', icon: '<i class="%s %s"></i>',
inputGroup: '<div class="input-group">%s<span class="input-group-btn">%s</span></div>', inputGroup: '<div class="input-group">%s<span class="input-group-btn">%s</span></div>',
searchInput: '<input class="%s%s" type="text" placeholder="%s">', searchInput: '<input class="%s%s" type="text" placeholder="%s">',
searchButton: '<button class="btn btn-default" type="button" name="search" title="%s">%s %s</button>', searchButton: '<button class="%s" type="button" name="search" title="%s">%s %s</button>',
searchClearButton: '<button class="btn btn-default" type="button" name="clearSearch" title="%s">%s %s</button>' searchClearButton: '<button class="%s" type="button" name="clearSearch" title="%s">%s %s</button>'
} }
}, },
4: { 4: {
@ -2734,8 +2734,8 @@
icon: '<i class="%s %s"></i>', icon: '<i class="%s %s"></i>',
inputGroup: '<div class="input-group">%s<div class="input-group-append">%s</div></div>', inputGroup: '<div class="input-group">%s<div class="input-group-append">%s</div></div>',
searchInput: '<input class="%s%s" type="text" placeholder="%s">', searchInput: '<input class="%s%s" type="text" placeholder="%s">',
searchButton: '<button class="btn btn-secondary" type="button" name="search" title="%s">%s %s</button>', searchButton: '<button class="%s" type="button" name="search" title="%s">%s %s</button>',
searchClearButton: '<button class="btn btn-secondary" type="button" name="clearSearch" title="%s">%s %s</button>' searchClearButton: '<button class="%s" type="button" name="clearSearch" title="%s">%s %s</button>'
} }
} }
}[bootstrapVersion]; }[bootstrapVersion];
@ -4005,10 +4005,6 @@
} }
columns.forEach(function (column, j) { columns.forEach(function (column, j) {
if (!column.visible) {
return;
}
var class_ = Utils.sprintf(' class="%s"', column['class']); var class_ = Utils.sprintf(' class="%s"', column['class']);
var unitWidth = column.widthUnit; var unitWidth = column.widthUnit;
var width = parseFloat(column.width); var width = parseFloat(column.width);
@ -4017,6 +4013,10 @@
var style = Utils.sprintf('vertical-align: %s; ', column.valign); var style = Utils.sprintf('vertical-align: %s; ', column.valign);
style += Utils.sprintf('width: %s; ', (column.checkbox || column.radio) && !width ? !column.showSelectTitle ? '36px' : undefined : width ? width + unitWidth : undefined); style += Utils.sprintf('width: %s; ', (column.checkbox || column.radio) && !width ? !column.showSelectTitle ? '36px' : undefined : width ? width + unitWidth : undefined);
if (typeof column.fieldIndex === 'undefined' && !column.visible) {
return;
}
if (typeof column.fieldIndex !== 'undefined') { if (typeof column.fieldIndex !== 'undefined') {
_this2.header.fields[column.fieldIndex] = column.field; _this2.header.fields[column.fieldIndex] = column.field;
_this2.header.styles[column.fieldIndex] = align + style; _this2.header.styles[column.fieldIndex] = align + style;
@ -4029,6 +4029,10 @@
_this2.header.cellStyles[column.fieldIndex] = column.cellStyle; _this2.header.cellStyles[column.fieldIndex] = column.cellStyle;
_this2.header.searchables[column.fieldIndex] = column.searchable; _this2.header.searchables[column.fieldIndex] = column.searchable;
if (!column.visible) {
return;
}
if (_this2.options.cardView && !column.cardVisible) { if (_this2.options.cardView && !column.cardVisible) {
return; return;
} }
@ -4364,17 +4368,19 @@
_this4._toggleAllColumns($(currentTarget).prop('checked')); _this4._toggleAllColumns($(currentTarget).prop('checked'));
}); });
} } // Fix #4516: this.showSearchClearButton is for extensions
if (o.search) {
if (o.search || this.showSearchClearButton) {
html = []; html = [];
var showSearchButton = Utils.sprintf(this.constants.html.searchButton, o.formatSearch(), o.showButtonIcons ? Utils.sprintf(this.constants.html.icon, o.iconsPrefix, o.icons.search) : '', o.showButtonText ? o.formatSearch() : ''); var showSearchButton = Utils.sprintf(this.constants.html.searchButton, this.constants.buttonsClass, o.formatSearch(), o.showButtonIcons ? Utils.sprintf(this.constants.html.icon, o.iconsPrefix, o.icons.search) : '', o.showButtonText ? o.formatSearch() : '');
var showSearchClearButton = Utils.sprintf(this.constants.html.searchClearButton, o.formatClearSearch(), o.showButtonIcons ? Utils.sprintf(this.constants.html.icon, o.iconsPrefix, o.icons.clearSearch) : '', o.showButtonText ? o.formatClearSearch() : ''); var showSearchClearButton = Utils.sprintf(this.constants.html.searchClearButton, this.constants.buttonsClass, o.formatClearSearch(), o.showButtonIcons ? Utils.sprintf(this.constants.html.icon, o.iconsPrefix, o.icons.clearSearch) : '', o.showButtonText ? o.formatClearSearch() : '');
var searchInputHtml = "<input class=\"".concat(this.constants.classes.input).concat(Utils.sprintf(' input-%s', o.iconSize), " search-input\" type=\"text\" placeholder=\"").concat(o.formatSearch(), "\">"); var searchInputHtml = "<input class=\"".concat(this.constants.classes.input).concat(Utils.sprintf(' input-%s', o.iconSize), " search-input\" type=\"text\" placeholder=\"").concat(o.formatSearch(), "\">");
var searchInputFinalHtml = searchInputHtml; var searchInputFinalHtml = searchInputHtml;
if (o.showSearchButton || o.showSearchClearButton) { if (o.showSearchButton || o.showSearchClearButton) {
searchInputFinalHtml = Utils.sprintf(this.constants.html.inputGroup, searchInputHtml, (o.showSearchButton ? showSearchButton : '') + (o.showSearchClearButton ? showSearchClearButton : '')); var buttonsHtml = (o.showSearchButton ? showSearchButton : '') + (o.showSearchClearButton ? showSearchClearButton : '');
searchInputFinalHtml = o.search ? Utils.sprintf(this.constants.html.inputGroup, searchInputHtml, buttonsHtml) : buttonsHtml;
} }
html.push(Utils.sprintf("\n <div class=\"".concat(this.constants.classes.pull, "-").concat(o.searchAlign, " search ").concat(this.constants.classes.inputGroup, "\">\n %s\n </div>\n "), searchInputFinalHtml)); html.push(Utils.sprintf("\n <div class=\"".concat(this.constants.classes.pull, "-").concat(o.searchAlign, " search ").concat(this.constants.classes.inputGroup, "\">\n %s\n </div>\n "), searchInputFinalHtml));
@ -4403,10 +4409,6 @@
if (o.showSearchClearButton) { if (o.showSearchClearButton) {
this.$toolbar.find('.search button[name=clearSearch]').click(function () { this.$toolbar.find('.search button[name=clearSearch]').click(function () {
_this4.resetSearch(); _this4.resetSearch();
_this4.onSearch({
currentTarget: _this4.$toolbar.find('.search input')
});
}); });
} }
} }
@ -4420,7 +4422,7 @@
var overwriteSearchText = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true; var overwriteSearchText = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
if (currentTarget !== undefined && overwriteSearchText) { if (currentTarget !== undefined && $(currentTarget).length && overwriteSearchText) {
var text = $(currentTarget).val().trim(); var text = $(currentTarget).val().trim();
if (this.options.trimOnSearch && $(currentTarget).val() !== text) { if (this.options.trimOnSearch && $(currentTarget).val() !== text) {
@ -4462,7 +4464,7 @@
if (this.options.sidePagination !== 'server') { if (this.options.sidePagination !== 'server') {
if (this.options.customSearch) { if (this.options.customSearch) {
this.data = Utils.calculateObjectValue(this.options, this.options.customSearch, [this.options.data, this.searchText]); this.data = Utils.calculateObjectValue(this.options, this.options.customSearch, [this.options.data, this.searchText, this.filterColumns]);
return; return;
} }
@ -5270,7 +5272,7 @@
_this8.$body.find('>tr:not(.no-records-found)').each(function (i, tr) { _this8.$body.find('>tr:not(.no-records-found)').each(function (i, tr) {
var $tr = $(tr); var $tr = $(tr);
var $td = $tr.find(_this8.options.cardView ? '.card-view' : 'td').eq(fieldIndex); var $td = $tr.find(_this8.options.cardView ? '.card-views>.card-view' : '>td').eq(fieldIndex);
var index = key.indexOf(' '); var index = key.indexOf(' ');
var name = key.substring(0, index); var name = key.substring(0, index);
var el = key.substring(index + 1); var el = key.substring(index + 1);
@ -5346,8 +5348,8 @@
params.filter = JSON.stringify(this.filterColumnsPartial, null); params.filter = JSON.stringify(this.filterColumnsPartial, null);
} }
data = Utils.calculateObjectValue(this.options, this.options.queryParams, [params], data); $.extend(params, query || {});
$.extend(data, query || {}); // false to stop request data = Utils.calculateObjectValue(this.options, this.options.queryParams, [params], data); // false to stop request
if (data === false) { if (data === false) {
return; return;
@ -5574,7 +5576,7 @@
if (i === 0) { if (i === 0) {
var $thDetail = $ths.filter('.detail'); var $thDetail = $ths.filter('.detail');
var _zoomWidth = $thDetail.width() - $thDetail.find('.fht-cell').width(); var _zoomWidth = $thDetail.innerWidth() - $thDetail.find('.fht-cell').width();
$thDetail.find('.fht-cell').width($this.innerWidth() - _zoomWidth); $thDetail.find('.fht-cell').width($this.innerWidth() - _zoomWidth);
} }
@ -5592,7 +5594,7 @@
$th = $($ths[$this[0].cellIndex]); $th = $($ths[$this[0].cellIndex]);
} }
var zoomWidth = $th.width() - $th.find('.fht-cell').width(); var zoomWidth = $th.innerWidth() - $th.find('.fht-cell').width();
$th.find('.fht-cell').width($this.innerWidth() - zoomWidth); $th.find('.fht-cell').width($this.innerWidth() - zoomWidth);
}); });
this.horizontalScroll(); this.horizontalScroll();
@ -5709,7 +5711,7 @@
if (i === 0) { if (i === 0) {
var $thDetail = $ths.filter('.detail'); var $thDetail = $ths.filter('.detail');
var _zoomWidth2 = $thDetail.width() - $thDetail.find('.fht-cell').width(); var _zoomWidth2 = $thDetail.innerWidth() - $thDetail.find('.fht-cell').width();
$thDetail.find('.fht-cell').width($this.innerWidth() - _zoomWidth2); $thDetail.find('.fht-cell').width($this.innerWidth() - _zoomWidth2);
} }
@ -5722,7 +5724,7 @@
} }
var $th = $ths.eq(i); var $th = $ths.eq(i);
var zoomWidth = $th.width() - $th.find('.fht-cell').width(); var zoomWidth = $th.innerWidth() - $th.find('.fht-cell').width();
$th.find('.fht-cell').width($this.innerWidth() - zoomWidth); $th.find('.fht-cell').width($this.innerWidth() - zoomWidth);
}); });
this.horizontalScroll(); this.horizontalScroll();
@ -6520,8 +6522,15 @@
} }
if (obj.values.includes(row[obj.field])) { if (obj.values.includes(row[obj.field])) {
var $el = _this22.$selectItem.filter(':enabled').filter(Utils.sprintf('[data-index="%s"]', i)).prop('checked', checked); var $el = _this22.$selectItem.filter(':enabled').filter(Utils.sprintf('[data-index="%s"]', i));
$el = checked ? $el.not(':checked') : $el.filter(':checked');
if (!$el.length) {
return;
}
$el.prop('checked', checked);
row[_this22.header.stateField] = checked; row[_this22.header.stateField] = checked;
rows.push(row); rows.push(row);

4
Bootstrap.Admin/wwwroot/lib/bootstrap-table/bootstrap-table.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
Bootstrap.Admin/wwwroot/lib/bootstrap-table/bootstrap-table.min.js vendored
View File

File diff suppressed because one or more lines are too long