From c06757c6c8fe16ac752dbc2fa6327d8b6b0d5ea0 Mon Sep 17 00:00:00 2001 From: Kira Date: Fri, 17 Jan 2020 10:52:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1refactor:=20?= =?UTF-8?q?basic=20button=E4=BA=8B=E4=BB=B6=E5=A3=B0=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- typescript/base/single/button/button.basic.ts | 4 ++++ typescript/index.ts | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/typescript/base/single/button/button.basic.ts b/typescript/base/single/button/button.basic.ts index 294ed0b0e8..4aada2a99e 100644 --- a/typescript/base/single/button/button.basic.ts +++ b/typescript/base/single/button/button.basic.ts @@ -31,3 +31,7 @@ export interface _BasicButton extends _Single { isDisableSelected(): boolean; } + +export interface _BasicButtonStatic { + EVENT_CHANGE: "BasicButton.EVENT_CHANGE"; +} diff --git a/typescript/index.ts b/typescript/index.ts index 5e66099839..61146c7cbc 100644 --- a/typescript/index.ts +++ b/typescript/index.ts @@ -6,7 +6,7 @@ import { _func } from "./core/func"; import { _Widget, _WidgetStatic } from "./core/widget"; import { _Single } from "./base/single/single"; import { _base } from "./core/base"; -import { _BasicButton } from "./base/single/button/button.basic"; +import { _BasicButton, _BasicButtonStatic } from "./base/single/button/button.basic"; import { _Trigger } from "./base/single/trigger/trigger"; import { _Action, _ActionFactory } from "./core/action/action"; import { _ShowAction } from "./core/action/action.show"; @@ -26,7 +26,7 @@ export interface BI extends _func, _i18n, _base { OB: ClassConstructor<_OB>; Widget: ClassConstructor<_Widget> & _WidgetStatic; Single: ClassConstructor<_Single>; - BasicButton: ClassConstructor<_BasicButton>; + BasicButton: ClassConstructor<_BasicButton> & _BasicButtonStatic; Trigger: ClassConstructor<_Trigger>; Action: ClassConstructor<_Action>; ActionFactory: ClassConstructor<_ActionFactory>; From 91fe4a03fcafcfdda2b2b720f6c60ac1d7aa34f5 Mon Sep 17 00:00:00 2001 From: Kira Date: Fri, 17 Jan 2020 12:05:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=E5=8F=98=E9=87=8F=E5=A3=B0?= =?UTF-8?q?=E6=98=8E=E6=94=B9=E6=88=90string?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- typescript/base/pane.ts | 4 ++-- typescript/base/single/button/button.basic.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/typescript/base/pane.ts b/typescript/base/pane.ts index 1d8acd8bf1..75c3fc9f0f 100644 --- a/typescript/base/pane.ts +++ b/typescript/base/pane.ts @@ -8,5 +8,5 @@ export interface _Pane extends _Widget { } export interface _PaneStatic { - EVENT_LOADED: "EVENT_LOADED"; -} \ No newline at end of file + EVENT_LOADED: string; +} diff --git a/typescript/base/single/button/button.basic.ts b/typescript/base/single/button/button.basic.ts index 4aada2a99e..acdb143d2c 100644 --- a/typescript/base/single/button/button.basic.ts +++ b/typescript/base/single/button/button.basic.ts @@ -33,5 +33,5 @@ export interface _BasicButton extends _Single { } export interface _BasicButtonStatic { - EVENT_CHANGE: "BasicButton.EVENT_CHANGE"; + EVENT_CHANGE: string; }