Browse Source

Pull request #2785: BI-106879 单边框去圆角

Merge in VISUAL/fineui from ~WINDY/fui:master to master

* commit '6eef021942c1f82b793f20dc50ce1d0471d82574':
  BI-106879 单边框去圆角
es6
windy 2 years ago
parent
commit
18cc0bf6b7
  1. 2
      src/case/colorchooser/colorchooser.trigger.js
  2. 2
      src/case/colorchooser/colorchooser.trigger.long.js
  3. 2
      src/case/combo/icontextvaluecombo/combo.icontextvalue.js
  4. 2
      src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
  5. 2
      src/case/combo/textvaluecombo/combo.textvalue.js
  6. 4
      src/less/base/colorchooser/colorchooser.trigger.less
  7. 1
      src/less/base/editor/editor.search.less
  8. 8
      src/less/core/utils/common.less
  9. 1
      src/less/widget/numbereditor/number.editor.less
  10. 8
      src/less/widget/numberinterval/numberinterval.less
  11. 2
      src/less/widget/year/trigger.year.less
  12. 2
      src/widget/dynamicdate/dynamicdate.combo.js
  13. 2
      src/widget/dynamicdatetime/dynamicdatetime.combo.js
  14. 2
      src/widget/editor/editor.search.js
  15. 2
      src/widget/multilayerselecttree/multilayerselecttree.combo.js
  16. 2
      src/widget/multilayersingletree/multilayersingletree.combo.js
  17. 2
      src/widget/multiselect/multiselect.combo.js
  18. 2
      src/widget/multiselect/multiselect.combo.nobar.js
  19. 2
      src/widget/multiselect/multiselect.insert.combo.js
  20. 2
      src/widget/multiselect/multiselect.insert.combo.nobar.js
  21. 2
      src/widget/multitree/multi.tree.combo.js
  22. 2
      src/widget/multitree/multi.tree.insert.combo.js
  23. 2
      src/widget/multitree/multi.tree.list.combo.js
  24. 2
      src/widget/numbereditor/number.editor.js
  25. 8
      src/widget/numberinterval/numberinterval.js
  26. 2
      src/widget/singleselect/singleselect.combo.js
  27. 2
      src/widget/singleselect/singleselect.insert.combo.js
  28. 2
      src/widget/singletree/singletree.combo.js
  29. 1
      src/widget/timeinterval/timeinterval.js
  30. 2
      src/widget/year/combo.year.js
  31. 2
      src/widget/yearmonth/combo.yearmonth.js
  32. 2
      src/widget/yearquarter/combo.yearquarter.js

2
src/case/colorchooser/colorchooser.trigger.js

@ -10,7 +10,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function (config) {
var conf = BI.ColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-focus-shadow " + (config.simple ? "bi-border-bottom" : "bi-border"),
baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-focus-shadow " + (config.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
height: 22
});
},

2
src/case/colorchooser/colorchooser.trigger.long.js

@ -10,7 +10,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function (config) {
var conf = BI.LongColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-focus-shadow " + (config.simple ? "bi-border-bottom" : "bi-border"),
baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-focus-shadow " + (config.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
height: 24
});
},

2
src/case/combo/icontextvaluecombo/combo.icontextvalue.js

@ -5,7 +5,7 @@
BI.IconTextValueCombo = BI.inherit(BI.Widget, {
_defaultConfig: function (config) {
return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-icon-text-value-combo bi-border-radius " + (config.simple ? "bi-border-bottom" : "bi-border"),
baseCls: "bi-icon-text-value-combo " + (config.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
height: 24,
iconHeight: null,
iconWidth: null,

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

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

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

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

4
src/less/base/colorchooser/colorchooser.trigger.less

@ -1,9 +1,5 @@
@import "../../index.less";
.bi-color-chooser-trigger {
.border-radius(2px);
}
.bi-combo-popup {
&>.bi-color-chooser-trigger {
border-color: @color-bi-border-hover-combo;

1
src/less/base/editor/editor.search.less

@ -1,7 +1,6 @@
@import "../../index.less";
/*************BI.SearchEditor******************/
.bi-search-editor {
.border-radius(2px);
& .circle-close-font{
font-size: @font-size-18;
}

8
src/less/core/utils/common.less

@ -339,6 +339,14 @@
.border-radius(2px);
}
.bi-border-corner-left-radius {
.border-corner-left-radius(2px, 2px);
}
.bi-border-corner-right-radius {
.border-corner-right-radius(2px, 2px);
}
.bi-font-bold {
font-weight: 700;
}

1
src/less/widget/numbereditor/number.editor.less

@ -1,7 +1,6 @@
@import "../../index.less";
.bi-number-editor {
.border-radius(2px);
& .pull-down-font {
font-size: @font-size-12;
}

8
src/less/widget/numberinterval/numberinterval.less

@ -4,14 +4,7 @@
&.hack {
.border-radius(0px);
}
& .number-interval-small-editor {
.border-corner-left-radius(2px, 2px);
}
& .number-interval-big-editor {
.border-corner-right-radius(2px, 2px);
}
& .number-interval-big-combo {
.border-corner-left-radius(2px, 2px);
& .bi-icon-combo-trigger {
& .icon-combo-trigger-icon {
font-size: @font-size-14;
@ -20,7 +13,6 @@
}
& .number-interval-small-combo {
.border-corner-right-radius(2px, 2px);
& .bi-icon-combo-trigger {
& .icon-combo-trigger-icon {
font-size: @font-size-14;

2
src/less/widget/year/trigger.year.less

@ -1,4 +1,4 @@
@import "../../index.less";
.bi-year-trigger{
.border-radius(2px);
}

2
src/widget/dynamicdate/dynamicdate.combo.js

@ -38,7 +38,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
items: [{
el: {
type: "bi.combo",
cls: (opts.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius bi-focus-shadow",
cls: (opts.simple ? "bi-border-bottom" : "bi-border bi-border-radius") + " bi-focus-shadow",
container: opts.container,
ref: function () {
self.combo = this;

2
src/widget/dynamicdatetime/dynamicdatetime.combo.js

@ -38,7 +38,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
items: [{
el: {
type: "bi.combo",
cls: (opts.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius bi-focus-shadow",
cls: (opts.simple ? "bi-border-bottom" : "bi-border bi-border-radius") + " bi-focus-shadow",
destroyWhenHide: true,
container: opts.container,
ref: function () {

2
src/widget/editor/editor.search.js

@ -5,7 +5,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
_defaultConfig: function (config) {
var conf = BI.SearchEditor.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: "bi-search-editor bi-focus-shadow " + (config.simple ? "bi-border-bottom" : "bi-border"),
baseCls: "bi-search-editor bi-focus-shadow " + (config.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
height: 24,
errorText: "",
watermark: BI.i18nText("BI-Basic_Search"),

2
src/widget/multilayerselecttree/multilayerselecttree.combo.js

@ -38,7 +38,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
var self = this, o = this.options;
return {
type: "bi.combo",
cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius " + (BI.isKey(o.status) ? ("status-" + o.status) : ""),
cls: (o.simple ? "bi-border-bottom " : "bi-border bi-border-radius ") + (BI.isKey(o.status) ? ("status-" + o.status) : ""),
container: o.container,
destroyWhenHide: o.destroyWhenHide,
adjustLength: 2,

2
src/widget/multilayersingletree/multilayersingletree.combo.js

@ -45,7 +45,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
var self = this, o = this.options;
return {
type: "bi.combo",
cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius " + (BI.isKey(o.status) ? ("status-" + o.status) : ""),
cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius ") + (BI.isKey(o.status) ? ("status-" + o.status) : ""),
container: o.container,
destroyWhenHide: o.destroyWhenHide,
adjustLength: 2,

2
src/widget/multiselect/multiselect.combo.js

@ -124,7 +124,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({
type: "bi.combo",
cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius",
cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
toggle: !o.allowEdit,
container: o.container,
el: this.trigger,

2
src/widget/multiselect/multiselect.combo.nobar.js

@ -122,7 +122,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({
type: "bi.combo",
cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius",
cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
toggle: false,
container: o.container,
el: this.trigger,

2
src/widget/multiselect/multiselect.insert.combo.js

@ -125,7 +125,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({
type: "bi.combo",
cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius",
cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
toggle: !o.allowEdit,
el: this.trigger,
adjustLength: 1,

2
src/widget/multiselect/multiselect.insert.combo.nobar.js

@ -117,7 +117,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({
type: "bi.combo",
cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius",
cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
toggle: false,
container: o.container,
el: this.trigger,

2
src/widget/multitree/multi.tree.combo.js

@ -49,7 +49,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({
type: "bi.combo",
cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius",
cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
toggle: !o.allowEdit,
container: o.container,
el: this.trigger,

2
src/widget/multitree/multi.tree.insert.combo.js

@ -65,7 +65,7 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({
type: "bi.combo",
cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius",
cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
toggle: !o.allowEdit,
container: o.container,
el: this.trigger,

2
src/widget/multitree/multi.tree.list.combo.js

@ -80,7 +80,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({
type: "bi.combo",
cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius",
cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
toggle: !o.allowEdit,
container: o.container,
el: this.trigger,

2
src/widget/numbereditor/number.editor.js

@ -5,7 +5,7 @@
BI.NumberEditor = BI.inherit(BI.Widget, {
_defaultConfig: function (conf) {
return BI.extend(BI.NumberEditor.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-number-editor bi-focus-shadow " + (conf.simple ? "bi-border-bottom" : "bi-border"),
baseCls: "bi-number-editor bi-focus-shadow " + (conf.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
validationChecker: BI.emptyFn,
valueFormatter: function (v) {
return v;

8
src/widget/numberinterval/numberinterval.js

@ -55,7 +55,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
}
return true;
},
cls: "number-interval-small-editor " + (o.simple ? "bi-border-bottom" : "bi-border")
cls: "number-interval-small-editor " + (o.simple ? "bi-border-bottom" : "bi-border bi-border-corner-left-radius")
});
this.smallTip = BI.createWidget({
@ -93,7 +93,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
}
return true;
},
cls: "number-interval-big-editor" + (o.simple ? " bi-border-bottom" : " bi-border")
cls: "number-interval-big-editor" + (o.simple ? " bi-border-bottom" : " bi-border bi-border-corner-right-radius")
});
this.bigTip = BI.createWidget({
@ -113,7 +113,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
});
this.smallCombo = BI.createWidget({
type: "bi.icon_combo",
cls: "number-interval-small-combo" + (o.simple ? "" : " bi-border-top bi-border-bottom bi-border-right"),
cls: "number-interval-small-combo" + (o.simple ? "" : " bi-border-top bi-border-bottom bi-border-right bi-border-corner-right-radius"),
height: o.height - (o.simple ? 0 : 2),
items: [{
text: "(" + BI.i18nText("BI-Less_Than") + ")",
@ -132,7 +132,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
}
this.bigCombo = BI.createWidget({
type: "bi.icon_combo",
cls: "number-interval-big-combo" + (o.simple ? "" : " bi-border-top bi-border-bottom bi-border-left"),
cls: "number-interval-big-combo" + (o.simple ? "" : " bi-border-top bi-border-bottom bi-border-left bi-border-corner-left-radius"),
height: o.height - (o.simple ? 0 : 2),
items: [{
text: "(" + BI.i18nText("BI-Less_Than") + ")",

2
src/widget/singleselect/singleselect.combo.js

@ -83,7 +83,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({
type: "bi.combo",
cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius",
cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
container: o.container,
toggle: false,
el: this.trigger,

2
src/widget/singleselect/singleselect.insert.combo.js

@ -94,7 +94,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({
type: "bi.combo",
cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius",
cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
container: o.container,
toggle: false,
el: this.trigger,

2
src/widget/singletree/singletree.combo.js

@ -6,7 +6,7 @@ BI.SingleTreeCombo = BI.inherit(BI.Widget, {
_defaultConfig: function (config) {
return BI.extend(BI.SingleTreeCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-single-tree-combo bi-border-radius " + (config.simple ? "bi-border-bottom" : "bi-border"),
baseCls: "bi-single-tree-combo " + (config.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
trigger: {},
height: 24,
text: "",

1
src/widget/timeinterval/timeinterval.js

@ -69,6 +69,7 @@ BI.TimeInterval = BI.inherit(BI.Single, {
var self = this, o = this.options;
var combo = BI.createWidget({
type: "bi.dynamic_date_time_combo",
simple: o.simple,
supportDynamic: o.supportDynamic,
minDate: o.minDate,
maxDate: o.maxDate,

2
src/widget/year/combo.year.js

@ -133,7 +133,7 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
items: [{
el: {
type: "bi.htape",
cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius bi-focus-shadow",
cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius") + " bi-focus-shadow",
ref: function () {
self.comboWrapper = this;
},

2
src/widget/yearmonth/combo.yearmonth.js

@ -132,7 +132,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
items: [{
el: {
type: "bi.htape",
cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius bi-focus-shadow",
cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius") + " bi-focus-shadow",
ref: function () {
self.comboWrapper = this;
},

2
src/widget/yearquarter/combo.yearquarter.js

@ -135,7 +135,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
items: [{
el: {
type: "bi.htape",
cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius bi-focus-shadow",
cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius") + " bi-focus-shadow",
ref: function () {
self.comboWrapper = this;
},

Loading…
Cancel
Save