Merge pull request #308 from 2betop/master

update
This commit is contained in:
liaoxuezhi 2019-10-25 12:32:09 +08:00 committed by GitHub
commit b23930e545
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions

View File

@ -44,7 +44,7 @@
"keycode": "^2.1.9", "keycode": "^2.1.9",
"match-sorter": "2.2.1", "match-sorter": "2.2.1",
"mobx": "^4.5.0", "mobx": "^4.5.0",
"mobx-react": "^5.2.5", "mobx-react": "^6.1.4",
"mobx-state-tree": "^3.7.0", "mobx-state-tree": "^3.7.0",
"moment": "^2.19.3", "moment": "^2.19.3",
"monaco-editor": "0.17.1", "monaco-editor": "0.17.1",

View File

@ -31,8 +31,8 @@
color: $red; color: $red;
font-size: $fontSizeXs; font-size: $fontSizeXs;
position: absolute; position: absolute;
left: px2rem(-7px); left: px2rem(-6px);
top: px2rem(4px); top: px2rem(3px);
line-height: 1; line-height: 1;
} }

View File

@ -103,7 +103,7 @@ export default class CRUD extends React.Component<CRUDProps, any> {
'tableClassName', 'tableClassName',
'headerClassName', 'headerClassName',
'footerClassName', 'footerClassName',
'toolbarClassName', // 'toolbarClassName',
'headerToolbar', 'headerToolbar',
'footerToolbar', 'footerToolbar',
'filterTogglable', 'filterTogglable',
@ -1367,7 +1367,7 @@ export default class CRUD extends React.Component<CRUDProps, any> {
onPopOverClose: this.handleChildPopOverClose, onPopOverClose: this.handleChildPopOverClose,
headerToolbarRender: this.renderHeaderToolbar, headerToolbarRender: this.renderHeaderToolbar,
footerToolbarRender: this.renderFooterToolbar, footerToolbarRender: this.renderFooterToolbar,
data: store.mergedData data: store.mergedData,
} }
)} )}