Browse Source

JSY-17840 fix: clearButton 占满高度

es6
zsmj 3 years ago
parent
commit
f00ecee106
  1. 2
      src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
  2. 1
      src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js
  3. 2
      src/case/combo/textvaluecombo/combo.textvalue.js
  4. 1
      src/case/trigger/trigger.text.js
  5. 28
      src/less/base/combo/combo.searchtextvalue.less

2
src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js

@ -28,7 +28,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
return { return {
type: "bi.combo", type: "bi.combo",
cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-focus-shadow", cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius bi-focus-shadow",
container: o.container, container: o.container,
adjustLength: 2, adjustLength: 2,
height: height, height: height,

1
src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js

@ -86,6 +86,7 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
stopPropagation: true, stopPropagation: true,
invisible: !BI.isNotEmptyString(stateText), invisible: !BI.isNotEmptyString(stateText),
width: o.height, width: o.height,
height: o.height,
handler: function () { handler: function () {
self.fireEvent(BI.SearchTextValueTrigger.EVENT_CLEAR); self.fireEvent(BI.SearchTextValueTrigger.EVENT_CLEAR);
}, },

2
src/case/combo/textvaluecombo/combo.textvalue.js

@ -7,7 +7,7 @@
BI.TextValueCombo = BI.inherit(BI.Widget, { BI.TextValueCombo = BI.inherit(BI.Widget, {
_defaultConfig: function (config) { _defaultConfig: function (config) {
return BI.extend(BI.TextValueCombo.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.TextValueCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-text-value-combo " + (config.simple ? "bi-border-bottom" : "bi-border"), baseCls: "bi-text-value-combo bi-border-radius " + (config.simple ? "bi-border-bottom" : "bi-border"),
height: 24, height: 24,
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE, chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
text: "", text: "",

1
src/case/trigger/trigger.text.js

@ -73,6 +73,7 @@ BI.TextTrigger = BI.inherit(BI.Trigger, {
cls: "close-h-font " + (o.allowClear ? "clear-button" : ""), cls: "close-h-font " + (o.allowClear ? "clear-button" : ""),
stopPropagation: true, stopPropagation: true,
width: o.triggerWidth || o.height, width: o.triggerWidth || o.height,
height: o.height,
invisible: !BI.isNotEmptyString(o.text), invisible: !BI.isNotEmptyString(o.text),
handler: function () { handler: function () {
self.fireEvent(BI.TextTrigger.EVENT_CLEAR); self.fireEvent(BI.TextTrigger.EVENT_CLEAR);

28
src/less/base/combo/combo.searchtextvalue.less

@ -1,33 +1,19 @@
@import "../../index.less"; @import "../../index.less";
@val: transform .3s ease;
.bi-search-text-value-combo{ .bi-search-text-value-combo {
& .trigger-icon-button{ & .trigger-icon-button {
font-size: 16px; font-size: 16px;
} }
& .search-text-value-trigger{
.border-radius(2px);
}
&.combo-error { &.combo-error {
& .bi-search-text-value-trigger{ & .bi-search-text-value-trigger {
& .bi-text-button { & .bi-text-button {
color: @color-bi-text-error-hover-search-text-value-combo; color: @color-bi-text-error-hover-search-text-value-combo;
} }
} }
&>.bi-border, &>.bi-border-bottom {
&.bi-border, &.bi-border-bottom {
border-color: @border-color-negative; border-color: @border-color-negative;
} }
} }
// 此combo的trigger_button是absolute上去的,与bi-combo在同一层级,独立写一下
& .bi-combo.bi-combo-popup + .bi-trigger-icon-button {
& .x-icon {
.rotate(180deg);
.transition(@val);
}
}
& .bi-combo + .bi-trigger-icon-button {
& .x-icon {
.rotate(0deg);
.transition(@val);
}
}
} }

Loading…
Cancel
Save