Browse Source

Merge branch 'master' into bugfix/bugfix

es6
iapyang 6 years ago
parent
commit
833440d630
  1. 1
      demo/js/case/combo/demo.icon_text_value_combo.js
  2. 37
      demo/js/case/demo.click.effect.js
  3. 4
      demo/js/config/case.js
  4. 56
      dist/_fineui.min.js
  5. 16
      dist/base.css
  6. 10
      dist/base.js
  7. 80
      dist/bundle.css
  8. 80
      dist/bundle.js
  9. 2
      dist/bundle.min.css
  10. 56
      dist/bundle.min.js
  11. 65
      dist/case.js
  12. 49
      dist/core.css
  13. 4
      dist/core.js
  14. 49
      dist/core_without_normalize.css
  15. 41
      dist/demo.js
  16. 80
      dist/fineui.css
  17. 80
      dist/fineui.js
  18. 2
      dist/fineui.min.css
  19. 56
      dist/fineui.min.js
  20. 0
      dist/images/1x/background/auto_color_normal_disable.png
  21. 0
      dist/images/1x/background/auto_color_normal_select.png
  22. 0
      dist/images/1x/background/trans_disable.png
  23. 0
      dist/images/1x/background/trans_normal.png
  24. 0
      dist/images/1x/background/trans_select.png
  25. BIN
      dist/images/1x/icon/auto_normal.png
  26. BIN
      dist/images/1x/icon/dark/tree_collapse_1.png
  27. BIN
      dist/images/1x/icon/dark/tree_collapse_2.png
  28. BIN
      dist/images/1x/icon/dark/tree_collapse_3.png
  29. BIN
      dist/images/1x/icon/dark/tree_collapse_4.png
  30. BIN
      dist/images/1x/icon/dark/tree_expand_1.png
  31. BIN
      dist/images/1x/icon/dark/tree_expand_2.png
  32. BIN
      dist/images/1x/icon/dark/tree_expand_3.png
  33. BIN
      dist/images/1x/icon/dark/tree_expand_4.png
  34. BIN
      dist/images/1x/icon/dark/tree_vertical_line_1.png
  35. BIN
      dist/images/1x/icon/dark/tree_vertical_line_2.png
  36. BIN
      dist/images/1x/icon/dark/tree_vertical_line_3.png
  37. BIN
      dist/images/1x/icon/dark/tree_vertical_line_4.png
  38. BIN
      dist/images/1x/icon/dark/tree_vertical_line_5.png
  39. BIN
      dist/images/1x/icon/dark_tree_collapse_1.png
  40. BIN
      dist/images/1x/icon/dark_tree_collapse_2.png
  41. BIN
      dist/images/1x/icon/dark_tree_collapse_3.png
  42. BIN
      dist/images/1x/icon/dark_tree_collapse_4.png
  43. BIN
      dist/images/1x/icon/dark_tree_expand_1.png
  44. BIN
      dist/images/1x/icon/dark_tree_expand_2.png
  45. BIN
      dist/images/1x/icon/dark_tree_expand_3.png
  46. BIN
      dist/images/1x/icon/dark_tree_expand_4.png
  47. BIN
      dist/images/1x/icon/dark_tree_vertical_line_1.png
  48. BIN
      dist/images/1x/icon/dark_tree_vertical_line_2.png
  49. BIN
      dist/images/1x/icon/dark_tree_vertical_line_3.png
  50. BIN
      dist/images/1x/icon/dark_tree_vertical_line_4.png
  51. BIN
      dist/images/1x/icon/dark_tree_vertical_line_5.png
  52. BIN
      dist/images/2x/icon/dark/tree_collapse_1.png
  53. BIN
      dist/images/2x/icon/dark/tree_collapse_2.png
  54. BIN
      dist/images/2x/icon/dark/tree_collapse_3.png
  55. BIN
      dist/images/2x/icon/dark/tree_collapse_4.png
  56. BIN
      dist/images/2x/icon/dark/tree_expand_1.png
  57. BIN
      dist/images/2x/icon/dark/tree_expand_2.png
  58. BIN
      dist/images/2x/icon/dark/tree_expand_3.png
  59. BIN
      dist/images/2x/icon/dark/tree_expand_4.png
  60. BIN
      dist/images/2x/icon/dark/tree_vertical_line_1.png
  61. BIN
      dist/images/2x/icon/dark/tree_vertical_line_2.png
  62. BIN
      dist/images/2x/icon/dark/tree_vertical_line_3.png
  63. BIN
      dist/images/2x/icon/dark/tree_vertical_line_4.png
  64. BIN
      dist/images/2x/icon/dark/tree_vertical_line_5.png
  65. BIN
      dist/images/2x/icon/dark_tree_collapse_1.png
  66. BIN
      dist/images/2x/icon/dark_tree_collapse_2.png
  67. BIN
      dist/images/2x/icon/dark_tree_collapse_3.png
  68. BIN
      dist/images/2x/icon/dark_tree_collapse_4.png
  69. BIN
      dist/images/2x/icon/dark_tree_expand_1.png
  70. BIN
      dist/images/2x/icon/dark_tree_expand_2.png
  71. BIN
      dist/images/2x/icon/dark_tree_expand_3.png
  72. BIN
      dist/images/2x/icon/dark_tree_expand_4.png
  73. BIN
      dist/images/2x/icon/dark_tree_vertical_line_1.png
  74. BIN
      dist/images/2x/icon/dark_tree_vertical_line_2.png
  75. BIN
      dist/images/2x/icon/dark_tree_vertical_line_3.png
  76. BIN
      dist/images/2x/icon/dark_tree_vertical_line_4.png
  77. BIN
      dist/images/2x/icon/dark_tree_vertical_line_5.png
  78. 15
      dist/resource.css
  79. 1
      dist/widget.js
  80. 9
      public/css/background.css
  81. 6
      public/css/font.css
  82. 4
      src/base/single/button/button.basic.js
  83. 6
      src/base/single/single.js
  84. 25
      src/case/colorchooser/colorpicker/editor.colorpicker.js
  85. 17
      src/case/combo/icontextvaluecombo/combo.icontextvalue.js
  86. 7
      src/case/richeditor/niceditor/niceditor.js
  87. 4
      src/case/richeditor/plugins/combo.fontfamily.js
  88. 2
      src/case/richeditor/plugins/combo.sizechooser.js
  89. 9
      src/case/segment/segment.js
  90. 1
      src/case/trigger/trigger.icon.text.js
  91. 4
      src/core/inject.js
  92. 4
      src/css/base/combo/combo.css
  93. 12
      src/css/base/segment/segment.css
  94. 49
      src/css/core/utils/common.css
  95. 9
      src/css/resource/background.css
  96. 6
      src/css/resource/font.css
  97. 11
      src/less/base/combo/combo.textvalue.icon.less
  98. 4
      src/less/base/segment/segment.less
  99. 40
      src/less/core/utils/common.less
  100. 4
      src/less/lib/background.less
  101. Some files were not shown because too many files have changed in this diff Show More

1
demo/js/case/combo/demo.icon_text_value_combo.js

@ -13,7 +13,6 @@ Demo.IconTextValueCombo = BI.inherit(BI.Widget, {
type: "bi.icon_text_value_combo", type: "bi.icon_text_value_combo",
text: "默认值", text: "默认值",
// defaultIconCls: "next-page-h-font", // defaultIconCls: "next-page-h-font",
value: 1,
width: 300, width: 300,
iconHeight: 16, iconHeight: 16,
iconWidth: 16, iconWidth: 16,

37
demo/js/case/demo.click.effect.js

@ -0,0 +1,37 @@
Demo.Func = BI.inherit(BI.Widget, {
props: {
baseCls: "demo-func"
},
render: function () {
return {
type: "bi.vertical",
items: BI.createItems([{
text: "bi-list-item",
cls: "bi-list-item"
}, {
text: "bi-list-item-simple",
cls: "bi-list-item-simple"
}, {
text: "bi-list-item-effect",
cls: "bi-list-item-effect"
}, {
text: "bi-list-item-active",
cls: "bi-list-item-active"
}, {
text: "bi-list-item-active2",
cls: "bi-list-item-active2"
}, {
text: "bi-list-item-active3",
cls: "bi-list-item-active3"
}, {
text: "bi-list-item-select",
cls: "bi-list-item-select"
}], {
type: "bi.text_item"
}),
vgap: 10
};
}
});
BI.shortcut("demo.click_item_effect", Demo.Func);

4
demo/js/config/case.js

@ -230,4 +230,8 @@ Demo.CASE_CONFIG = [{
pId: 3, pId: 3,
text: "bi.segment", text: "bi.segment",
value: "demo.segment" value: "demo.segment"
}, {
pId: 3,
text: "点击项样式查看",
value: "demo.click_item_effect"
}]; }];

56
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

16
dist/base.css vendored

@ -188,6 +188,10 @@
display: none; display: none;
} }
.bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label {
color: #ff4949;
}
.bi-text-value-combo.combo-error .bi-select-text-trigger .select-text-label { .bi-text-value-combo.combo-error .bi-select-text-trigger .select-text-label {
color: #ff4949; color: #ff4949;
} }
@ -806,14 +810,14 @@ li.CodeMirror-hint-active {
} }
.bi-segment > .first-element { .bi-segment > .first-element {
border-left: 1px solid #3685f2; border-left: 1px solid #3685f2;
-webkit-border-radius: 6px 0px 0px 6px; -webkit-border-radius: 2px 0px 0px 2px;
-moz-border-radius: 6px 0px 0px 6px; -moz-border-radius: 2px 0px 0px 2px;
border-radius: 6px 0px 0px 6px; border-radius: 2px 0px 0px 2px;
} }
.bi-segment > .last-element { .bi-segment > .last-element {
-webkit-border-radius: 0px 6px 6px 0px; -webkit-border-radius: 0px 2px 2px 0px;
-moz-border-radius: 0px 6px 6px 0px; -moz-border-radius: 0px 2px 2px 0px;
border-radius: 0px 6px 6px 0px; border-radius: 0px 2px 2px 0px;
} }
.bi-segment.disabled > .center-element, .bi-segment.disabled > .center-element,
.bi-segment.disabled > .first-element { .bi-segment.disabled > .first-element {

10
dist/base.js vendored

@ -342,7 +342,7 @@ BI.Single = BI.inherit(BI.Widget, {
warningTitle: null, warningTitle: null,
tipType: null, // success或warning tipType: null, // success或warning
value: null, value: null,
belowMouse: false // title是否跟随鼠标 belowMouse: false // title是否跟随鼠标,
}); });
}, },
@ -353,6 +353,10 @@ BI.Single = BI.inherit(BI.Widget, {
var title = type === "success" ? this.getTitle() : (this.getWarningTitle() || this.getTitle()); var title = type === "success" ? this.getTitle() : (this.getWarningTitle() || this.getTitle());
if (BI.isKey(title)) { if (BI.isKey(title)) {
BI.Tooltips.show(e, this.getName(), title, type, this, opt); BI.Tooltips.show(e, this.getName(), title, type, this, opt);
if (opt.action) {
BI.Actions.runAction(opt.action, "hover", opt, title);
}
BI.Actions.runGlobalAction("hover", opt, title);
} }
}, },
@ -905,9 +909,9 @@ BI.BasicButton = BI.inherit(BI.Single, {
this.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.CLICK, v, this); this.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.CLICK, v, this);
this.fireEvent(BI.BasicButton.EVENT_CHANGE, v, this); this.fireEvent(BI.BasicButton.EVENT_CHANGE, v, this);
if (o.action) { if (o.action) {
BI.Actions.runAction(o.action, o); BI.Actions.runAction(o.action, "click", o);
} }
BI.Actions.runGlobalAction(o); BI.Actions.runGlobalAction("click", o);
} }
}, },

80
dist/bundle.css vendored

@ -981,6 +981,55 @@ textarea {
.bi-list-item-active3.disabled:active .bi-high-light { .bi-list-item-active3.disabled:active .bi-high-light {
color: #9ea6b2 !important; color: #9ea6b2 !important;
} }
.bi-theme-dark .bi-list-item-active3:hover,
.bi-theme-dark .bi-list-item-active3.hover {
color: #ffffff;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-theme-dark .bi-list-item-active3:hover .bi-input,
.bi-theme-dark .bi-list-item-active3.hover .bi-input {
color: #ffffff;
}
.bi-theme-dark .bi-list-item-active3:hover .bi-textarea,
.bi-theme-dark .bi-list-item-active3.hover .bi-textarea {
color: #ffffff;
}
.bi-theme-dark .bi-list-item-active3:active,
.bi-theme-dark .bi-list-item-active3.active {
color: #3685f2;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-theme-dark .bi-list-item-active3:active .bi-input,
.bi-theme-dark .bi-list-item-active3.active .bi-input {
color: #3685f2;
}
.bi-theme-dark .bi-list-item-active3:active .bi-textarea,
.bi-theme-dark .bi-list-item-active3.active .bi-textarea {
color: #3685f2;
}
.bi-theme-dark .bi-list-item-active3.disabled,
.bi-theme-dark .bi-list-item-active3.disabled:hover,
.bi-theme-dark .bi-list-item-active3.disabled:active {
background-color: transparent !important;
color: #878d9f !important;
}
.bi-theme-dark .bi-list-item-active3.disabled .bi-input,
.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-input,
.bi-theme-dark .bi-list-item-active3.disabled:active .bi-input {
color: #878d9f !important;
}
.bi-theme-dark .bi-list-item-active3.disabled .bi-textarea,
.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-textarea,
.bi-theme-dark .bi-list-item-active3.disabled:active .bi-textarea {
color: #878d9f !important;
}
.bi-theme-dark .bi-list-item-active3.disabled .bi-high-light,
.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-high-light,
.bi-theme-dark .bi-list-item-active3.disabled:active .bi-high-light {
color: #878d9f !important;
}
.bi-list-item-select:hover, .bi-list-item-select:hover,
.bi-list-item-select.hover { .bi-list-item-select.hover {
background-color: rgba(54, 133, 242, 0.06); background-color: rgba(54, 133, 242, 0.06);
@ -1979,6 +2028,10 @@ textarea {
display: none; display: none;
} }
.bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label {
color: #ff4949;
}
.bi-text-value-combo.combo-error .bi-select-text-trigger .select-text-label { .bi-text-value-combo.combo-error .bi-select-text-trigger .select-text-label {
color: #ff4949; color: #ff4949;
} }
@ -2597,14 +2650,14 @@ li.CodeMirror-hint-active {
} }
.bi-segment > .first-element { .bi-segment > .first-element {
border-left: 1px solid #3685f2; border-left: 1px solid #3685f2;
-webkit-border-radius: 6px 0px 0px 6px; -webkit-border-radius: 2px 0px 0px 2px;
-moz-border-radius: 6px 0px 0px 6px; -moz-border-radius: 2px 0px 0px 2px;
border-radius: 6px 0px 0px 6px; border-radius: 2px 0px 0px 2px;
} }
.bi-segment > .last-element { .bi-segment > .last-element {
-webkit-border-radius: 0px 6px 6px 0px; -webkit-border-radius: 0px 2px 2px 0px;
-moz-border-radius: 0px 6px 6px 0px; -moz-border-radius: 0px 2px 2px 0px;
border-radius: 0px 6px 6px 0px; border-radius: 0px 2px 2px 0px;
} }
.bi-segment.disabled > .center-element, .bi-segment.disabled > .center-element,
.bi-segment.disabled > .first-element { .bi-segment.disabled > .first-element {
@ -4537,9 +4590,14 @@ textarea::-webkit-scrollbar-thumb:hover {
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal.png'); _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal.png');
_background: none; _background: none;
} }
.auto-color-normal-disabled-background {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal.png');
_background: none;
}
.trans-color-background { .trans-color-background {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/background/trans_color.png') no-repeat center center; background: url('https://fanruan.coding.me/fineui/dist/images/1x/background/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/trans_color.png'); _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/trans_normal.png');
_background: none; _background: none;
} }
@font-face { @font-face {
@ -4767,7 +4825,7 @@ textarea::-webkit-scrollbar-thumb:hover {
} }
.dot-e-font .b-font:before { .dot-e-font .b-font:before {
content: "\e762"; content: "\e762";
color: #ffffff; color: transparent;
} }
.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 {
@ -4780,11 +4838,11 @@ textarea::-webkit-scrollbar-thumb:hover {
} }
.dot-e-font.active .b-font:before { .dot-e-font.active .b-font:before {
content: "\e762"; content: "\e762";
color: #232e40; color: #3685f2;
} }
.dot-e-font.disabled .b-font:before { .dot-e-font.disabled .b-font:before {
content: "\e762"; content: "\e762";
color: #ffffff; color: transparent;
} }
.pull-right-font .b-font { .pull-right-font .b-font {
font-size: 16px; font-size: 16px;

80
dist/bundle.js vendored

@ -28916,10 +28916,10 @@ BI.extend(BI.DOM, {
}; };
BI.Actions = { BI.Actions = {
runAction: function (type, config) { runAction: function (type, event, config) {
BI.each(actions[type], function (i, act) { BI.each(actions[type], function (i, act) {
try { try {
act(config); act(event, config);
} catch (e) { } catch (e) {
console.error(e); console.error(e);
} }
@ -36147,7 +36147,7 @@ BI.Single = BI.inherit(BI.Widget, {
warningTitle: null, warningTitle: null,
tipType: null, // success或warning tipType: null, // success或warning
value: null, value: null,
belowMouse: false // title是否跟随鼠标 belowMouse: false // title是否跟随鼠标,
}); });
}, },
@ -36158,6 +36158,10 @@ BI.Single = BI.inherit(BI.Widget, {
var title = type === "success" ? this.getTitle() : (this.getWarningTitle() || this.getTitle()); var title = type === "success" ? this.getTitle() : (this.getWarningTitle() || this.getTitle());
if (BI.isKey(title)) { if (BI.isKey(title)) {
BI.Tooltips.show(e, this.getName(), title, type, this, opt); BI.Tooltips.show(e, this.getName(), title, type, this, opt);
if (opt.action) {
BI.Actions.runAction(opt.action, "hover", opt, title);
}
BI.Actions.runGlobalAction("hover", opt, title);
} }
}, },
@ -36710,9 +36714,9 @@ BI.BasicButton = BI.inherit(BI.Single, {
this.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.CLICK, v, this); this.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.CLICK, v, this);
this.fireEvent(BI.BasicButton.EVENT_CHANGE, v, this); this.fireEvent(BI.BasicButton.EVENT_CHANGE, v, this);
if (o.action) { if (o.action) {
BI.Actions.runAction(o.action, o); BI.Actions.runAction(o.action, "click", o);
} }
BI.Actions.runGlobalAction(o); BI.Actions.runGlobalAction("click", o);
} }
}, },
@ -77177,15 +77181,30 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
}, },
_showPreColor: function (color) { _showPreColor: function (color) {
if (color === "") { if(this.isEnabled()) {
this.colorShow.element.css("background-color", "").removeClass("trans-color-background").addClass("auto-color-normal-background"); if (color === "") {
} else if (color === "transparent") { this.colorShow.element.css("background-color", "").removeClass("trans-color-background").addClass("auto-color-normal-background");
this.colorShow.element.css("background-color", "").removeClass("auto-color-normal-background").addClass("trans-color-background"); } else if (color === "transparent") {
this.colorShow.element.css("background-color", "").removeClass("auto-color-normal-background").addClass("trans-color-background");
} else {
this.colorShow.element.css({"background-color": color}).removeClass("auto-color-normal-background").removeClass("trans-color-background");
}
} else { } else {
this.colorShow.element.css({"background-color": color}).removeClass("auto-color-normal-background").removeClass("trans-color-background"); if (color === "") {
this.colorShow.element.css("background-color", "").removeClass("trans-color-disabled-background").addClass("auto-color-normal-disabled-background");
} else if (color === "transparent") {
this.colorShow.element.css("background-color", "").removeClass("auto-color-normal-disabled-background").addClass("trans-color-disabled-background");
} else {
this.colorShow.element.css({"background-color": color}).removeClass("auto-color-normal-disabled-background").removeClass("trans-color-disabled-background");
}
} }
}, },
_setEnable: function (enable) {
BI.ColorPickerEditor.superclass._setEnable.apply(this, arguments);
this.mask.setVisible(!enable);
},
setValue: function (color) { setValue: function (color) {
if (color === "transparent") { if (color === "transparent") {
this.transparent.setSelected(true); this.transparent.setSelected(true);
@ -78467,7 +78486,7 @@ BI.shortcut("bi.icon_combo_trigger", BI.IconComboTrigger);/**
BI.IconTextValueCombo = BI.inherit(BI.Widget, { BI.IconTextValueCombo = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), {
baseClass: "bi-icon-text-value-combo", baseCls: "bi-icon-text-value-combo",
height: 24, height: 24,
iconHeight: null, iconHeight: null,
iconWidth: null, iconWidth: null,
@ -78518,9 +78537,24 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
} }
}, },
_checkError: function (v) {
if(BI.isNotNull(v)) {
v = BI.isArray(v) ? v : [v];
var result = BI.find(this.options.items, function (idx, item) {
return BI.contains(v, item.value);
});
if (BI.isNull(result)) {
this.element.removeClass("combo-error").addClass("combo-error");
} else {
this.element.removeClass("combo-error");
}
}
},
setValue: function (v) { setValue: function (v) {
this.trigger.setValue(v); this.trigger.setValue(v);
this.popup.setValue(v); this.popup.setValue(v);
this._checkError(v);
}, },
getValue: function () { getValue: function () {
@ -83519,6 +83553,13 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
} }
}, },
restoreRngAndClearRange: function () {
if (this.savedRange) {
this.savedRange.setStart(this.savedRange.endContainer, this.savedRange.endOffset);
this.selRng(this.savedRange, this.savedSel);
}
},
keyDown: function (e, t) { keyDown: function (e, t) {
this.ne.fireEvent("keydown", e); this.ne.fireEvent("keydown", e);
}, },
@ -84096,8 +84137,8 @@ BI.shortcut("bi.rich_editor_color_chooser", BI.RichEditorColorChooser);BI.RichEd
return BI.extend(BI.RichEditorFontChooser.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.RichEditorFontChooser.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-rich-editor-font-chooser bi-border bi-card", baseCls: "bi-rich-editor-font-chooser bi-border bi-card",
command: "FontName", command: "FontName",
width: 50, width: 100,
height: 20 height: 24
}); });
}, },
@ -84169,7 +84210,7 @@ BI.RichEditorSizeChooser = BI.inherit(BI.RichEditorAction, {
baseCls: "bi-rich-editor-size-chooser bi-border bi-card", baseCls: "bi-rich-editor-size-chooser bi-border bi-card",
command: "FontSize", command: "FontSize",
width: 50, width: 50,
height: 20 height: 24
}); });
}, },
@ -84437,6 +84478,15 @@ BI.Segment = BI.inherit(BI.Widget, {
}); });
}, },
_setEnable: function (enable) {
BI.Segment.superclass._setEnable.apply(this, arguments);
if (enable === true) {
this.element.removeClass("base-disabled disabled");
} else if (enable === false) {
this.element.addClass("base-disabled disabled");
}
},
setValue: function (v) { setValue: function (v) {
this.buttonGroup.setValue(v); this.buttonGroup.setValue(v);
}, },
@ -87390,6 +87440,7 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
var self = this, o = this.options, c = this._const; var self = this, o = this.options, c = this._const;
this.text = BI.createWidget({ this.text = BI.createWidget({
type: "bi.label", type: "bi.label",
cls: "select-text-label",
textAlign: "left", textAlign: "left",
height: o.height, height: o.height,
text: o.text, text: o.text,
@ -90423,6 +90474,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
item.el.height = self.constants.height; item.el.height = self.constants.height;
item.el.iconCls2 = self.constants.nextIcon; item.el.iconCls2 = self.constants.nextIcon;
item.popup = { item.popup = {
lgap: 1,
el: { el: {
type: "bi.button_tree", type: "bi.button_tree",
chooseType: 0, chooseType: 0,

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

56
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

65
dist/case.js vendored

@ -4617,15 +4617,30 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
}, },
_showPreColor: function (color) { _showPreColor: function (color) {
if (color === "") { if(this.isEnabled()) {
this.colorShow.element.css("background-color", "").removeClass("trans-color-background").addClass("auto-color-normal-background"); if (color === "") {
} else if (color === "transparent") { this.colorShow.element.css("background-color", "").removeClass("trans-color-background").addClass("auto-color-normal-background");
this.colorShow.element.css("background-color", "").removeClass("auto-color-normal-background").addClass("trans-color-background"); } else if (color === "transparent") {
this.colorShow.element.css("background-color", "").removeClass("auto-color-normal-background").addClass("trans-color-background");
} else {
this.colorShow.element.css({"background-color": color}).removeClass("auto-color-normal-background").removeClass("trans-color-background");
}
} else { } else {
this.colorShow.element.css({"background-color": color}).removeClass("auto-color-normal-background").removeClass("trans-color-background"); if (color === "") {
this.colorShow.element.css("background-color", "").removeClass("trans-color-disabled-background").addClass("auto-color-normal-disabled-background");
} else if (color === "transparent") {
this.colorShow.element.css("background-color", "").removeClass("auto-color-normal-disabled-background").addClass("trans-color-disabled-background");
} else {
this.colorShow.element.css({"background-color": color}).removeClass("auto-color-normal-disabled-background").removeClass("trans-color-disabled-background");
}
} }
}, },
_setEnable: function (enable) {
BI.ColorPickerEditor.superclass._setEnable.apply(this, arguments);
this.mask.setVisible(!enable);
},
setValue: function (color) { setValue: function (color) {
if (color === "transparent") { if (color === "transparent") {
this.transparent.setSelected(true); this.transparent.setSelected(true);
@ -5907,7 +5922,7 @@ BI.shortcut("bi.icon_combo_trigger", BI.IconComboTrigger);/**
BI.IconTextValueCombo = BI.inherit(BI.Widget, { BI.IconTextValueCombo = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), {
baseClass: "bi-icon-text-value-combo", baseCls: "bi-icon-text-value-combo",
height: 24, height: 24,
iconHeight: null, iconHeight: null,
iconWidth: null, iconWidth: null,
@ -5958,9 +5973,24 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
} }
}, },
_checkError: function (v) {
if(BI.isNotNull(v)) {
v = BI.isArray(v) ? v : [v];
var result = BI.find(this.options.items, function (idx, item) {
return BI.contains(v, item.value);
});
if (BI.isNull(result)) {
this.element.removeClass("combo-error").addClass("combo-error");
} else {
this.element.removeClass("combo-error");
}
}
},
setValue: function (v) { setValue: function (v) {
this.trigger.setValue(v); this.trigger.setValue(v);
this.popup.setValue(v); this.popup.setValue(v);
this._checkError(v);
}, },
getValue: function () { getValue: function () {
@ -10959,6 +10989,13 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
} }
}, },
restoreRngAndClearRange: function () {
if (this.savedRange) {
this.savedRange.setStart(this.savedRange.endContainer, this.savedRange.endOffset);
this.selRng(this.savedRange, this.savedSel);
}
},
keyDown: function (e, t) { keyDown: function (e, t) {
this.ne.fireEvent("keydown", e); this.ne.fireEvent("keydown", e);
}, },
@ -11536,8 +11573,8 @@ BI.shortcut("bi.rich_editor_color_chooser", BI.RichEditorColorChooser);BI.RichEd
return BI.extend(BI.RichEditorFontChooser.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.RichEditorFontChooser.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-rich-editor-font-chooser bi-border bi-card", baseCls: "bi-rich-editor-font-chooser bi-border bi-card",
command: "FontName", command: "FontName",
width: 50, width: 100,
height: 20 height: 24
}); });
}, },
@ -11609,7 +11646,7 @@ BI.RichEditorSizeChooser = BI.inherit(BI.RichEditorAction, {
baseCls: "bi-rich-editor-size-chooser bi-border bi-card", baseCls: "bi-rich-editor-size-chooser bi-border bi-card",
command: "FontSize", command: "FontSize",
width: 50, width: 50,
height: 20 height: 24
}); });
}, },
@ -11877,6 +11914,15 @@ BI.Segment = BI.inherit(BI.Widget, {
}); });
}, },
_setEnable: function (enable) {
BI.Segment.superclass._setEnable.apply(this, arguments);
if (enable === true) {
this.element.removeClass("base-disabled disabled");
} else if (enable === false) {
this.element.addClass("base-disabled disabled");
}
},
setValue: function (v) { setValue: function (v) {
this.buttonGroup.setValue(v); this.buttonGroup.setValue(v);
}, },
@ -14830,6 +14876,7 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
var self = this, o = this.options, c = this._const; var self = this, o = this.options, c = this._const;
this.text = BI.createWidget({ this.text = BI.createWidget({
type: "bi.label", type: "bi.label",
cls: "select-text-label",
textAlign: "left", textAlign: "left",
height: o.height, height: o.height,
text: o.text, text: o.text,

49
dist/core.css vendored

@ -981,6 +981,55 @@ textarea {
.bi-list-item-active3.disabled:active .bi-high-light { .bi-list-item-active3.disabled:active .bi-high-light {
color: #9ea6b2 !important; color: #9ea6b2 !important;
} }
.bi-theme-dark .bi-list-item-active3:hover,
.bi-theme-dark .bi-list-item-active3.hover {
color: #ffffff;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-theme-dark .bi-list-item-active3:hover .bi-input,
.bi-theme-dark .bi-list-item-active3.hover .bi-input {
color: #ffffff;
}
.bi-theme-dark .bi-list-item-active3:hover .bi-textarea,
.bi-theme-dark .bi-list-item-active3.hover .bi-textarea {
color: #ffffff;
}
.bi-theme-dark .bi-list-item-active3:active,
.bi-theme-dark .bi-list-item-active3.active {
color: #3685f2;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-theme-dark .bi-list-item-active3:active .bi-input,
.bi-theme-dark .bi-list-item-active3.active .bi-input {
color: #3685f2;
}
.bi-theme-dark .bi-list-item-active3:active .bi-textarea,
.bi-theme-dark .bi-list-item-active3.active .bi-textarea {
color: #3685f2;
}
.bi-theme-dark .bi-list-item-active3.disabled,
.bi-theme-dark .bi-list-item-active3.disabled:hover,
.bi-theme-dark .bi-list-item-active3.disabled:active {
background-color: transparent !important;
color: #878d9f !important;
}
.bi-theme-dark .bi-list-item-active3.disabled .bi-input,
.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-input,
.bi-theme-dark .bi-list-item-active3.disabled:active .bi-input {
color: #878d9f !important;
}
.bi-theme-dark .bi-list-item-active3.disabled .bi-textarea,
.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-textarea,
.bi-theme-dark .bi-list-item-active3.disabled:active .bi-textarea {
color: #878d9f !important;
}
.bi-theme-dark .bi-list-item-active3.disabled .bi-high-light,
.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-high-light,
.bi-theme-dark .bi-list-item-active3.disabled:active .bi-high-light {
color: #878d9f !important;
}
.bi-list-item-select:hover, .bi-list-item-select:hover,
.bi-list-item-select.hover { .bi-list-item-select.hover {
background-color: rgba(54, 133, 242, 0.06); background-color: rgba(54, 133, 242, 0.06);

4
dist/core.js vendored

@ -28916,10 +28916,10 @@ BI.extend(BI.DOM, {
}; };
BI.Actions = { BI.Actions = {
runAction: function (type, config) { runAction: function (type, event, config) {
BI.each(actions[type], function (i, act) { BI.each(actions[type], function (i, act) {
try { try {
act(config); act(event, config);
} catch (e) { } catch (e) {
console.error(e); console.error(e);
} }

49
dist/core_without_normalize.css vendored

@ -703,6 +703,55 @@ textarea {
.bi-list-item-active3.disabled:active .bi-high-light { .bi-list-item-active3.disabled:active .bi-high-light {
color: #9ea6b2 !important; color: #9ea6b2 !important;
} }
.bi-theme-dark .bi-list-item-active3:hover,
.bi-theme-dark .bi-list-item-active3.hover {
color: #ffffff;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-theme-dark .bi-list-item-active3:hover .bi-input,
.bi-theme-dark .bi-list-item-active3.hover .bi-input {
color: #ffffff;
}
.bi-theme-dark .bi-list-item-active3:hover .bi-textarea,
.bi-theme-dark .bi-list-item-active3.hover .bi-textarea {
color: #ffffff;
}
.bi-theme-dark .bi-list-item-active3:active,
.bi-theme-dark .bi-list-item-active3.active {
color: #3685f2;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-theme-dark .bi-list-item-active3:active .bi-input,
.bi-theme-dark .bi-list-item-active3.active .bi-input {
color: #3685f2;
}
.bi-theme-dark .bi-list-item-active3:active .bi-textarea,
.bi-theme-dark .bi-list-item-active3.active .bi-textarea {
color: #3685f2;
}
.bi-theme-dark .bi-list-item-active3.disabled,
.bi-theme-dark .bi-list-item-active3.disabled:hover,
.bi-theme-dark .bi-list-item-active3.disabled:active {
background-color: transparent !important;
color: #878d9f !important;
}
.bi-theme-dark .bi-list-item-active3.disabled .bi-input,
.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-input,
.bi-theme-dark .bi-list-item-active3.disabled:active .bi-input {
color: #878d9f !important;
}
.bi-theme-dark .bi-list-item-active3.disabled .bi-textarea,
.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-textarea,
.bi-theme-dark .bi-list-item-active3.disabled:active .bi-textarea {
color: #878d9f !important;
}
.bi-theme-dark .bi-list-item-active3.disabled .bi-high-light,
.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-high-light,
.bi-theme-dark .bi-list-item-active3.disabled:active .bi-high-light {
color: #878d9f !important;
}
.bi-list-item-select:hover, .bi-list-item-select:hover,
.bi-list-item-select.hover { .bi-list-item-select.hover {
background-color: rgba(54, 133, 242, 0.06); background-color: rgba(54, 133, 242, 0.06);

41
dist/demo.js vendored

@ -2030,7 +2030,6 @@ Demo.IconTextValueCombo = BI.inherit(BI.Widget, {
type: "bi.icon_text_value_combo", type: "bi.icon_text_value_combo",
text: "默认值", text: "默认值",
// defaultIconCls: "next-page-h-font", // defaultIconCls: "next-page-h-font",
value: 1,
width: 300, width: 300,
iconHeight: 16, iconHeight: 16,
iconWidth: 16, iconWidth: 16,
@ -2382,6 +2381,42 @@ BI.shortcut("demo.calendar", Demo.Func);Demo.Func = BI.inherit(BI.Widget, {
baseCls: "demo-func" baseCls: "demo-func"
}, },
render: function () {
return {
type: "bi.vertical",
items: BI.createItems([{
text: "bi-list-item",
cls: "bi-list-item"
}, {
text: "bi-list-item-simple",
cls: "bi-list-item-simple"
}, {
text: "bi-list-item-effect",
cls: "bi-list-item-effect"
}, {
text: "bi-list-item-active",
cls: "bi-list-item-active"
}, {
text: "bi-list-item-active2",
cls: "bi-list-item-active2"
}, {
text: "bi-list-item-active3",
cls: "bi-list-item-active3"
}, {
text: "bi-list-item-select",
cls: "bi-list-item-select"
}], {
type: "bi.text_item"
}),
vgap: 10
};
}
});
BI.shortcut("demo.click_item_effect", Demo.Func);Demo.Func = BI.inherit(BI.Widget, {
props: {
baseCls: "demo-func"
},
render: function () { render: function () {
var editor = BI.createWidget({ var editor = BI.createWidget({
type: "bi.text_editor", type: "bi.text_editor",
@ -5408,6 +5443,10 @@ BI.shortcut("demo.value_chooser_pane", Demo.ValueChooserPane);Demo.BASE_CONFIG =
pId: 3, pId: 3,
text: "bi.segment", text: "bi.segment",
value: "demo.segment" value: "demo.segment"
}, {
pId: 3,
text: "点击项样式查看",
value: "demo.click_item_effect"
}];Demo.CATEGORY_CONFIG = [{ }];Demo.CATEGORY_CONFIG = [{
id: 100000, id: 100000,
text: "专题" text: "专题"

80
dist/fineui.css vendored

@ -981,6 +981,55 @@ textarea {
.bi-list-item-active3.disabled:active .bi-high-light { .bi-list-item-active3.disabled:active .bi-high-light {
color: #9ea6b2 !important; color: #9ea6b2 !important;
} }
.bi-theme-dark .bi-list-item-active3:hover,
.bi-theme-dark .bi-list-item-active3.hover {
color: #ffffff;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-theme-dark .bi-list-item-active3:hover .bi-input,
.bi-theme-dark .bi-list-item-active3.hover .bi-input {
color: #ffffff;
}
.bi-theme-dark .bi-list-item-active3:hover .bi-textarea,
.bi-theme-dark .bi-list-item-active3.hover .bi-textarea {
color: #ffffff;
}
.bi-theme-dark .bi-list-item-active3:active,
.bi-theme-dark .bi-list-item-active3.active {
color: #3685f2;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-theme-dark .bi-list-item-active3:active .bi-input,
.bi-theme-dark .bi-list-item-active3.active .bi-input {
color: #3685f2;
}
.bi-theme-dark .bi-list-item-active3:active .bi-textarea,
.bi-theme-dark .bi-list-item-active3.active .bi-textarea {
color: #3685f2;
}
.bi-theme-dark .bi-list-item-active3.disabled,
.bi-theme-dark .bi-list-item-active3.disabled:hover,
.bi-theme-dark .bi-list-item-active3.disabled:active {
background-color: transparent !important;
color: #878d9f !important;
}
.bi-theme-dark .bi-list-item-active3.disabled .bi-input,
.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-input,
.bi-theme-dark .bi-list-item-active3.disabled:active .bi-input {
color: #878d9f !important;
}
.bi-theme-dark .bi-list-item-active3.disabled .bi-textarea,
.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-textarea,
.bi-theme-dark .bi-list-item-active3.disabled:active .bi-textarea {
color: #878d9f !important;
}
.bi-theme-dark .bi-list-item-active3.disabled .bi-high-light,
.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-high-light,
.bi-theme-dark .bi-list-item-active3.disabled:active .bi-high-light {
color: #878d9f !important;
}
.bi-list-item-select:hover, .bi-list-item-select:hover,
.bi-list-item-select.hover { .bi-list-item-select.hover {
background-color: rgba(54, 133, 242, 0.06); background-color: rgba(54, 133, 242, 0.06);
@ -1979,6 +2028,10 @@ textarea {
display: none; display: none;
} }
.bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label {
color: #ff4949;
}
.bi-text-value-combo.combo-error .bi-select-text-trigger .select-text-label { .bi-text-value-combo.combo-error .bi-select-text-trigger .select-text-label {
color: #ff4949; color: #ff4949;
} }
@ -2597,14 +2650,14 @@ li.CodeMirror-hint-active {
} }
.bi-segment > .first-element { .bi-segment > .first-element {
border-left: 1px solid #3685f2; border-left: 1px solid #3685f2;
-webkit-border-radius: 6px 0px 0px 6px; -webkit-border-radius: 2px 0px 0px 2px;
-moz-border-radius: 6px 0px 0px 6px; -moz-border-radius: 2px 0px 0px 2px;
border-radius: 6px 0px 0px 6px; border-radius: 2px 0px 0px 2px;
} }
.bi-segment > .last-element { .bi-segment > .last-element {
-webkit-border-radius: 0px 6px 6px 0px; -webkit-border-radius: 0px 2px 2px 0px;
-moz-border-radius: 0px 6px 6px 0px; -moz-border-radius: 0px 2px 2px 0px;
border-radius: 0px 6px 6px 0px; border-radius: 0px 2px 2px 0px;
} }
.bi-segment.disabled > .center-element, .bi-segment.disabled > .center-element,
.bi-segment.disabled > .first-element { .bi-segment.disabled > .first-element {
@ -4537,9 +4590,14 @@ textarea::-webkit-scrollbar-thumb:hover {
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/background/auto_color_normal.png'); _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/background/auto_color_normal.png');
_background: none; _background: none;
} }
.auto-color-normal-disabled-background {
background: url('resources?path=/com/fr/web/ui/images/1x/background/auto_color_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/background/auto_color_normal.png');
_background: none;
}
.trans-color-background { .trans-color-background {
background: url('resources?path=/com/fr/web/ui/images/1x/background/trans_color.png') no-repeat center center; background: url('resources?path=/com/fr/web/ui/images/1x/background/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/background/trans_color.png'); _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/background/trans_normal.png');
_background: none; _background: none;
} }
@font-face { @font-face {
@ -4767,7 +4825,7 @@ textarea::-webkit-scrollbar-thumb:hover {
} }
.dot-e-font .b-font:before { .dot-e-font .b-font:before {
content: "\e762"; content: "\e762";
color: #ffffff; color: transparent;
} }
.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 {
@ -4780,11 +4838,11 @@ textarea::-webkit-scrollbar-thumb:hover {
} }
.dot-e-font.active .b-font:before { .dot-e-font.active .b-font:before {
content: "\e762"; content: "\e762";
color: #232e40; color: #3685f2;
} }
.dot-e-font.disabled .b-font:before { .dot-e-font.disabled .b-font:before {
content: "\e762"; content: "\e762";
color: #ffffff; color: transparent;
} }
.pull-right-font .b-font { .pull-right-font .b-font {
font-size: 16px; font-size: 16px;

80
dist/fineui.js vendored

@ -29165,10 +29165,10 @@ BI.extend(BI.DOM, {
}; };
BI.Actions = { BI.Actions = {
runAction: function (type, config) { runAction: function (type, event, config) {
BI.each(actions[type], function (i, act) { BI.each(actions[type], function (i, act) {
try { try {
act(config); act(event, config);
} catch (e) { } catch (e) {
console.error(e); console.error(e);
} }
@ -36396,7 +36396,7 @@ BI.Single = BI.inherit(BI.Widget, {
warningTitle: null, warningTitle: null,
tipType: null, // success或warning tipType: null, // success或warning
value: null, value: null,
belowMouse: false // title是否跟随鼠标 belowMouse: false // title是否跟随鼠标,
}); });
}, },
@ -36407,6 +36407,10 @@ BI.Single = BI.inherit(BI.Widget, {
var title = type === "success" ? this.getTitle() : (this.getWarningTitle() || this.getTitle()); var title = type === "success" ? this.getTitle() : (this.getWarningTitle() || this.getTitle());
if (BI.isKey(title)) { if (BI.isKey(title)) {
BI.Tooltips.show(e, this.getName(), title, type, this, opt); BI.Tooltips.show(e, this.getName(), title, type, this, opt);
if (opt.action) {
BI.Actions.runAction(opt.action, "hover", opt, title);
}
BI.Actions.runGlobalAction("hover", opt, title);
} }
}, },
@ -36959,9 +36963,9 @@ BI.BasicButton = BI.inherit(BI.Single, {
this.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.CLICK, v, this); this.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.CLICK, v, this);
this.fireEvent(BI.BasicButton.EVENT_CHANGE, v, this); this.fireEvent(BI.BasicButton.EVENT_CHANGE, v, this);
if (o.action) { if (o.action) {
BI.Actions.runAction(o.action, o); BI.Actions.runAction(o.action, "click", o);
} }
BI.Actions.runGlobalAction(o); BI.Actions.runGlobalAction("click", o);
} }
}, },
@ -77426,15 +77430,30 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
}, },
_showPreColor: function (color) { _showPreColor: function (color) {
if (color === "") { if(this.isEnabled()) {
this.colorShow.element.css("background-color", "").removeClass("trans-color-background").addClass("auto-color-normal-background"); if (color === "") {
} else if (color === "transparent") { this.colorShow.element.css("background-color", "").removeClass("trans-color-background").addClass("auto-color-normal-background");
this.colorShow.element.css("background-color", "").removeClass("auto-color-normal-background").addClass("trans-color-background"); } else if (color === "transparent") {
this.colorShow.element.css("background-color", "").removeClass("auto-color-normal-background").addClass("trans-color-background");
} else {
this.colorShow.element.css({"background-color": color}).removeClass("auto-color-normal-background").removeClass("trans-color-background");
}
} else { } else {
this.colorShow.element.css({"background-color": color}).removeClass("auto-color-normal-background").removeClass("trans-color-background"); if (color === "") {
this.colorShow.element.css("background-color", "").removeClass("trans-color-disabled-background").addClass("auto-color-normal-disabled-background");
} else if (color === "transparent") {
this.colorShow.element.css("background-color", "").removeClass("auto-color-normal-disabled-background").addClass("trans-color-disabled-background");
} else {
this.colorShow.element.css({"background-color": color}).removeClass("auto-color-normal-disabled-background").removeClass("trans-color-disabled-background");
}
} }
}, },
_setEnable: function (enable) {
BI.ColorPickerEditor.superclass._setEnable.apply(this, arguments);
this.mask.setVisible(!enable);
},
setValue: function (color) { setValue: function (color) {
if (color === "transparent") { if (color === "transparent") {
this.transparent.setSelected(true); this.transparent.setSelected(true);
@ -78716,7 +78735,7 @@ BI.shortcut("bi.icon_combo_trigger", BI.IconComboTrigger);/**
BI.IconTextValueCombo = BI.inherit(BI.Widget, { BI.IconTextValueCombo = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), {
baseClass: "bi-icon-text-value-combo", baseCls: "bi-icon-text-value-combo",
height: 24, height: 24,
iconHeight: null, iconHeight: null,
iconWidth: null, iconWidth: null,
@ -78767,9 +78786,24 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
} }
}, },
_checkError: function (v) {
if(BI.isNotNull(v)) {
v = BI.isArray(v) ? v : [v];
var result = BI.find(this.options.items, function (idx, item) {
return BI.contains(v, item.value);
});
if (BI.isNull(result)) {
this.element.removeClass("combo-error").addClass("combo-error");
} else {
this.element.removeClass("combo-error");
}
}
},
setValue: function (v) { setValue: function (v) {
this.trigger.setValue(v); this.trigger.setValue(v);
this.popup.setValue(v); this.popup.setValue(v);
this._checkError(v);
}, },
getValue: function () { getValue: function () {
@ -83768,6 +83802,13 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
} }
}, },
restoreRngAndClearRange: function () {
if (this.savedRange) {
this.savedRange.setStart(this.savedRange.endContainer, this.savedRange.endOffset);
this.selRng(this.savedRange, this.savedSel);
}
},
keyDown: function (e, t) { keyDown: function (e, t) {
this.ne.fireEvent("keydown", e); this.ne.fireEvent("keydown", e);
}, },
@ -84345,8 +84386,8 @@ BI.shortcut("bi.rich_editor_color_chooser", BI.RichEditorColorChooser);BI.RichEd
return BI.extend(BI.RichEditorFontChooser.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.RichEditorFontChooser.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-rich-editor-font-chooser bi-border bi-card", baseCls: "bi-rich-editor-font-chooser bi-border bi-card",
command: "FontName", command: "FontName",
width: 50, width: 100,
height: 20 height: 24
}); });
}, },
@ -84418,7 +84459,7 @@ BI.RichEditorSizeChooser = BI.inherit(BI.RichEditorAction, {
baseCls: "bi-rich-editor-size-chooser bi-border bi-card", baseCls: "bi-rich-editor-size-chooser bi-border bi-card",
command: "FontSize", command: "FontSize",
width: 50, width: 50,
height: 20 height: 24
}); });
}, },
@ -84686,6 +84727,15 @@ BI.Segment = BI.inherit(BI.Widget, {
}); });
}, },
_setEnable: function (enable) {
BI.Segment.superclass._setEnable.apply(this, arguments);
if (enable === true) {
this.element.removeClass("base-disabled disabled");
} else if (enable === false) {
this.element.addClass("base-disabled disabled");
}
},
setValue: function (v) { setValue: function (v) {
this.buttonGroup.setValue(v); this.buttonGroup.setValue(v);
}, },
@ -87639,6 +87689,7 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
var self = this, o = this.options, c = this._const; var self = this, o = this.options, c = this._const;
this.text = BI.createWidget({ this.text = BI.createWidget({
type: "bi.label", type: "bi.label",
cls: "select-text-label",
textAlign: "left", textAlign: "left",
height: o.height, height: o.height,
text: o.text, text: o.text,
@ -90672,6 +90723,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
item.el.height = self.constants.height; item.el.height = self.constants.height;
item.el.iconCls2 = self.constants.nextIcon; item.el.iconCls2 = self.constants.nextIcon;
item.popup = { item.popup = {
lgap: 1,
el: { el: {
type: "bi.button_tree", type: "bi.button_tree",
chooseType: 0, chooseType: 0,

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

56
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

0
dist/images/1x/icon/auto_disable.png → dist/images/1x/background/auto_color_normal_disable.png vendored

Before

Width:  |  Height:  |  Size: 608 B

After

Width:  |  Height:  |  Size: 608 B

0
dist/images/1x/icon/auto_select.png → dist/images/1x/background/auto_color_normal_select.png vendored

Before

Width:  |  Height:  |  Size: 617 B

After

Width:  |  Height:  |  Size: 617 B

0
dist/images/1x/icon/trans_disable.png → dist/images/1x/background/trans_disable.png vendored

Before

Width:  |  Height:  |  Size: 200 B

After

Width:  |  Height:  |  Size: 200 B

0
dist/images/1x/icon/trans_normal .png → dist/images/1x/background/trans_normal.png vendored

Before

Width:  |  Height:  |  Size: 192 B

After

Width:  |  Height:  |  Size: 192 B

0
dist/images/1x/icon/trans_select .png → dist/images/1x/background/trans_select.png vendored

Before

Width:  |  Height:  |  Size: 199 B

After

Width:  |  Height:  |  Size: 199 B

BIN
dist/images/1x/icon/auto_normal.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 637 B

BIN
dist/images/1x/icon/dark/tree_collapse_1.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 160 B

After

Width:  |  Height:  |  Size: 193 B

BIN
dist/images/1x/icon/dark/tree_collapse_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 203 B

After

Width:  |  Height:  |  Size: 230 B

BIN
dist/images/1x/icon/dark/tree_collapse_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 206 B

After

Width:  |  Height:  |  Size: 247 B

BIN
dist/images/1x/icon/dark/tree_collapse_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 191 B

After

Width:  |  Height:  |  Size: 236 B

BIN
dist/images/1x/icon/dark/tree_expand_1.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 146 B

After

Width:  |  Height:  |  Size: 171 B

BIN
dist/images/1x/icon/dark/tree_expand_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 183 B

After

Width:  |  Height:  |  Size: 213 B

BIN
dist/images/1x/icon/dark/tree_expand_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 192 B

After

Width:  |  Height:  |  Size: 227 B

BIN
dist/images/1x/icon/dark/tree_expand_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 178 B

After

Width:  |  Height:  |  Size: 214 B

BIN
dist/images/1x/icon/dark/tree_vertical_line_1.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 112 B

After

Width:  |  Height:  |  Size: 102 B

BIN
dist/images/1x/icon/dark/tree_vertical_line_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 156 B

After

Width:  |  Height:  |  Size: 143 B

BIN
dist/images/1x/icon/dark/tree_vertical_line_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 161 B

After

Width:  |  Height:  |  Size: 162 B

BIN
dist/images/1x/icon/dark/tree_vertical_line_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 150 B

After

Width:  |  Height:  |  Size: 148 B

BIN
dist/images/1x/icon/dark/tree_vertical_line_5.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 140 B

After

Width:  |  Height:  |  Size: 138 B

BIN
dist/images/1x/icon/dark_tree_collapse_1.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 193 B

BIN
dist/images/1x/icon/dark_tree_collapse_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 230 B

BIN
dist/images/1x/icon/dark_tree_collapse_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 247 B

BIN
dist/images/1x/icon/dark_tree_collapse_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 236 B

BIN
dist/images/1x/icon/dark_tree_expand_1.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 171 B

BIN
dist/images/1x/icon/dark_tree_expand_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 213 B

BIN
dist/images/1x/icon/dark_tree_expand_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 227 B

BIN
dist/images/1x/icon/dark_tree_expand_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 214 B

BIN
dist/images/1x/icon/dark_tree_vertical_line_1.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 102 B

BIN
dist/images/1x/icon/dark_tree_vertical_line_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 143 B

BIN
dist/images/1x/icon/dark_tree_vertical_line_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 162 B

BIN
dist/images/1x/icon/dark_tree_vertical_line_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 148 B

BIN
dist/images/1x/icon/dark_tree_vertical_line_5.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 138 B

BIN
dist/images/2x/icon/dark/tree_collapse_1.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 211 B

After

Width:  |  Height:  |  Size: 272 B

BIN
dist/images/2x/icon/dark/tree_collapse_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 250 B

After

Width:  |  Height:  |  Size: 333 B

BIN
dist/images/2x/icon/dark/tree_collapse_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 254 B

After

Width:  |  Height:  |  Size: 338 B

BIN
dist/images/2x/icon/dark/tree_collapse_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 242 B

After

Width:  |  Height:  |  Size: 320 B

BIN
dist/images/2x/icon/dark/tree_expand_1.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 192 B

After

Width:  |  Height:  |  Size: 244 B

BIN
dist/images/2x/icon/dark/tree_expand_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 232 B

After

Width:  |  Height:  |  Size: 311 B

BIN
dist/images/2x/icon/dark/tree_expand_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 240 B

After

Width:  |  Height:  |  Size: 316 B

BIN
dist/images/2x/icon/dark/tree_expand_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 227 B

After

Width:  |  Height:  |  Size: 299 B

BIN
dist/images/2x/icon/dark/tree_vertical_line_1.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 127 B

After

Width:  |  Height:  |  Size: 117 B

BIN
dist/images/2x/icon/dark/tree_vertical_line_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 204 B

After

Width:  |  Height:  |  Size: 215 B

BIN
dist/images/2x/icon/dark/tree_vertical_line_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 200 B

After

Width:  |  Height:  |  Size: 238 B

BIN
dist/images/2x/icon/dark/tree_vertical_line_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 192 B

After

Width:  |  Height:  |  Size: 206 B

BIN
dist/images/2x/icon/dark/tree_vertical_line_5.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 183 B

After

Width:  |  Height:  |  Size: 210 B

BIN
dist/images/2x/icon/dark_tree_collapse_1.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 272 B

BIN
dist/images/2x/icon/dark_tree_collapse_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 333 B

BIN
dist/images/2x/icon/dark_tree_collapse_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 338 B

BIN
dist/images/2x/icon/dark_tree_collapse_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 320 B

BIN
dist/images/2x/icon/dark_tree_expand_1.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 244 B

BIN
dist/images/2x/icon/dark_tree_expand_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 311 B

BIN
dist/images/2x/icon/dark_tree_expand_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 316 B

BIN
dist/images/2x/icon/dark_tree_expand_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 299 B

BIN
dist/images/2x/icon/dark_tree_vertical_line_1.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 117 B

BIN
dist/images/2x/icon/dark_tree_vertical_line_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 215 B

BIN
dist/images/2x/icon/dark_tree_vertical_line_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 238 B

BIN
dist/images/2x/icon/dark_tree_vertical_line_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 206 B

BIN
dist/images/2x/icon/dark_tree_vertical_line_5.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 210 B

15
dist/resource.css vendored

@ -319,9 +319,14 @@ textarea::-webkit-scrollbar-thumb:hover {
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal.png'); _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal.png');
_background: none; _background: none;
} }
.auto-color-normal-disabled-background {
background: url('images/1x/background/auto_color_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal.png');
_background: none;
}
.trans-color-background { .trans-color-background {
background: url('images/1x/background/trans_color.png') no-repeat center center; background: url('images/1x/background/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/trans_color.png'); _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/trans_normal.png');
_background: none; _background: none;
} }
@font-face { @font-face {
@ -549,7 +554,7 @@ textarea::-webkit-scrollbar-thumb:hover {
} }
.dot-e-font .b-font:before { .dot-e-font .b-font:before {
content: "\e762"; content: "\e762";
color: #ffffff; color: transparent;
} }
.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 {
@ -562,11 +567,11 @@ textarea::-webkit-scrollbar-thumb:hover {
} }
.dot-e-font.active .b-font:before { .dot-e-font.active .b-font:before {
content: "\e762"; content: "\e762";
color: #232e40; color: #3685f2;
} }
.dot-e-font.disabled .b-font:before { .dot-e-font.disabled .b-font:before {
content: "\e762"; content: "\e762";
color: #ffffff; color: transparent;
} }
.pull-right-font .b-font { .pull-right-font .b-font {
font-size: 16px; font-size: 16px;

1
dist/widget.js vendored

@ -2665,6 +2665,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
item.el.height = self.constants.height; item.el.height = self.constants.height;
item.el.iconCls2 = self.constants.nextIcon; item.el.iconCls2 = self.constants.nextIcon;
item.popup = { item.popup = {
lgap: 1,
el: { el: {
type: "bi.button_tree", type: "bi.button_tree",
chooseType: 0, chooseType: 0,

9
public/css/background.css

@ -248,8 +248,13 @@
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal.png'); _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal.png');
_background: none; _background: none;
} }
.auto-color-normal-disabled-background {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal.png');
_background: none;
}
.trans-color-background { .trans-color-background {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/background/trans_color.png') no-repeat center center; background: url('https://fanruan.coding.me/fineui/dist/images/1x/background/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/trans_color.png'); _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/trans_normal.png');
_background: none; _background: none;
} }

6
public/css/font.css

@ -223,7 +223,7 @@
} }
.dot-e-font .b-font:before { .dot-e-font .b-font:before {
content: "\e762"; content: "\e762";
color: #ffffff; color: transparent;
} }
.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 {
@ -236,11 +236,11 @@
} }
.dot-e-font.active .b-font:before { .dot-e-font.active .b-font:before {
content: "\e762"; content: "\e762";
color: #232e40; color: #3685f2;
} }
.dot-e-font.disabled .b-font:before { .dot-e-font.disabled .b-font:before {
content: "\e762"; content: "\e762";
color: #ffffff; color: transparent;
} }
.pull-right-font .b-font { .pull-right-font .b-font {
font-size: 16px; font-size: 16px;

4
src/base/single/button/button.basic.js

@ -302,9 +302,9 @@ BI.BasicButton = BI.inherit(BI.Single, {
this.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.CLICK, v, this); this.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.CLICK, v, this);
this.fireEvent(BI.BasicButton.EVENT_CHANGE, v, this); this.fireEvent(BI.BasicButton.EVENT_CHANGE, v, this);
if (o.action) { if (o.action) {
BI.Actions.runAction(o.action, o); BI.Actions.runAction(o.action, "click", o);
} }
BI.Actions.runGlobalAction(o); BI.Actions.runGlobalAction("click", o);
} }
}, },

6
src/base/single/single.js

@ -19,7 +19,7 @@ BI.Single = BI.inherit(BI.Widget, {
warningTitle: null, warningTitle: null,
tipType: null, // success或warning tipType: null, // success或warning
value: null, value: null,
belowMouse: false // title是否跟随鼠标 belowMouse: false // title是否跟随鼠标,
}); });
}, },
@ -30,6 +30,10 @@ BI.Single = BI.inherit(BI.Widget, {
var title = type === "success" ? this.getTitle() : (this.getWarningTitle() || this.getTitle()); var title = type === "success" ? this.getTitle() : (this.getWarningTitle() || this.getTitle());
if (BI.isKey(title)) { if (BI.isKey(title)) {
BI.Tooltips.show(e, this.getName(), title, type, this, opt); BI.Tooltips.show(e, this.getName(), title, type, this, opt);
if (opt.action) {
BI.Actions.runAction(opt.action, "hover", opt, title);
}
BI.Actions.runGlobalAction("hover", opt, title);
} }
}, },

25
src/case/colorchooser/colorpicker/editor.colorpicker.js

@ -171,15 +171,30 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
}, },
_showPreColor: function (color) { _showPreColor: function (color) {
if (color === "") { if(this.isEnabled()) {
this.colorShow.element.css("background-color", "").removeClass("trans-color-background").addClass("auto-color-normal-background"); if (color === "") {
} else if (color === "transparent") { this.colorShow.element.css("background-color", "").removeClass("trans-color-background").addClass("auto-color-normal-background");
this.colorShow.element.css("background-color", "").removeClass("auto-color-normal-background").addClass("trans-color-background"); } else if (color === "transparent") {
this.colorShow.element.css("background-color", "").removeClass("auto-color-normal-background").addClass("trans-color-background");
} else {
this.colorShow.element.css({"background-color": color}).removeClass("auto-color-normal-background").removeClass("trans-color-background");
}
} else { } else {
this.colorShow.element.css({"background-color": color}).removeClass("auto-color-normal-background").removeClass("trans-color-background"); if (color === "") {
this.colorShow.element.css("background-color", "").removeClass("trans-color-disabled-background").addClass("auto-color-normal-disabled-background");
} else if (color === "transparent") {
this.colorShow.element.css("background-color", "").removeClass("auto-color-normal-disabled-background").addClass("trans-color-disabled-background");
} else {
this.colorShow.element.css({"background-color": color}).removeClass("auto-color-normal-disabled-background").removeClass("trans-color-disabled-background");
}
} }
}, },
_setEnable: function (enable) {
BI.ColorPickerEditor.superclass._setEnable.apply(this, arguments);
this.mask.setVisible(!enable);
},
setValue: function (color) { setValue: function (color) {
if (color === "transparent") { if (color === "transparent") {
this.transparent.setSelected(true); this.transparent.setSelected(true);

17
src/case/combo/icontextvaluecombo/combo.icontextvalue.js

@ -5,7 +5,7 @@
BI.IconTextValueCombo = BI.inherit(BI.Widget, { BI.IconTextValueCombo = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), {
baseClass: "bi-icon-text-value-combo", baseCls: "bi-icon-text-value-combo",
height: 24, height: 24,
iconHeight: null, iconHeight: null,
iconWidth: null, iconWidth: null,
@ -56,9 +56,24 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
} }
}, },
_checkError: function (v) {
if(BI.isNotNull(v)) {
v = BI.isArray(v) ? v : [v];
var result = BI.find(this.options.items, function (idx, item) {
return BI.contains(v, item.value);
});
if (BI.isNull(result)) {
this.element.removeClass("combo-error").addClass("combo-error");
} else {
this.element.removeClass("combo-error");
}
}
},
setValue: function (v) { setValue: function (v) {
this.trigger.setValue(v); this.trigger.setValue(v);
this.popup.setValue(v); this.popup.setValue(v);
this._checkError(v);
}, },
getValue: function () { getValue: function () {

7
src/case/richeditor/niceditor/niceditor.js

@ -254,6 +254,13 @@
} }
}, },
restoreRngAndClearRange: function () {
if (this.savedRange) {
this.savedRange.setStart(this.savedRange.endContainer, this.savedRange.endOffset);
this.selRng(this.savedRange, this.savedSel);
}
},
keyDown: function (e, t) { keyDown: function (e, t) {
this.ne.fireEvent("keydown", e); this.ne.fireEvent("keydown", e);
}, },

4
src/case/richeditor/plugins/combo.fontfamily.js

@ -3,8 +3,8 @@ BI.RichEditorFontChooser = BI.inherit(BI.RichEditorAction, {
return BI.extend(BI.RichEditorFontChooser.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.RichEditorFontChooser.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-rich-editor-font-chooser bi-border bi-card", baseCls: "bi-rich-editor-font-chooser bi-border bi-card",
command: "FontName", command: "FontName",
width: 50, width: 100,
height: 20 height: 24
}); });
}, },

2
src/case/richeditor/plugins/combo.sizechooser.js

@ -11,7 +11,7 @@ BI.RichEditorSizeChooser = BI.inherit(BI.RichEditorAction, {
baseCls: "bi-rich-editor-size-chooser bi-border bi-card", baseCls: "bi-rich-editor-size-chooser bi-border bi-card",
command: "FontSize", command: "FontSize",
width: 50, width: 50,
height: 20 height: 24
}); });
}, },

9
src/case/segment/segment.js

@ -39,6 +39,15 @@ BI.Segment = BI.inherit(BI.Widget, {
}); });
}, },
_setEnable: function (enable) {
BI.Segment.superclass._setEnable.apply(this, arguments);
if (enable === true) {
this.element.removeClass("base-disabled disabled");
} else if (enable === false) {
this.element.addClass("base-disabled disabled");
}
},
setValue: function (v) { setValue: function (v) {
this.buttonGroup.setValue(v); this.buttonGroup.setValue(v);
}, },

1
src/case/trigger/trigger.icon.text.js

@ -25,6 +25,7 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
var self = this, o = this.options, c = this._const; var self = this, o = this.options, c = this._const;
this.text = BI.createWidget({ this.text = BI.createWidget({
type: "bi.label", type: "bi.label",
cls: "select-text-label",
textAlign: "left", textAlign: "left",
height: o.height, height: o.height,
text: o.text, text: o.text,

4
src/core/inject.js

@ -177,10 +177,10 @@
}; };
BI.Actions = { BI.Actions = {
runAction: function (type, config) { runAction: function (type, event, config) {
BI.each(actions[type], function (i, act) { BI.each(actions[type], function (i, act) {
try { try {
act(config); act(event, config);
} catch (e) { } catch (e) {
console.error(e); console.error(e);
} }

4
src/css/base/combo/combo.css

@ -130,6 +130,10 @@
display: none; display: none;
} }
.bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label {
color: #ff4949;
}
.bi-text-value-combo.combo-error .bi-select-text-trigger .select-text-label { .bi-text-value-combo.combo-error .bi-select-text-trigger .select-text-label {
color: #ff4949; color: #ff4949;
} }

12
src/css/base/segment/segment.css

@ -9,14 +9,14 @@
} }
.bi-segment > .first-element { .bi-segment > .first-element {
border-left: 1px solid #3685f2; border-left: 1px solid #3685f2;
-webkit-border-radius: 6px 0px 0px 6px; -webkit-border-radius: 2px 0px 0px 2px;
-moz-border-radius: 6px 0px 0px 6px; -moz-border-radius: 2px 0px 0px 2px;
border-radius: 6px 0px 0px 6px; border-radius: 2px 0px 0px 2px;
} }
.bi-segment > .last-element { .bi-segment > .last-element {
-webkit-border-radius: 0px 6px 6px 0px; -webkit-border-radius: 0px 2px 2px 0px;
-moz-border-radius: 0px 6px 6px 0px; -moz-border-radius: 0px 2px 2px 0px;
border-radius: 0px 6px 6px 0px; border-radius: 0px 2px 2px 0px;
} }
.bi-segment.disabled > .center-element, .bi-segment.disabled > .center-element,
.bi-segment.disabled > .first-element { .bi-segment.disabled > .first-element {

49
src/css/core/utils/common.css

@ -703,6 +703,55 @@ textarea {
.bi-list-item-active3.disabled:active .bi-high-light { .bi-list-item-active3.disabled:active .bi-high-light {
color: #9ea6b2 !important; color: #9ea6b2 !important;
} }
.bi-theme-dark .bi-list-item-active3:hover,
.bi-theme-dark .bi-list-item-active3.hover {
color: #ffffff;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-theme-dark .bi-list-item-active3:hover .bi-input,
.bi-theme-dark .bi-list-item-active3.hover .bi-input {
color: #ffffff;
}
.bi-theme-dark .bi-list-item-active3:hover .bi-textarea,
.bi-theme-dark .bi-list-item-active3.hover .bi-textarea {
color: #ffffff;
}
.bi-theme-dark .bi-list-item-active3:active,
.bi-theme-dark .bi-list-item-active3.active {
color: #3685f2;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-theme-dark .bi-list-item-active3:active .bi-input,
.bi-theme-dark .bi-list-item-active3.active .bi-input {
color: #3685f2;
}
.bi-theme-dark .bi-list-item-active3:active .bi-textarea,
.bi-theme-dark .bi-list-item-active3.active .bi-textarea {
color: #3685f2;
}
.bi-theme-dark .bi-list-item-active3.disabled,
.bi-theme-dark .bi-list-item-active3.disabled:hover,
.bi-theme-dark .bi-list-item-active3.disabled:active {
background-color: transparent !important;
color: #878d9f !important;
}
.bi-theme-dark .bi-list-item-active3.disabled .bi-input,
.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-input,
.bi-theme-dark .bi-list-item-active3.disabled:active .bi-input {
color: #878d9f !important;
}
.bi-theme-dark .bi-list-item-active3.disabled .bi-textarea,
.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-textarea,
.bi-theme-dark .bi-list-item-active3.disabled:active .bi-textarea {
color: #878d9f !important;
}
.bi-theme-dark .bi-list-item-active3.disabled .bi-high-light,
.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-high-light,
.bi-theme-dark .bi-list-item-active3.disabled:active .bi-high-light {
color: #878d9f !important;
}
.bi-list-item-select:hover, .bi-list-item-select:hover,
.bi-list-item-select.hover { .bi-list-item-select.hover {
background-color: rgba(54, 133, 242, 0.06); background-color: rgba(54, 133, 242, 0.06);

9
src/css/resource/background.css

@ -248,8 +248,13 @@
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal.png'); _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal.png');
_background: none; _background: none;
} }
.auto-color-normal-disabled-background {
background: url('images/1x/background/auto_color_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal.png');
_background: none;
}
.trans-color-background { .trans-color-background {
background: url('images/1x/background/trans_color.png') no-repeat center center; background: url('images/1x/background/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/trans_color.png'); _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/trans_normal.png');
_background: none; _background: none;
} }

6
src/css/resource/font.css

@ -223,7 +223,7 @@
} }
.dot-e-font .b-font:before { .dot-e-font .b-font:before {
content: "\e762"; content: "\e762";
color: #ffffff; color: transparent;
} }
.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 {
@ -236,11 +236,11 @@
} }
.dot-e-font.active .b-font:before { .dot-e-font.active .b-font:before {
content: "\e762"; content: "\e762";
color: #232e40; color: #3685f2;
} }
.dot-e-font.disabled .b-font:before { .dot-e-font.disabled .b-font:before {
content: "\e762"; content: "\e762";
color: #ffffff; color: transparent;
} }
.pull-right-font .b-font { .pull-right-font .b-font {
font-size: 16px; font-size: 16px;

11
src/less/base/combo/combo.textvalue.icon.less

@ -0,0 +1,11 @@
@import "../../index";
.bi-icon-text-value-combo{
&.combo-error {
& .bi-text-trigger {
& .select-text-label{
color: @color-bi-text-failure;
}
}
}
}

4
src/less/base/segment/segment.less

@ -10,10 +10,10 @@
} }
& > .first-element{ & > .first-element{
border-left: 1px solid @color-bi-border-highlight; border-left: 1px solid @color-bi-border-highlight;
.border-corner-radius(6px,0px,0px,6px) .border-corner-radius(2px,0px,0px,2px)
} }
& > .last-element{ & > .last-element{
.border-corner-radius(0px,6px,6px,0px) .border-corner-radius(0px,2px,2px,0px)
} }
&.disabled > .center-element, &.disabled > .first-element{ &.disabled > .center-element, &.disabled > .first-element{
border-color: @color-bi-border-disabled; border-color: @color-bi-border-disabled;

40
src/less/core/utils/common.less

@ -707,6 +707,46 @@ textarea {
} }
} }
.bi-theme-dark {
.bi-list-item-active3 {
&:hover, &.hover {
color: @color-bi-text;
& .bi-input {
color: @color-bi-text;
}
& .bi-textarea {
color: @color-bi-text;
}
.background-color(@color-bi-background-highlight, 6%);
}
&:active, &.active {
color: @color-bi-text-highlight;
& .bi-input {
color: @color-bi-text-highlight;
}
& .bi-textarea {
color: @color-bi-text-highlight;
}
.background-color(@color-bi-background-highlight, 6%);
}
&.disabled {
&, &:hover, &:active {
background-color: transparent !important;
color: @color-bi-text-disabled-theme-dark !important;
& .bi-input {
color: @color-bi-text-disabled-theme-dark !important;
}
& .bi-textarea {
color: @color-bi-text-disabled-theme-dark !important;
}
& .bi-high-light {
color: @color-bi-text-disabled-theme-dark !important;
}
}
}
}
}
// 激活和选中时背景高亮 // 激活和选中时背景高亮
.bi-list-item-select { .bi-list-item-select {
&:hover, &.hover { &:hover, &.hover {

4
src/less/lib/background.less

@ -1,6 +1,8 @@
@background-auto-color: "background/auto_color.png"; @background-auto-color: "background/auto_color.png";
@background-auto-color-normal: "background/auto_color_normal.png"; @background-auto-color-normal: "background/auto_color_normal.png";
@background-trans-color: "background/trans_color.png"; @background-auto-color-normal-disabled: "background/auto_color_normal.png";
@background-trans-color: "background/trans_normal.png";
@background-trans-color-disabled: "background/trans_disable.png";
@background-farbtastic-wheel:"background/wheel.png"; @background-farbtastic-wheel:"background/wheel.png";
@background-farbtastic-overlay:"background/mask.png"; @background-farbtastic-overlay:"background/mask.png";

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save