Browse Source

Merge remote-tracking branch 'dec-fineui/release/11.0'

# Conflicts:
#	packages/fineui/src/core/utils/dom.js
research/test
Treecat 1 year ago
parent
commit
9e5895f11b
  1. 2
      packages/fineui/bi.lessconfig.json
  2. 4
      packages/fineui/src/core/utils/dom.js

2
packages/fineui/bi.lessconfig.json

@ -28,7 +28,7 @@
"@color-bi-background-disabled-active-radio-content": "#FFFFFF", "@color-bi-background-disabled-active-radio-content": "#FFFFFF",
"@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": "#FFFFFF", "@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": "rgba(255, 255, 255, 0.24)",
"@color-bi-background-tooltip-success": "#3F506A", "@color-bi-background-tooltip-success": "#3F506A",
"@color-bi-background-tooltip-failure": "#E65251", "@color-bi-background-tooltip-failure": "#E65251",
"@color-bi-border-tooltip-success": "#2E3A4D", "@color-bi-border-tooltip-success": "#2E3A4D",

4
packages/fineui/src/core/utils/dom.js

@ -1,9 +1,9 @@
/** /**
* 对DOM操作的通用函数 * 对DOM操作的通用函数
*/ */
import { Widget } from "../4.widget";
import { each, isEmpty, isNull, isNotNull } from "../2.base";
import $ from "jquery"; import $ from "jquery";
import { each, isEmpty, isNotNull, isNull } from "../2.base";
import { Widget } from "../4.widget";
import { isIE } from "./../platform"; import { isIE } from "./../platform";
export function ready(fn) { export function ready(fn) {

Loading…
Cancel
Save