Browse Source

Merge pull request #208515 in DEC/fineui from release/11.0 to bugfix/11.0

* commit 'eba0c8b7292ff95197b42efca65f0715bc443af3':
  BI-117684 视觉
  REPORT-83708 fix: worker对safari浏览器12以下版本做处理
research/test
superman 2 years ago
parent
commit
34ed703d34
  1. 12
      src/core/platform/web/function.js
  2. 1
      src/less/base/single/button/button.less
  3. 1
      src/less/lib/theme.less
  4. 1
      typescript/core/platform/web/function.ts
  5. 3
      typescript/core/worker/controller/worker.main_thread.controller.ts

12
src/core/platform/web/function.js

@ -125,5 +125,17 @@ BI._.extend(BI, {
} }
} }
return false; return false;
},
getSafariVersion: function () {
if (!_global.navigator) {
return 0;
}
var agent = navigator.userAgent.toLowerCase();
var version = agent.match(/version\/([\d.]+)/);
if (version && version[1]) {
return version[1] * 1;
}
return 0;
} }
}); });

1
src/less/base/single/button/button.less

@ -502,6 +502,7 @@ body .bi-button, #body .bi-button {
&.button-error.disabled, &.button-error.disabled,
&.button-warning.disabled { &.button-warning.disabled {
&, &.base-disabled { &, &.base-disabled {
color: @color-bi-text-disabled-button-theme-dark !important;
border-color: @color-bi-border-dark-gray-line-theme-dark !important; border-color: @color-bi-border-dark-gray-line-theme-dark !important;
background-color: fade(@color-bi-background-disabled-button-theme-dark, 20%) !important; background-color: fade(@color-bi-background-disabled-button-theme-dark, 20%) !important;
@ieColor: argb(fade(@color-bi-background-disabled-button-theme-dark, 20%)); @ieColor: argb(fade(@color-bi-background-disabled-button-theme-dark, 20%));

1
src/less/lib/theme.less

@ -125,6 +125,7 @@
@color-bi-text-error-clear-button: @color-bi-text-failure; @color-bi-text-error-clear-button: @color-bi-text-failure;
@color-bi-text-error-ghost-button: @color-bi-text-failure; @color-bi-text-error-ghost-button: @color-bi-text-failure;
@color-bi-text-disabled-button: @color-bi-text-disabled; @color-bi-text-disabled-button: @color-bi-text-disabled;
@color-bi-text-disabled-button-theme-dark: @color-bi-text-disabled-theme-dark;
@color-bi-background-disabled-button: @color-bi-background-light-disabled; @color-bi-background-disabled-button: @color-bi-background-light-disabled;
@color-bi-border-disabled-button: @color-bi-border-disabled; @color-bi-border-disabled-button: @color-bi-border-disabled;
@color-bi-text-disabled-ignore-button: @color-bi-text-disabled; @color-bi-text-disabled-ignore-button: @color-bi-text-disabled;

1
typescript/core/platform/web/function.ts

@ -9,4 +9,5 @@ export type _function = {
isMac: () => boolean; isMac: () => boolean;
isWindows: () => boolean; isWindows: () => boolean;
isSupportCss3: (style: any) => boolean; isSupportCss3: (style: any) => boolean;
getSafariVersion: () => number;
} }

3
typescript/core/worker/controller/worker.main_thread.controller.ts

@ -10,9 +10,10 @@ export class WorkerMainThreadController extends WorkerBaseController {
/** /**
* new Worker, Wroker Class * new Worker, Wroker Class
* Blob url支持度问题 Safari 12
*/ */
public canNewWorker: boolean = WorkerMainThreadController.hasWorkerClass; public canNewWorker: boolean = WorkerMainThreadController.hasWorkerClass && !(BI.isSafari() && BI.getSafariVersion() < 12);
/** /**
* 线 new Worker * 线 new Worker

Loading…
Cancel
Save