From 0695b9896688b51eb778a5d707284076f5e8fc98 Mon Sep 17 00:00:00 2001 From: Kobi Date: Wed, 19 May 2021 14:50:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?KERNEL-7828=20=E8=A1=A5=E5=85=85=E4=B8=80?= =?UTF-8?q?=E4=B8=8B=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/base/combination/tab.ts | 9 +++++++++ .../allvaluechooser/combo.allvaluechooser.ts | 2 ++ typescript/index.ts | 12 ++++++++++++ 3 files changed, 23 insertions(+) diff --git a/typescript/base/combination/tab.ts b/typescript/base/combination/tab.ts index 0469a2f595..1d16fc0c75 100644 --- a/typescript/base/combination/tab.ts +++ b/typescript/base/combination/tab.ts @@ -6,6 +6,15 @@ export declare class Tab extends Widget { static EVENT_CHANGE: string; + props: { + showIndex: any; + cardCreator: Function; + direction?: string; // top, bottom, left, right, custom + single?: boolean; // 是不是单页面 + logic?: any; + tab?: boolean; + } + setSelect(v: string | number, action?: Action, callback?: Function): void; removeTab(v: string | number): void; diff --git a/typescript/component/allvaluechooser/combo.allvaluechooser.ts b/typescript/component/allvaluechooser/combo.allvaluechooser.ts index 20b3affe1a..76ac5171d7 100644 --- a/typescript/component/allvaluechooser/combo.allvaluechooser.ts +++ b/typescript/component/allvaluechooser/combo.allvaluechooser.ts @@ -3,6 +3,8 @@ import { AbstractAllValueChooser } from "./abstract.allvaluechooser"; export declare class AllValueChooserCombo extends AbstractAllValueChooser { static xtype: string; + static EVENT_CONFIRM: string; + getAllValue(): any; populate(...args: any[]): void; diff --git a/typescript/index.ts b/typescript/index.ts index fbfed1af78..cc436ff666 100644 --- a/typescript/index.ts +++ b/typescript/index.ts @@ -164,6 +164,10 @@ import { BlankIconTextItem } from './base/single/button/listitem/blankicontextit import { Broadcasts, Layers } from "./base/base"; import { BroadcastController } from "./core/controller/controller.broadcast"; import { Pager } from "./base/pager/pager"; +import { TimeInterval } from './widget/timeinterval/timeinterval'; +import { DynamicDateTimePane } from './widget/datetimepane/datetimepane'; +import { SingleSelectInsertList } from './widget/singleselect/singleselectlist.insert'; +import { MultiSelectTree } from './widget/multiselecttree/multiselecttree'; export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils { @@ -335,6 +339,10 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils { AdaptiveLayout: typeof AdaptiveLayout; HexColorChooserPopup: typeof HexColorChooserPopup; BlankIconTextItem: typeof BlankIconTextItem; + TimeInterval: typeof TimeInterval; + DynamicDateTimePane: typeof TimeInterval; + SingleSelectInsertList: typeof TimeInterval; + MultiSelectTree: typeof TimeInterval; } export default { @@ -506,4 +514,8 @@ export { AdaptiveLayout, HexColorChooserPopup, BlankIconTextItem, + TimeInterval, + DynamicDateTimePane, + SingleSelectInsertList, + MultiSelectTree, }; From 42c5bef1cd9718bcd899ffde26675b4e15df8e05 Mon Sep 17 00:00:00 2001 From: Kobi Date: Wed, 19 May 2021 14:56:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?KERNEL-7828=20=E8=A1=A5=E5=85=85=E4=B8=80?= =?UTF-8?q?=E4=B8=8B=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/base/combination/tab.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/typescript/base/combination/tab.ts b/typescript/base/combination/tab.ts index 1d16fc0c75..6d521772cf 100644 --- a/typescript/base/combination/tab.ts +++ b/typescript/base/combination/tab.ts @@ -8,11 +8,13 @@ export declare class Tab extends Widget { props: { showIndex: any; - cardCreator: Function; - direction?: string; // top, bottom, left, right, custom + cardCreator: (v: any) => Obj; + direction?: 'top' | 'bottom' | 'left' | 'right' | 'custom'; // top, bottom, left, right, custom single?: boolean; // 是不是单页面 - logic?: any; - tab?: boolean; + logic?: { + dynamic: boolean; + }; + tab?: any[]; } setSelect(v: string | number, action?: Action, callback?: Function): void; From ca851d37e5994d3245e266aea4c925a8a1a378f2 Mon Sep 17 00:00:00 2001 From: Kobi Date: Wed, 19 May 2021 14:57:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?KERNEL-7828=20=E8=A1=A5=E5=85=85=E4=B8=80?= =?UTF-8?q?=E4=B8=8B=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/index.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/typescript/index.ts b/typescript/index.ts index cc436ff666..5a35dde5a5 100644 --- a/typescript/index.ts +++ b/typescript/index.ts @@ -340,9 +340,9 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils { HexColorChooserPopup: typeof HexColorChooserPopup; BlankIconTextItem: typeof BlankIconTextItem; TimeInterval: typeof TimeInterval; - DynamicDateTimePane: typeof TimeInterval; - SingleSelectInsertList: typeof TimeInterval; - MultiSelectTree: typeof TimeInterval; + DynamicDateTimePane: typeof DynamicDateTimePane; + SingleSelectInsertList: typeof SingleSelectInsertList; + MultiSelectTree: typeof MultiSelectTree; } export default {