From 0851954f794ddb11a2e8143c33f9feecbce69302 Mon Sep 17 00:00:00 2001 From: zhangwenshuai Date: Tue, 1 Sep 2020 19:53:44 +0800 Subject: [PATCH] update --- components/apolloTable/component/Cell.tsx | 2 +- components/apolloTable/component/Table.tsx | 3 ++- components/apolloTable/component/base/edit/textarea/index.tsx | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/components/apolloTable/component/Cell.tsx b/components/apolloTable/component/Cell.tsx index be9ebde..c033355 100644 --- a/components/apolloTable/component/Cell.tsx +++ b/components/apolloTable/component/Cell.tsx @@ -79,7 +79,7 @@ const Cell = (props: CellProps) => { return; } let temp: CellDataProps[] = []; - cellData.map((item: CellDataProps) => { + cellData && cellData.map((item: CellDataProps) => { temp.push({ text: item.text, value: item.value }); }); if (temp.length === 0) { diff --git a/components/apolloTable/component/Table.tsx b/components/apolloTable/component/Table.tsx index c4fc55b..74947f7 100644 --- a/components/apolloTable/component/Table.tsx +++ b/components/apolloTable/component/Table.tsx @@ -332,6 +332,7 @@ export default class AirTable extends Component { onEmitMsg, tableId, renderFirstLeft, + bordered = false, } = this.props; if (showColumns.length === 0 || showData.length === 0) { return; @@ -346,7 +347,7 @@ export default class AirTable extends Component { const cellData: any = columnData && columnData.cellValueList; // 列数据 - const { cellClassName, cellStyle, bordered = false } = columnConfig; + const { cellClassName, cellStyle } = columnConfig; const rowClassNameStr = getMergeClassName(styles.bodyRow, rowClassName, { rowIndex }); const rowStyleObj = getMergeStyle({}, rowStyle, { rowIndex }); diff --git a/components/apolloTable/component/base/edit/textarea/index.tsx b/components/apolloTable/component/base/edit/textarea/index.tsx index bbace38..374fe98 100644 --- a/components/apolloTable/component/base/edit/textarea/index.tsx +++ b/components/apolloTable/component/base/edit/textarea/index.tsx @@ -89,9 +89,9 @@ export const ApolloTextArea = (props: ApolloTextAreaProps) => { if (newValue) { newValue = newValue[0] && newValue[0].value; setCurValue(newValue); - setVisible(true); } } + setVisible(true); }; if (origin === 'editForm') { return ( -- 2.21.0