Browse Source

Merge pull request #202720 in DEC/fineui from master to feature/x

* commit 'c45e7686a3e183bb0f152edd18d830b69cc6eaa7':
  BI-115556 fix: 【6.0.3.4发散】BI全局样式为默认暗黑,过滤组件绑定参数前面的勾选框看不清
  无JIRA: fix unResize
  KERNEL-13169 feat: 或许可以通过setValid控制输入框的错误提示显示
master
superman 2 years ago
parent
commit
a0b86c1cf6
  1. 5
      src/base/single/editor/editor.js
  2. 2
      src/core/wrapper/layout/responsive/responsive.flex.horizontal.js
  3. 21
      src/less/base/tree/ztree.less
  4. 4
      src/widget/editor/editor.text.js

5
src/base/single/editor/editor.js

@ -344,6 +344,11 @@ BI.Editor = BI.inherit(BI.Single, {
return this.editor.isValid(); return this.editor.isValid();
}, },
setValid: function (b) {
this.editor.setValid(b);
this._checkError();
},
destroyed: function () { destroyed: function () {
BI.Bubbles.remove(this.getName()); BI.Bubbles.remove(this.getName());
}, },

2
src/core/wrapper/layout/responsive/responsive.flex.horizontal.js

@ -51,7 +51,7 @@ BI.ResponsiveFlexHorizontalLayout = BI.inherit(BI.FlexHorizontalLayout, {
}, },
destroyed: function () { destroyed: function () {
this.unResize(); this.unResize?.();
} }
}); });
BI.shortcut("bi.responsive_flex_horizontal", BI.ResponsiveFlexHorizontalLayout); BI.shortcut("bi.responsive_flex_horizontal", BI.ResponsiveFlexHorizontalLayout);

21
src/less/base/tree/ztree.less

@ -67,6 +67,27 @@
border-left: 1px solid @border-color-dark-gray-line-theme-dark; border-left: 1px solid @border-color-dark-gray-line-theme-dark;
} }
} }
&.bi-checkbox {
border: 1px solid @color-bi-border-checkbox-theme-dark;
&.active {
background-color: @color-bi-background-active-checkbox-theme-dark;
border-color: @color-bi-border-hover-active-checkbox-theme-dark;
}
&.disabled {
background-color: @color-bi-background-disabled-checkbox-theme-dark;
&.active {
border-color: @color-bi-border-disabled-checkbox-theme-dark;
}
}
}
&.bi-half-button {
border: 1px solid @color-bi-border-hover-active-checkbox-theme-dark;
}
} }
.ztree li a { .ztree li a {

4
src/widget/editor/editor.text.js

@ -138,6 +138,10 @@ BI.TextEditor = BI.inherit(BI.Widget, {
return this.editor.isValid(); return this.editor.isValid();
}, },
setValid: function (b) {
this.editor.setValid(b);
},
setValue: function (v) { setValue: function (v) {
this.editor.setValue(v); this.editor.setValue(v);
}, },

Loading…
Cancel
Save