Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
B
basic-vue-admin
概览
概览
详情
活动
周期分析
版本库
存储库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
Basic
basic-vue-admin
Commits
da12da9d
提交
da12da9d
authored
8月 15, 2021
作者:
无木
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
perf(table): fixed code style
修复一些代码检查警告,并且为table的canResize属性添加不兼容场景警告 close: #1070
上级
30c5fc63
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
30 行增加
和
10 行删除
+30
-10
index.ts
src/components/Page/index.ts
+2
-0
PageWrapper.vue
src/components/Page/src/PageWrapper.vue
+7
-1
BasicTable.vue
src/components/Table/src/BasicTable.vue
+13
-4
useTableForm.ts
src/components/Table/src/hooks/useTableForm.ts
+4
-2
FetchTable.vue
src/views/demo/table/FetchTable.vue
+4
-3
没有找到文件。
src/components/Page/index.ts
浏览文件 @
da12da9d
...
...
@@ -5,3 +5,5 @@ import pageWrapper from './src/PageWrapper.vue';
export
const
PageFooter
=
withInstall
(
pageFooter
);
export
const
PageWrapper
=
withInstall
(
pageWrapper
);
export
const
PageWrapperFixedHeightKey
=
'PageWrapperFixedHeight'
;
src/components/Page/src/PageWrapper.vue
浏览文件 @
da12da9d
...
...
@@ -33,7 +33,7 @@
</div>
</template>
<
script
lang=
"ts"
>
import
type
{
CSSProperties
,
PropTyp
e
}
from
'vue'
;
import
{
CSSProperties
,
PropType
,
provid
e
}
from
'vue'
;
import
{
defineComponent
,
computed
,
watch
,
ref
,
unref
}
from
'vue'
;
import
PageFooter
from
'./PageFooter.vue'
;
...
...
@@ -43,6 +43,7 @@
import
{
omit
}
from
'lodash-es'
;
import
{
PageHeader
}
from
'ant-design-vue'
;
import
{
useContentHeight
}
from
'/@/hooks/web/useContentHeight'
;
import
{
PageWrapperFixedHeightKey
}
from
'..'
;
export
default
defineComponent
({
name
:
'PageWrapper'
,
...
...
@@ -68,6 +69,11 @@
const
footerRef
=
ref
(
null
);
const
{
prefixCls
}
=
useDesign
(
'page-wrapper'
);
provide
(
PageWrapperFixedHeightKey
,
computed
(()
=>
props
.
fixedHeight
)
);
const
getIsContentFullHeight
=
computed
(()
=>
{
return
props
.
contentFullHeight
;
});
...
...
src/components/Table/src/BasicTable.vue
浏览文件 @
da12da9d
...
...
@@ -39,9 +39,10 @@
ColumnChangeParam
,
}
from
'./types/table'
;
import
{
defineComponent
,
ref
,
computed
,
unref
,
toRaw
}
from
'vue'
;
import
{
defineComponent
,
ref
,
computed
,
unref
,
toRaw
,
inject
,
watchEffect
}
from
'vue'
;
import
{
Table
}
from
'ant-design-vue'
;
import
{
BasicForm
,
useForm
}
from
'/@/components/Form/index'
;
import
{
PageWrapperFixedHeightKey
}
from
'/@/components/Page'
;
import
expandIcon
from
'./components/ExpandIcon'
;
import
HeaderCell
from
'./components/HeaderCell.vue'
;
import
{
InnerHandlers
}
from
'./types/table'
;
...
...
@@ -64,6 +65,7 @@
import
{
omit
}
from
'lodash-es'
;
import
{
basicProps
}
from
'./props'
;
import
{
isFunction
}
from
'/@/utils/is'
;
import
{
warn
}
from
'/@/utils/log'
;
export
default
defineComponent
({
components
:
{
...
...
@@ -104,6 +106,13 @@
return
{
...
props
,
...
unref
(
innerPropsRef
)
}
as
BasicTableProps
;
});
const
isFixedHeightPage
=
inject
(
PageWrapperFixedHeightKey
);
watchEffect
(()
=>
{
unref
(
isFixedHeightPage
)
&&
props
.
canResize
&&
warn
(
"[BasicTable] 'canRize' not worked with PageWrapper while 'fixedHeight' is true"
);
});
const
{
getLoading
,
setLoading
}
=
useLoading
(
getProps
);
const
{
getPaginationInfo
,
...
...
@@ -380,9 +389,9 @@
align-items
:
center
;
}
.ant-table-tbody
>
tr
.ant-table-row-selected
td
{
//
background-color
:
fade
(
@
primary-color
,
8%
)
!important
;
}
//
.ant-table-tbody
>
tr
.ant-table-row-selected
td
{
//
background-color
:
fade
(
@
primary-color
,
8%
)
!important
;
//
}
}
.ant-pagination
{
...
...
src/components/Table/src/hooks/useTableForm.ts
浏览文件 @
da12da9d
...
...
@@ -21,9 +21,11 @@ export function useTableForm(
};
});
const
getFormSlotKeys
=
computed
(()
=>
{
const
getFormSlotKeys
:
ComputedRef
<
string
[]
>
=
computed
(()
=>
{
const
keys
=
Object
.
keys
(
slots
);
return
keys
.
map
((
item
)
=>
(
item
.
startsWith
(
'form-'
)
?
item
:
null
)).
filter
(
Boolean
);
return
keys
.
map
((
item
)
=>
(
item
.
startsWith
(
'form-'
)
?
item
:
null
))
.
filter
((
item
)
=>
!!
item
)
as
string
[];
});
function
replaceFormSlotKey
(
key
:
string
)
{
...
...
src/views/demo/table/FetchTable.vue
浏览文件 @
da12da9d
<
template
>
<
div
class=
"p-4"
>
<
PageWrapper
contentBackground
contentClass=
"flex"
dense
contentFullHeight
fixedHeight
>
<BasicTable
@
register=
"registerTable"
>
<template
#
toolbar
>
<a-button
type=
"primary"
@
click=
"handleReloadCurrent"
>
刷新当前页
</a-button>
<a-button
type=
"primary"
@
click=
"handleReload"
>
刷新并返回第一页
</a-button>
</
template
>
</BasicTable>
</
div
>
</
PageWrapper
>
</template>
<
script
lang=
"ts"
>
import
{
defineComponent
}
from
'vue'
;
import
{
BasicTable
,
useTable
}
from
'/@/components/Table'
;
import
{
getBasicColumns
}
from
'./tableData'
;
import
{
PageWrapper
}
from
'/@/components/Page'
;
import
{
demoListApi
}
from
'/@/api/demo/table'
;
export
default
defineComponent
({
components
:
{
BasicTable
},
components
:
{
BasicTable
,
PageWrapper
},
setup
()
{
const
[
registerTable
,
{
reload
}]
=
useTable
({
title
:
'远程加载示例'
,
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论