Merge pull request #6332 from 2betop/chore-table-ceel

chore: tableCell 内部属性换个名字,以免跟已有其他组件组合使用时冲突
This commit is contained in:
hsm-lv 2023-03-09 13:07:47 +08:00 committed by GitHub
commit f9c2ebbf7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions

View File

@ -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>
);
}

View File

@ -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,