Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
najiu-admin-template
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
najiu-frontend
najiu-admin-template
Commits
1d7608ee
Commit
1d7608ee
authored
Mar 20, 2021
by
Vben
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(table): ensure that the height calculation is correct close #395
parent
7c16c2fa
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
37 additions
and
30 deletions
+37
-30
CHANGELOG.zh_CN.md
CHANGELOG.zh_CN.md
+9
-0
index.ts
build/vite/plugin/index.ts
+2
-2
useTableScroll.ts
src/components/Table/src/hooks/useTableScroll.ts
+2
-2
index.less
src/components/Table/src/style/index.less
+1
-1
index.vue
src/layouts/page/index.vue
+23
-25
No files found.
CHANGELOG.zh_CN.md
View file @
1d7608ee
## Wip
### ✨ Features
-
路由新增 hideChildrenInMenu 配置。用于隐藏子菜单
### ✨ Refactor
-
重构路由多层模式,解决嵌套 keepalive 执行多次问题
...
...
@@ -8,6 +12,11 @@
-
确保 CountDownInput 组件重置清空值
-
修复分割模式下在小屏幕中显示问题
-
修复表格高度计算问题
-
修复后台路由获取不到组件问题
-
修复 Modal 组件 loadingTip 配置不生效
-
修复后台权限指令不生效
-
确保 progress 进度条正确关闭
## 2.1.0 (2021-03-15)
...
...
build/vite/plugin/index.ts
View file @
1d7608ee
...
...
@@ -17,7 +17,7 @@ import { configThemePlugin } from './theme';
import
{
configImageminPlugin
}
from
'
./imagemin
'
;
import
{
configWindiCssPlugin
}
from
'
./windicss
'
;
import
{
configSvgIconsPlugin
}
from
'
./svgSprite
'
;
//
import { configHmrPlugin } from './hmr';
import
{
configHmrPlugin
}
from
'
./hmr
'
;
export
function
createVitePlugins
(
viteEnv
:
ViteEnv
,
isBuild
:
boolean
)
{
const
{
VITE_USE_IMAGEMIN
,
VITE_USE_MOCK
,
VITE_LEGACY
,
VITE_BUILD_COMPRESS
}
=
viteEnv
;
...
...
@@ -30,7 +30,7 @@ export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean) {
];
// TODO
//
!isBuild && vitePlugins.push(configHmrPlugin());
!
isBuild
&&
vitePlugins
.
push
(
configHmrPlugin
());
// @vitejs/plugin-legacy
VITE_LEGACY
&&
isBuild
&&
vitePlugins
.
push
(
legacy
());
...
...
src/components/Table/src/hooks/useTableScroll.ts
View file @
1d7608ee
...
...
@@ -87,7 +87,6 @@ export function useTableScroll(
// Table height from bottom height-custom offset
const
paddingHeight
=
32
;
const
borderHeight
=
0
;
// Pager height
let
paginationHeight
=
2
;
if
(
!
isBoolean
(
pagination
))
{
...
...
@@ -99,6 +98,8 @@ export function useTableScroll(
// TODO First fix 24
paginationHeight
+=
24
;
}
}
else
{
paginationHeight
=
-
8
;
}
let
footerHeight
=
0
;
...
...
@@ -120,7 +121,6 @@ export function useTableScroll(
bottomIncludeBody
-
(
resizeHeightOffset
||
0
)
-
paddingHeight
-
borderHeight
-
paginationHeight
-
footerHeight
-
headerHeight
;
...
...
src/components/Table/src/style/index.less
View file @
1d7608ee
...
...
@@ -35,7 +35,7 @@
}
.ant-table-wrapper {
padding:
8
px;
padding:
6
px;
background: #fff;
border-radius: 2px;
...
...
src/layouts/page/index.vue
View file @
1d7608ee
<
template
>
<div>
<RouterView>
<template
#default
="
{ Component, route }">
<transition
...
...
@@ -23,7 +22,6 @@
</
template
>
</RouterView>
<FrameLayout
v-if=
"getCanEmbedIFramePage"
/>
</div>
</template>
<
script
lang=
"ts"
>
...
...
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