Browse Source

Merge pull request #524 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit '41c6083a79d8e29483c67fe4d3dc38e21f426db7':
  BI-27532 点击自动或透明收起下拉面板
es6
Young 6 years ago
parent
commit
02c909a075
  1. 24
      dist/_fineui.min.js
  2. 7
      dist/bundle.js
  3. 48
      dist/bundle.min.js
  4. 7
      dist/case.js
  5. 7
      dist/fineui.js
  6. 24
      dist/fineui.min.js
  7. 7
      src/case/colorchooser/colorchooser.js

24
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

7
dist/bundle.js vendored

@ -76270,6 +76270,9 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
eventName: BI.ColorChooserPopup.EVENT_VALUE_CHANGE, eventName: BI.ColorChooserPopup.EVENT_VALUE_CHANGE,
action: function () { action: function () {
fn(); fn();
if (!self._isRGBColor(self.colorPicker.getValue())) {
self.combo.hideView();
}
} }
}, { }, {
eventName: BI.ColorChooserPopup.EVENT_CHANGE, eventName: BI.ColorChooserPopup.EVENT_CHANGE,
@ -76304,6 +76307,10 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
}); });
}, },
_isRGBColor: function (color) {
return BI.isNotEmptyString(color) && color !== "transparent";
},
isViewVisible: function () { isViewVisible: function () {
return this.combo.isViewVisible(); return this.combo.isViewVisible();
}, },

48
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

7
dist/case.js vendored

@ -3661,6 +3661,9 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
eventName: BI.ColorChooserPopup.EVENT_VALUE_CHANGE, eventName: BI.ColorChooserPopup.EVENT_VALUE_CHANGE,
action: function () { action: function () {
fn(); fn();
if (!self._isRGBColor(self.colorPicker.getValue())) {
self.combo.hideView();
}
} }
}, { }, {
eventName: BI.ColorChooserPopup.EVENT_CHANGE, eventName: BI.ColorChooserPopup.EVENT_CHANGE,
@ -3695,6 +3698,10 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
}); });
}, },
_isRGBColor: function (color) {
return BI.isNotEmptyString(color) && color !== "transparent";
},
isViewVisible: function () { isViewVisible: function () {
return this.combo.isViewVisible(); return this.combo.isViewVisible();
}, },

7
dist/fineui.js vendored

@ -76519,6 +76519,9 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
eventName: BI.ColorChooserPopup.EVENT_VALUE_CHANGE, eventName: BI.ColorChooserPopup.EVENT_VALUE_CHANGE,
action: function () { action: function () {
fn(); fn();
if (!self._isRGBColor(self.colorPicker.getValue())) {
self.combo.hideView();
}
} }
}, { }, {
eventName: BI.ColorChooserPopup.EVENT_CHANGE, eventName: BI.ColorChooserPopup.EVENT_CHANGE,
@ -76553,6 +76556,10 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
}); });
}, },
_isRGBColor: function (color) {
return BI.isNotEmptyString(color) && color !== "transparent";
},
isViewVisible: function () { isViewVisible: function () {
return this.combo.isViewVisible(); return this.combo.isViewVisible();
}, },

24
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

7
src/case/colorchooser/colorchooser.js

@ -42,6 +42,9 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
eventName: BI.ColorChooserPopup.EVENT_VALUE_CHANGE, eventName: BI.ColorChooserPopup.EVENT_VALUE_CHANGE,
action: function () { action: function () {
fn(); fn();
if (!self._isRGBColor(self.colorPicker.getValue())) {
self.combo.hideView();
}
} }
}, { }, {
eventName: BI.ColorChooserPopup.EVENT_CHANGE, eventName: BI.ColorChooserPopup.EVENT_CHANGE,
@ -76,6 +79,10 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
}); });
}, },
_isRGBColor: function (color) {
return BI.isNotEmptyString(color) && color !== "transparent";
},
isViewVisible: function () { isViewVisible: function () {
return this.combo.isViewVisible(); return this.combo.isViewVisible();
}, },

Loading…
Cancel
Save