From 9712b897b35faded715c3f63792d7a547193415a Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Wed, 11 Sep 2019 10:24:29 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-21790=20refactor:=20=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E4=B8=80=E4=B8=8B=E5=8A=A0=E5=9C=86=E8=A7=92=E7=9A=84=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/2.0/fineui.css | 5 ----- dist/2.0/fineui.ie.js | 6 +++--- dist/2.0/fineui.js | 6 +++--- dist/bundle.css | 5 ----- dist/bundle.ie.js | 6 +++--- dist/bundle.js | 6 +++--- dist/fineui.css | 5 ----- dist/fineui.ie.js | 6 +++--- dist/fineui.js | 6 +++--- dist/fineui_without_jquery_polyfill.js | 6 +++--- dist/widget.css | 5 ----- dist/widget.js | 6 +++--- src/css/widget/multiselect/multiselect.css | 5 ----- src/less/widget/multiselect/multiselect.trigger.less | 2 +- src/widget/multiselect/multiselect.insert.trigger.js | 2 +- src/widget/multiselect/multiselect.trigger.js | 2 +- src/widget/singleselect/singleselect.trigger.js | 2 +- 17 files changed, 28 insertions(+), 53 deletions(-) diff --git a/dist/2.0/fineui.css b/dist/2.0/fineui.css index f5872a772..2d3784fdd 100644 --- a/dist/2.0/fineui.css +++ b/dist/2.0/fineui.css @@ -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; } diff --git a/dist/2.0/fineui.ie.js b/dist/2.0/fineui.ie.js index 79f8dab2c..8156130e3 100644 --- a/dist/2.0/fineui.ie.js +++ b/dist/2.0/fineui.ie.js @@ -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, diff --git a/dist/2.0/fineui.js b/dist/2.0/fineui.js index b80972acb..662247963 100644 --- a/dist/2.0/fineui.js +++ b/dist/2.0/fineui.js @@ -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, diff --git a/dist/bundle.css b/dist/bundle.css index f5872a772..2d3784fdd 100644 --- a/dist/bundle.css +++ b/dist/bundle.css @@ -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; } diff --git a/dist/bundle.ie.js b/dist/bundle.ie.js index 79f8dab2c..8156130e3 100644 --- a/dist/bundle.ie.js +++ b/dist/bundle.ie.js @@ -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, diff --git a/dist/bundle.js b/dist/bundle.js index b80972acb..662247963 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -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, diff --git a/dist/fineui.css b/dist/fineui.css index bc3132ae5..46e6c48a7 100644 --- a/dist/fineui.css +++ b/dist/fineui.css @@ -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; } diff --git a/dist/fineui.ie.js b/dist/fineui.ie.js index aea5a2abc..10ea2c68f 100644 --- a/dist/fineui.ie.js +++ b/dist/fineui.ie.js @@ -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, diff --git a/dist/fineui.js b/dist/fineui.js index 4f60e98e8..48bbd64b3 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -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, diff --git a/dist/fineui_without_jquery_polyfill.js b/dist/fineui_without_jquery_polyfill.js index ab1915011..fdacf9b6e 100644 --- a/dist/fineui_without_jquery_polyfill.js +++ b/dist/fineui_without_jquery_polyfill.js @@ -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, diff --git a/dist/widget.css b/dist/widget.css index b9e2fd77a..f1a92fd8d 100644 --- a/dist/widget.css +++ b/dist/widget.css @@ -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; } diff --git a/dist/widget.js b/dist/widget.js index 79a2db36c..8a01997d2 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -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, diff --git a/src/css/widget/multiselect/multiselect.css b/src/css/widget/multiselect/multiselect.css index 2574cb51c..9710bffb0 100644 --- a/src/css/widget/multiselect/multiselect.css +++ b/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; -} diff --git a/src/less/widget/multiselect/multiselect.trigger.less b/src/less/widget/multiselect/multiselect.trigger.less index f82ed797e..32a887595 100644 --- a/src/less/widget/multiselect/multiselect.trigger.less +++ b/src/less/widget/multiselect/multiselect.trigger.less @@ -1,5 +1,5 @@ @import "../../index"; .bi-multi-select-trigger { - .border-corner-radius(2px, 2px, 2px, 2px); + } \ No newline at end of file diff --git a/src/widget/multiselect/multiselect.insert.trigger.js b/src/widget/multiselect/multiselect.insert.trigger.js index 154a1dda9..8f6865283 100644 --- a/src/widget/multiselect/multiselect.insert.trigger.js +++ b/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: {}, diff --git a/src/widget/multiselect/multiselect.trigger.js b/src/widget/multiselect/multiselect.trigger.js index e30b23e3b..f47370d1e 100644 --- a/src/widget/multiselect/multiselect.trigger.js +++ b/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: {}, diff --git a/src/widget/singleselect/singleselect.trigger.js b/src/widget/singleselect/singleselect.trigger.js index 81320ef86..c32395a55 100644 --- a/src/widget/singleselect/singleselect.trigger.js +++ b/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,