mirror of
https://gitee.com/baidu/amis.git
synced 2024-12-02 03:48:13 +08:00
Merge pull request #6332 from 2betop/chore-table-ceel
chore: tableCell 内部属性换个名字,以免跟已有其他组件组合使用时冲突
This commit is contained in:
commit
f9c2ebbf7f
@ -57,8 +57,8 @@ export class TableCell extends React.Component<TableCellProps> {
|
||||
body: _body,
|
||||
tpl,
|
||||
remark,
|
||||
prefix,
|
||||
affix,
|
||||
cellPrefix,
|
||||
cellAffix,
|
||||
isHead,
|
||||
colIndex,
|
||||
row,
|
||||
@ -98,13 +98,13 @@ export class TableCell extends React.Component<TableCellProps> {
|
||||
if (!/%$/.test(String(style.width))) {
|
||||
body = (
|
||||
<div style={{width: style.width}}>
|
||||
{prefix}
|
||||
{cellPrefix}
|
||||
{body}
|
||||
{affix}
|
||||
{cellAffix}
|
||||
</div>
|
||||
);
|
||||
prefix = null;
|
||||
affix = null;
|
||||
cellPrefix = null;
|
||||
cellAffix = null;
|
||||
// delete style.width;
|
||||
}
|
||||
}
|
||||
@ -180,9 +180,9 @@ export class TableCell extends React.Component<TableCellProps> {
|
||||
data={row.data}
|
||||
/>
|
||||
) : null}
|
||||
{prefix}
|
||||
{cellPrefix}
|
||||
{body}
|
||||
{affix}
|
||||
{cellAffix}
|
||||
</Component>
|
||||
);
|
||||
}
|
||||
|
@ -2224,7 +2224,7 @@ export default class Table extends React.Component<TableProps, object> {
|
||||
popOverContainer: popOverContainer || this.getPopOverContainer,
|
||||
rowSpan: item.rowSpans[column.name as string],
|
||||
quickEditFormRef: this.subFormRef,
|
||||
prefix,
|
||||
cellPrefix: prefix,
|
||||
onImageEnlarge: this.handleImageEnlarge,
|
||||
canAccessSuperData,
|
||||
row: item,
|
||||
|
Loading…
Reference in New Issue
Block a user