Merge branch 'master' of ssh://code.fineres.com:7999/~windy/fui

typescript/core/controller/controller.layer.ts

@@ -1,5 +1,23 @@
-import { Controller } from '../controller';
+import { Controller } from './controller';
 
 export declare class LayerController extends Controller {
-  make(name: string, container: , op, context) 
+    make<T>(name: string, container: any, op: any, context: any): T;
+
+    create<T>(name: string, from: any, op: any, context: any): T;
+
+    hide(name: string, callback: boolean): LayerController;
+
+    show(name: string, callback: boolean): LayerController;
+
+    isVisible(name: string): boolean;
+
+    add(name: string, layer: any, layout: any): LayerController;
+
+    get<T>(name: string): T;
+
+    has(name: string): boolean;
+
+    remove(name: string): LayerController;
+
+    removeAll(): LayerController;
 }

typescript/core/controller/controller.ts

@@ -0,0 +1,5 @@
+import { OB } from "../ob";
+
+export declare class Controller extends OB {
+    static EVENT_CHANGE: string;
+}

typescript/index.ts

@@ -145,6 +145,8 @@ import { _msg } from './base/foundation/message';
 import { _web } from './core/platform/web';
 import { DynamicYearMonthPopup } from './widget/yearmonth/popup.yearmonth';
 import { _utils } from './core/utils';
+import { Controller } from "./core/controller/controller";
+import { LayerController } from "./core/controller/controller.layer";
 
 
 export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
@@ -162,6 +164,8 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     Action: typeof Action;
     ActionFactory: typeof ActionFactory;
     ShowAction: typeof ShowAction;
+    Controller: typeof Controller;
+    LayerController: typeof LayerController;
     Behavior: typeof Behavior;
     BehaviorFactory: typeof BehaviorFactory;
     HighlightBehavior: typeof HighlightBehavior;
@@ -337,6 +341,8 @@ export {
     Action,
     ActionFactory,
     ShowAction,
+    Controller,
+    LayerController,
     Behavior,
     BehaviorFactory,
     RedMarkBehavior,