Browse Source

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

* commit 'f896d5badebc2b5c9d71900fe97c1e3bf4fa9f18':
  BI-45967 refactor: downlistitem的小点点
  BI-46742 refactor: 去掉文件头部多余的注释
  update
es6
guy 5 years ago
parent
commit
63ad634013
  1. 4
      public/css/font.css
  2. 2
      src/base/single/tip/tip.tooltip.js
  3. 5
      src/case/button/item.singleselect.js
  4. 5
      src/case/button/treeitem/item.first.treeleaf.js
  5. 5
      src/case/button/treeitem/item.last.treeleaf.js
  6. 5
      src/case/button/treeitem/item.mid.treeleaf.js
  7. 3
      src/case/colorchooser/colorchooser.js
  8. 2
      src/component/allvaluechooser/pane.allvaluechooser.js
  9. 2
      src/component/treevaluechooser/pane.treevaluechooser.js
  10. 2
      src/component/valuechooser/pane.valuechooser.js
  11. 4
      src/css/resource/font.css
  12. 2
      src/less/resource/font.less
  13. 2
      src/widget/downlist/item.downlistgroup.js
  14. 4
      src/widget/dynamicdate/dynamicdate.caculate.js
  15. 2
      src/widget/multilayerselecttree/multilayerselecttree.leveltree.js
  16. 5
      src/widget/singleselect/singleselect.item.js
  17. 3
      src/widget/singleslider/button/editor.sign.text.js
  18. 2
      src/widget/yearmonth/card.dynamic.yearmonth.js
  19. 2
      src/widget/yearquarter/card.dynamic.yearquarter.js
  20. 4
      ui/css/font.css

4
public/css/font.css

@ -224,11 +224,11 @@
.dot-e-font:hover .b-font:before, .dot-e-font:hover .b-font:before,
.dot-e-font.hover .b-font:before { .dot-e-font.hover .b-font:before {
content: "\e762"; content: "\e762";
color: rgba(54, 133, 242, 0.06); color: transparent;
} }
.dot-e-font:active .b-font:before { .dot-e-font:active .b-font:before {
content: "\e762"; content: "\e762";
color: #3685f2; color: transparent;
} }
.dot-e-font.active .b-font:before { .dot-e-font.active .b-font:before {
content: "\e762"; content: "\e762";

2
src/base/single/tip/tip.tooltip.js

@ -1,5 +1,5 @@
/** /**
* toast提示 * title提示
* *
* Created by GUY on 2015/9/7. * Created by GUY on 2015/9/7.
* @class BI.Tooltip * @class BI.Tooltip

5
src/case/button/item.singleselect.js

@ -1,8 +1,3 @@
/**
* guy
* 复选框item
* @type {*|void|Object}
*/
BI.SingleSelectItem = BI.inherit(BI.BasicButton, { BI.SingleSelectItem = BI.inherit(BI.BasicButton, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.SingleSelectItem.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.SingleSelectItem.superclass._defaultConfig.apply(this, arguments), {

5
src/case/button/treeitem/item.first.treeleaf.js

@ -1,8 +1,3 @@
/**
* guy
* 复选框item
* @type {*|void|Object}
*/
BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, { BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.FirstTreeLeafItem.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.FirstTreeLeafItem.superclass._defaultConfig.apply(this, arguments), {

5
src/case/button/treeitem/item.last.treeleaf.js

@ -1,8 +1,3 @@
/**
* guy
* 复选框item
* @type {*|void|Object}
*/
BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, { BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.LastTreeLeafItem.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.LastTreeLeafItem.superclass._defaultConfig.apply(this, arguments), {

5
src/case/button/treeitem/item.mid.treeleaf.js

@ -1,8 +1,3 @@
/**
* guy
* 复选框item
* @type {*|void|Object}
*/
BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, { BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MidTreeLeafItem.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MidTreeLeafItem.superclass._defaultConfig.apply(this, arguments), {

3
src/case/colorchooser/colorchooser.js

@ -65,9 +65,6 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
var color = self.colorPicker.getValue(); var color = self.colorPicker.getValue();
self.trigger.setValue(color); 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 () { this.combo.on(BI.Combo.EVENT_AFTER_HIDEVIEW, function () {
self.fireEvent(BI.ColorChooser.EVENT_CHANGE, arguments); self.fireEvent(BI.ColorChooser.EVENT_CHANGE, arguments);

2
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. * Created by GUY on 2015/10/29.

2
src/component/treevaluechooser/pane.treevaluechooser.js

@ -1,5 +1,5 @@
/** /**
* 简单的复选下拉树控件, 适用于数据量少的情况 * 简单的树面板, 适用于数据量少的情况
* *
* Created by GUY on 2015/10/29. * Created by GUY on 2015/10/29.
* @class BI.TreeValueChooserPane * @class BI.TreeValueChooserPane

2
src/component/valuechooser/pane.valuechooser.js

@ -1,5 +1,5 @@
/** /**
* 简单的复选下拉框控件, 适用于数据量少的情况 * 简单的复选面板, 适用于数据量少的情况
* 封装了字段处理逻辑 * 封装了字段处理逻辑
* *
* Created by GUY on 2015/10/29. * Created by GUY on 2015/10/29.

4
src/css/resource/font.css

@ -224,11 +224,11 @@
.dot-e-font:hover .b-font:before, .dot-e-font:hover .b-font:before,
.dot-e-font.hover .b-font:before { .dot-e-font.hover .b-font:before {
content: "\e762"; content: "\e762";
color: rgba(54, 133, 242, 0.06); color: transparent;
} }
.dot-e-font:active .b-font:before { .dot-e-font:active .b-font:before {
content: "\e762"; content: "\e762";
color: #3685f2; color: transparent;
} }
.dot-e-font.active .b-font:before { .dot-e-font.active .b-font:before {
content: "\e762"; content: "\e762";

2
src/less/resource/font.less

@ -28,7 +28,7 @@
.font(dot-font, @font-dot, @color-bi-text-black); .font(dot-font, @font-dot, @color-bi-text-black);
.font-hover(dot-h-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-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); .font(pull-right-font, @font-right-triangle);

2
src/widget/downlist/item.downlistgroup.js

@ -28,7 +28,7 @@ BI.DownListGroupItem = BI.inherit(BI.BasicButton, {
type: "bi.icon_button", type: "bi.icon_button",
cls: o.iconCls1, cls: o.iconCls1,
width: 36, width: 36,
forceNotSelected: true, disableSelected: true,
selected: this._digest(o.value) selected: this._digest(o.value)
}); });

4
src/widget/dynamicdate/dynamicdate.caculate.js

@ -1,7 +1,3 @@
/**
* 汇总表格帮助类
* Created by Young's on 2017/1/19.
*/
!(function () { !(function () {
BI.DynamicDateHelper = {}; BI.DynamicDateHelper = {};
BI.extend(BI.DynamicDateHelper, { BI.extend(BI.DynamicDateHelper, {

2
src/widget/multilayerselecttree/multilayerselecttree.leveltree.js

@ -2,7 +2,7 @@
* guy * guy
* 二级树 * 二级树
* @class BI.MultiLayerSelectLevelTree * @class BI.MultiLayerSelectLevelTree
* @extends BI.Select * @extends BI.Pane
*/ */
BI.MultiLayerSelectLevelTree = BI.inherit(BI.Pane, { BI.MultiLayerSelectLevelTree = BI.inherit(BI.Pane, {
_defaultConfig: function () { _defaultConfig: function () {

5
src/widget/singleselect/singleselect.item.js

@ -1,8 +1,3 @@
/**
* guy
* 单选框item
* @type {*|void|Object}
*/
BI.SingleSelectComboItem = BI.inherit(BI.BasicButton, { BI.SingleSelectComboItem = BI.inherit(BI.BasicButton, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.SingleSelectComboItem.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.SingleSelectComboItem.superclass._defaultConfig.apply(this, arguments), {

3
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, { BI.SignTextEditor = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.SignTextEditor.superclass._defaultConfig.apply(this, arguments); var conf = BI.SignTextEditor.superclass._defaultConfig.apply(this, arguments);

2
src/widget/yearmonth/card.dynamic.yearmonth.js

@ -1,5 +1,5 @@
/** /**
* 展示面板 * 展示面板
* *
* Created by GUY on 2015/9/2. * Created by GUY on 2015/9/2.
* @class BI.YearCard * @class BI.YearCard

2
src/widget/yearquarter/card.dynamic.yearquarter.js

@ -1,5 +1,5 @@
/** /**
* 展示面板 * 季度展示面板
* *
* Created by GUY on 2015/9/2. * Created by GUY on 2015/9/2.
* @class BI.YearCard * @class BI.YearCard

4
ui/css/font.css

@ -224,11 +224,11 @@
.dot-e-font:hover .b-font:before, .dot-e-font:hover .b-font:before,
.dot-e-font.hover .b-font:before { .dot-e-font.hover .b-font:before {
content: "\e762"; content: "\e762";
color: rgba(54, 133, 242, 0.06); color: transparent;
} }
.dot-e-font:active .b-font:before { .dot-e-font:active .b-font:before {
content: "\e762"; content: "\e762";
color: #3685f2; color: transparent;
} }
.dot-e-font.active .b-font:before { .dot-e-font.active .b-font:before {
content: "\e762"; content: "\e762";

Loading…
Cancel
Save