Browse Source

Merge remote-tracking branch 'origin/master'

es6
imp 3 years ago
parent
commit
c72715b13c
  1. 2
      package.json
  2. 1
      typescript/base/combination/combo.ts
  3. 5
      typescript/core/wrapper/layout/fill/fill.horizontal.ts
  4. 5
      typescript/core/wrapper/layout/fill/fill.vertical.ts
  5. 6
      typescript/index.ts

2
package.json

@ -1,6 +1,6 @@
{ {
"name": "fineui", "name": "fineui",
"version": "2.0.20211119102238", "version": "2.0.20211119161234",
"description": "fineui", "description": "fineui",
"main": "dist/fineui.min.js", "main": "dist/fineui.min.js",
"types": "dist/lib/index.d.ts", "types": "dist/lib/index.d.ts",

1
typescript/base/combination/combo.ts

@ -22,6 +22,7 @@ export declare class Combo extends Widget {
container?: any; // popupview放置的容器,默认为this.element container?: any; // popupview放置的容器,默认为this.element
isDefaultInit?: boolean; isDefaultInit?: boolean;
destroyWhenHide?: boolean; destroyWhenHide?: boolean;
hideWhenBlur?: boolean;
hideWhenAnotherComboOpen?: boolean; hideWhenAnotherComboOpen?: boolean;
isNeedAdjustHeight?: boolean; // 是否需要高度调整 isNeedAdjustHeight?: boolean; // 是否需要高度调整
isNeedAdjustWidth?: boolean; isNeedAdjustWidth?: boolean;

5
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;
}

5
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;
}

6
typescript/index.ts

@ -44,6 +44,8 @@ import { _inject } from "./core/inject";
import { Layout } from "./core/wrapper/layout"; import { Layout } from "./core/wrapper/layout";
import { AbsoluteLayout } from "./core/wrapper/layout/layout.absolute"; import { AbsoluteLayout } from "./core/wrapper/layout/layout.absolute";
import { HTapeLayout, VTapeLayout } from "./core/wrapper/layout/layout.tape"; 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 { VerticalLayout } from "./core/wrapper/layout/layout.vertical";
import { DefaultLayout } from "./core/wrapper/layout/layout.default"; import { DefaultLayout } from "./core/wrapper/layout/layout.default";
import { DownListCombo } from "./widget/downlist/combo.downlist"; 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; DownListCombo: typeof DownListCombo;
Iframe: typeof Iframe; Iframe: typeof Iframe;
AbsoluteLayout: typeof AbsoluteLayout; AbsoluteLayout: typeof AbsoluteLayout;
HorizontalFillLayout: typeof HorizontalFillLayout;
VerticalFillLayout: typeof VerticalFillLayout;
VerticalLayout: typeof VerticalLayout; VerticalLayout: typeof VerticalLayout;
DefaultLayout: typeof DefaultLayout; DefaultLayout: typeof DefaultLayout;
Input: typeof Input; Input: typeof Input;
@ -389,6 +393,8 @@ export {
HorizontalAdaptLayout, HorizontalAdaptLayout,
FloatLeftLayout, FloatLeftLayout,
FloatRightLayout, FloatRightLayout,
HorizontalFillLayout,
VerticalFillLayout,
VerticalLayout, VerticalLayout,
AbsoluteLayout, AbsoluteLayout,
DefaultLayout, DefaultLayout,

Loading…
Cancel
Save