Merge pull request #78 from Glen1021/master

fix: 兼容table为null的情况
ecomfe · Dec 13, 2021 · 3847ca4 · 3847ca4
2 parents 90c701f + b6ec9b6
commit 3847ca4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/site/src/containers/Header.js b/site/src/containers/Header.js
@@ -111,7 +111,7 @@ export default class Header extends Component {
     }
     handleSearch(value) {
         const opts = this.data.get('opts');
-        let showOpts = value ? opts.filter(item => item.name.indexOf(value) > -1) : opts;
+        let showOpts = value ? opts.filter(item => item.name && item.name.toLowerCase().indexOf(value.toLowerCase()) > -1) : opts;
         this.data.set('showOpts', showOpts);
     }
     handleSelect(value) {

diff --git a/src/table/Table.js b/src/table/Table.js
@@ -190,7 +190,7 @@ export default san.defineComponent({
     },
     inited() {
         this.rowSpanArr = {};
-        let data = this.data.get('data').concat() || [];
+        let data = this.data.get('data') ? this.data.get('data').concat() : [];
 
         this.data.set('expandedRowKeys', this.data.get('expandedRowKeys') || this.data.get('defaultExpandedRowKeys'));
         this.data.set('originalData', data);