From b40e4f2e36ed894f124b07be722cda86d13368f1 Mon Sep 17 00:00:00 2001 From: liaoxuezhi Date: Thu, 24 Oct 2019 14:16:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?form=20star=20=E6=A0=B7=E5=BC=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scss/components/form/_form.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scss/components/form/_form.scss b/scss/components/form/_form.scss index 6be0970c7..d0008e970 100644 --- a/scss/components/form/_form.scss +++ b/scss/components/form/_form.scss @@ -31,8 +31,8 @@ color: $red; font-size: $fontSizeXs; position: absolute; - left: px2rem(-7px); - top: px2rem(4px); + left: px2rem(-6px); + top: px2rem(3px); line-height: 1; } From 7bef503e68208579db15441fc9528dfb39950958 Mon Sep 17 00:00:00 2001 From: liaoxuezhi Date: Fri, 25 Oct 2019 10:23:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=B8=80=E4=B8=8B=20mobx?= =?UTF-8?q?-react=205.x=20=E8=B2=8C=E4=BC=BC=E4=B8=8D=E6=94=AF=E6=8C=81=20?= =?UTF-8?q?react-hooks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/renderers/CRUD.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 326507e6a..8a8016197 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "keycode": "^2.1.9", "match-sorter": "2.2.1", "mobx": "^4.5.0", - "mobx-react": "^5.2.5", + "mobx-react": "^6.1.4", "mobx-state-tree": "^3.7.0", "moment": "^2.19.3", "monaco-editor": "0.17.1", diff --git a/src/renderers/CRUD.tsx b/src/renderers/CRUD.tsx index b104baa06..42a98fe41 100644 --- a/src/renderers/CRUD.tsx +++ b/src/renderers/CRUD.tsx @@ -103,7 +103,7 @@ export default class CRUD extends React.Component { 'tableClassName', 'headerClassName', 'footerClassName', - 'toolbarClassName', + // 'toolbarClassName', 'headerToolbar', 'footerToolbar', 'filterTogglable', @@ -1367,7 +1367,7 @@ export default class CRUD extends React.Component { onPopOverClose: this.handleChildPopOverClose, headerToolbarRender: this.renderHeaderToolbar, footerToolbarRender: this.renderFooterToolbar, - data: store.mergedData + data: store.mergedData, } )}