Skip to content

Commit

Permalink
Merge pull request #873 from hectorqin/master
Browse files Browse the repository at this point in the history
修复表格Filter激活状态显示bug,补充本地发布命令及编译依赖
  • Loading branch information
2betop committed Aug 21, 2020
2 parents 546fcb8 + 0463eab commit 689116b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 2 additions & 0 deletions package.json
Expand Up @@ -10,6 +10,7 @@
"stop": "fis3 server stop",
"dev": "fis3 release -cwd ./public",
"publish2npm": "sh publish.sh && npm publish",
"build": "sh publish.sh",
"prettier": "prettier --write '{src,examples,scss}/**/*.{tsx,ts,jsx,scss}'"
},
"repository": {
Expand Down Expand Up @@ -119,6 +120,7 @@
"fis3-deploy-skip-packed": "0.0.5",
"fis3-hook-commonjs": "^0.1.31",
"fis3-hook-node_modules": "^2.3.1",
"fis3-hook-relative": "^2.0.3",
"fis3-packager-deps-pack": "^0.1.2",
"fis3-parser-typescript": "^1.3.0",
"fis3-postpackager-loader": "^2.1.11",
Expand Down
5 changes: 3 additions & 2 deletions src/renderers/Table.tsx
Expand Up @@ -2510,7 +2510,8 @@ export class HeadCellFilterDropDown extends React.Component<

alterOptions(options: Array<any>) {
const {data, filterable, name} = this.props;
const filterValue = (data && data[name]) || '';
const filterValue =
data && typeof data[name] !== 'undefined' ? data[name] : '';

if (filterable.multiple) {
options = options.map(option => ({
Expand Down Expand Up @@ -2591,7 +2592,7 @@ export class HeadCellFilterDropDown extends React.Component<
<span
className={cx(
`${ns}TableCell-filterBtn`,
data[name] ? 'is-active' : ''
typeof data[name] !== 'undefined' ? 'is-active' : ''
)}
>
<span onClick={this.open}>
Expand Down

0 comments on commit 689116b

Please sign in to comment.