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
69af37ec
Commit
69af37ec
authored
Nov 03, 2020
by
vben
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(table): fix table typo
parent
86de3104
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
12 deletions
+22
-12
CHANGELOG.zh_CN.md
CHANGELOG.zh_CN.md
+6
-0
table.ts
src/components/Table/src/types/table.ts
+10
-6
tableData.tsx
src/views/demo/table/tableData.tsx
+6
-6
No files found.
CHANGELOG.zh_CN.md
View file @
69af37ec
...
...
@@ -7,6 +7,12 @@
### 🎫 Chores
-
删除菜单背景图
-
更新
`ant-design-vue`
版本为
`beta13`
-
更新
`vite`
版本为
`rc.9`
### 🐛 Bug Fixes
-
修复升级之后 table 类型问题
## 2.0.0-rc.8 (2020-11-2)
...
...
src/components/Table/src/types/table.ts
View file @
69af37ec
import
type
{
VNodeChild
}
from
'
vue
'
;
import
type
{
PaginationProps
}
from
'
./pagination
'
;
import
type
{
FormProps
}
from
'
/@/components/Form/index
'
;
import
type
{
IColumnProps
,
ITableRowSelection
}
from
'
ant-design-vue/lib/table/interface
'
;
import
type
{
ColumnProps
,
TableRowSelection
as
ITableRowSelection
,
}
from
'
ant-design-vue/lib/table/interface
'
;
import
{
ComponentType
}
from
'
./componentType
'
;
import
{
ColumnProps
}
from
'
./column
'
;
//
import { ColumnProps } from './column';
export
declare
type
SortOrder
=
'
ascend
'
|
'
descend
'
;
export
interface
TableCurrentDataSource
<
T
=
any
>
{
currentDataSource
:
T
[];
...
...
@@ -55,8 +58,8 @@ export interface TableCustomRecord<T = any> {
index
?:
number
;
}
export
interface
SorterResult
<
T
>
{
column
:
ColumnProps
<
T
>
;
export
interface
SorterResult
{
column
:
ColumnProps
;
order
:
SortOrder
;
field
:
string
;
columnKey
:
string
;
...
...
@@ -309,7 +312,7 @@ export interface BasicTableProps<T = any> {
* Set props on per header row
* @type Function
*/
customHeaderRow
?:
(
column
:
I
ColumnProps
,
index
:
number
)
=>
object
;
customHeaderRow
?:
(
column
:
ColumnProps
,
index
:
number
)
=>
object
;
/**
* Set props on per row
...
...
@@ -366,8 +369,9 @@ export interface BasicTableProps<T = any> {
onExpandedRowsChange
?:
(
expandedRows
:
string
[]
|
number
[])
=>
void
;
}
export
interface
BasicColumn
extends
I
ColumnProps
{
export
interface
BasicColumn
extends
ColumnProps
{
children
?:
BasicColumn
[];
//
flag
?:
'
INDEX
'
|
'
DEFAULT
'
|
'
CHECKBOX
'
|
'
RADIO
'
|
'
ACTION
'
;
...
...
src/views/demo/table/tableData.tsx
View file @
69af37ec
...
...
@@ -80,8 +80,8 @@ export function getMultipleHeaderColumns(): BasicColumn[] {
dataIndex
:
'
no
'
,
width
:
120
,
filters
:
[
{
text
:
'
Male
'
,
value
:
'
male
'
},
{
text
:
'
Female
'
,
value
:
'
female
'
},
{
text
:
'
Male
'
,
value
:
'
male
'
,
children
:
[]
},
{
text
:
'
Female
'
,
value
:
'
female
'
,
children
:
[]
},
],
},
...
...
@@ -125,8 +125,8 @@ export function getCustomHeaderColumns(): BasicColumn[] {
dataIndex
:
'
no
'
,
width
:
120
,
filters
:
[
{
text
:
'
Male
'
,
value
:
'
male
'
},
{
text
:
'
Female
'
,
value
:
'
female
'
},
{
text
:
'
Male
'
,
value
:
'
male
'
,
children
:
[]
},
{
text
:
'
Female
'
,
value
:
'
female
'
,
children
:
[]
},
],
},
{
...
...
@@ -190,8 +190,8 @@ export function getMergeHeaderColumns(): BasicColumn[] {
dataIndex
:
'
no
'
,
colSpan
:
0
,
filters
:
[
{
text
:
'
Male
'
,
value
:
'
male
'
},
{
text
:
'
Female
'
,
value
:
'
female
'
},
{
text
:
'
Male
'
,
value
:
'
male
'
,
children
:
[]
},
{
text
:
'
Female
'
,
value
:
'
female
'
,
children
:
[]
},
],
customRender
:
renderContent
,
},
...
...
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