From 1b4cf271084b484d997d66bc3e83d0442e68f9f4 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Mon, 1 Jul 2019 15:18:42 +0800 Subject: [PATCH 1/3] update --- src/case/colorchooser/colorchooser.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/case/colorchooser/colorchooser.js b/src/case/colorchooser/colorchooser.js index b2e1f6999..6fa7c55cf 100644 --- a/src/case/colorchooser/colorchooser.js +++ b/src/case/colorchooser/colorchooser.js @@ -65,9 +65,6 @@ BI.ColorChooser = BI.inherit(BI.Widget, { var color = self.colorPicker.getValue(); self.trigger.setValue(color); }; - this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { - self.colorPicker.setStoreColors(BI.string2Array(BI.Cache.getItem("colors") || "")); - }); this.combo.on(BI.Combo.EVENT_AFTER_HIDEVIEW, function () { self.fireEvent(BI.ColorChooser.EVENT_CHANGE, arguments); From 1045643bb65474b91d86241a5b2b84fefb2f1395 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Mon, 1 Jul 2019 16:42:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?BI-46742=20refactor:=20=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B4=E9=83=A8=E5=A4=9A=E4=BD=99=E7=9A=84?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/single/tip/tip.tooltip.js | 2 +- src/case/button/item.singleselect.js | 5 ----- src/case/button/treeitem/item.first.treeleaf.js | 5 ----- src/case/button/treeitem/item.last.treeleaf.js | 5 ----- src/case/button/treeitem/item.mid.treeleaf.js | 5 ----- src/component/allvaluechooser/pane.allvaluechooser.js | 2 +- src/component/treevaluechooser/pane.treevaluechooser.js | 2 +- src/component/valuechooser/pane.valuechooser.js | 2 +- src/widget/downlist/item.downlistgroup.js | 2 +- src/widget/dynamicdate/dynamicdate.caculate.js | 4 ---- .../multilayerselecttree/multilayerselecttree.leveltree.js | 2 +- src/widget/singleselect/singleselect.item.js | 5 ----- src/widget/singleslider/button/editor.sign.text.js | 3 --- src/widget/yearmonth/card.dynamic.yearmonth.js | 2 +- src/widget/yearquarter/card.dynamic.yearquarter.js | 2 +- 15 files changed, 8 insertions(+), 40 deletions(-) diff --git a/src/base/single/tip/tip.tooltip.js b/src/base/single/tip/tip.tooltip.js index 9d396507d..c8b5b053d 100644 --- a/src/base/single/tip/tip.tooltip.js +++ b/src/base/single/tip/tip.tooltip.js @@ -1,5 +1,5 @@ /** - * toast提示 + * title提示 * * Created by GUY on 2015/9/7. * @class BI.Tooltip diff --git a/src/case/button/item.singleselect.js b/src/case/button/item.singleselect.js index 04420722d..910b579cd 100644 --- a/src/case/button/item.singleselect.js +++ b/src/case/button/item.singleselect.js @@ -1,8 +1,3 @@ -/** - * guy - * 复选框item - * @type {*|void|Object} - */ BI.SingleSelectItem = BI.inherit(BI.BasicButton, { _defaultConfig: function () { return BI.extend(BI.SingleSelectItem.superclass._defaultConfig.apply(this, arguments), { diff --git a/src/case/button/treeitem/item.first.treeleaf.js b/src/case/button/treeitem/item.first.treeleaf.js index 4db068ab8..461548608 100644 --- a/src/case/button/treeitem/item.first.treeleaf.js +++ b/src/case/button/treeitem/item.first.treeleaf.js @@ -1,8 +1,3 @@ -/** - * guy - * 复选框item - * @type {*|void|Object} - */ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, { _defaultConfig: function () { return BI.extend(BI.FirstTreeLeafItem.superclass._defaultConfig.apply(this, arguments), { diff --git a/src/case/button/treeitem/item.last.treeleaf.js b/src/case/button/treeitem/item.last.treeleaf.js index 8f3f8e54a..135124db6 100644 --- a/src/case/button/treeitem/item.last.treeleaf.js +++ b/src/case/button/treeitem/item.last.treeleaf.js @@ -1,8 +1,3 @@ -/** - * guy - * 复选框item - * @type {*|void|Object} - */ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, { _defaultConfig: function () { return BI.extend(BI.LastTreeLeafItem.superclass._defaultConfig.apply(this, arguments), { diff --git a/src/case/button/treeitem/item.mid.treeleaf.js b/src/case/button/treeitem/item.mid.treeleaf.js index 8b41612b0..77a4126e8 100644 --- a/src/case/button/treeitem/item.mid.treeleaf.js +++ b/src/case/button/treeitem/item.mid.treeleaf.js @@ -1,8 +1,3 @@ -/** - * guy - * 复选框item - * @type {*|void|Object} - */ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, { _defaultConfig: function () { return BI.extend(BI.MidTreeLeafItem.superclass._defaultConfig.apply(this, arguments), { diff --git a/src/component/allvaluechooser/pane.allvaluechooser.js b/src/component/allvaluechooser/pane.allvaluechooser.js index 1e2c6837d..c7c1e4cff 100644 --- a/src/component/allvaluechooser/pane.allvaluechooser.js +++ b/src/component/allvaluechooser/pane.allvaluechooser.js @@ -1,5 +1,5 @@ /** - * 简单的复选下拉框控件, 适用于数据量少的情况， 与valuechooser的区别是allvaluechooser setValue和getValue返回的是所有值 + * 简单的复选面板, 适用于数据量少的情况， 与valuechooser的区别是allvaluechooser setValue和getValue返回的是所有值 * 封装了字段处理逻辑 * * Created by GUY on 2015/10/29. diff --git a/src/component/treevaluechooser/pane.treevaluechooser.js b/src/component/treevaluechooser/pane.treevaluechooser.js index 87c80ce8b..906ed682a 100644 --- a/src/component/treevaluechooser/pane.treevaluechooser.js +++ b/src/component/treevaluechooser/pane.treevaluechooser.js @@ -1,5 +1,5 @@ /** - * 简单的复选下拉树控件, 适用于数据量少的情况 + * 简单的树面板, 适用于数据量少的情况 * * Created by GUY on 2015/10/29. * @class BI.TreeValueChooserPane diff --git a/src/component/valuechooser/pane.valuechooser.js b/src/component/valuechooser/pane.valuechooser.js index eb53acca6..9e7a9e096 100644 --- a/src/component/valuechooser/pane.valuechooser.js +++ b/src/component/valuechooser/pane.valuechooser.js @@ -1,5 +1,5 @@ /** - * 简单的复选下拉框控件, 适用于数据量少的情况 + * 简单的复选面板, 适用于数据量少的情况 * 封装了字段处理逻辑 * * Created by GUY on 2015/10/29. diff --git a/src/widget/downlist/item.downlistgroup.js b/src/widget/downlist/item.downlistgroup.js index 79cb55a44..7c1d33a04 100644 --- a/src/widget/downlist/item.downlistgroup.js +++ b/src/widget/downlist/item.downlistgroup.js @@ -28,7 +28,7 @@ BI.DownListGroupItem = BI.inherit(BI.BasicButton, { type: "bi.icon_button", cls: o.iconCls1, width: 36, - forceNotSelected: true, + disableSelected: true, selected: this._digest(o.value) }); diff --git a/src/widget/dynamicdate/dynamicdate.caculate.js b/src/widget/dynamicdate/dynamicdate.caculate.js index 3b876358f..3b49a9118 100644 --- a/src/widget/dynamicdate/dynamicdate.caculate.js +++ b/src/widget/dynamicdate/dynamicdate.caculate.js @@ -1,7 +1,3 @@ -/** - * 汇总表格帮助类 - * Created by Young's on 2017/1/19. - */ !(function () { BI.DynamicDateHelper = {}; BI.extend(BI.DynamicDateHelper, { diff --git a/src/widget/multilayerselecttree/multilayerselecttree.leveltree.js b/src/widget/multilayerselecttree/multilayerselecttree.leveltree.js index 49319ea9d..5f6e24f57 100644 --- a/src/widget/multilayerselecttree/multilayerselecttree.leveltree.js +++ b/src/widget/multilayerselecttree/multilayerselecttree.leveltree.js @@ -2,7 +2,7 @@ * guy * 二级树 * @class BI.MultiLayerSelectLevelTree - * @extends BI.Select + * @extends BI.Pane */ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Pane, { _defaultConfig: function () { diff --git a/src/widget/singleselect/singleselect.item.js b/src/widget/singleselect/singleselect.item.js index b3a053f01..4c581201b 100644 --- a/src/widget/singleselect/singleselect.item.js +++ b/src/widget/singleselect/singleselect.item.js @@ -1,8 +1,3 @@ -/** - * guy - * 单选框item - * @type {*|void|Object} - */ BI.SingleSelectComboItem = BI.inherit(BI.BasicButton, { _defaultConfig: function () { return BI.extend(BI.SingleSelectComboItem.superclass._defaultConfig.apply(this, arguments), { diff --git a/src/widget/singleslider/button/editor.sign.text.js b/src/widget/singleslider/button/editor.sign.text.js index dee498687..d2b91930a 100644 --- a/src/widget/singleslider/button/editor.sign.text.js +++ b/src/widget/singleslider/button/editor.sign.text.js @@ -1,6 +1,3 @@ -/** - * Created by User on 2017/11/16. - */ BI.SignTextEditor = BI.inherit(BI.Widget, { _defaultConfig: function () { var conf = BI.SignTextEditor.superclass._defaultConfig.apply(this, arguments); diff --git a/src/widget/yearmonth/card.dynamic.yearmonth.js b/src/widget/yearmonth/card.dynamic.yearmonth.js index ed56da75e..983fd8456 100644 --- a/src/widget/yearmonth/card.dynamic.yearmonth.js +++ b/src/widget/yearmonth/card.dynamic.yearmonth.js @@ -1,5 +1,5 @@ /** - * 年份展示面板 + * 年月展示面板 * * Created by GUY on 2015/9/2. * @class BI.YearCard diff --git a/src/widget/yearquarter/card.dynamic.yearquarter.js b/src/widget/yearquarter/card.dynamic.yearquarter.js index 5dc01b8d5..90cc87d4a 100644 --- a/src/widget/yearquarter/card.dynamic.yearquarter.js +++ b/src/widget/yearquarter/card.dynamic.yearquarter.js @@ -1,5 +1,5 @@ /** - * 年份展示面板 + * 年季度展示面板 * * Created by GUY on 2015/9/2. * @class BI.YearCard From f896d5badebc2b5c9d71900fe97c1e3bf4fa9f18 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Mon, 1 Jul 2019 16:56:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?BI-45967=20refactor:=20downlistitem?= =?UTF-8?q?=E7=9A=84=E5=B0=8F=E7=82=B9=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/font.css | 4 ++-- src/css/resource/font.css | 4 ++-- src/less/resource/font.less | 2 +- ui/css/font.css | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/public/css/font.css b/public/css/font.css index e5415e95d..c3f4420e4 100644 --- a/public/css/font.css +++ b/public/css/font.css @@ -224,11 +224,11 @@ .dot-e-font:hover .b-font:before, .dot-e-font.hover .b-font:before { content: "\e762"; - color: rgba(54, 133, 242, 0.06); + color: transparent; } .dot-e-font:active .b-font:before { content: "\e762"; - color: #3685f2; + color: transparent; } .dot-e-font.active .b-font:before { content: "\e762"; diff --git a/src/css/resource/font.css b/src/css/resource/font.css index c9ccd6320..5c59876e7 100644 --- a/src/css/resource/font.css +++ b/src/css/resource/font.css @@ -224,11 +224,11 @@ .dot-e-font:hover .b-font:before, .dot-e-font.hover .b-font:before { content: "\e762"; - color: rgba(54, 133, 242, 0.06); + color: transparent; } .dot-e-font:active .b-font:before { content: "\e762"; - color: #3685f2; + color: transparent; } .dot-e-font.active .b-font:before { content: "\e762"; diff --git a/src/less/resource/font.less b/src/less/resource/font.less index 725cad15a..8b171cf85 100644 --- a/src/less/resource/font.less +++ b/src/less/resource/font.less @@ -28,7 +28,7 @@ .font(dot-font, @font-dot, @color-bi-text-black); .font-hover(dot-h-font, @font-dot, @color-bi-text-black); .font-hover-active(dot-ha-font, @font-dot, @color-bi-text, @color-bi-text-gray, @color-bi-text-black); -.font-effect(dot-e-font, @font-dot, transparent, fade(@color-bi-text-highlight, 6), @color-bi-text-highlight, @color-bi-text-highlight); +.font-effect(dot-e-font, @font-dot, transparent, transparent, transparent, @color-bi-text-highlight); //向右展开子菜单 .font(pull-right-font, @font-right-triangle); diff --git a/ui/css/font.css b/ui/css/font.css index b225b1937..d7e4e85b1 100644 --- a/ui/css/font.css +++ b/ui/css/font.css @@ -224,11 +224,11 @@ .dot-e-font:hover .b-font:before, .dot-e-font.hover .b-font:before { content: "\e762"; - color: rgba(54, 133, 242, 0.06); + color: transparent; } .dot-e-font:active .b-font:before { content: "\e762"; - color: #3685f2; + color: transparent; } .dot-e-font.active .b-font:before { content: "\e762";