From b9513348459a01d88099b2cdec3cd044d498ef27 Mon Sep 17 00:00:00 2001 From: "Roy.Liu" Date: Wed, 23 Dec 2020 16:19:00 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- typescript/base/foundation/message.ts | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 typescript/base/foundation/message.ts diff --git a/typescript/base/foundation/message.ts b/typescript/base/foundation/message.ts new file mode 100644 index 000000000..40aae2129 --- /dev/null +++ b/typescript/base/foundation/message.ts @@ -0,0 +1,6 @@ +export type _msg = { + alert: (title: string, message?: string, callback?: (result?: boolean)=>void) => void + confirm: (title: string, message?: string, callback?: (result: boolean)=>void) => void + prompt: (title: string, message?: string, value?: any, callback?: (result: string) => void, min_width?: number) => void + toast: (message: string, options?: object, context?: HTMLElement ) => void +} \ No newline at end of file From 349e57cbe7f2e6682f773e9962c811a0031619c8 Mon Sep 17 00:00:00 2001 From: "Roy.Liu" Date: Wed, 23 Dec 2020 17:15:12 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=A1=A5=E5=85=85BI.Msg=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- typescript/base/foundation/message.ts | 2 +- typescript/index.ts | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/typescript/base/foundation/message.ts b/typescript/base/foundation/message.ts index 40aae2129..40c79cc0e 100644 --- a/typescript/base/foundation/message.ts +++ b/typescript/base/foundation/message.ts @@ -1,6 +1,6 @@ export type _msg = { alert: (title: string, message?: string, callback?: (result?: boolean)=>void) => void confirm: (title: string, message?: string, callback?: (result: boolean)=>void) => void - prompt: (title: string, message?: string, value?: any, callback?: (result: string) => void, min_width?: number) => void + prompt: (title: string, message?: string, value?: any, callback?: (result: string) => void, minWidth?: number) => void toast: (message: string, options?: object, context?: HTMLElement ) => void } \ No newline at end of file diff --git a/typescript/index.ts b/typescript/index.ts index cb8f6436d..fc804b880 100644 --- a/typescript/index.ts +++ b/typescript/index.ts @@ -141,6 +141,7 @@ import { EditorIconCheckCombo } from "./case/combo/editoriconcheckcombo/combo.ed import { IconTextValueCombo } from './case/combo/icontextvaluecombo/combo.icontextvalue'; import { ListView } from './base/list/listview'; import { FloatCenterLayout } from './core/wrapper/layout/middle/middle.float.center'; +import { _msg } from './base/foundation/message' type ClassConstructor = T & { @@ -297,6 +298,7 @@ export interface BI extends _func, _i18n, _base, _inject, _var { IconTextValueCombo: typeof IconTextValueCombo; ListView: typeof ListView; FloatCenterLayout: typeof FloatCenterLayout; + Msg: _msg; } export default { From 986d09a6e5894234464e9b8ce8ce5ff55b76d30a Mon Sep 17 00:00:00 2001 From: "Roy.Liu" Date: Wed, 23 Dec 2020 19:16:14 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=A1=A5=E5=85=85BI.Msg=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- typescript/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/typescript/index.ts b/typescript/index.ts index fc804b880..eccf63658 100644 --- a/typescript/index.ts +++ b/typescript/index.ts @@ -141,7 +141,7 @@ import { EditorIconCheckCombo } from "./case/combo/editoriconcheckcombo/combo.ed import { IconTextValueCombo } from './case/combo/icontextvaluecombo/combo.icontextvalue'; import { ListView } from './base/list/listview'; import { FloatCenterLayout } from './core/wrapper/layout/middle/middle.float.center'; -import { _msg } from './base/foundation/message' +import { _msg } from './base/foundation/message'; type ClassConstructor = T & { From dfff4c0d1a47a678b9edd535f7391fc9c83b8aa7 Mon Sep 17 00:00:00 2001 From: "Roy.Liu" Date: Wed, 23 Dec 2020 19:30:29 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=A1=A5=E5=85=85web/function?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- typescript/core/platform/web/function.ts | 12 ++++++++++++ typescript/core/platform/web/index.ts | 6 ++++++ typescript/index.ts | 3 ++- 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 typescript/core/platform/web/function.ts create mode 100644 typescript/core/platform/web/index.ts diff --git a/typescript/core/platform/web/function.ts b/typescript/core/platform/web/function.ts new file mode 100644 index 000000000..28aace824 --- /dev/null +++ b/typescript/core/platform/web/function.ts @@ -0,0 +1,12 @@ +export type _function = { + isIE: () => boolean; + getIEVersion: () => number; + isEdge: () => boolean; + isChrome: () => boolean; + isFireFox: () => boolean; + isOpera: () => boolean; + isSafari: () => boolean; + isMac: () => boolean; + isWindows: () => boolean; + isSupportCss3: (style: string) => boolean; +} \ No newline at end of file diff --git a/typescript/core/platform/web/index.ts b/typescript/core/platform/web/index.ts new file mode 100644 index 000000000..469e247a1 --- /dev/null +++ b/typescript/core/platform/web/index.ts @@ -0,0 +1,6 @@ +import { _function } from "./function"; + + +export interface _web extends _function { + +} \ No newline at end of file diff --git a/typescript/index.ts b/typescript/index.ts index eccf63658..18b0d0de5 100644 --- a/typescript/index.ts +++ b/typescript/index.ts @@ -142,6 +142,7 @@ import { IconTextValueCombo } from './case/combo/icontextvaluecombo/combo.iconte import { ListView } from './base/list/listview'; import { FloatCenterLayout } from './core/wrapper/layout/middle/middle.float.center'; import { _msg } from './base/foundation/message'; +import { _web } from './core/platform/web'; type ClassConstructor = T & { @@ -151,7 +152,7 @@ type ClassConstructor = T & { readonly xtype: string; } -export interface BI extends _func, _i18n, _base, _inject, _var { +export interface BI extends _func, _i18n, _base, _inject, _var, _web { OB: ClassConstructor<_OB>; Plugin: _Plugin; Widget: ClassConstructor<_Widget> & _WidgetStatic; From bf0995c5cc2af61d6a5a38e4d26a79e9c7e7429d Mon Sep 17 00:00:00 2001 From: "Roy.Liu" Date: Thu, 24 Dec 2020 10:07:22 +0800 Subject: [PATCH 5/6] change --- typescript/core/platform/web/function.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/typescript/core/platform/web/function.ts b/typescript/core/platform/web/function.ts index 28aace824..95b2d29ef 100644 --- a/typescript/core/platform/web/function.ts +++ b/typescript/core/platform/web/function.ts @@ -8,5 +8,5 @@ export type _function = { isSafari: () => boolean; isMac: () => boolean; isWindows: () => boolean; - isSupportCss3: (style: string) => boolean; + isSupportCss3: (style: any) => boolean; } \ No newline at end of file From a0432ca461ebe573856dfc82b63804b6432a55cb Mon Sep 17 00:00:00 2001 From: "Roy.Liu" Date: Thu, 24 Dec 2020 15:51:23 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- typescript/index.ts | 6 ------ 1 file changed, 6 deletions(-) diff --git a/typescript/index.ts b/typescript/index.ts index b4e5a14dd..75e811f3a 100644 --- a/typescript/index.ts +++ b/typescript/index.ts @@ -141,12 +141,9 @@ import { EditorIconCheckCombo } from "./case/combo/editoriconcheckcombo/combo.ed import { IconTextValueCombo } from './case/combo/icontextvaluecombo/combo.icontextvalue'; import { ListView } from './base/list/listview'; import { FloatCenterLayout } from './core/wrapper/layout/middle/middle.float.center'; -<<<<<<< HEAD import { _msg } from './base/foundation/message'; import { _web } from './core/platform/web'; -======= import { DynamicYearMonthPopup } from './widget/yearmonth/popup.yearmonth'; ->>>>>>> 6719cf4a69338c554f8e06c51d91a74c6b66e71e type ClassConstructor = T & { @@ -303,11 +300,8 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web { IconTextValueCombo: typeof IconTextValueCombo; ListView: typeof ListView; FloatCenterLayout: typeof FloatCenterLayout; -<<<<<<< HEAD Msg: _msg; -======= DynamicYearMonthPopup: typeof DynamicYearMonthPopup; ->>>>>>> 6719cf4a69338c554f8e06c51d91a74c6b66e71e } export default {