mirror of
https://github.com/grokability/snipe-it.git
synced 2026-03-12 17:52:00 +08:00
Added sticky column
This commit is contained in:
@@ -30,6 +30,21 @@ class AssetPresenter extends Presenter
|
||||
'switchable' => true,
|
||||
'title' => trans('general.id'),
|
||||
'visible' => false,
|
||||
], [
|
||||
'field' => 'asset_tag',
|
||||
'searchable' => true,
|
||||
'sortable' => true,
|
||||
'switchable' => false,
|
||||
'title' => trans('admin/hardware/table.asset_tag'),
|
||||
'visible' => true,
|
||||
'formatter' => 'hardwareLinkFormatter',
|
||||
], [
|
||||
'field' => 'name',
|
||||
'searchable' => true,
|
||||
'sortable' => true,
|
||||
'title' => trans('admin/hardware/form.name'),
|
||||
'visible' => true,
|
||||
'formatter' => 'hardwareLinkFormatter',
|
||||
], [
|
||||
'field' => 'company',
|
||||
'searchable' => true,
|
||||
@@ -38,13 +53,6 @@ class AssetPresenter extends Presenter
|
||||
'title' => trans('general.company'),
|
||||
'visible' => false,
|
||||
'formatter' => 'companiesLinkObjFormatter',
|
||||
], [
|
||||
'field' => 'name',
|
||||
'searchable' => true,
|
||||
'sortable' => true,
|
||||
'title' => trans('admin/hardware/form.name'),
|
||||
'visible' => true,
|
||||
'formatter' => 'hardwareLinkFormatter',
|
||||
], [
|
||||
'field' => 'image',
|
||||
'searchable' => false,
|
||||
@@ -53,15 +61,7 @@ class AssetPresenter extends Presenter
|
||||
'title' => trans('admin/hardware/table.image'),
|
||||
'visible' => true,
|
||||
'formatter' => 'imageFormatter',
|
||||
], [
|
||||
'field' => 'asset_tag',
|
||||
'searchable' => true,
|
||||
'sortable' => true,
|
||||
'switchable' => false,
|
||||
'title' => trans('admin/hardware/table.asset_tag'),
|
||||
'visible' => true,
|
||||
'formatter' => 'hardwareLinkFormatter',
|
||||
], [
|
||||
],[
|
||||
'field' => 'serial',
|
||||
'searchable' => true,
|
||||
'sortable' => true,
|
||||
|
||||
@@ -35,6 +35,15 @@ class UserPresenter extends Presenter
|
||||
'title' => trans('general.id'),
|
||||
'visible' => false,
|
||||
],
|
||||
[
|
||||
'field' => 'username',
|
||||
'searchable' => true,
|
||||
'sortable' => true,
|
||||
'switchable' => false,
|
||||
'title' => trans('admin/users/table.username'),
|
||||
'visible' => true,
|
||||
'formatter' => 'usernameRoleLinkFormatter',
|
||||
],
|
||||
[
|
||||
'field' => 'avatar',
|
||||
'searchable' => false,
|
||||
@@ -44,15 +53,6 @@ class UserPresenter extends Presenter
|
||||
'visible' => false,
|
||||
'formatter' => 'imageFormatter',
|
||||
],
|
||||
[
|
||||
'field' => 'company',
|
||||
'searchable' => true,
|
||||
'sortable' => true,
|
||||
'switchable' => true,
|
||||
'title' => trans('admin/companies/table.title'),
|
||||
'visible' => false,
|
||||
'formatter' => 'companiesLinkObjFormatter',
|
||||
],
|
||||
[
|
||||
'field' => 'name',
|
||||
'searchable' => true,
|
||||
@@ -83,14 +83,15 @@ class UserPresenter extends Presenter
|
||||
'title' => trans('admin/users/table.display_name'),
|
||||
'visible' => false,
|
||||
'formatter' => 'usersLinkFormatter',
|
||||
], [
|
||||
'field' => 'username',
|
||||
],
|
||||
[
|
||||
'field' => 'company',
|
||||
'searchable' => true,
|
||||
'sortable' => true,
|
||||
'switchable' => false,
|
||||
'title' => trans('admin/users/table.username'),
|
||||
'visible' => true,
|
||||
'formatter' => 'usernameRoleLinkFormatter',
|
||||
'switchable' => true,
|
||||
'title' => trans('admin/companies/table.title'),
|
||||
'visible' => false,
|
||||
'formatter' => 'companiesLinkObjFormatter',
|
||||
],
|
||||
[
|
||||
'field' => 'employee_num',
|
||||
|
||||
24
public/css/dist/bootstrap-table.css
vendored
24
public/css/dist/bootstrap-table.css
vendored
@@ -348,6 +348,30 @@ div.fixed-table-scroll-outer {
|
||||
background: #212529;
|
||||
}
|
||||
|
||||
.fixed-columns,
|
||||
.fixed-columns-right {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
height: 100%;
|
||||
background-color: #fff;
|
||||
box-sizing: border-box;
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
.fixed-columns {
|
||||
left: 0;
|
||||
}
|
||||
.fixed-columns .fixed-table-body {
|
||||
overflow: hidden !important;
|
||||
}
|
||||
|
||||
.fixed-columns-right {
|
||||
right: 0;
|
||||
}
|
||||
.fixed-columns-right .fixed-table-body {
|
||||
overflow-x: hidden !important;
|
||||
}
|
||||
|
||||
/*
|
||||
* dragtable
|
||||
*
|
||||
|
||||
11
public/js/dist/bootstrap-table.js
vendored
11
public/js/dist/bootstrap-table.js
vendored
File diff suppressed because one or more lines are too long
@@ -77,6 +77,6 @@
|
||||
"/js/dist/bootstrap-table-locale-all.min.js": "/js/dist/bootstrap-table-locale-all.min.js?id=d300041b9e5038b45b68e036add83be4",
|
||||
"/js/dist/bootstrap-table-en-US.min.js": "/js/dist/bootstrap-table-en-US.min.js?id=6d0de12d91548ba2cd80b868838ce5fa",
|
||||
"/js/dist/Chart.min.js": "/js/dist/Chart.min.js?id=9b1ae20c4c7048d6e4a1b2e1aee7fb31",
|
||||
"/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=9def0b5d3b891ac3669b3b7aa7e805ce",
|
||||
"/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=ed9dc2e13cf495675067c4c7091b325a"
|
||||
"/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=82b56573f8098e439bf14ccb4530de6e",
|
||||
"/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=3ca77183321168d36eb1fac73a64e6e5"
|
||||
}
|
||||
|
||||
@@ -66,6 +66,7 @@
|
||||
data-show-footer="true"
|
||||
data-sort-order="asc"
|
||||
data-sort-name="name"
|
||||
data-fixed-number="2"
|
||||
data-search-text="{{ session()->get('search') }}"
|
||||
data-show-columns-search="true"
|
||||
data-toolbar="#assetsBulkEditToolbar"
|
||||
|
||||
@@ -688,7 +688,7 @@
|
||||
background-color: #2c3b41;
|
||||
}
|
||||
|
||||
.sidebar-menu>li>.treeview-menu,
|
||||
.sidebar-menu>li>.treeview-menu
|
||||
{
|
||||
background-color: #1e282c;
|
||||
}
|
||||
|
||||
@@ -112,6 +112,8 @@
|
||||
showSearchClearButton: data_with_default('show-search-clear-button', true),
|
||||
sortName: data_with_default('sort-name', 'created_at'),
|
||||
sortOrder: data_with_default('sort-order', 'desc'),
|
||||
fixedColumns: data_with_default('fixed-columns', 'true'),
|
||||
fixedRightNumber: data_with_default('fixed-right-number', '1'),
|
||||
stickyHeader: true,
|
||||
stickyHeaderOffsetLeft: parseInt($('body').css('padding-left'), 10),
|
||||
stickyHeaderOffsetRight: parseInt($('body').css('padding-right'), 10),
|
||||
|
||||
@@ -42,6 +42,7 @@
|
||||
data-bulk-form-id="#usersBulkForm"
|
||||
data-show-columns-search="true"
|
||||
id="usersTable"
|
||||
data-fixed-number="2"
|
||||
data-buttons="userButtons"
|
||||
class="table table-striped snipe-table"
|
||||
data-url="{{ route('api.users.index',
|
||||
|
||||
@@ -91,6 +91,7 @@ mix
|
||||
[
|
||||
"./node_modules/bootstrap-table/dist/bootstrap-table.css",
|
||||
"./node_modules/bootstrap-table/dist/extensions/sticky-header/bootstrap-table-sticky-header.css",
|
||||
"./node_modules/bootstrap-table/dist/extensions/fixed-columns/bootstrap-table-fixed-columns.css",
|
||||
"./resources/assets/css/dragtable.css",
|
||||
],
|
||||
"public/css/dist/bootstrap-table.css"
|
||||
@@ -109,6 +110,7 @@ mix
|
||||
'./node_modules/bootstrap-table/dist/extensions/export/bootstrap-table-export.js',
|
||||
'./node_modules/bootstrap-table/dist/extensions/cookie/bootstrap-table-cookie.js',
|
||||
'./node_modules/bootstrap-table/dist/extensions/sticky-header/bootstrap-table-sticky-header.js',
|
||||
'./node_modules/bootstrap-table/dist/extensions/fixed-columns/bootstrap-table-fixed-columns.min.js',
|
||||
'./node_modules/bootstrap-table/dist/extensions/addrbar/bootstrap-table-addrbar.js',
|
||||
'./node_modules/bootstrap-table/dist/extensions/print/bootstrap-table-print.min.js',
|
||||
'./node_modules/bootstrap-table/dist/extensions/custom-view/bootstrap-table-custom-view.js',
|
||||
|
||||
Reference in New Issue
Block a user