Browse Source

Pull request #3694: BI-139664 fix:滑块组件 & BI-137647 fix:radio

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

* commit '91d175508d2476d24faa0a2777778c4abfcb9a2c':
  无jira chore: console.log
  BI-137647 fix:单选颜色
  无jira fix:bind
  BI-139664 fix:滑块组件
  BI-139664 fix:滑块组件
  BI-139664 fix:滑块组件
research/test
treecat-罗群 12 months ago
parent
commit
57ddfc6ea5
  1. 3
      packages/fineui/src/less/base/single/input/radio.less
  2. 8
      packages/fineui/src/widget/intervalslider/intervalslider.js
  3. 4
      packages/fineui/src/widget/singleslider/button/editor.sign.text.js

3
packages/fineui/src/less/base/single/input/radio.less

@ -15,6 +15,9 @@
border-color: @color-bi-border-hover-active-radio; border-color: @color-bi-border-hover-active-radio;
} }
} }
.bi-radio-icon {
background-color: @color-bi-background-active-radio-content;
}
&.active { &.active {
& .radio-content, &.radio-content { & .radio-content, &.radio-content {
border-color: @color-bi-border-hover-active-radio; border-color: @color-bi-border-hover-active-radio;

8
packages/fineui/src/widget/intervalslider/intervalslider.js

@ -59,6 +59,10 @@ export class IntervalSlider extends Single {
this.populate(); this.populate();
} }
getConstant() {
return CONSTANTS;
}
render() { render() {
const o = this.options; const o = this.options;
this.enable = false; this.enable = false;
@ -85,7 +89,7 @@ export class IntervalSlider extends Single {
text: unit, text: unit,
allowBlank: false, allowBlank: false,
textAlign: lAlign, textAlign: lAlign,
width: BI.isNull(editorWidth) ? BI.toPix(CONSTANTS.EDITOR_WIDTH, 2) : BI.toPix(editorWidth, 2), width: isNull(editorWidth) ? toPix(CONSTANTS.EDITOR_WIDTH, 2) : toPix(editorWidth, 2),
height: toPix(CONSTANTS.EDITOR_HEIGHT, 2), height: toPix(CONSTANTS.EDITOR_HEIGHT, 2),
validationChecker: v => this._checkValidation(v), validationChecker: v => this._checkValidation(v),
}); });
@ -115,7 +119,7 @@ export class IntervalSlider extends Single {
text: unit, text: unit,
allowBlank: false, allowBlank: false,
textAlign: rAlign, textAlign: rAlign,
width: BI.isNull(editorWidth) ? BI.toPix(CONSTANTS.EDITOR_WIDTH, 2) : BI.toPix(editorWidth, 2), width: isNull(editorWidth) ? toPix(CONSTANTS.EDITOR_WIDTH, 2) : toPix(editorWidth, 2),
height: toPix(CONSTANTS.EDITOR_HEIGHT, 2), height: toPix(CONSTANTS.EDITOR_HEIGHT, 2),
validationChecker: v => this._checkValidation(v), validationChecker: v => this._checkValidation(v),
}); });

4
packages/fineui/src/widget/singleslider/button/editor.sign.text.js

@ -106,7 +106,7 @@ export class SignTextEditor extends Widget {
_checkText() { _checkText() {
const o = this.options; const o = this.options;
nextTick( nextTick(
bind(() => { () => {
if (this.editor.getValue() === "") { if (this.editor.getValue() === "") {
this.text.setValue(o.watermark || ""); this.text.setValue(o.watermark || "");
this.text.element.addClass("bi-water-mark"); this.text.element.addClass("bi-water-mark");
@ -116,7 +116,7 @@ export class SignTextEditor extends Widget {
this.text.setValue(v); this.text.setValue(v);
this.text.element.removeClass("bi-water-mark"); this.text.element.removeClass("bi-water-mark");
} }
}, this) }
); );
} }

Loading…
Cancel
Save