From aba112d3f666ca4b209fd34d4fe43af666481c9d Mon Sep 17 00:00:00 2001 From: chenzeyu Date: Wed, 21 Sep 2022 14:04:22 +0800 Subject: [PATCH 1/4] =?UTF-8?q?KERNEL-12829=20feat:=20=5Fgap=E4=B9=8B?= =?UTF-8?q?=E7=B1=BB=E7=9A=84=E5=9C=A8fineui=E4=B8=AD=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- typescript/shims-tsx.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/typescript/shims-tsx.ts b/typescript/shims-tsx.ts index e77dceffb..cabf21b78 100644 --- a/typescript/shims-tsx.ts +++ b/typescript/shims-tsx.ts @@ -13,6 +13,12 @@ interface UIProps { bgap: number; vgap: number; hgap: number; + _rgap: number; + _lgap: number; + _tgap: number; + _bgap: number; + _hgap: number; + _vgap: number; inset: number | string; } From ced667c37123c7ce5f193c10a67c4368e85fb228 Mon Sep 17 00:00:00 2001 From: iapyang Date: Wed, 21 Sep 2022 17:19:02 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20lodash=E7=8E=AF=E5=A2=83=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/logic/logic.layout.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/core/logic/logic.layout.js b/src/core/logic/logic.layout.js index 94cac3b2f..a3911b04b 100644 --- a/src/core/logic/logic.layout.js +++ b/src/core/logic/logic.layout.js @@ -32,7 +32,7 @@ BI.VerticalLayoutLogic = BI.inherit(BI.Logic, { } else { layout = "bi.vtape"; } - return _.pickBy({ + return BI._pickBy({ type: layout, scrollable: o.scrollable, scrolly: o.scrolly, @@ -50,7 +50,7 @@ BI.VerticalLayoutLogic = BI.inherit(BI.Logic, { verticalAlign: o.verticalAlign, columnSize: o.columnSize, rowSize: o.rowSize - }, _.identity); + }, BI._identity); } }); @@ -89,7 +89,7 @@ BI.HorizontalLayoutLogic = BI.inherit(BI.Logic, { } else { layout = "bi.htape"; } - return _.pickBy({ + return BI._pickBy({ type: layout, scrollable: o.scrollable, scrolly: o.scrolly, @@ -107,7 +107,7 @@ BI.HorizontalLayoutLogic = BI.inherit(BI.Logic, { verticalAlign: o.verticalAlign, columnSize: o.columnSize, rowSize: o.rowSize - }, _.identity); + }, BI._identity); } }); @@ -143,7 +143,7 @@ BI.TableLayoutLogic = BI.inherit(BI.Logic, { } else { layout = "bi.window"; } - return _.pickBy({ + return BI._pickBy({ type: layout, scrollable: o.scrollable, scrolly: o.scrolly, @@ -157,7 +157,7 @@ BI.TableLayoutLogic = BI.inherit(BI.Logic, { verticalAlign: o.verticalAlign, columnSize: o.columnSize, rowSize: o.rowSize - }, _.identity); + }, BI._identity); } }); @@ -198,7 +198,7 @@ BI.HorizontalFillLayoutLogic = BI.inherit(BI.Logic, { } else { layout = "bi.htape"; } - return _.pickBy({ + return BI._pickBy({ type: layout, scrollable: o.scrollable, scrolly: o.scrolly, @@ -216,6 +216,6 @@ BI.HorizontalFillLayoutLogic = BI.inherit(BI.Logic, { verticalAlign: o.verticalAlign, columnSize: columnSize, rowSize: o.rowSize - }, _.identity); + }, BI._identity); } }); From 4b1e2b4458b9d13521b299a6de02ae199595db96 Mon Sep 17 00:00:00 2001 From: iapyang Date: Wed, 21 Sep 2022 17:20:58 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E6=94=B9=E9=94=99=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/logic/logic.layout.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/logic/logic.layout.js b/src/core/logic/logic.layout.js index a3911b04b..b34866f9a 100644 --- a/src/core/logic/logic.layout.js +++ b/src/core/logic/logic.layout.js @@ -50,7 +50,7 @@ BI.VerticalLayoutLogic = BI.inherit(BI.Logic, { verticalAlign: o.verticalAlign, columnSize: o.columnSize, rowSize: o.rowSize - }, BI._identity); + }, BI._.identity); } }); @@ -107,7 +107,7 @@ BI.HorizontalLayoutLogic = BI.inherit(BI.Logic, { verticalAlign: o.verticalAlign, columnSize: o.columnSize, rowSize: o.rowSize - }, BI._identity); + }, BI._.identity); } }); @@ -157,7 +157,7 @@ BI.TableLayoutLogic = BI.inherit(BI.Logic, { verticalAlign: o.verticalAlign, columnSize: o.columnSize, rowSize: o.rowSize - }, BI._identity); + }, BI._.identity); } }); @@ -216,6 +216,6 @@ BI.HorizontalFillLayoutLogic = BI.inherit(BI.Logic, { verticalAlign: o.verticalAlign, columnSize: columnSize, rowSize: o.rowSize - }, BI._identity); + }, BI._.identity); } }); From 59e0e182259f8f1bc8ddce335041b9336c0546c6 Mon Sep 17 00:00:00 2001 From: iapyang Date: Wed, 21 Sep 2022 17:22:01 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E6=94=B9=E9=94=99=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/logic/logic.layout.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/logic/logic.layout.js b/src/core/logic/logic.layout.js index b34866f9a..8b4abc85a 100644 --- a/src/core/logic/logic.layout.js +++ b/src/core/logic/logic.layout.js @@ -32,7 +32,7 @@ BI.VerticalLayoutLogic = BI.inherit(BI.Logic, { } else { layout = "bi.vtape"; } - return BI._pickBy({ + return BI._.pickBy({ type: layout, scrollable: o.scrollable, scrolly: o.scrolly, @@ -89,7 +89,7 @@ BI.HorizontalLayoutLogic = BI.inherit(BI.Logic, { } else { layout = "bi.htape"; } - return BI._pickBy({ + return BI._.pickBy({ type: layout, scrollable: o.scrollable, scrolly: o.scrolly, @@ -143,7 +143,7 @@ BI.TableLayoutLogic = BI.inherit(BI.Logic, { } else { layout = "bi.window"; } - return BI._pickBy({ + return BI._.pickBy({ type: layout, scrollable: o.scrollable, scrolly: o.scrolly, @@ -198,7 +198,7 @@ BI.HorizontalFillLayoutLogic = BI.inherit(BI.Logic, { } else { layout = "bi.htape"; } - return BI._pickBy({ + return BI._.pickBy({ type: layout, scrollable: o.scrollable, scrolly: o.scrolly,