Browse Source

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

* commit 'dc3c2a29804f905aacc5a97074e1a0db13cda959':
  无JIRA 同步
  auto upgrade version to 2.0.20220616223849
  无JIRA任务 simple
  auto upgrade version to 2.0.20220616171423
  无JIRA fix: 背景色不能遮住线,改为:after
  auto upgrade version to 2.0.20220615230525
  auto upgrade version to 2.0.20220615223521
  无jira任务 simple样式
  BI-107564 fix: 【6.0一轮冒烟】平台深色,目录的搜索提示依旧是黑色看不清
  auto upgrade version to 2.0.20220615202341
  auto upgrade version to 2.0.20220615183423
  BI-107651 边框高亮
master
superman 2 years ago
parent
commit
4ceb07056c
  1. 6
      bi.lessconfig.json
  2. 2
      package.json
  3. 4
      src/case/trigger/trigger.editor.js
  4. 18
      src/less/base/tree/tree.expander.less
  5. 9
      src/less/theme/dark.less
  6. 4
      src/widget/datetime/datetime.combo.js
  7. 4
      src/widget/numberinterval/numberinterval.js

6
bi.lessconfig.json

@ -12,10 +12,13 @@
"@border-color-dark-line": "#2E3A4D",
"@color-sliver-theme-dark": "#363E55",
"@border-color-disabled": "rgba(9, 30, 64, 0.07)",
"@font-color-normal": "#091E40",
"@font-color-gray": "rgba(9, 30, 64, 0.9)",
"@font-color-light-gray": "rgba(9, 30, 64, 0.66)",
"@font-color-tips": "rgba(9, 30, 64, 0.47)",
"@font-color-disabled": "rgba(9, 30, 64, 0.25)",
"@background-color-normal": "#EEF1F6",
"@color-bi-background-active-radio": "transparent",
"@color-bi-border-radio": "rgba(9, 30, 64, 0.37)",
"@color-bi-border-disabled-radio": "rgba(9, 30, 64, 0.19)",
@ -35,6 +38,5 @@
"@color-bi-color-toast-warning": "#FAAA39",
"@color-bi-color-toast-error": "#E65251",
"@color-bi-color-toast-normal": "#2C60DB",
"@color-bi-color-toast-text": "#000A19",
"@color-bi-color-toast-shadow": "rgba(9, 30, 64, 0.16)"
"@color-bi-color-toast-text": "#000A19"
}

2
package.json

@ -1,6 +1,6 @@
{
"name": "fineui",
"version": "2.0.20220615141348",
"version": "2.0.20220616223849",
"description": "fineui",
"main": "dist/fineui.min.js",
"types": "dist/lib/index.d.ts",

4
src/case/trigger/trigger.editor.js

@ -6,10 +6,10 @@
* @extends BI.Trigger
*/
BI.EditorTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
_defaultConfig: function (config) {
var conf = BI.EditorTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-editor-trigger bi-border bi-border-radius",
baseCls: (conf.baseCls || "") + " bi-editor-trigger bi-border-radius " + (config.simple ? "bi-border-bottom" : "bi-border"),
height: 24,
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,

18
src/less/base/tree/tree.expander.less

@ -3,40 +3,34 @@
.bi-tree-expander-popup.line {
&:before {
&:after {
border-left: 1px dashed @border-color-dark-gray-line;
position: absolute;
content: "";
height: 100%;
left: -1px;
top: 0;
}
&.solid:before {
&.solid:after {
border-left: 1px solid @border-color-dark-gray-line;
position: absolute;
content: "";
height: 100%;
left: -1px;
}
}
.bi-theme-dark {
.bi-tree-expander-popup.line {
&:before {
&:after {
border-left: 1px dashed @border-color-dark-gray-line-theme-dark;
position: absolute;
content: "";
height: 100%;
left: -1px;
top: 0;
}
&.solid:before {
&.solid:after {
border-left: 1px solid @border-color-dark-gray-line-theme-dark;
position: absolute;
content: "";
height: 100%;
left: -1px;
}
}
}

9
src/less/theme/dark.less

@ -2,7 +2,14 @@
.bi-theme-dark {
color: @color-bi-text-theme-dark;
& .bi-input {
color: @color-bi-text;
}
}
& .bi-textarea {
color: @color-bi-text;
}
}

4
src/widget/datetime/datetime.combo.js

@ -9,9 +9,9 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
border: 1,
iconWidth: 24
},
_defaultConfig: function () {
_defaultConfig: function (conf) {
return BI.extend(BI.DateTimeCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-date-time-combo bi-border bi-border-radius",
baseCls: "bi-date-time-combo bi-focus-shadow " + (conf.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
width: 200,
height: 24,
minDate: "1900-01-01",

4
src/widget/numberinterval/numberinterval.js

@ -55,7 +55,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
}
return true;
},
cls: "number-interval-small-editor " + (o.simple ? "bi-border-bottom" : "bi-border bi-border-corner-left-radius")
cls: "number-interval-small-editor bi-focus-shadow " + (o.simple ? "bi-border-bottom" : "bi-border bi-border-corner-left-radius")
});
this.smallTip = BI.createWidget({
@ -93,7 +93,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
}
return true;
},
cls: "number-interval-big-editor" + (o.simple ? " bi-border-bottom" : " bi-border bi-border-corner-right-radius")
cls: "number-interval-big-editor bi-focus-shadow" + (o.simple ? " bi-border-bottom" : " bi-border bi-border-corner-right-radius")
});
this.bigTip = BI.createWidget({

Loading…
Cancel
Save