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/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 6e6131a7d..27dc12099 100644 --- a/typescript/index.ts +++ b/typescript/index.ts @@ -44,6 +44,8 @@ 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 { VerticalLayout } from "./core/wrapper/layout/layout.vertical"; import { DefaultLayout } from "./core/wrapper/layout/layout.default"; import { DownListCombo } from "./widget/downlist/combo.downlist"; @@ -243,6 +245,8 @@ 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; VerticalLayout: typeof VerticalLayout; DefaultLayout: typeof DefaultLayout; Input: typeof Input; @@ -389,6 +393,8 @@ export { HorizontalAdaptLayout, FloatLeftLayout, FloatRightLayout, + HorizontalFillLayout, + VerticalFillLayout, VerticalLayout, AbsoluteLayout, DefaultLayout,