Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fgqyxxlr
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
yaru
fgqyxxlr
Commits
25232575
Commit
25232575
authored
Apr 02, 2019
by
RuoYi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改冻结显示问题
parent
79137967
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
37 additions
and
47 deletions
+37
-47
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/columns/bootstrap-table-fixed-columns.css
+0
-28
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/columns/bootstrap-table-fixed-columns.js
+3
-3
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-treetable/bootstrap-treetable.css
+0
-14
ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
+34
-0
ruoyi-admin/src/main/resources/templates/include.html
+0
-2
No files found.
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/columns/bootstrap-table-fixed-columns.css
deleted
100644 → 0
View file @
79137967
.fixed-table-header-columns
,
.fixed-table-body-columns
{
position
:
absolute
;
background-color
:
#fff
;
display
:
none
;
box-sizing
:
border-box
;
overflow
:
hidden
;
}
.fixed-table-header-columns
.table
,
.fixed-table-body-columns
.table
{
border-right
:
1px
solid
#ddd
;
}
.fixed-table-header-columns
.table.table-no-bordered
,
.fixed-table-body-columns
.table.table-no-bordered
{
border-right
:
1px
solid
transparent
;
}
.fixed-table-body-columns
table
{
position
:
absolute
;
animation
:
none
;
}
.bootstrap-table
.table-hover
>
tbody
>
tr
.hover
>
td
{
background-color
:
#f5f5f5
;
}
\ No newline at end of file
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/columns/bootstrap-table-fixed-columns.js
View file @
25232575
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
this
.
timeoutBodyColumns_
=
0
;
this
.
timeoutBodyColumns_
=
0
;
if
(
this
.
options
.
fixedColumns
)
{
if
(
this
.
options
.
fixedColumns
)
{
this
.
$fixedBody
=
$
([
this
.
$fixedBody
=
$
([
'<div class="
fixed-table-column" style="position: absolute; background-color: #fff; border-right:1px solid #ddd;
">'
,
'<div class="
left-fixed-table-columns
">'
,
'<table>'
,
'<table>'
,
'<thead></thead>'
,
'<thead></thead>'
,
'<tbody></tbody>'
,
'<tbody></tbody>'
,
...
@@ -38,10 +38,10 @@
...
@@ -38,10 +38,10 @@
}
}
if
(
this
.
options
.
rightFixedColumns
)
{
if
(
this
.
options
.
rightFixedColumns
)
{
this
.
$rightfixedBody
=
$
([
this
.
$rightfixedBody
=
$
([
'<div class="
fixed-table-column" style="position: absolute;right:0px; background-color: #fff; border-right:1px solid #ddd;
">'
,
'<div class="
right-fixed-table-columns
">'
,
'<table>'
,
'<table>'
,
'<thead></thead>'
,
'<thead></thead>'
,
'<tbody></tbody>'
,
'<tbody
style="background-color: #fff;"
></tbody>'
,
'</table>'
,
'</table>'
,
'</div>'
].
join
(
''
));
'</div>'
].
join
(
''
));
...
...
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-treetable/bootstrap-treetable.css
deleted
100644 → 0
View file @
79137967
.bootstrap-tree-table
.treetable-indent
{
width
:
16px
;
height
:
16px
;
display
:
inline-block
;
position
:
relative
;}
.bootstrap-tree-table
.treetable-expander
{
width
:
16px
;
height
:
16px
;
display
:
inline-block
;
position
:
relative
;
cursor
:
pointer
;}
.bootstrap-tree-table
.treetable-selected
{
background
:
#f5f5f5
!important
;}
.bootstrap-tree-table
.treetable-table
{
border
:
0
!important
;
margin-bottom
:
0
}
.bootstrap-tree-table
.treetable-table
tbody
{
display
:
block
;
height
:
auto
;}
.bootstrap-tree-table
.treetable-table
thead
,
.treetable-table
tbody
tr
{
display
:
table
;
width
:
100%
;
table-layout
:
fixed
;}
.bootstrap-tree-table
.treetable-thead
th
{
line-height
:
24px
;
border
:
0
!important
;
border-radius
:
4px
;
border-left
:
0px
solid
#e7eaec
!important
;
border-bottom
:
1px
solid
#ccc
!important
;
text-align
:
left
;}
.bootstrap-tree-table
.treetable-thead
tr
:first-child
{
border-left
:
0
!important
}
.bootstrap-tree-table
.treetable-tbody
td
{
border
:
0
!important
;
border-left
:
0px
solid
#e7eaec
!important
;
border-bottom
:
1px
solid
#e7eaec
!important
;
white-space
:
nowrap
;
text-overflow
:
ellipsis
;}
.bootstrap-tree-table
.treetable-tbody
tr
:first-child
{
border-left
:
0
!important
}
.bootstrap-tree-table
.treetable-bars
.tool-left
,
.bootstrap-tree-table
.treetable-bars
.tool-right
{
margin-top
:
10px
;
margin-bottom
:
10px
;}
.bootstrap-tree-table
.treetable-bars
.tool-left
{
float
:
left
;}
.bootstrap-tree-table
.treetable-bars
.tool-right
{
float
:
right
;}
.bootstrap-tree-table
.treetable-bars
.columns
li
label
{
display
:
block
;
padding
:
3px
20px
;
clear
:
both
;
font-weight
:
400
;
line-height
:
1.428571429
;
max-width
:
100%
;
margin-bottom
:
5px
;
cursor
:
pointer
;}
ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
View file @
25232575
...
@@ -638,6 +638,40 @@ label {
...
@@ -638,6 +638,40 @@ label {
display
:
inline-block
display
:
inline-block
}
}
/** 表格冻结列样式 **/
.left-fixed-table-columns
{
position
:
absolute
;
background-color
:
#fff
;
display
:
none
;
border-right
:
1px
solid
#ddd
;
overflow
:
hidden
;
}
.right-fixed-table-columns
{
position
:
absolute
;
right
:
63px
;
border-left
:
1px
solid
#ddd
;
display
:
none
;
z-index
:
100
;
}
/** 表格树样式 **/
.bootstrap-tree-table
.treetable-indent
{
width
:
16px
;
height
:
16px
;
display
:
inline-block
;
position
:
relative
;}
.bootstrap-tree-table
.treetable-expander
{
width
:
16px
;
height
:
16px
;
display
:
inline-block
;
position
:
relative
;
cursor
:
pointer
;}
.bootstrap-tree-table
.treetable-selected
{
background
:
#f5f5f5
!important
;}
.bootstrap-tree-table
.treetable-table
{
border
:
0
!important
;
margin-bottom
:
0
}
.bootstrap-tree-table
.treetable-table
tbody
{
display
:
block
;
height
:
auto
;}
.bootstrap-tree-table
.treetable-table
thead
,
.treetable-table
tbody
tr
{
display
:
table
;
width
:
100%
;
table-layout
:
fixed
;}
.bootstrap-tree-table
.treetable-thead
th
{
line-height
:
24px
;
border
:
0
!important
;
border-radius
:
4px
;
border-left
:
0px
solid
#e7eaec
!important
;
border-bottom
:
1px
solid
#ccc
!important
;
text-align
:
left
;}
.bootstrap-tree-table
.treetable-thead
tr
:first-child
{
border-left
:
0
!important
}
.bootstrap-tree-table
.treetable-tbody
td
{
border
:
0
!important
;
border-left
:
0px
solid
#e7eaec
!important
;
border-bottom
:
1px
solid
#e7eaec
!important
;
white-space
:
nowrap
;
text-overflow
:
ellipsis
;}
.bootstrap-tree-table
.treetable-tbody
tr
:first-child
{
border-left
:
0
!important
}
.bootstrap-tree-table
.treetable-bars
.tool-left
,
.bootstrap-tree-table
.treetable-bars
.tool-right
{
margin-top
:
10px
;
margin-bottom
:
10px
;}
.bootstrap-tree-table
.treetable-bars
.tool-left
{
float
:
left
;}
.bootstrap-tree-table
.treetable-bars
.tool-right
{
float
:
right
;}
.bootstrap-tree-table
.treetable-bars
.columns
li
label
{
display
:
block
;
padding
:
3px
20px
;
clear
:
both
;
font-weight
:
400
;
line-height
:
1.428571429
;
max-width
:
100%
;
margin-bottom
:
5px
;
cursor
:
pointer
;}
/** 首页样式 **/
/** 首页样式 **/
.ax_close_max
{
.ax_close_max
{
position
:
fixed
;
position
:
fixed
;
...
...
ruoyi-admin/src/main/resources/templates/include.html
View file @
25232575
...
@@ -10,8 +10,6 @@
...
@@ -10,8 +10,6 @@
<link
th:href=
"@{/css/font-awesome.min.css}"
rel=
"stylesheet"
/>
<link
th:href=
"@{/css/font-awesome.min.css}"
rel=
"stylesheet"
/>
<!-- bootstrap-table 表格插件样式 -->
<!-- bootstrap-table 表格插件样式 -->
<link
th:href=
"@{/ajax/libs/bootstrap-table/bootstrap-table.min.css}"
rel=
"stylesheet"
/>
<link
th:href=
"@{/ajax/libs/bootstrap-table/bootstrap-table.min.css}"
rel=
"stylesheet"
/>
<link
th:href=
"@{/ajax/libs/bootstrap-treetable/bootstrap-treetable.css}"
rel=
"stylesheet"
/>
<link
th:href=
"@{/ajax/libs/bootstrap-table/extensions/columns/bootstrap-table-fixed-columns.css}"
rel=
"stylesheet"
/>
<link
th:href=
"@{/css/animate.css}"
rel=
"stylesheet"
/>
<link
th:href=
"@{/css/animate.css}"
rel=
"stylesheet"
/>
<link
th:href=
"@{/css/style.css}"
rel=
"stylesheet"
/>
<link
th:href=
"@{/css/style.css}"
rel=
"stylesheet"
/>
<link
th:href=
"@{/ruoyi/css/ry-ui.css}"
rel=
"stylesheet"
/>
<link
th:href=
"@{/ruoyi/css/ry-ui.css}"
rel=
"stylesheet"
/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment