Browse Source

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

* commit '4cefefd68958ef959b7db054a57ccddceba60582':
  REPORT-21790 refactor: 统一一下加圆角的方式
master
guy 5 years ago
parent
commit
76524e8b81
  1. 5
      dist/2.0/fineui.css
  2. 6
      dist/2.0/fineui.ie.js
  3. 6
      dist/2.0/fineui.js
  4. 5
      dist/bundle.css
  5. 6
      dist/bundle.ie.js
  6. 6
      dist/bundle.js
  7. 5
      dist/fineui.css
  8. 6
      dist/fineui.ie.js
  9. 6
      dist/fineui.js
  10. 6
      dist/fineui_without_jquery_polyfill.js
  11. 5
      dist/widget.css
  12. 6
      dist/widget.js
  13. 5
      src/css/widget/multiselect/multiselect.css
  14. 2
      src/less/widget/multiselect/multiselect.trigger.less
  15. 2
      src/widget/multiselect/multiselect.insert.trigger.js
  16. 2
      src/widget/multiselect/multiselect.trigger.js
  17. 2
      src/widget/singleselect/singleselect.trigger.js

5
dist/2.0/fineui.css vendored

@ -4429,11 +4429,6 @@ ul.ztree.zTreeDragUL {
}
.bi-multi-select-trigger {
-webkit-border-radius: 2px 2px 2px 2px;
-moz-border-radius: 2px 2px 2px 2px;
border-radius: 2px 2px 2px 2px;
}
.bi-multi-select-search-pane .multi-select-toolbar {
color: #faaa39;
}

6
dist/2.0/fineui.ie.js vendored

@ -72640,7 +72640,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.MultiSelectInsertTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-trigger bi-border",
baseCls: "bi-multi-select-trigger bi-border bi-border-radius",
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,
searcher: {},
@ -73367,7 +73367,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.MultiSelectTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-trigger bi-border",
baseCls: "bi-multi-select-trigger bi-border bi-border-radius",
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,
searcher: {},
@ -81699,7 +81699,7 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.SingleSelectTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-single-select-trigger bi-border",
baseCls: "bi-single-select-trigger bi-border bi-border-radius",
allowNoSelect: false,
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,

6
dist/2.0/fineui.js vendored

@ -73044,7 +73044,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.MultiSelectInsertTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-trigger bi-border",
baseCls: "bi-multi-select-trigger bi-border bi-border-radius",
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,
searcher: {},
@ -73771,7 +73771,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.MultiSelectTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-trigger bi-border",
baseCls: "bi-multi-select-trigger bi-border bi-border-radius",
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,
searcher: {},
@ -82103,7 +82103,7 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.SingleSelectTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-single-select-trigger bi-border",
baseCls: "bi-single-select-trigger bi-border bi-border-radius",
allowNoSelect: false,
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,

5
dist/bundle.css vendored

@ -4429,11 +4429,6 @@ ul.ztree.zTreeDragUL {
}
.bi-multi-select-trigger {
-webkit-border-radius: 2px 2px 2px 2px;
-moz-border-radius: 2px 2px 2px 2px;
border-radius: 2px 2px 2px 2px;
}
.bi-multi-select-search-pane .multi-select-toolbar {
color: #faaa39;
}

6
dist/bundle.ie.js vendored

@ -72640,7 +72640,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.MultiSelectInsertTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-trigger bi-border",
baseCls: "bi-multi-select-trigger bi-border bi-border-radius",
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,
searcher: {},
@ -73367,7 +73367,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.MultiSelectTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-trigger bi-border",
baseCls: "bi-multi-select-trigger bi-border bi-border-radius",
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,
searcher: {},
@ -81699,7 +81699,7 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.SingleSelectTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-single-select-trigger bi-border",
baseCls: "bi-single-select-trigger bi-border bi-border-radius",
allowNoSelect: false,
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,

6
dist/bundle.js vendored

@ -73044,7 +73044,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.MultiSelectInsertTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-trigger bi-border",
baseCls: "bi-multi-select-trigger bi-border bi-border-radius",
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,
searcher: {},
@ -73771,7 +73771,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.MultiSelectTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-trigger bi-border",
baseCls: "bi-multi-select-trigger bi-border bi-border-radius",
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,
searcher: {},
@ -82103,7 +82103,7 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.SingleSelectTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-single-select-trigger bi-border",
baseCls: "bi-single-select-trigger bi-border bi-border-radius",
allowNoSelect: false,
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,

5
dist/fineui.css vendored

@ -4429,11 +4429,6 @@ ul.ztree.zTreeDragUL {
}
.bi-multi-select-trigger {
-webkit-border-radius: 2px 2px 2px 2px;
-moz-border-radius: 2px 2px 2px 2px;
border-radius: 2px 2px 2px 2px;
}
.bi-multi-select-search-pane .multi-select-toolbar {
color: #faaa39;
}

6
dist/fineui.ie.js vendored

@ -72885,7 +72885,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.MultiSelectInsertTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-trigger bi-border",
baseCls: "bi-multi-select-trigger bi-border bi-border-radius",
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,
searcher: {},
@ -73612,7 +73612,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.MultiSelectTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-trigger bi-border",
baseCls: "bi-multi-select-trigger bi-border bi-border-radius",
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,
searcher: {},
@ -81944,7 +81944,7 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.SingleSelectTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-single-select-trigger bi-border",
baseCls: "bi-single-select-trigger bi-border bi-border-radius",
allowNoSelect: false,
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,

6
dist/fineui.js vendored

@ -73289,7 +73289,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.MultiSelectInsertTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-trigger bi-border",
baseCls: "bi-multi-select-trigger bi-border bi-border-radius",
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,
searcher: {},
@ -74016,7 +74016,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.MultiSelectTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-trigger bi-border",
baseCls: "bi-multi-select-trigger bi-border bi-border-radius",
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,
searcher: {},
@ -82348,7 +82348,7 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.SingleSelectTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-single-select-trigger bi-border",
baseCls: "bi-single-select-trigger bi-border bi-border-radius",
allowNoSelect: false,
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,

6
dist/fineui_without_jquery_polyfill.js vendored

@ -55588,7 +55588,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.MultiSelectInsertTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-trigger bi-border",
baseCls: "bi-multi-select-trigger bi-border bi-border-radius",
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,
searcher: {},
@ -56315,7 +56315,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.MultiSelectTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-trigger bi-border",
baseCls: "bi-multi-select-trigger bi-border bi-border-radius",
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,
searcher: {},
@ -64647,7 +64647,7 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.SingleSelectTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-single-select-trigger bi-border",
baseCls: "bi-single-select-trigger bi-border bi-border-radius",
allowNoSelect: false,
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,

5
dist/widget.css vendored

@ -130,11 +130,6 @@
}
.bi-multi-select-trigger {
-webkit-border-radius: 2px 2px 2px 2px;
-moz-border-radius: 2px 2px 2px 2px;
border-radius: 2px 2px 2px 2px;
}
.bi-multi-select-search-pane .multi-select-toolbar {
color: #faaa39;
}

6
dist/widget.js vendored

@ -10699,7 +10699,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.MultiSelectInsertTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-trigger bi-border",
baseCls: "bi-multi-select-trigger bi-border bi-border-radius",
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,
searcher: {},
@ -11426,7 +11426,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.MultiSelectTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-trigger bi-border",
baseCls: "bi-multi-select-trigger bi-border bi-border-radius",
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,
searcher: {},
@ -19758,7 +19758,7 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.SingleSelectTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-single-select-trigger bi-border",
baseCls: "bi-single-select-trigger bi-border bi-border-radius",
allowNoSelect: false,
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,

5
src/css/widget/multiselect/multiselect.css

@ -43,8 +43,3 @@
}
.bi-multi-select-trigger {
-webkit-border-radius: 2px 2px 2px 2px;
-moz-border-radius: 2px 2px 2px 2px;
border-radius: 2px 2px 2px 2px;
}

2
src/less/widget/multiselect/multiselect.trigger.less

@ -1,5 +1,5 @@
@import "../../index";
.bi-multi-select-trigger {
.border-corner-radius(2px, 2px, 2px, 2px);
}

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

@ -15,7 +15,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.MultiSelectInsertTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-trigger bi-border",
baseCls: "bi-multi-select-trigger bi-border bi-border-radius",
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,
searcher: {},

2
src/widget/multiselect/multiselect.trigger.js

@ -15,7 +15,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.MultiSelectTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-trigger bi-border",
baseCls: "bi-multi-select-trigger bi-border bi-border-radius",
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,
searcher: {},

2
src/widget/singleselect/singleselect.trigger.js

@ -15,7 +15,7 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.SingleSelectTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-single-select-trigger bi-border",
baseCls: "bi-single-select-trigger bi-border bi-border-radius",
allowNoSelect: false,
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,

Loading…
Cancel
Save