From cca83d82083e9cc6bc01d9fd88fa437c547e307d Mon Sep 17 00:00:00 2001
From: dailer <Dailer@fanruan.com>
Date: Fri, 19 Nov 2021 11:39:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?update=20=E7=B1=BB=E5=9E=8B=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 typescript/base/combination/combo.ts | 1 +
 typescript/index.ts                  | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/typescript/base/combination/combo.ts b/typescript/base/combination/combo.ts
index ee80cfeea..38191df7a 100644
--- a/typescript/base/combination/combo.ts
+++ b/typescript/base/combination/combo.ts
@@ -22,6 +22,7 @@ export declare class Combo extends Widget {
         container?: any; // popupview放置的容器，默认为this.element
         isDefaultInit?: boolean;
         destroyWhenHide?: boolean;
+        hideWhenBlur?: boolean;
         hideWhenAnotherComboOpen?: boolean;
         isNeedAdjustHeight?: boolean; // 是否需要高度调整
         isNeedAdjustWidth?: boolean;
diff --git a/typescript/index.ts b/typescript/index.ts
index 6e6131a7d..f21e573a1 100644
--- a/typescript/index.ts
+++ b/typescript/index.ts
@@ -44,6 +44,9 @@ import { _inject } from "./core/inject";
 import { Layout } from "./core/wrapper/layout";
 import { AbsoluteLayout } from "./core/wrapper/layout/layout.absolute";
 import { HTapeLayout, VTapeLayout } from "./core/wrapper/layout/layout.tape";
+import {HorizontalFillLayout} from "./core/wrapper/layout/fill/fill.horizontal";
+import {VerticalFillLayout} from "./core/wrapper/layout/fill/fill.vertical";
+import {FloatHorizontalFillLayout} from "./core/wrapper/layout/fill/float.fill.horizontal";
 import { VerticalLayout } from "./core/wrapper/layout/layout.vertical";
 import { DefaultLayout } from "./core/wrapper/layout/layout.default";
 import { DownListCombo } from "./widget/downlist/combo.downlist";
@@ -243,6 +246,9 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     DownListCombo: typeof DownListCombo;
     Iframe: typeof Iframe;
     AbsoluteLayout: typeof AbsoluteLayout;
+    HorizontalFillLayout: typeof HorizontalFillLayout;
+    VerticalFillLayout: typeof VerticalFillLayout;
+    FloatHorizontalFillLayout: typeof FloatHorizontalFillLayout;
     VerticalLayout: typeof VerticalLayout;
     DefaultLayout: typeof DefaultLayout;
     Input: typeof Input;
@@ -389,6 +395,9 @@ export {
     HorizontalAdaptLayout,
     FloatLeftLayout,
     FloatRightLayout,
+    HorizontalFillLayout,
+    VerticalFillLayout,
+    FloatHorizontalFillLayout,
     VerticalLayout,
     AbsoluteLayout,
     DefaultLayout,

From 384e1c2c7f04b28c3329cd5e4850bd977f0f7c16 Mon Sep 17 00:00:00 2001
From: dailer <Dailer@fanruan.com>
Date: Fri, 19 Nov 2021 11:53:12 +0800
Subject: [PATCH 2/2] update

---
 typescript/core/wrapper/layout/fill/fill.horizontal.ts | 5 +++++
 typescript/core/wrapper/layout/fill/fill.vertical.ts   | 5 +++++
 typescript/index.ts                                    | 3 ---
 3 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 typescript/core/wrapper/layout/fill/fill.horizontal.ts
 create mode 100644 typescript/core/wrapper/layout/fill/fill.vertical.ts

diff --git a/typescript/core/wrapper/layout/fill/fill.horizontal.ts b/typescript/core/wrapper/layout/fill/fill.horizontal.ts
new file mode 100644
index 000000000..378f402ad
--- /dev/null
+++ b/typescript/core/wrapper/layout/fill/fill.horizontal.ts
@@ -0,0 +1,5 @@
+import { Layout } from "../../layout";
+
+export declare class HorizontalFillLayout extends Layout {
+    static xtype: string;
+}
diff --git a/typescript/core/wrapper/layout/fill/fill.vertical.ts b/typescript/core/wrapper/layout/fill/fill.vertical.ts
new file mode 100644
index 000000000..809b34c36
--- /dev/null
+++ b/typescript/core/wrapper/layout/fill/fill.vertical.ts
@@ -0,0 +1,5 @@
+import { Layout } from "../../layout";
+
+export declare class VerticalFillLayout extends Layout {
+    static xtype: string;
+}
diff --git a/typescript/index.ts b/typescript/index.ts
index f21e573a1..27dc12099 100644
--- a/typescript/index.ts
+++ b/typescript/index.ts
@@ -46,7 +46,6 @@ import { AbsoluteLayout } from "./core/wrapper/layout/layout.absolute";
 import { HTapeLayout, VTapeLayout } from "./core/wrapper/layout/layout.tape";
 import {HorizontalFillLayout} from "./core/wrapper/layout/fill/fill.horizontal";
 import {VerticalFillLayout} from "./core/wrapper/layout/fill/fill.vertical";
-import {FloatHorizontalFillLayout} from "./core/wrapper/layout/fill/float.fill.horizontal";
 import { VerticalLayout } from "./core/wrapper/layout/layout.vertical";
 import { DefaultLayout } from "./core/wrapper/layout/layout.default";
 import { DownListCombo } from "./widget/downlist/combo.downlist";
@@ -248,7 +247,6 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     AbsoluteLayout: typeof AbsoluteLayout;
     HorizontalFillLayout: typeof HorizontalFillLayout;
     VerticalFillLayout: typeof VerticalFillLayout;
-    FloatHorizontalFillLayout: typeof FloatHorizontalFillLayout;
     VerticalLayout: typeof VerticalLayout;
     DefaultLayout: typeof DefaultLayout;
     Input: typeof Input;
@@ -397,7 +395,6 @@ export {
     FloatRightLayout,
     HorizontalFillLayout,
     VerticalFillLayout,
-    FloatHorizontalFillLayout,
     VerticalLayout,
     AbsoluteLayout,
     DefaultLayout,