Browse Source

Pull request #2645: BI-103212 fix: checkbox灰化时候选中状态颜色

Merge in VISUAL/fineui from ~DAILER/fineui:master to master

* commit 'f7c683bb03c8cabaff95f383e12f40c6472d4aaa':
  无JIRA  toast 支持直接传level
  无JIRA 删掉无用的getTime方法,重复了
  BI-103212 fix: checkbox灰化时候选中状态颜色
es6
Dailer 3 years ago
parent
commit
1ee48b6bf9
  1. 2
      bi.lessconfig.json
  2. 1
      src/base/foundation/message.js
  3. 14
      src/core/2.base.js
  4. 2
      typescript/base/foundation/message.ts

2
bi.lessconfig.json

@ -15,7 +15,7 @@
"@color-bi-background-active-radio-content": "#2C60DB", "@color-bi-background-active-radio-content": "#2C60DB",
"@color-bi-background-disabled-active-radio-content": "#D0D4DA", "@color-bi-background-disabled-active-radio-content": "#D0D4DA",
"@color-bi-background-disabled-active-radio-content-theme-dark": "#606479", "@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-disabled-active-checkbox-content-theme-dark": "#606479",
"@color-bi-background-tooltip-success": "#2E3A4D", "@color-bi-background-tooltip-success": "#2E3A4D",
"@color-bi-text-header-background": "#647185", "@color-bi-text-header-background": "#647185",

1
src/base/foundation/message.js

@ -22,6 +22,7 @@ BI.Msg = function () {
// BI.Msg.prompt(title, message, value, callback, min_width); // BI.Msg.prompt(title, message, value, callback, min_width);
}, },
toast: function (message, options, context) { toast: function (message, options, context) {
BI.isString(options) && (options = { level: options })
options = options || {}; options = options || {};
context = context || BI.Widget._renderEngine.createElement("body"); context = context || BI.Widget._renderEngine.createElement("body");
var level = options.level || "common"; var level = options.level || "common";

14
src/core/2.base.js

@ -735,20 +735,6 @@
BI[name] = _apply(name); BI[name] = _apply(name);
}); });
_.extend(BI, { _.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) { parseInt: function (number) {
var radix = 10; var radix = 10;

2
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 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 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 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
} }

Loading…
Cancel
Save