Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
zuiqiangwanggong
vue-vben-admin
提交
da12da9d
V
vue-vben-admin
项目概览
zuiqiangwanggong
/
vue-vben-admin
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vue-vben-admin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
da12da9d
编写于
8月 15, 2021
作者:
无
无木
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
perf(table): fixed code style
修复一些代码检查警告,并且为table的canResize属性添加不兼容场景警告 close: #1070
上级
30c5fc63
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
30 addition
and
10 deletion
+30
-10
src/components/Page/index.ts
src/components/Page/index.ts
+2
-0
src/components/Page/src/PageWrapper.vue
src/components/Page/src/PageWrapper.vue
+7
-1
src/components/Table/src/BasicTable.vue
src/components/Table/src/BasicTable.vue
+13
-4
src/components/Table/src/hooks/useTableForm.ts
src/components/Table/src/hooks/useTableForm.ts
+4
-2
src/views/demo/table/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';
...
@@ -5,3 +5,5 @@ import pageWrapper from './src/PageWrapper.vue';
export
const
PageFooter
=
withInstall
(
pageFooter
);
export
const
PageFooter
=
withInstall
(
pageFooter
);
export
const
PageWrapper
=
withInstall
(
pageWrapper
);
export
const
PageWrapper
=
withInstall
(
pageWrapper
);
export
const
PageWrapperFixedHeightKey
=
'
PageWrapperFixedHeight
'
;
src/components/Page/src/PageWrapper.vue
浏览文件 @
da12da9d
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
</div>
</div>
</template>
</template>
<
script
lang=
"ts"
>
<
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
{
defineComponent
,
computed
,
watch
,
ref
,
unref
}
from
'
vue
'
;
import
PageFooter
from
'
./PageFooter.vue
'
;
import
PageFooter
from
'
./PageFooter.vue
'
;
...
@@ -43,6 +43,7 @@
...
@@ -43,6 +43,7 @@
import
{
omit
}
from
'
lodash-es
'
;
import
{
omit
}
from
'
lodash-es
'
;
import
{
PageHeader
}
from
'
ant-design-vue
'
;
import
{
PageHeader
}
from
'
ant-design-vue
'
;
import
{
useContentHeight
}
from
'
/@/hooks/web/useContentHeight
'
;
import
{
useContentHeight
}
from
'
/@/hooks/web/useContentHeight
'
;
import
{
PageWrapperFixedHeightKey
}
from
'
..
'
;
export
default
defineComponent
({
export
default
defineComponent
({
name
:
'
PageWrapper
'
,
name
:
'
PageWrapper
'
,
...
@@ -68,6 +69,11 @@
...
@@ -68,6 +69,11 @@
const
footerRef
=
ref
(
null
);
const
footerRef
=
ref
(
null
);
const
{
prefixCls
}
=
useDesign
(
'
page-wrapper
'
);
const
{
prefixCls
}
=
useDesign
(
'
page-wrapper
'
);
provide
(
PageWrapperFixedHeightKey
,
computed
(()
=>
props
.
fixedHeight
)
);
const
getIsContentFullHeight
=
computed
(()
=>
{
const
getIsContentFullHeight
=
computed
(()
=>
{
return
props
.
contentFullHeight
;
return
props
.
contentFullHeight
;
});
});
...
...
src/components/Table/src/BasicTable.vue
浏览文件 @
da12da9d
...
@@ -39,9 +39,10 @@
...
@@ -39,9 +39,10 @@
ColumnChangeParam
,
ColumnChangeParam
,
}
from
'
./types/table
'
;
}
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
{
Table
}
from
'
ant-design-vue
'
;
import
{
BasicForm
,
useForm
}
from
'
/@/components/Form/index
'
;
import
{
BasicForm
,
useForm
}
from
'
/@/components/Form/index
'
;
import
{
PageWrapperFixedHeightKey
}
from
'
/@/components/Page
'
;
import
expandIcon
from
'
./components/ExpandIcon
'
;
import
expandIcon
from
'
./components/ExpandIcon
'
;
import
HeaderCell
from
'
./components/HeaderCell.vue
'
;
import
HeaderCell
from
'
./components/HeaderCell.vue
'
;
import
{
InnerHandlers
}
from
'
./types/table
'
;
import
{
InnerHandlers
}
from
'
./types/table
'
;
...
@@ -64,6 +65,7 @@
...
@@ -64,6 +65,7 @@
import
{
omit
}
from
'
lodash-es
'
;
import
{
omit
}
from
'
lodash-es
'
;
import
{
basicProps
}
from
'
./props
'
;
import
{
basicProps
}
from
'
./props
'
;
import
{
isFunction
}
from
'
/@/utils/is
'
;
import
{
isFunction
}
from
'
/@/utils/is
'
;
import
{
warn
}
from
'
/@/utils/log
'
;
export
default
defineComponent
({
export
default
defineComponent
({
components
:
{
components
:
{
...
@@ -104,6 +106,13 @@
...
@@ -104,6 +106,13 @@
return
{
...
props
,
...
unref
(
innerPropsRef
)
}
as
BasicTableProps
;
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
{
getLoading
,
setLoading
}
=
useLoading
(
getProps
);
const
{
const
{
getPaginationInfo
,
getPaginationInfo
,
...
@@ -380,9 +389,9 @@
...
@@ -380,9 +389,9 @@
align-items: center;
align-items: center;
}
}
.ant-table-tbody > tr.ant-table-row-selected td {
//
.ant-table-tbody > tr.ant-table-row-selected td {
//background-color: fade(@primary-color, 8%) !important;
//background-color: fade(@primary-color, 8%) !important;
}
//
}
}
}
.ant-pagination {
.ant-pagination {
...
...
src/components/Table/src/hooks/useTableForm.ts
浏览文件 @
da12da9d
...
@@ -21,9 +21,11 @@ export function useTableForm(
...
@@ -21,9 +21,11 @@ export function useTableForm(
};
};
});
});
const
getFormSlotKeys
=
computed
(()
=>
{
const
getFormSlotKeys
:
ComputedRef
<
string
[]
>
=
computed
(()
=>
{
const
keys
=
Object
.
keys
(
slots
);
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
)
{
function
replaceFormSlotKey
(
key
:
string
)
{
...
...
src/views/demo/table/FetchTable.vue
浏览文件 @
da12da9d
<
template
>
<
template
>
<
div
class=
"p-4"
>
<
PageWrapper
contentBackground
contentClass=
"flex"
dense
contentFullHeight
fixedHeight
>
<BasicTable
@
register=
"registerTable"
>
<BasicTable
@
register=
"registerTable"
>
<template
#toolbar
>
<template
#toolbar
>
<a-button
type=
"primary"
@
click=
"handleReloadCurrent"
>
刷新当前页
</a-button>
<a-button
type=
"primary"
@
click=
"handleReloadCurrent"
>
刷新当前页
</a-button>
<a-button
type=
"primary"
@
click=
"handleReload"
>
刷新并返回第一页
</a-button>
<a-button
type=
"primary"
@
click=
"handleReload"
>
刷新并返回第一页
</a-button>
</
template
>
</
template
>
</BasicTable>
</BasicTable>
</
div
>
</
PageWrapper
>
</template>
</template>
<
script
lang=
"ts"
>
<
script
lang=
"ts"
>
import
{
defineComponent
}
from
'
vue
'
;
import
{
defineComponent
}
from
'
vue
'
;
import
{
BasicTable
,
useTable
}
from
'
/@/components/Table
'
;
import
{
BasicTable
,
useTable
}
from
'
/@/components/Table
'
;
import
{
getBasicColumns
}
from
'
./tableData
'
;
import
{
getBasicColumns
}
from
'
./tableData
'
;
import
{
PageWrapper
}
from
'
/@/components/Page
'
;
import
{
demoListApi
}
from
'
/@/api/demo/table
'
;
import
{
demoListApi
}
from
'
/@/api/demo/table
'
;
export
default
defineComponent
({
export
default
defineComponent
({
components
:
{
BasicTable
},
components
:
{
BasicTable
,
PageWrapper
},
setup
()
{
setup
()
{
const
[
registerTable
,
{
reload
}]
=
useTable
({
const
[
registerTable
,
{
reload
}]
=
useTable
({
title
:
'
远程加载示例
'
,
title
:
'
远程加载示例
'
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录