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

Revert "BI-19095" 

This reverts commit 1a9d4f3fac.
es6
windy 7 years ago
parent
1a9d4f3fac
commit
74cda59c8d
31 changed files with 85 additions and 602 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 48
      dist/_fineui.min.js
  2. 24
      dist/base.css
  3. 72
      dist/bundle.css
  4. 42
      dist/bundle.js
  5. 2
      dist/bundle.min.css
  6. 46
      dist/bundle.min.js
  7. 20
      dist/case.js
  8. 72
      dist/fineui.css
  9. 42
      dist/fineui.js
  10. 2
      dist/fineui.min.css
  11. 48
      dist/fineui.min.js
  12. 48
      dist/widget.css
  13. 22
      dist/widget.js
  14. 18
      src/case/button/icon/icon.trigger.js
  15. 2
      src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
  16. 12
      src/css/base/combo/combo.css
  17. 12
      src/css/base/trigger/trigger.css
  18. 24
      src/css/widget/multiselect/multiselect.css
  19. 12
      src/css/widget/multitree/multi.css
  20. 12
      src/css/widget/singleselect/multiselect.css
  21. 14
      src/less/base/combo/combo.searchtextvalue.less
  22. 15
      src/less/base/trigger/trigger.less
  23. 14
      src/less/widget/multiselect/multiselect.combo.less
  24. 14
      src/less/widget/multiselect/multiselect.insert.combo.less
  25. 14
      src/less/widget/multitree/multi.tree.combo.less
  26. 14
      src/less/widget/singleselect/multiselect.combo.less
  27. 5
      src/widget/multiselect/multiselect..insert.combo.js
  28. 5
      src/widget/multiselect/multiselect.combo.js
  29. 5
      src/widget/multiselect/multiselect.insert.combo.nobar.js
  30. 2
      src/widget/multitree/multi.tree.combo.js
  31. 5
      src/widget/singleselect/singleselect.combo.js

48
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

24
dist/base.css vendored
Unescape View File

@ -299,18 +299,6 @@
.bi-search-text-value-combo.combo-error .bi-search-text-value-trigger .bi-text-button {
color: #ff4949;
}
.bi-search-text-value-combo .trigger-up {
display: none;
}
.bi-search-text-value-combo .trigger-down {
display: block;
}
.bi-search-text-value-combo.combo-show .trigger-up {
display: block;
}
.bi-search-text-value-combo.combo-show .trigger-down {
display: none;
}
.bi-text-value-combo.combo-error .bi-select-text-trigger .bi-label {
color: #ff4949;
@ -2406,18 +2394,6 @@ ul.ztree.zTreeDragUL {
.bi-trigger .bi-trigger-icon-button {
font-size: 16px;
}
.bi-trigger .trigger-up {
display: none;
}
.bi-trigger .trigger-down {
display: block;
}
.bi-combo-popup .trigger-up {
display: block;
}
.bi-combo-popup .trigger-down {
display: none;
}
.bi-select-text-trigger {
-webkit-border-radius: 2px;

72
dist/bundle.css vendored
Unescape View File

@ -2345,18 +2345,6 @@ textarea {
.bi-search-text-value-combo.combo-error .bi-search-text-value-trigger .bi-text-button {
color: #ff4949;
}
.bi-search-text-value-combo .trigger-up {
display: none;
}
.bi-search-text-value-combo .trigger-down {
display: block;
}
.bi-search-text-value-combo.combo-show .trigger-up {
display: block;
}
.bi-search-text-value-combo.combo-show .trigger-down {
display: none;
}
.bi-text-value-combo.combo-error .bi-select-text-trigger .bi-label {
color: #ff4949;
@ -4452,18 +4440,6 @@ ul.ztree.zTreeDragUL {
.bi-trigger .bi-trigger-icon-button {
font-size: 16px;
}
.bi-trigger .trigger-up {
display: none;
}
.bi-trigger .trigger-down {
display: block;
}
.bi-combo-popup .trigger-up {
display: block;
}
.bi-combo-popup .trigger-down {
display: none;
}
.bi-select-text-trigger {
-webkit-border-radius: 2px;
@ -4764,34 +4740,10 @@ ul.ztree.zTreeDragUL {
.bi-multi-select-combo .multi-select-trigger-icon-button {
font-size: 16px;
}
.bi-multi-select-combo .trigger-up {
display: none;
}
.bi-multi-select-combo .trigger-down {
display: block;
}
.bi-multi-select-combo.combo-show .trigger-up {
display: block;
}
.bi-multi-select-combo.combo-show .trigger-down {
display: none;
}
.bi-multi-select-insert-combo .multi-select-trigger-icon-button {
font-size: 16px;
}
.bi-multi-select-insert-combo .trigger-up {
display: none;
}
.bi-multi-select-insert-combo .trigger-down {
display: block;
}
.bi-multi-select-insert-combo.combo-show .trigger-up {
display: block;
}
.bi-multi-select-insert-combo.combo-show .trigger-down {
display: none;
}
.bi-multi-select-trigger {
@ -4828,18 +4780,6 @@ ul.ztree.zTreeDragUL {
.bi-multi-tree-combo .multi-select-trigger-icon-button {
font-size: 16px;
}
.bi-multi-tree-combo .trigger-up {
display: none;
}
.bi-multi-tree-combo .trigger-down {
display: block;
}
.bi-multi-tree-combo.combo-show .trigger-up {
display: block;
}
.bi-multi-tree-combo.combo-show .trigger-down {
display: none;
}
.bi-multi-tree-combo .multi-select-trigger-icon-button {
font-size: 16px;
}
@ -5152,18 +5092,6 @@ ul.ztree.zTreeDragUL {
.bi-single-select-combo .single-select-trigger-icon-button {
font-size: 16px;
}
.bi-single-select-combo .trigger-up {
display: none;
}
.bi-single-select-combo .trigger-down {
display: block;
}
.bi-single-select-combo.combo-show .trigger-up {
display: block;
}
.bi-single-select-combo.combo-show .trigger-down {
display: none;
}
.bi-single-slider-label {
min-height: 50px;
}

42
dist/bundle.js vendored
Unescape View File

@ -72595,31 +72595,19 @@ BI.shortcut("bi.half_icon_button", BI.HalfIconButton);/**
* Created by GUY on 2015/9/16.
* @class BI.TriggerIconButton
* @extends BI.IconButton
*
* attention: 不要加invisible, 不要单独拿出去用
*/
BI.TriggerIconButton = BI.inherit(BI.BasicButton, {
BI.TriggerIconButton = BI.inherit(BI.IconButton, {
_defaultConfig: function () {
var conf = BI.TriggerIconButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-trigger-icon-button"
baseCls: (conf.baseCls || "") + " bi-trigger-icon-button",
extraCls: "pull-down-font"
});
},
_init: function () {
BI.TriggerIconButton.superclass._init.apply(this, arguments);
BI.createWidget({
type: "bi.center_adapt",
element: this,
items: [{
type: "bi.icon_button",
cls: "pull-down-font trigger-down"
}, {
type: "bi.icon_button",
cls: "pull-up-font trigger-up"
}]
});
},
doClick: function () {
@ -78557,12 +78545,10 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,
action: function () {
self.trigger.stopEditing();
self.element.removeClass("combo-show");
}
}, {
eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW,
action: function () {
self.element.removeClass("combo-show").addClass("combo-show");
self.fireEvent(BI.SearchTextValueCombo.EVENT_BEFORE_POPUPVIEW);
}
}],
@ -97522,12 +97508,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
}
});
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
this.setValue(self.storeValue);
BI.nextTick(function () {
self.populate();
@ -97884,12 +97865,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
}
});
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
this.setValue(self.storeValue);
BI.nextTick(function () {
self.populate();
@ -98283,12 +98259,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
}
});
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
this.setValue(self.storeValue);
BI.nextTick(function () {
self.populate();
@ -101361,7 +101332,6 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
if (isSearching()) {
return;
}
@ -101374,7 +101344,6 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
});
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
if (isSearching()) {
self.trigger.stopEditing();
self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
@ -105169,12 +105138,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
value: o.value
});
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
this.setValue(self.storeValue);
BI.nextTick(function () {
self.populate();

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

46
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

20
dist/case.js vendored
Unescape View File

@ -117,31 +117,19 @@ BI.shortcut("bi.half_icon_button", BI.HalfIconButton);/**
* Created by GUY on 2015/9/16.
* @class BI.TriggerIconButton
* @extends BI.IconButton
*
* attention: 不要加invisible, 不要单独拿出去用
*/
BI.TriggerIconButton = BI.inherit(BI.BasicButton, {
BI.TriggerIconButton = BI.inherit(BI.IconButton, {
_defaultConfig: function () {
var conf = BI.TriggerIconButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-trigger-icon-button"
baseCls: (conf.baseCls || "") + " bi-trigger-icon-button",
extraCls: "pull-down-font"
});
},
_init: function () {
BI.TriggerIconButton.superclass._init.apply(this, arguments);
BI.createWidget({
type: "bi.center_adapt",
element: this,
items: [{
type: "bi.icon_button",
cls: "pull-down-font trigger-down"
}, {
type: "bi.icon_button",
cls: "pull-up-font trigger-up"
}]
});
},
doClick: function () {
@ -6079,12 +6067,10 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,
action: function () {
self.trigger.stopEditing();
self.element.removeClass("combo-show");
}
}, {
eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW,
action: function () {
self.element.removeClass("combo-show").addClass("combo-show");
self.fireEvent(BI.SearchTextValueCombo.EVENT_BEFORE_POPUPVIEW);
}
}],

72
dist/fineui.css vendored
Unescape View File

@ -2345,18 +2345,6 @@ textarea {
.bi-search-text-value-combo.combo-error .bi-search-text-value-trigger .bi-text-button {
color: #ff4949;
}
.bi-search-text-value-combo .trigger-up {
display: none;
}
.bi-search-text-value-combo .trigger-down {
display: block;
}
.bi-search-text-value-combo.combo-show .trigger-up {
display: block;
}
.bi-search-text-value-combo.combo-show .trigger-down {
display: none;
}
.bi-text-value-combo.combo-error .bi-select-text-trigger .bi-label {
color: #ff4949;
@ -4452,18 +4440,6 @@ ul.ztree.zTreeDragUL {
.bi-trigger .bi-trigger-icon-button {
font-size: 16px;
}
.bi-trigger .trigger-up {
display: none;
}
.bi-trigger .trigger-down {
display: block;
}
.bi-combo-popup .trigger-up {
display: block;
}
.bi-combo-popup .trigger-down {
display: none;
}
.bi-select-text-trigger {
-webkit-border-radius: 2px;
@ -4764,34 +4740,10 @@ ul.ztree.zTreeDragUL {
.bi-multi-select-combo .multi-select-trigger-icon-button {
font-size: 16px;
}
.bi-multi-select-combo .trigger-up {
display: none;
}
.bi-multi-select-combo .trigger-down {
display: block;
}
.bi-multi-select-combo.combo-show .trigger-up {
display: block;
}
.bi-multi-select-combo.combo-show .trigger-down {
display: none;
}
.bi-multi-select-insert-combo .multi-select-trigger-icon-button {
font-size: 16px;
}
.bi-multi-select-insert-combo .trigger-up {
display: none;
}
.bi-multi-select-insert-combo .trigger-down {
display: block;
}
.bi-multi-select-insert-combo.combo-show .trigger-up {
display: block;
}
.bi-multi-select-insert-combo.combo-show .trigger-down {
display: none;
}
.bi-multi-select-trigger {
@ -4828,18 +4780,6 @@ ul.ztree.zTreeDragUL {
.bi-multi-tree-combo .multi-select-trigger-icon-button {
font-size: 16px;
}
.bi-multi-tree-combo .trigger-up {
display: none;
}
.bi-multi-tree-combo .trigger-down {
display: block;
}
.bi-multi-tree-combo.combo-show .trigger-up {
display: block;
}
.bi-multi-tree-combo.combo-show .trigger-down {
display: none;
}
.bi-multi-tree-combo .multi-select-trigger-icon-button {
font-size: 16px;
}
@ -5152,18 +5092,6 @@ ul.ztree.zTreeDragUL {
.bi-single-select-combo .single-select-trigger-icon-button {
font-size: 16px;
}
.bi-single-select-combo .trigger-up {
display: none;
}
.bi-single-select-combo .trigger-down {
display: block;
}
.bi-single-select-combo.combo-show .trigger-up {
display: block;
}
.bi-single-select-combo.combo-show .trigger-down {
display: none;
}
.bi-single-slider-label {
min-height: 50px;
}

42
dist/fineui.js vendored
Unescape View File

@ -72838,31 +72838,19 @@ BI.shortcut("bi.half_icon_button", BI.HalfIconButton);/**
* Created by GUY on 2015/9/16.
* @class BI.TriggerIconButton
* @extends BI.IconButton
*
* attention: 不要加invisible, 不要单独拿出去用
*/
BI.TriggerIconButton = BI.inherit(BI.BasicButton, {
BI.TriggerIconButton = BI.inherit(BI.IconButton, {
_defaultConfig: function () {
var conf = BI.TriggerIconButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-trigger-icon-button"
baseCls: (conf.baseCls || "") + " bi-trigger-icon-button",
extraCls: "pull-down-font"
});
},
_init: function () {
BI.TriggerIconButton.superclass._init.apply(this, arguments);
BI.createWidget({
type: "bi.center_adapt",
element: this,
items: [{
type: "bi.icon_button",
cls: "pull-down-font trigger-down"
}, {
type: "bi.icon_button",
cls: "pull-up-font trigger-up"
}]
});
},
doClick: function () {
@ -78800,12 +78788,10 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,
action: function () {
self.trigger.stopEditing();
self.element.removeClass("combo-show");
}
}, {
eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW,
action: function () {
self.element.removeClass("combo-show").addClass("combo-show");
self.fireEvent(BI.SearchTextValueCombo.EVENT_BEFORE_POPUPVIEW);
}
}],
@ -97765,12 +97751,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
}
});
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
this.setValue(self.storeValue);
BI.nextTick(function () {
self.populate();
@ -98127,12 +98108,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
}
});
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
this.setValue(self.storeValue);
BI.nextTick(function () {
self.populate();
@ -98526,12 +98502,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
}
});
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
this.setValue(self.storeValue);
BI.nextTick(function () {
self.populate();
@ -101604,7 +101575,6 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
if (isSearching()) {
return;
}
@ -101617,7 +101587,6 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
});
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
if (isSearching()) {
self.trigger.stopEditing();
self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
@ -105412,12 +105381,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
value: o.value
});
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
this.setValue(self.storeValue);
BI.nextTick(function () {
self.populate();

2
dist/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

48
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

48
dist/widget.css vendored
Unescape View File

@ -248,34 +248,10 @@
.bi-multi-select-combo .multi-select-trigger-icon-button {
font-size: 16px;
}
.bi-multi-select-combo .trigger-up {
display: none;
}
.bi-multi-select-combo .trigger-down {
display: block;
}
.bi-multi-select-combo.combo-show .trigger-up {
display: block;
}
.bi-multi-select-combo.combo-show .trigger-down {
display: none;
}
.bi-multi-select-insert-combo .multi-select-trigger-icon-button {
font-size: 16px;
}
.bi-multi-select-insert-combo .trigger-up {
display: none;
}
.bi-multi-select-insert-combo .trigger-down {
display: block;
}
.bi-multi-select-insert-combo.combo-show .trigger-up {
display: block;
}
.bi-multi-select-insert-combo.combo-show .trigger-down {
display: none;
}
.bi-multi-select-trigger {
@ -312,18 +288,6 @@
.bi-multi-tree-combo .multi-select-trigger-icon-button {
font-size: 16px;
}
.bi-multi-tree-combo .trigger-up {
display: none;
}
.bi-multi-tree-combo .trigger-down {
display: block;
}
.bi-multi-tree-combo.combo-show .trigger-up {
display: block;
}
.bi-multi-tree-combo.combo-show .trigger-down {
display: none;
}
.bi-multi-tree-combo .multi-select-trigger-icon-button {
font-size: 16px;
}
@ -636,18 +600,6 @@
.bi-single-select-combo .single-select-trigger-icon-button {
font-size: 16px;
}
.bi-single-select-combo .trigger-up {
display: none;
}
.bi-single-select-combo .trigger-down {
display: block;
}
.bi-single-select-combo.combo-show .trigger-up {
display: block;
}
.bi-single-select-combo.combo-show .trigger-down {
display: none;
}
.bi-single-slider-label {
min-height: 50px;
}

22
dist/widget.js vendored
Unescape View File

@ -9946,12 +9946,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
}
});
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
this.setValue(self.storeValue);
BI.nextTick(function () {
self.populate();
@ -10308,12 +10303,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
}
});
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
this.setValue(self.storeValue);
BI.nextTick(function () {
self.populate();
@ -10707,12 +10697,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
}
});
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
this.setValue(self.storeValue);
BI.nextTick(function () {
self.populate();
@ -13785,7 +13770,6 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
if (isSearching()) {
return;
}
@ -13798,7 +13782,6 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
});
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
if (isSearching()) {
self.trigger.stopEditing();
self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
@ -17593,12 +17576,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
value: o.value
});
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
this.setValue(self.storeValue);
BI.nextTick(function () {
self.populate();

18
src/case/button/icon/icon.trigger.js
Unescape View File

@ -4,31 +4,19 @@
* Created by GUY on 2015/9/16.
* @class BI.TriggerIconButton
* @extends BI.IconButton
*
* attention: 不要加invisible, 不要单独拿出去用
*/
BI.TriggerIconButton = BI.inherit(BI.BasicButton, {
BI.TriggerIconButton = BI.inherit(BI.IconButton, {
_defaultConfig: function () {
var conf = BI.TriggerIconButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-trigger-icon-button"
baseCls: (conf.baseCls || "") + " bi-trigger-icon-button",
extraCls: "pull-down-font"
});
},
_init: function () {
BI.TriggerIconButton.superclass._init.apply(this, arguments);
BI.createWidget({
type: "bi.center_adapt",
element: this,
items: [{
type: "bi.icon_button",
cls: "pull-down-font trigger-down"
}, {
type: "bi.icon_button",
cls: "pull-up-font trigger-up"
}]
});
},
doClick: function () {

2
src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
Unescape View File

@ -69,12 +69,10 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,
action: function () {
self.trigger.stopEditing();
self.element.removeClass("combo-show");
}
}, {
eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW,
action: function () {
self.element.removeClass("combo-show").addClass("combo-show");
self.fireEvent(BI.SearchTextValueCombo.EVENT_BEFORE_POPUPVIEW);
}
}],

12
src/css/base/combo/combo.css
Unescape View File

@ -118,18 +118,6 @@
.bi-search-text-value-combo.combo-error .bi-search-text-value-trigger .bi-text-button {
color: #ff4949;
}
.bi-search-text-value-combo .trigger-up {
display: none;
}
.bi-search-text-value-combo .trigger-down {
display: block;
}
.bi-search-text-value-combo.combo-show .trigger-up {
display: block;
}
.bi-search-text-value-combo.combo-show .trigger-down {
display: none;
}
.bi-text-value-combo.combo-error .bi-select-text-trigger .bi-label {
color: #ff4949;

12
src/css/base/trigger/trigger.css
Unescape View File

@ -3,18 +3,6 @@
.bi-trigger .bi-trigger-icon-button {
font-size: 16px;
}
.bi-trigger .trigger-up {
display: none;
}
.bi-trigger .trigger-down {
display: block;
}
.bi-combo-popup .trigger-up {
display: block;
}
.bi-combo-popup .trigger-down {
display: none;
}
.bi-select-text-trigger {
-webkit-border-radius: 2px;

24
src/css/widget/multiselect/multiselect.css
Unescape View File

@ -1,34 +1,10 @@
.bi-multi-select-combo .multi-select-trigger-icon-button {
font-size: 16px;
}
.bi-multi-select-combo .trigger-up {
display: none;
}
.bi-multi-select-combo .trigger-down {
display: block;
}
.bi-multi-select-combo.combo-show .trigger-up {
display: block;
}
.bi-multi-select-combo.combo-show .trigger-down {
display: none;
}
.bi-multi-select-insert-combo .multi-select-trigger-icon-button {
font-size: 16px;
}
.bi-multi-select-insert-combo .trigger-up {
display: none;
}
.bi-multi-select-insert-combo .trigger-down {
display: block;
}
.bi-multi-select-insert-combo.combo-show .trigger-up {
display: block;
}
.bi-multi-select-insert-combo.combo-show .trigger-down {
display: none;
}
.bi-multi-select-trigger {

12
src/css/widget/multitree/multi.css
Unescape View File

@ -1,15 +1,3 @@
.bi-multi-tree-combo .multi-select-trigger-icon-button {
font-size: 16px;
}
.bi-multi-tree-combo .trigger-up {
display: none;
}
.bi-multi-tree-combo .trigger-down {
display: block;
}
.bi-multi-tree-combo.combo-show .trigger-up {
display: block;
}
.bi-multi-tree-combo.combo-show .trigger-down {
display: none;
}

12
src/css/widget/singleselect/multiselect.css
Unescape View File

@ -1,15 +1,3 @@
.bi-single-select-combo .single-select-trigger-icon-button {
font-size: 16px;
}
.bi-single-select-combo .trigger-up {
display: none;
}
.bi-single-select-combo .trigger-down {
display: block;
}
.bi-single-select-combo.combo-show .trigger-up {
display: block;
}
.bi-single-select-combo.combo-show .trigger-down {
display: none;
}

14
src/less/base/combo/combo.searchtextvalue.less
Unescape View File

@ -11,18 +11,4 @@
}
}
}
& .trigger-up {
display: none;
}
& .trigger-down {
display: block;
}
&.combo-show {
& .trigger-up {
display: block;
}
& .trigger-down {
display: none;
}
}
}

15
src/less/base/trigger/trigger.less
Unescape View File

@ -4,19 +4,4 @@
& .bi-trigger-icon-button{
font-size: @font-size-16;
}
& .trigger-up {
display: none;
}
& .trigger-down {
display: block;
}
}
.bi-combo-popup {
& .trigger-up {
display: block;
}
& .trigger-down {
display: none;
}
}

14
src/less/widget/multiselect/multiselect.combo.less
Unescape View File

@ -4,18 +4,4 @@
& .multi-select-trigger-icon-button{
font-size: 16px;
}
& .trigger-up {
display: none;
}
& .trigger-down {
display: block;
}
&.combo-show {
& .trigger-up {
display: block;
}
& .trigger-down {
display: none;
}
}
}

14
src/less/widget/multiselect/multiselect.insert.combo.less
Unescape View File

@ -4,18 +4,4 @@
& .multi-select-trigger-icon-button{
font-size: 16px;
}
& .trigger-up {
display: none;
}
& .trigger-down {
display: block;
}
&.combo-show {
& .trigger-up {
display: block;
}
& .trigger-down {
display: none;
}
}
}

14
src/less/widget/multitree/multi.tree.combo.less
Unescape View File

@ -4,18 +4,4 @@
& .multi-select-trigger-icon-button{
font-size: 16px;
}
& .trigger-up {
display: none;
}
& .trigger-down {
display: block;
}
&.combo-show {
& .trigger-up {
display: block;
}
& .trigger-down {
display: none;
}
}
}

14
src/less/widget/singleselect/multiselect.combo.less
Unescape View File

@ -4,18 +4,4 @@
& .single-select-trigger-icon-button{
font-size: 16px;
}
& .trigger-up {
display: none;
}
& .trigger-down {
display: block;
}
&.combo-show {
& .trigger-up {
display: block;
}
& .trigger-down {
display: none;
}
}
}

5
src/widget/multiselect/multiselect..insert.combo.js
Unescape View File

@ -164,12 +164,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
}
});
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
this.setValue(self.storeValue);
BI.nextTick(function () {
self.populate();

5
src/widget/multiselect/multiselect.combo.js
Unescape View File

@ -163,12 +163,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
}
});
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
this.setValue(self.storeValue);
BI.nextTick(function () {
self.populate();

5
src/widget/multiselect/multiselect.insert.combo.nobar.js
Unescape View File

@ -176,12 +176,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
}
});
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
this.setValue(self.storeValue);
BI.nextTick(function () {
self.populate();

2
src/widget/multitree/multi.tree.combo.js
Unescape View File

@ -180,7 +180,6 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
if (isSearching()) {
return;
}
@ -193,7 +192,6 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
});
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
if (isSearching()) {
self.trigger.stopEditing();
self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);

5
src/widget/singleselect/singleselect.combo.js
Unescape View File

@ -139,12 +139,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
value: o.value
});
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
this.setValue(self.storeValue);
BI.nextTick(function () {
self.populate();

Write Preview
Loading…
Cancel
Save