innov
/
BootstrapAdmin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改BUG：异常管理与日志管理页面移除对longbow.dataentity.js的引用。增加查询按钮事件

This commit is contained in:
Argo-MacBookPro 2018-09-08 18:41:31 +08:00
parent 6593c20816
commit 3ca7196c82
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Bootstrap.Admin/Views/Admin/Exceptions.cshtml
View File

@ -11,7 +11,6 @@
@section Javascript { @section Javascript {
<script src="~/js/bootstrap-table.js"></script> <script src="~/js/bootstrap-table.js"></script>
<script src="~/js/bootstrap-table-zh-CN.js"></script> <script src="~/js/bootstrap-table-zh-CN.js"></script>
<script src="~/js/longbow.dataentity.js"></script>
<script src="~/js/bootstrap-datetimepicker.js"></script> <script src="~/js/bootstrap-datetimepicker.js"></script>
<script src="~/js/bootstrap-datetimepicker.zh-CN.js"></script> <script src="~/js/bootstrap-datetimepicker.zh-CN.js"></script>
<script src="~/js/exceptions.js"></script> <script src="~/js/exceptions.js"></script>

1
Bootstrap.Admin/Views/Admin/Logs.cshtml
View File

@ -25,7 +25,6 @@
<script src="~/js/bootstrap-datetimepicker.min.js"></script> <script src="~/js/bootstrap-datetimepicker.min.js"></script>
</environment> </environment>
<script src="~/js/bootstrap-datetimepicker.zh-CN.js"></script> <script src="~/js/bootstrap-datetimepicker.zh-CN.js"></script>
<script src="~/js/longbow.dataentity.js"></script>
<script src="~/js/logs.js"></script> <script src="~/js/logs.js"></script>
} }
<div class="card"> <div class="card">

9
Bootstrap.Admin/wwwroot/js/longbow.common.js
View File

@ -271,7 +271,8 @@
checkbox: true, checkbox: true,
edit: true, edit: true,
editTitle: "编辑", editTitle: "编辑",
editField: "Id" editField: "Id",
queryButton: false
}, options.smartTable); }, options.smartTable);
if (settings.edit) settings.columns.unshift({ title: settings.editTitle, field: settings.editField, events: bsa.idEvents(), formatter: DataTable.idFormatter }); if (settings.edit) settings.columns.unshift({ title: settings.editTitle, field: settings.editField, events: bsa.idEvents(), formatter: DataTable.idFormatter });
if (settings.checkbox) settings.columns.unshift({ checkbox: true }); if (settings.checkbox) settings.columns.unshift({ checkbox: true });
@ -294,6 +295,7 @@
showToggle: true, //是否显示详细视图和列表视图的切换按钮 showToggle: true, //是否显示详细视图和列表视图的切换按钮
cardView: $(window).width() < 768, //是否显示详细视图 cardView: $(window).width() < 768, //是否显示详细视图
footer: '.site-footer', footer: '.site-footer',
queryButton: '#btn_query',
onLoadSuccess: function () { onLoadSuccess: function () {
$(settings.footer).footer(); $(settings.footer).footer();
} }
@ -304,6 +306,11 @@
e.preventDefault(); e.preventDefault();
$('#' + $(this).attr('id').replace('tb_', 'btn_')).trigger("click"); $('#' + $(this).attr('id').replace('tb_', 'btn_')).trigger("click");
}).insertBefore(this.parents('.bootstrap-table').find('.fixed-table-toolbar > .bs-bars')); }).insertBefore(this.parents('.bootstrap-table').find('.fixed-table-toolbar > .bs-bars'));
if (settings.queryButton) {
$(settings.queryButton).on('click', this, function (e) {
e.data.bootstrapTable('refresh');
});
}
return this; return this;
}, },
msgHandler: function (options) { msgHandler: function (options) {