fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

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

* commit '4cefefd68958ef959b7db054a57ccddceba60582':
  REPORT-21790 refactor: 统一一下加圆角的方式
es6
guy 5 years ago
parent
6dcd4dbbe4 4cefefd689
commit
76524e8b81
17 changed files with 28 additions and 53 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  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
Unescape View File

@ -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 { .bi-multi-select-search-pane .multi-select-toolbar {
color: #faaa39; color: #faaa39;
} }

6
dist/2.0/fineui.ie.js vendored
Unescape View File

@ -72640,7 +72640,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectInsertTrigger.superclass._defaultConfig.apply(this, arguments), { 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, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,
searcher: {}, searcher: {},
@ -73367,7 +73367,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectTrigger.superclass._defaultConfig.apply(this, arguments), { 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, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,
searcher: {}, searcher: {},
@ -81699,7 +81699,7 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.SingleSelectTrigger.superclass._defaultConfig.apply(this, arguments), { 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, allowNoSelect: false,
itemsCreator: BI.emptyFn, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,

6
dist/2.0/fineui.js vendored
Unescape View File

@ -73044,7 +73044,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectInsertTrigger.superclass._defaultConfig.apply(this, arguments), { 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, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,
searcher: {}, searcher: {},
@ -73771,7 +73771,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectTrigger.superclass._defaultConfig.apply(this, arguments), { 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, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,
searcher: {}, searcher: {},
@ -82103,7 +82103,7 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.SingleSelectTrigger.superclass._defaultConfig.apply(this, arguments), { 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, allowNoSelect: false,
itemsCreator: BI.emptyFn, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,

5
dist/bundle.css vendored
Unescape View File

@ -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 { .bi-multi-select-search-pane .multi-select-toolbar {
color: #faaa39; color: #faaa39;
} }

6
dist/bundle.ie.js vendored
Unescape View File

@ -72640,7 +72640,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectInsertTrigger.superclass._defaultConfig.apply(this, arguments), { 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, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,
searcher: {}, searcher: {},
@ -73367,7 +73367,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectTrigger.superclass._defaultConfig.apply(this, arguments), { 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, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,
searcher: {}, searcher: {},
@ -81699,7 +81699,7 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.SingleSelectTrigger.superclass._defaultConfig.apply(this, arguments), { 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, allowNoSelect: false,
itemsCreator: BI.emptyFn, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,

6
dist/bundle.js vendored
Unescape View File

@ -73044,7 +73044,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectInsertTrigger.superclass._defaultConfig.apply(this, arguments), { 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, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,
searcher: {}, searcher: {},
@ -73771,7 +73771,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectTrigger.superclass._defaultConfig.apply(this, arguments), { 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, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,
searcher: {}, searcher: {},
@ -82103,7 +82103,7 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.SingleSelectTrigger.superclass._defaultConfig.apply(this, arguments), { 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, allowNoSelect: false,
itemsCreator: BI.emptyFn, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,

5
dist/fineui.css vendored
Unescape View File

@ -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 { .bi-multi-select-search-pane .multi-select-toolbar {
color: #faaa39; color: #faaa39;
} }

6
dist/fineui.ie.js vendored
Unescape View File

@ -72885,7 +72885,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectInsertTrigger.superclass._defaultConfig.apply(this, arguments), { 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, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,
searcher: {}, searcher: {},
@ -73612,7 +73612,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectTrigger.superclass._defaultConfig.apply(this, arguments), { 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, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,
searcher: {}, searcher: {},
@ -81944,7 +81944,7 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.SingleSelectTrigger.superclass._defaultConfig.apply(this, arguments), { 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, allowNoSelect: false,
itemsCreator: BI.emptyFn, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,

6
dist/fineui.js vendored
Unescape View File

@ -73289,7 +73289,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectInsertTrigger.superclass._defaultConfig.apply(this, arguments), { 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, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,
searcher: {}, searcher: {},
@ -74016,7 +74016,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectTrigger.superclass._defaultConfig.apply(this, arguments), { 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, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,
searcher: {}, searcher: {},
@ -82348,7 +82348,7 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.SingleSelectTrigger.superclass._defaultConfig.apply(this, arguments), { 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, allowNoSelect: false,
itemsCreator: BI.emptyFn, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,

6
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -55588,7 +55588,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectInsertTrigger.superclass._defaultConfig.apply(this, arguments), { 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, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,
searcher: {}, searcher: {},
@ -56315,7 +56315,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectTrigger.superclass._defaultConfig.apply(this, arguments), { 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, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,
searcher: {}, searcher: {},
@ -64647,7 +64647,7 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.SingleSelectTrigger.superclass._defaultConfig.apply(this, arguments), { 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, allowNoSelect: false,
itemsCreator: BI.emptyFn, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,

5
dist/widget.css vendored
Unescape View File

@ -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 { .bi-multi-select-search-pane .multi-select-toolbar {
color: #faaa39; color: #faaa39;
} }

6
dist/widget.js vendored
Unescape View File

@ -10699,7 +10699,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectInsertTrigger.superclass._defaultConfig.apply(this, arguments), { 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, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,
searcher: {}, searcher: {},
@ -11426,7 +11426,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectTrigger.superclass._defaultConfig.apply(this, arguments), { 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, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,
searcher: {}, searcher: {},
@ -19758,7 +19758,7 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.SingleSelectTrigger.superclass._defaultConfig.apply(this, arguments), { 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, allowNoSelect: false,
itemsCreator: BI.emptyFn, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,

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

@ -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
Unescape View File

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

2
src/widget/multiselect/multiselect.insert.trigger.js
Unescape View File

@ -15,7 +15,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectInsertTrigger.superclass._defaultConfig.apply(this, arguments), { 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, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,
searcher: {}, searcher: {},

2
src/widget/multiselect/multiselect.trigger.js
Unescape View File

@ -15,7 +15,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectTrigger.superclass._defaultConfig.apply(this, arguments), { 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, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,
searcher: {}, searcher: {},

2
src/widget/singleselect/singleselect.trigger.js
Unescape View File

@ -15,7 +15,7 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.SingleSelectTrigger.superclass._defaultConfig.apply(this, arguments), { 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, allowNoSelect: false,
itemsCreator: BI.emptyFn, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,

Write Preview
Loading…
Cancel
Save