From f63e002e53752a1c961df73dfdec05f84ef23f34 Mon Sep 17 00:00:00 2001 From: zsmj Date: Mon, 18 Apr 2022 14:47:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?BI-103212=20fix:=20checkbox=E7=81=B0?= =?UTF-8?q?=E5=8C=96=E6=97=B6=E5=80=99=E9=80=89=E4=B8=AD=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bi.lessconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bi.lessconfig.json b/bi.lessconfig.json index d4042b18d..a5f1d669f 100644 --- a/bi.lessconfig.json +++ b/bi.lessconfig.json @@ -15,7 +15,7 @@ "@color-bi-background-active-radio-content": "#2C60DB", "@color-bi-background-disabled-active-radio-content": "#D0D4DA", "@color-bi-background-disabled-active-radio-content-theme-dark": "#606479", - "@color-bi-background-disabled-active-checkbox-content": "#D0D4DA", + "@color-bi-background-disabled-active-checkbox-content": "#FFFFFF", "@color-bi-background-disabled-active-checkbox-content-theme-dark": "#606479", "@color-bi-background-tooltip-success": "#2E3A4D", "@color-bi-text-header-background": "#647185", From 774d66c196b5b1d243d77ae38ad085664cd4277a Mon Sep 17 00:00:00 2001 From: zsmj Date: Mon, 18 Apr 2022 14:48:40 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=97=A0JIRA=20=E5=88=A0=E6=8E=89=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E7=9A=84getTime=E6=96=B9=E6=B3=95,=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/2.base.js | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/core/2.base.js b/src/core/2.base.js index 4a2a2df68..512a948a2 100644 --- a/src/core/2.base.js +++ b/src/core/2.base.js @@ -735,20 +735,6 @@ BI[name] = _apply(name); }); _.extend(BI, { - getTime: function () { - if (_global.performance && _global.performance.now) { - return _global.performance.now(); - } - if (_global.performance && _global.performance.webkitNow) { - return _global.performance.webkitNow(); - } - if (Date.now) { - return Date.now(); - } - return BI.getDate().getTime(); - - - }, parseInt: function (number) { var radix = 10; From 635ac250f44b236a8c17b663a2e552b34e381cc4 Mon Sep 17 00:00:00 2001 From: zsmj Date: Mon, 18 Apr 2022 14:56:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=97=A0JIRA=20=20toast=20=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E7=9B=B4=E6=8E=A5=E4=BC=A0level?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/foundation/message.js | 1 + typescript/base/foundation/message.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/base/foundation/message.js b/src/base/foundation/message.js index 860449ab4..156297c9d 100644 --- a/src/base/foundation/message.js +++ b/src/base/foundation/message.js @@ -22,6 +22,7 @@ BI.Msg = function () { // BI.Msg.prompt(title, message, value, callback, min_width); }, toast: function (message, options, context) { + BI.isString(options) && (options = { level: options }) options = options || {}; context = context || BI.Widget._renderEngine.createElement("body"); var level = options.level || "common"; diff --git a/typescript/base/foundation/message.ts b/typescript/base/foundation/message.ts index ce7d54c3a..63790d1cb 100644 --- a/typescript/base/foundation/message.ts +++ b/typescript/base/foundation/message.ts @@ -2,5 +2,5 @@ export type _msg = { alert: (title: string, message?: string | {[key: string]: any}, callback?: (result?: boolean)=>void) => void confirm: (title: string, message?: string | {[key: string]: any}, callback?: (result: boolean)=>void) => void prompt: (title: string, message?: string, value?: any, callback?: (result: string) => void, minWidth?: number) => void - toast: (message: string, options?: object, context?: HTMLElement) => void + toast: (message: string, options?: object | string, context?: HTMLElement) => void }