caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

CHART-21632 fix:与交互沟通，自动/透明按钮再次点击时不取消选中

es6
Tangjinxia 3 years ago
parent
e8bbc3ee79
commit
5e8abc7b6a
2 changed files with 12 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      src/case/colorchooser/colorpicker/editor.colorpicker.hex.js
  2. 30
      src/case/colorchooser/colorpicker/editor.colorpicker.js

30
src/case/colorchooser/colorpicker/editor.colorpicker.hex.js
Unescape View File

@ -72,20 +72,9 @@ BI.HexColorPickerEditor = BI.inherit(BI.Widget, {
listeners: [{ listeners: [{
eventName: BI.ColorChooserShowButton.EVENT_CHANGE, eventName: BI.ColorChooserShowButton.EVENT_CHANGE,
action: function () { action: function () {
if (this.isSelected()) { var value = self.getValue();
self.lastColor = self.getValue(); self.setValue("transparent");
self.setValue("transparent"); (value !== "transparent") && self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE);
} else {
if (self.lastColor === "transparent") {
self.lastColor = "";
}
self.setValue(self.lastColor || "#ffffff");
}
if ((self.R.isValid() && self.G.isValid() && self.B.isValid()) ||
self._isEmptyRGB()) {
self.colorShow.element.css("background-color", self.getValue());
self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE);
}
} }
}], }],
ref: function (_ref) { ref: function (_ref) {
@ -101,16 +90,9 @@ BI.HexColorPickerEditor = BI.inherit(BI.Widget, {
listeners: [{ listeners: [{
eventName: BI.ColorChooserShowButton.EVENT_CHANGE, eventName: BI.ColorChooserShowButton.EVENT_CHANGE,
action: function () { action: function () {
if (this.isSelected()) { var value = self.getValue();
self.lastColor = self.getValue(); self.setValue("");
self.setValue(""); (value !== "") && self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE);
} else {
self.setValue(self.lastColor || "#ffffff");
}
if ((self.R.isValid() && self.G.isValid() && self.B.isValid()) || self._isEmptyRGB()) {
self.colorShow.element.css("background-color", self.getValue());
self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE);
}
} }
}], }],
ref: function (_ref) { ref: function (_ref) {

30
src/case/colorchooser/colorpicker/editor.colorpicker.js
Unescape View File

@ -72,16 +72,9 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
title: BI.i18nText("BI-Basic_Auto") title: BI.i18nText("BI-Basic_Auto")
}); });
this.none.on(BI.IconButton.EVENT_CHANGE, function () { this.none.on(BI.IconButton.EVENT_CHANGE, function () {
if (this.isSelected()) { var value = self.getValue();
self.lastColor = self.getValue(); self.setValue("");
self.setValue(""); (value !== "") && self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE);
} else {
self.setValue(self.lastColor || "#ffffff");
}
if ((self.R.isValid() && self.G.isValid() && self.B.isValid()) || self._isEmptyRGB()) {
self.colorShow.element.css("background-color", self.getValue());
self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE);
}
}); });
this.transparent = BI.createWidget({ this.transparent = BI.createWidget({
@ -94,20 +87,9 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
title: BI.i18nText("BI-Transparent_Color") title: BI.i18nText("BI-Transparent_Color")
}); });
this.transparent.on(BI.IconButton.EVENT_CHANGE, function () { this.transparent.on(BI.IconButton.EVENT_CHANGE, function () {
if (this.isSelected()) { var value = self.getValue();
self.lastColor = self.getValue(); self.setValue("transparent");
self.setValue("transparent"); (value !== "transparent") && self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE);
} else {
if (self.lastColor === "transparent") {
self.lastColor = "";
}
self.setValue(self.lastColor || "#ffffff");
}
if ((self.R.isValid() && self.G.isValid() && self.B.isValid()) ||
self._isEmptyRGB()) {
self.colorShow.element.css("background-color", self.getValue());
self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE);
}
}); });
BI.createWidget({ BI.createWidget({

Write Preview
Loading…
Cancel
Save