Skip to content

Commit 3847ca4

Browse files
authored
Merge pull request #78 from Glen1021/master
fix: 兼容table为null的情况
2 parents 90c701f + b6ec9b6 commit 3847ca4

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

site/src/containers/Header.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ export default class Header extends Component {
111111
}
112112
handleSearch(value) {
113113
const opts = this.data.get('opts');
114-
let showOpts = value ? opts.filter(item => item.name.indexOf(value) > -1) : opts;
114+
let showOpts = value ? opts.filter(item => item.name && item.name.toLowerCase().indexOf(value.toLowerCase()) > -1) : opts;
115115
this.data.set('showOpts', showOpts);
116116
}
117117
handleSelect(value) {

src/table/Table.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ export default san.defineComponent({
190190
},
191191
inited() {
192192
this.rowSpanArr = {};
193-
let data = this.data.get('data').concat() || [];
193+
let data = this.data.get('data') ? this.data.get('data').concat() : [];
194194

195195
this.data.set('expandedRowKeys', this.data.get('expandedRowKeys') || this.data.get('defaultExpandedRowKeys'));
196196
this.data.set('originalData', data);

0 commit comments

Comments
 (0)