Browse Source

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

* commit 'c4428b52ce0ec47dfc1b229b2d15416334e7f031':
  BI-27490
  更新
  update
  BI-24404 && BI-25602 && BI-27449
  BI-24404
es6
windy 6 years ago
parent
commit
1972538c95
  1. 20
      demo/js/case/demo.click.effect.js
  2. 1
      demo/js/widget/numbereditor/demo.number_editor.js
  3. 32
      dist/_fineui.min.js
  4. 22
      dist/base.css
  5. 9
      dist/base.js
  6. 59
      dist/bundle.css
  7. 59
      dist/bundle.js
  8. 2
      dist/bundle.min.css
  9. 33
      dist/bundle.min.js
  10. 8
      dist/case.js
  11. 14
      dist/core.css
  12. 14
      dist/core_without_normalize.css
  13. 21
      dist/demo.js
  14. 59
      dist/fineui.css
  15. 59
      dist/fineui.js
  16. 2
      dist/fineui.min.css
  17. 32
      dist/fineui.min.js
  18. 12
      dist/resource.css
  19. 11
      dist/widget.css
  20. 42
      dist/widget.js
  21. 12
      public/css/app.css
  22. 9
      src/base/single/tip/tip.toast.js
  23. 6
      src/case/combo/iconcombo/trigger.iconcombo.js
  24. 2
      src/case/segment/button.segment.js
  25. 2
      src/css/base/segment/segment.css
  26. 4
      src/css/base/single/button/button.css
  27. 16
      src/css/base/table/table.css
  28. 14
      src/css/core/utils/common.css
  29. 12
      src/css/resource/app.css
  30. 11
      src/css/widget/singleslider/slider/widget.css
  31. 9
      src/less/core/utils/common.less
  32. 4
      src/less/lib/colors.less
  33. 6
      src/less/lib/constant.less
  34. 10
      src/less/widget/singleslider/slider/widget.slider.less
  35. 8
      src/widget/dynamicdate/dynamicdate.popup.js
  36. 8
      src/widget/dynamicdatetime/dynamicdatetime.popup.js
  37. 2
      src/widget/numbereditor/number.editor.js
  38. 8
      src/widget/year/popup.year.js
  39. 8
      src/widget/yearmonth/popup.yearmonth.js
  40. 8
      src/widget/yearquarter/popup.yearquarter.js
  41. 12
      ui/css/app.css

20
demo/js/case/demo.click.effect.js

@ -8,27 +8,31 @@ Demo.Func = BI.inherit(BI.Widget, {
type: "bi.vertical",
items: BI.createItems([{
text: "bi-list-item",
cls: "bi-list-item"
cls: "bi-list-item close-font"
}, {
text: "bi-list-item-simple",
cls: "bi-list-item-simple"
cls: "bi-list-item-simple close-font"
}, {
text: "bi-list-item-effect",
cls: "bi-list-item-effect"
cls: "bi-list-item-effect close-font"
}, {
text: "bi-list-item-active",
cls: "bi-list-item-active"
cls: "bi-list-item-active close-font"
}, {
text: "bi-list-item-active2",
cls: "bi-list-item-active2"
cls: "bi-list-item-active2 close-font"
}, {
text: "bi-list-item-active3",
cls: "bi-list-item-active3"
cls: "bi-list-item-active3 close-font"
}, {
text: "bi-list-item-select",
cls: "bi-list-item-select"
cls: "bi-list-item-select close-font"
}], {
type: "bi.text_item"
type: "bi.icon_text_item",
disabled: true,
logic: {
dynamic: true
}
}),
vgap: 10
};

1
demo/js/widget/numbereditor/demo.number_editor.js

@ -22,6 +22,7 @@ Demo.FileManager = BI.inherit(BI.Widget, {
} else {
editor.setDownEnable(true);
}
BI.Msg.toast(editor.getValue());
});
return {
type: "bi.vertical",

32
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

22
dist/base.css vendored

@ -1095,7 +1095,7 @@ li.CodeMirror-hint-active {
}
.bi-segment.disabled > .center-element,
.bi-segment.disabled > .first-element {
border-color: #F0F3F7;
border-color: #d0d4da;
}
.bi-theme-dark .bi-segment > .center-element {
overflow: hidden;
@ -1274,8 +1274,8 @@ body .bi-button.button-error.disabled.base-disabled,
#body .bi-button.button-error.disabled.base-disabled,
body .bi-button.button-warning.disabled.base-disabled,
#body .bi-button.button-warning.disabled.base-disabled {
background: #F0F3F7 !important;
border-color: #F0F3F7 !important;
background: #d0d4da !important;
border-color: #d0d4da !important;
}
body .bi-button.button-common.disabled,
#body .bi-button.button-common.disabled,
@ -1734,8 +1734,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
border-radius: 5px;
}
.bi-theme-dark .scrollbar-layout-main {
background-color: rgba(240, 243, 247, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
background-color: rgba(208, 212, 218, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dd0d4da,endColorstr=#0dd0d4da);
}
.scrollbar-layout-main-vertical {
bottom: 0;
@ -1757,8 +1757,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d878d9f,endColorstr=#0d878d9f);
}
.bi-theme-dark .scrollbar-layout-main-horizontal {
background-color: rgba(240, 243, 247, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
background-color: rgba(208, 212, 218, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dd0d4da,endColorstr=#0dd0d4da);
}
/* Touching the scroll-track directly makes the scroll-track bolder */
.scrollbar-layout-main-horizontal.public-scrollbar-main-active,
@ -1815,8 +1815,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d878d9f,endColorstr=#4d878d9f);
}
.bi-theme-dark .public-scrollbar-face:after {
background-color: rgba(240, 243, 247, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4df0f3f7,endColorstr=#4df0f3f7);
background-color: rgba(208, 212, 218, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dd0d4da,endColorstr=#4dd0d4da);
}
.public-scrollbar-main:hover .public-scrollbar-face:after,
.public-scrollbar-main-active .public-scrollbar-face:after,
@ -1827,8 +1827,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-theme-dark .public-scrollbar-main:hover .public-scrollbar-face:after,
.bi-theme-dark .public-scrollbar-main-active .public-scrollbar-face:after,
.bi-theme-dark .public-scrollbar-face-active:after {
background-color: rgba(240, 243, 247, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3f0f3f7,endColorstr=#b3f0f3f7);
background-color: rgba(208, 212, 218, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3d0d4da,endColorstr=#b3d0d4da);
}
.horizontal-scrollbar {
bottom: 0;

9
dist/base.js vendored

@ -20669,17 +20669,16 @@ BI.Toast = BI.inherit(BI.Tip, {
}
var items = [{
type: "bi.center_adapt",
type: "bi.icon_button",
disableSelected: true,
cls: cls + " toast-icon",
items: [{
type: "bi.icon"
}],
width: 36
}, {
el: {
type: "bi.label",
whiteSpace: "normal",
text: o.text,
textHeight: 16,
textAlign: "left"
},
rgap: o.autoClose ? this._const.hgap : 0
@ -20703,7 +20702,7 @@ BI.Toast = BI.inherit(BI.Tip, {
type: "bi.horizontal_adapt",
element: this,
items: items,
vgap: 5,
vgap: 7,
columnSize: columnSize
});
},

59
dist/bundle.css vendored

@ -295,7 +295,7 @@ textarea {
color: #9ea6b2 !important;
}
.base-disabled .b-font:before {
color: #9ea6b2 !important;
color: #d0d4da !important;
}
.bi-theme-dark .base-disabled {
color: #878d9f !important;
@ -307,7 +307,7 @@ textarea {
color: #878d9f !important;
}
.bi-theme-dark .base-disabled .b-font:before {
color: #878d9f !important;
color: #606479 !important;
}
.base-invalid {
cursor: default !important;
@ -1144,7 +1144,7 @@ textarea {
color: #9ea6b2 !important;
}
.bi-list-item-select.disabled.bi-high-light-border {
border-color: #F0F3F7;
border-color: #d0d4da;
}
.bi-list-item-select.disabled.hover,
.bi-list-item-select.disabled.active {
@ -1165,7 +1165,7 @@ textarea {
}
.bi-list-item-select.disabled.hover.bi-high-light-border,
.bi-list-item-select.disabled.active.bi-high-light-border {
border-color: #F0F3F7;
border-color: #d0d4da;
}
.bi-list-item-select2:hover,
.bi-list-item-select2.hover {
@ -1188,6 +1188,12 @@ textarea {
.bi-list-item-select2.active .bi-high-light {
color: #ffffff;
}
.bi-list-item-select2.disabled:hover,
.bi-list-item-select2.disabled.hover,
.bi-list-item-select2.disabled:active,
.bi-list-item-select2.disabled.active {
background-color: #ffffff !important;
}
.bi-theme-dark .bi-list-item-select:hover,
.bi-theme-dark .bi-list-item-select.hover {
color: #ffffff;
@ -2935,7 +2941,7 @@ li.CodeMirror-hint-active {
}
.bi-segment.disabled > .center-element,
.bi-segment.disabled > .first-element {
border-color: #F0F3F7;
border-color: #d0d4da;
}
.bi-theme-dark .bi-segment > .center-element {
overflow: hidden;
@ -3114,8 +3120,8 @@ body .bi-button.button-error.disabled.base-disabled,
#body .bi-button.button-error.disabled.base-disabled,
body .bi-button.button-warning.disabled.base-disabled,
#body .bi-button.button-warning.disabled.base-disabled {
background: #F0F3F7 !important;
border-color: #F0F3F7 !important;
background: #d0d4da !important;
border-color: #d0d4da !important;
}
body .bi-button.button-common.disabled,
#body .bi-button.button-common.disabled,
@ -3574,8 +3580,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
border-radius: 5px;
}
.bi-theme-dark .scrollbar-layout-main {
background-color: rgba(240, 243, 247, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
background-color: rgba(208, 212, 218, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dd0d4da,endColorstr=#0dd0d4da);
}
.scrollbar-layout-main-vertical {
bottom: 0;
@ -3597,8 +3603,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d878d9f,endColorstr=#0d878d9f);
}
.bi-theme-dark .scrollbar-layout-main-horizontal {
background-color: rgba(240, 243, 247, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
background-color: rgba(208, 212, 218, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dd0d4da,endColorstr=#0dd0d4da);
}
/* Touching the scroll-track directly makes the scroll-track bolder */
.scrollbar-layout-main-horizontal.public-scrollbar-main-active,
@ -3655,8 +3661,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d878d9f,endColorstr=#4d878d9f);
}
.bi-theme-dark .public-scrollbar-face:after {
background-color: rgba(240, 243, 247, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4df0f3f7,endColorstr=#4df0f3f7);
background-color: rgba(208, 212, 218, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dd0d4da,endColorstr=#4dd0d4da);
}
.public-scrollbar-main:hover .public-scrollbar-face:after,
.public-scrollbar-main-active .public-scrollbar-face:after,
@ -3667,8 +3673,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-theme-dark .public-scrollbar-main:hover .public-scrollbar-face:after,
.bi-theme-dark .public-scrollbar-main-active .public-scrollbar-face:after,
.bi-theme-dark .public-scrollbar-face-active:after {
background-color: rgba(240, 243, 247, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3f0f3f7,endColorstr=#b3f0f3f7);
background-color: rgba(208, 212, 218, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3d0d4da,endColorstr=#b3d0d4da);
}
.horizontal-scrollbar {
bottom: 0;
@ -4489,6 +4495,17 @@ ul.ztree.zTreeDragUL {
top: 4px;
left: -10px;
}
.bi-single-slider-button .slider-button.disabled {
border-color: #d0d4da;
}
.bi-single-slider-button .slider-button.disabled:hover,
.bi-single-slider-button .slider-button.disabled.hover {
background-color: #f7f8fa;
width: 16px;
height: 16px;
top: 6px;
left: -8px;
}
.bi-slider-track .gray-track {
background-color: #F2F4F7;
-webkit-border-radius: 3px;
@ -4602,8 +4619,8 @@ textarea::-webkit-scrollbar-thumb:hover {
.bi-theme-dark div::-webkit-scrollbar,
.bi-theme-dark textarea::-webkit-scrollbar {
-webkit-appearance: none;
background-color: rgba(240, 243, 247, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
background-color: rgba(208, 212, 218, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dd0d4da,endColorstr=#0dd0d4da);
width: 6px;
height: 6px;
}
@ -4612,13 +4629,13 @@ textarea::-webkit-scrollbar-thumb:hover {
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
background-color: rgba(240, 243, 247, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4df0f3f7,endColorstr=#4df0f3f7);
background-color: rgba(208, 212, 218, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dd0d4da,endColorstr=#4dd0d4da);
}
.bi-theme-dark div::-webkit-scrollbar-thumb:hover,
.bi-theme-dark textarea::-webkit-scrollbar-thumb:hover {
background-color: rgba(240, 243, 247, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3f0f3f7,endColorstr=#b3f0f3f7);
background-color: rgba(208, 212, 218, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3d0d4da,endColorstr=#b3d0d4da);
}
.farbtastic .wheel {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/background/wheel.png') no-repeat center center;

59
dist/bundle.js vendored

@ -56476,17 +56476,16 @@ BI.Toast = BI.inherit(BI.Tip, {
}
var items = [{
type: "bi.center_adapt",
type: "bi.icon_button",
disableSelected: true,
cls: cls + " toast-icon",
items: [{
type: "bi.icon"
}],
width: 36
}, {
el: {
type: "bi.label",
whiteSpace: "normal",
text: o.text,
textHeight: 16,
textAlign: "left"
},
rgap: o.autoClose ? this._const.hgap : 0
@ -56510,7 +56509,7 @@ BI.Toast = BI.inherit(BI.Tip, {
type: "bi.horizontal_adapt",
element: this,
items: items,
vgap: 5,
vgap: 7,
columnSize: columnSize
});
},
@ -78411,7 +78410,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, {
cls: "icon-combo-trigger-icon",
iconCls: iconCls,
disableSelected: true,
width: o.isShowDown ? o.width - 2 : o.width,
width: o.isShowDown ? o.width - 12 : o.width,
height: o.height,
iconWidth: o.iconWidth,
iconHeight: o.iconHeight,
@ -78420,7 +78419,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, {
this.down = BI.createWidget({
type: "bi.icon_button",
disableSelected: true,
cls: "icon-combo-down-icon trigger-triangle-font",
cls: "icon-combo-down-icon trigger-triangle-font font-size-12",
width: 12,
height: 8,
selected: BI.isNotEmptyString(iconCls)
@ -78437,7 +78436,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, {
bottom: 0
}, {
el: this.down,
right: 0,
right: 3,
bottom: 0
}]
});
@ -84417,7 +84416,7 @@ BI.SegmentButton = BI.inherit(BI.BasicButton, {
this.text = BI.createWidget({
type: "bi.label",
element: this,
height: opts.height - 2,
textHeight: opts.height,
whiteSpace: opts.whiteSpace,
text: opts.text,
value: opts.value,
@ -91463,7 +91462,8 @@ BI.DynamicDateParamItem.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.dynamic_date_param_item", BI.DynamicDateParamItem);
BI.DynamicDatePopup = BI.inherit(BI.Widget, {
constants: {
tabHeight: 30
tabHeight: 30,
buttonHeight: 24
},
props: {
@ -91474,7 +91474,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
_init: function () {
BI.DynamicDatePopup.superclass._init.apply(this, arguments);
var self = this, opts = this.options;
var self = this, opts = this.options, c = this.constants;
this.storeValue = {type: BI.DynamicDateCombo.Static};
BI.createWidget({
element: this,
@ -91490,6 +91490,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
cls: "bi-high-light bi-border-top",
shadow: true,
text: BI.i18nText("BI-Basic_Clear"),
textHeight: c.buttonHeight - 1,
listeners: [{
eventName: BI.TextButton.EVENT_CHANGE,
action: function () {
@ -91501,6 +91502,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
forceCenter: true,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
shadow: true,
textHeight: c.buttonHeight - 1,
text: BI.i18nText("BI-Multi_Date_Today"),
ref: function () {
self.textButton = this;
@ -91515,6 +91517,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-high-light bi-border-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_OK"),
listeners: [{
@ -92229,7 +92232,8 @@ BI.extend(BI.DynamicDateTimeCombo, {
Dynamic: 2
});BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
constants: {
tabHeight: 30
tabHeight: 30,
buttonHeight: 24
},
props: {
@ -92240,7 +92244,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
_init: function () {
BI.DynamicDateTimePopup.superclass._init.apply(this, arguments);
var self = this, opts = this.options;
var self = this, opts = this.options, c = this.constants;
this.storeValue = {type: BI.DynamicDateCombo.Static};
BI.createWidget({
element: this,
@ -92254,6 +92258,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-high-light bi-border-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Clear"),
listeners: [{
@ -92266,6 +92271,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Multi_Date_Today"),
ref: function () {
@ -92281,6 +92287,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-high-light bi-border-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_OK"),
listeners: [{
@ -102042,7 +102049,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
errorText: o.errorText
});
this.editor.on(BI.TextEditor.EVENT_CHANGE, function () {
o.value = this.getValue();
o.value = BI.parseFloat(this.getValue());
self.fireEvent(BI.NumberEditor.EVENT_CHANGE);
});
this.editor.on(BI.TextEditor.EVENT_CONFIRM, function () {
@ -110021,7 +110028,8 @@ BI.extend(BI.DynamicYearCombo, {
*/
BI.DynamicYearPopup = BI.inherit(BI.Widget, {
constants: {
tabHeight: 30
tabHeight: 30,
buttonHeight: 24
},
props: {
@ -110034,7 +110042,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
},
render: function () {
var self = this, opts = this.options;
var self = this, opts = this.options, c = this.constants;
this.storeValue = {type: BI.DynamicYearCombo.Static};
return {
type: "bi.vtape",
@ -110047,6 +110055,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Clear"),
listeners: [{
@ -110058,6 +110067,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
}, {
type: "bi.text_button",
forceCenter: true,
textHeight: c.buttonHeight - 1,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
shadow: true,
text: BI.i18nText("BI-Basic_Current_Year"),
@ -110074,6 +110084,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_OK"),
listeners: [{
@ -110773,7 +110784,8 @@ BI.extend(BI.DynamicYearMonthCombo, {
*/
BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
constants: {
tabHeight: 30
tabHeight: 30,
buttonHeight: 24
},
props: {
@ -110786,7 +110798,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
},
render: function () {
var self = this, opts = this.options;
var self = this, opts = this.options, c = this.constants;
this.storeValue = {type: BI.DynamicYearMonthCombo.Static};
return {
type: "bi.vtape",
@ -110799,6 +110811,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Clear"),
listeners: [{
@ -110811,6 +110824,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Current_Month"),
ref: function () {
@ -110826,6 +110840,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_OK"),
listeners: [{
@ -111755,7 +111770,8 @@ BI.extend(BI.DynamicYearQuarterCombo, {
Dynamic: 2
});BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
constants: {
tabHeight: 30
tabHeight: 30,
buttonHeight: 24
},
props: {
@ -111768,7 +111784,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
},
render: function () {
var self = this, opts = this.options;
var self = this, opts = this.options, c = this.constants;
this.storeValue = {type: BI.DynamicYearQuarterCombo.Static};
return {
type: "bi.vtape",
@ -111782,6 +111798,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
forceCenter: true,
cls: "bi-border-top bi-high-light",
shadow: true,
textHeight: c.buttonHeight - 1,
text: BI.i18nText("BI-Basic_Clear"),
listeners: [{
eventName: BI.TextButton.EVENT_CHANGE,
@ -111793,6 +111810,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Current_Quarter"),
ref: function () {
@ -111809,6 +111827,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
forceCenter: true,
cls: "bi-border-top bi-high-light",
shadow: true,
textHeight: c.buttonHeight - 1,
text: BI.i18nText("BI-Basic_OK"),
listeners: [{
eventName: BI.TextButton.EVENT_CHANGE,

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

33
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

8
dist/case.js vendored

@ -5842,7 +5842,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, {
cls: "icon-combo-trigger-icon",
iconCls: iconCls,
disableSelected: true,
width: o.isShowDown ? o.width - 2 : o.width,
width: o.isShowDown ? o.width - 12 : o.width,
height: o.height,
iconWidth: o.iconWidth,
iconHeight: o.iconHeight,
@ -5851,7 +5851,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, {
this.down = BI.createWidget({
type: "bi.icon_button",
disableSelected: true,
cls: "icon-combo-down-icon trigger-triangle-font",
cls: "icon-combo-down-icon trigger-triangle-font font-size-12",
width: 12,
height: 8,
selected: BI.isNotEmptyString(iconCls)
@ -5868,7 +5868,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, {
bottom: 0
}, {
el: this.down,
right: 0,
right: 3,
bottom: 0
}]
});
@ -11848,7 +11848,7 @@ BI.SegmentButton = BI.inherit(BI.BasicButton, {
this.text = BI.createWidget({
type: "bi.label",
element: this,
height: opts.height - 2,
textHeight: opts.height,
whiteSpace: opts.whiteSpace,
text: opts.text,
value: opts.value,

14
dist/core.css vendored

@ -295,7 +295,7 @@ textarea {
color: #9ea6b2 !important;
}
.base-disabled .b-font:before {
color: #9ea6b2 !important;
color: #d0d4da !important;
}
.bi-theme-dark .base-disabled {
color: #878d9f !important;
@ -307,7 +307,7 @@ textarea {
color: #878d9f !important;
}
.bi-theme-dark .base-disabled .b-font:before {
color: #878d9f !important;
color: #606479 !important;
}
.base-invalid {
cursor: default !important;
@ -1144,7 +1144,7 @@ textarea {
color: #9ea6b2 !important;
}
.bi-list-item-select.disabled.bi-high-light-border {
border-color: #F0F3F7;
border-color: #d0d4da;
}
.bi-list-item-select.disabled.hover,
.bi-list-item-select.disabled.active {
@ -1165,7 +1165,7 @@ textarea {
}
.bi-list-item-select.disabled.hover.bi-high-light-border,
.bi-list-item-select.disabled.active.bi-high-light-border {
border-color: #F0F3F7;
border-color: #d0d4da;
}
.bi-list-item-select2:hover,
.bi-list-item-select2.hover {
@ -1188,6 +1188,12 @@ textarea {
.bi-list-item-select2.active .bi-high-light {
color: #ffffff;
}
.bi-list-item-select2.disabled:hover,
.bi-list-item-select2.disabled.hover,
.bi-list-item-select2.disabled:active,
.bi-list-item-select2.disabled.active {
background-color: #ffffff !important;
}
.bi-theme-dark .bi-list-item-select:hover,
.bi-theme-dark .bi-list-item-select.hover {
color: #ffffff;

14
dist/core_without_normalize.css vendored

@ -17,7 +17,7 @@ textarea {
color: #9ea6b2 !important;
}
.base-disabled .b-font:before {
color: #9ea6b2 !important;
color: #d0d4da !important;
}
.bi-theme-dark .base-disabled {
color: #878d9f !important;
@ -29,7 +29,7 @@ textarea {
color: #878d9f !important;
}
.bi-theme-dark .base-disabled .b-font:before {
color: #878d9f !important;
color: #606479 !important;
}
.base-invalid {
cursor: default !important;
@ -866,7 +866,7 @@ textarea {
color: #9ea6b2 !important;
}
.bi-list-item-select.disabled.bi-high-light-border {
border-color: #F0F3F7;
border-color: #d0d4da;
}
.bi-list-item-select.disabled.hover,
.bi-list-item-select.disabled.active {
@ -887,7 +887,7 @@ textarea {
}
.bi-list-item-select.disabled.hover.bi-high-light-border,
.bi-list-item-select.disabled.active.bi-high-light-border {
border-color: #F0F3F7;
border-color: #d0d4da;
}
.bi-list-item-select2:hover,
.bi-list-item-select2.hover {
@ -910,6 +910,12 @@ textarea {
.bi-list-item-select2.active .bi-high-light {
color: #ffffff;
}
.bi-list-item-select2.disabled:hover,
.bi-list-item-select2.disabled.hover,
.bi-list-item-select2.disabled:active,
.bi-list-item-select2.disabled.active {
background-color: #ffffff !important;
}
.bi-theme-dark .bi-list-item-select:hover,
.bi-theme-dark .bi-list-item-select.hover {
color: #ffffff;

21
dist/demo.js vendored

@ -2386,27 +2386,31 @@ BI.shortcut("demo.calendar", Demo.Func);Demo.Func = BI.inherit(BI.Widget, {
type: "bi.vertical",
items: BI.createItems([{
text: "bi-list-item",
cls: "bi-list-item"
cls: "bi-list-item close-font"
}, {
text: "bi-list-item-simple",
cls: "bi-list-item-simple"
cls: "bi-list-item-simple close-font"
}, {
text: "bi-list-item-effect",
cls: "bi-list-item-effect"
cls: "bi-list-item-effect close-font"
}, {
text: "bi-list-item-active",
cls: "bi-list-item-active"
cls: "bi-list-item-active close-font"
}, {
text: "bi-list-item-active2",
cls: "bi-list-item-active2"
cls: "bi-list-item-active2 close-font"
}, {
text: "bi-list-item-active3",
cls: "bi-list-item-active3"
cls: "bi-list-item-active3 close-font"
}, {
text: "bi-list-item-select",
cls: "bi-list-item-select"
cls: "bi-list-item-select close-font"
}], {
type: "bi.text_item"
type: "bi.icon_text_item",
disabled: true,
logic: {
dynamic: true
}
}),
vgap: 10
};
@ -13050,6 +13054,7 @@ Demo.FileManager = BI.inherit(BI.Widget, {
} else {
editor.setDownEnable(true);
}
BI.Msg.toast(editor.getValue());
});
return {
type: "bi.vertical",

59
dist/fineui.css vendored

@ -295,7 +295,7 @@ textarea {
color: #9ea6b2 !important;
}
.base-disabled .b-font:before {
color: #9ea6b2 !important;
color: #d0d4da !important;
}
.bi-theme-dark .base-disabled {
color: #878d9f !important;
@ -307,7 +307,7 @@ textarea {
color: #878d9f !important;
}
.bi-theme-dark .base-disabled .b-font:before {
color: #878d9f !important;
color: #606479 !important;
}
.base-invalid {
cursor: default !important;
@ -1144,7 +1144,7 @@ textarea {
color: #9ea6b2 !important;
}
.bi-list-item-select.disabled.bi-high-light-border {
border-color: #F0F3F7;
border-color: #d0d4da;
}
.bi-list-item-select.disabled.hover,
.bi-list-item-select.disabled.active {
@ -1165,7 +1165,7 @@ textarea {
}
.bi-list-item-select.disabled.hover.bi-high-light-border,
.bi-list-item-select.disabled.active.bi-high-light-border {
border-color: #F0F3F7;
border-color: #d0d4da;
}
.bi-list-item-select2:hover,
.bi-list-item-select2.hover {
@ -1188,6 +1188,12 @@ textarea {
.bi-list-item-select2.active .bi-high-light {
color: #ffffff;
}
.bi-list-item-select2.disabled:hover,
.bi-list-item-select2.disabled.hover,
.bi-list-item-select2.disabled:active,
.bi-list-item-select2.disabled.active {
background-color: #ffffff !important;
}
.bi-theme-dark .bi-list-item-select:hover,
.bi-theme-dark .bi-list-item-select.hover {
color: #ffffff;
@ -2935,7 +2941,7 @@ li.CodeMirror-hint-active {
}
.bi-segment.disabled > .center-element,
.bi-segment.disabled > .first-element {
border-color: #F0F3F7;
border-color: #d0d4da;
}
.bi-theme-dark .bi-segment > .center-element {
overflow: hidden;
@ -3114,8 +3120,8 @@ body .bi-button.button-error.disabled.base-disabled,
#body .bi-button.button-error.disabled.base-disabled,
body .bi-button.button-warning.disabled.base-disabled,
#body .bi-button.button-warning.disabled.base-disabled {
background: #F0F3F7 !important;
border-color: #F0F3F7 !important;
background: #d0d4da !important;
border-color: #d0d4da !important;
}
body .bi-button.button-common.disabled,
#body .bi-button.button-common.disabled,
@ -3574,8 +3580,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
border-radius: 5px;
}
.bi-theme-dark .scrollbar-layout-main {
background-color: rgba(240, 243, 247, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
background-color: rgba(208, 212, 218, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dd0d4da,endColorstr=#0dd0d4da);
}
.scrollbar-layout-main-vertical {
bottom: 0;
@ -3597,8 +3603,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d878d9f,endColorstr=#0d878d9f);
}
.bi-theme-dark .scrollbar-layout-main-horizontal {
background-color: rgba(240, 243, 247, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
background-color: rgba(208, 212, 218, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dd0d4da,endColorstr=#0dd0d4da);
}
/* Touching the scroll-track directly makes the scroll-track bolder */
.scrollbar-layout-main-horizontal.public-scrollbar-main-active,
@ -3655,8 +3661,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d878d9f,endColorstr=#4d878d9f);
}
.bi-theme-dark .public-scrollbar-face:after {
background-color: rgba(240, 243, 247, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4df0f3f7,endColorstr=#4df0f3f7);
background-color: rgba(208, 212, 218, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dd0d4da,endColorstr=#4dd0d4da);
}
.public-scrollbar-main:hover .public-scrollbar-face:after,
.public-scrollbar-main-active .public-scrollbar-face:after,
@ -3667,8 +3673,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-theme-dark .public-scrollbar-main:hover .public-scrollbar-face:after,
.bi-theme-dark .public-scrollbar-main-active .public-scrollbar-face:after,
.bi-theme-dark .public-scrollbar-face-active:after {
background-color: rgba(240, 243, 247, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3f0f3f7,endColorstr=#b3f0f3f7);
background-color: rgba(208, 212, 218, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3d0d4da,endColorstr=#b3d0d4da);
}
.horizontal-scrollbar {
bottom: 0;
@ -4489,6 +4495,17 @@ ul.ztree.zTreeDragUL {
top: 4px;
left: -10px;
}
.bi-single-slider-button .slider-button.disabled {
border-color: #d0d4da;
}
.bi-single-slider-button .slider-button.disabled:hover,
.bi-single-slider-button .slider-button.disabled.hover {
background-color: #f7f8fa;
width: 16px;
height: 16px;
top: 6px;
left: -8px;
}
.bi-slider-track .gray-track {
background-color: #F2F4F7;
-webkit-border-radius: 3px;
@ -4602,8 +4619,8 @@ textarea::-webkit-scrollbar-thumb:hover {
.bi-theme-dark div::-webkit-scrollbar,
.bi-theme-dark textarea::-webkit-scrollbar {
-webkit-appearance: none;
background-color: rgba(240, 243, 247, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
background-color: rgba(208, 212, 218, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dd0d4da,endColorstr=#0dd0d4da);
width: 6px;
height: 6px;
}
@ -4612,13 +4629,13 @@ textarea::-webkit-scrollbar-thumb:hover {
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
background-color: rgba(240, 243, 247, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4df0f3f7,endColorstr=#4df0f3f7);
background-color: rgba(208, 212, 218, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dd0d4da,endColorstr=#4dd0d4da);
}
.bi-theme-dark div::-webkit-scrollbar-thumb:hover,
.bi-theme-dark textarea::-webkit-scrollbar-thumb:hover {
background-color: rgba(240, 243, 247, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3f0f3f7,endColorstr=#b3f0f3f7);
background-color: rgba(208, 212, 218, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3d0d4da,endColorstr=#b3d0d4da);
}
.farbtastic .wheel {
background: url('resources?path=/com/fr/web/ui/images/1x/background/wheel.png') no-repeat center center;

59
dist/fineui.js vendored

@ -56725,17 +56725,16 @@ BI.Toast = BI.inherit(BI.Tip, {
}
var items = [{
type: "bi.center_adapt",
type: "bi.icon_button",
disableSelected: true,
cls: cls + " toast-icon",
items: [{
type: "bi.icon"
}],
width: 36
}, {
el: {
type: "bi.label",
whiteSpace: "normal",
text: o.text,
textHeight: 16,
textAlign: "left"
},
rgap: o.autoClose ? this._const.hgap : 0
@ -56759,7 +56758,7 @@ BI.Toast = BI.inherit(BI.Tip, {
type: "bi.horizontal_adapt",
element: this,
items: items,
vgap: 5,
vgap: 7,
columnSize: columnSize
});
},
@ -78660,7 +78659,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, {
cls: "icon-combo-trigger-icon",
iconCls: iconCls,
disableSelected: true,
width: o.isShowDown ? o.width - 2 : o.width,
width: o.isShowDown ? o.width - 12 : o.width,
height: o.height,
iconWidth: o.iconWidth,
iconHeight: o.iconHeight,
@ -78669,7 +78668,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, {
this.down = BI.createWidget({
type: "bi.icon_button",
disableSelected: true,
cls: "icon-combo-down-icon trigger-triangle-font",
cls: "icon-combo-down-icon trigger-triangle-font font-size-12",
width: 12,
height: 8,
selected: BI.isNotEmptyString(iconCls)
@ -78686,7 +78685,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, {
bottom: 0
}, {
el: this.down,
right: 0,
right: 3,
bottom: 0
}]
});
@ -84666,7 +84665,7 @@ BI.SegmentButton = BI.inherit(BI.BasicButton, {
this.text = BI.createWidget({
type: "bi.label",
element: this,
height: opts.height - 2,
textHeight: opts.height,
whiteSpace: opts.whiteSpace,
text: opts.text,
value: opts.value,
@ -91712,7 +91711,8 @@ BI.DynamicDateParamItem.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.dynamic_date_param_item", BI.DynamicDateParamItem);
BI.DynamicDatePopup = BI.inherit(BI.Widget, {
constants: {
tabHeight: 30
tabHeight: 30,
buttonHeight: 24
},
props: {
@ -91723,7 +91723,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
_init: function () {
BI.DynamicDatePopup.superclass._init.apply(this, arguments);
var self = this, opts = this.options;
var self = this, opts = this.options, c = this.constants;
this.storeValue = {type: BI.DynamicDateCombo.Static};
BI.createWidget({
element: this,
@ -91739,6 +91739,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
cls: "bi-high-light bi-border-top",
shadow: true,
text: BI.i18nText("BI-Basic_Clear"),
textHeight: c.buttonHeight - 1,
listeners: [{
eventName: BI.TextButton.EVENT_CHANGE,
action: function () {
@ -91750,6 +91751,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
forceCenter: true,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
shadow: true,
textHeight: c.buttonHeight - 1,
text: BI.i18nText("BI-Multi_Date_Today"),
ref: function () {
self.textButton = this;
@ -91764,6 +91766,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-high-light bi-border-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_OK"),
listeners: [{
@ -92478,7 +92481,8 @@ BI.extend(BI.DynamicDateTimeCombo, {
Dynamic: 2
});BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
constants: {
tabHeight: 30
tabHeight: 30,
buttonHeight: 24
},
props: {
@ -92489,7 +92493,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
_init: function () {
BI.DynamicDateTimePopup.superclass._init.apply(this, arguments);
var self = this, opts = this.options;
var self = this, opts = this.options, c = this.constants;
this.storeValue = {type: BI.DynamicDateCombo.Static};
BI.createWidget({
element: this,
@ -92503,6 +92507,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-high-light bi-border-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Clear"),
listeners: [{
@ -92515,6 +92520,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Multi_Date_Today"),
ref: function () {
@ -92530,6 +92536,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-high-light bi-border-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_OK"),
listeners: [{
@ -102291,7 +102298,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
errorText: o.errorText
});
this.editor.on(BI.TextEditor.EVENT_CHANGE, function () {
o.value = this.getValue();
o.value = BI.parseFloat(this.getValue());
self.fireEvent(BI.NumberEditor.EVENT_CHANGE);
});
this.editor.on(BI.TextEditor.EVENT_CONFIRM, function () {
@ -110270,7 +110277,8 @@ BI.extend(BI.DynamicYearCombo, {
*/
BI.DynamicYearPopup = BI.inherit(BI.Widget, {
constants: {
tabHeight: 30
tabHeight: 30,
buttonHeight: 24
},
props: {
@ -110283,7 +110291,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
},
render: function () {
var self = this, opts = this.options;
var self = this, opts = this.options, c = this.constants;
this.storeValue = {type: BI.DynamicYearCombo.Static};
return {
type: "bi.vtape",
@ -110296,6 +110304,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Clear"),
listeners: [{
@ -110307,6 +110316,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
}, {
type: "bi.text_button",
forceCenter: true,
textHeight: c.buttonHeight - 1,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
shadow: true,
text: BI.i18nText("BI-Basic_Current_Year"),
@ -110323,6 +110333,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_OK"),
listeners: [{
@ -111022,7 +111033,8 @@ BI.extend(BI.DynamicYearMonthCombo, {
*/
BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
constants: {
tabHeight: 30
tabHeight: 30,
buttonHeight: 24
},
props: {
@ -111035,7 +111047,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
},
render: function () {
var self = this, opts = this.options;
var self = this, opts = this.options, c = this.constants;
this.storeValue = {type: BI.DynamicYearMonthCombo.Static};
return {
type: "bi.vtape",
@ -111048,6 +111060,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Clear"),
listeners: [{
@ -111060,6 +111073,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Current_Month"),
ref: function () {
@ -111075,6 +111089,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_OK"),
listeners: [{
@ -112004,7 +112019,8 @@ BI.extend(BI.DynamicYearQuarterCombo, {
Dynamic: 2
});BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
constants: {
tabHeight: 30
tabHeight: 30,
buttonHeight: 24
},
props: {
@ -112017,7 +112033,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
},
render: function () {
var self = this, opts = this.options;
var self = this, opts = this.options, c = this.constants;
this.storeValue = {type: BI.DynamicYearQuarterCombo.Static};
return {
type: "bi.vtape",
@ -112031,6 +112047,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
forceCenter: true,
cls: "bi-border-top bi-high-light",
shadow: true,
textHeight: c.buttonHeight - 1,
text: BI.i18nText("BI-Basic_Clear"),
listeners: [{
eventName: BI.TextButton.EVENT_CHANGE,
@ -112042,6 +112059,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Current_Quarter"),
ref: function () {
@ -112058,6 +112076,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
forceCenter: true,
cls: "bi-border-top bi-high-light",
shadow: true,
textHeight: c.buttonHeight - 1,
text: BI.i18nText("BI-Basic_OK"),
listeners: [{
eventName: BI.TextButton.EVENT_CHANGE,

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

32
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

12
dist/resource.css vendored

@ -51,8 +51,8 @@ textarea::-webkit-scrollbar-thumb:hover {
.bi-theme-dark div::-webkit-scrollbar,
.bi-theme-dark textarea::-webkit-scrollbar {
-webkit-appearance: none;
background-color: rgba(240, 243, 247, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
background-color: rgba(208, 212, 218, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dd0d4da,endColorstr=#0dd0d4da);
width: 6px;
height: 6px;
}
@ -61,13 +61,13 @@ textarea::-webkit-scrollbar-thumb:hover {
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
background-color: rgba(240, 243, 247, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4df0f3f7,endColorstr=#4df0f3f7);
background-color: rgba(208, 212, 218, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dd0d4da,endColorstr=#4dd0d4da);
}
.bi-theme-dark div::-webkit-scrollbar-thumb:hover,
.bi-theme-dark textarea::-webkit-scrollbar-thumb:hover {
background-color: rgba(240, 243, 247, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3f0f3f7,endColorstr=#b3f0f3f7);
background-color: rgba(208, 212, 218, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3d0d4da,endColorstr=#b3d0d4da);
}
.farbtastic .wheel {
background: url('images/1x/background/wheel.png') no-repeat center center;

11
dist/widget.css vendored

@ -403,6 +403,17 @@
top: 4px;
left: -10px;
}
.bi-single-slider-button .slider-button.disabled {
border-color: #d0d4da;
}
.bi-single-slider-button .slider-button.disabled:hover,
.bi-single-slider-button .slider-button.disabled.hover {
background-color: #f7f8fa;
width: 16px;
height: 16px;
top: 6px;
left: -8px;
}
.bi-slider-track .gray-track {
background-color: #F2F4F7;
-webkit-border-radius: 3px;

42
dist/widget.js vendored

@ -3653,7 +3653,8 @@ BI.DynamicDateParamItem.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.dynamic_date_param_item", BI.DynamicDateParamItem);
BI.DynamicDatePopup = BI.inherit(BI.Widget, {
constants: {
tabHeight: 30
tabHeight: 30,
buttonHeight: 24
},
props: {
@ -3664,7 +3665,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
_init: function () {
BI.DynamicDatePopup.superclass._init.apply(this, arguments);
var self = this, opts = this.options;
var self = this, opts = this.options, c = this.constants;
this.storeValue = {type: BI.DynamicDateCombo.Static};
BI.createWidget({
element: this,
@ -3680,6 +3681,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
cls: "bi-high-light bi-border-top",
shadow: true,
text: BI.i18nText("BI-Basic_Clear"),
textHeight: c.buttonHeight - 1,
listeners: [{
eventName: BI.TextButton.EVENT_CHANGE,
action: function () {
@ -3691,6 +3693,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
forceCenter: true,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
shadow: true,
textHeight: c.buttonHeight - 1,
text: BI.i18nText("BI-Multi_Date_Today"),
ref: function () {
self.textButton = this;
@ -3705,6 +3708,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-high-light bi-border-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_OK"),
listeners: [{
@ -4419,7 +4423,8 @@ BI.extend(BI.DynamicDateTimeCombo, {
Dynamic: 2
});BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
constants: {
tabHeight: 30
tabHeight: 30,
buttonHeight: 24
},
props: {
@ -4430,7 +4435,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
_init: function () {
BI.DynamicDateTimePopup.superclass._init.apply(this, arguments);
var self = this, opts = this.options;
var self = this, opts = this.options, c = this.constants;
this.storeValue = {type: BI.DynamicDateCombo.Static};
BI.createWidget({
element: this,
@ -4444,6 +4449,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-high-light bi-border-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Clear"),
listeners: [{
@ -4456,6 +4462,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Multi_Date_Today"),
ref: function () {
@ -4471,6 +4478,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-high-light bi-border-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_OK"),
listeners: [{
@ -14232,7 +14240,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
errorText: o.errorText
});
this.editor.on(BI.TextEditor.EVENT_CHANGE, function () {
o.value = this.getValue();
o.value = BI.parseFloat(this.getValue());
self.fireEvent(BI.NumberEditor.EVENT_CHANGE);
});
this.editor.on(BI.TextEditor.EVENT_CONFIRM, function () {
@ -22211,7 +22219,8 @@ BI.extend(BI.DynamicYearCombo, {
*/
BI.DynamicYearPopup = BI.inherit(BI.Widget, {
constants: {
tabHeight: 30
tabHeight: 30,
buttonHeight: 24
},
props: {
@ -22224,7 +22233,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
},
render: function () {
var self = this, opts = this.options;
var self = this, opts = this.options, c = this.constants;
this.storeValue = {type: BI.DynamicYearCombo.Static};
return {
type: "bi.vtape",
@ -22237,6 +22246,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Clear"),
listeners: [{
@ -22248,6 +22258,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
}, {
type: "bi.text_button",
forceCenter: true,
textHeight: c.buttonHeight - 1,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
shadow: true,
text: BI.i18nText("BI-Basic_Current_Year"),
@ -22264,6 +22275,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_OK"),
listeners: [{
@ -22963,7 +22975,8 @@ BI.extend(BI.DynamicYearMonthCombo, {
*/
BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
constants: {
tabHeight: 30
tabHeight: 30,
buttonHeight: 24
},
props: {
@ -22976,7 +22989,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
},
render: function () {
var self = this, opts = this.options;
var self = this, opts = this.options, c = this.constants;
this.storeValue = {type: BI.DynamicYearMonthCombo.Static};
return {
type: "bi.vtape",
@ -22989,6 +23002,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Clear"),
listeners: [{
@ -23001,6 +23015,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Current_Month"),
ref: function () {
@ -23016,6 +23031,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_OK"),
listeners: [{
@ -23945,7 +23961,8 @@ BI.extend(BI.DynamicYearQuarterCombo, {
Dynamic: 2
});BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
constants: {
tabHeight: 30
tabHeight: 30,
buttonHeight: 24
},
props: {
@ -23958,7 +23975,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
},
render: function () {
var self = this, opts = this.options;
var self = this, opts = this.options, c = this.constants;
this.storeValue = {type: BI.DynamicYearQuarterCombo.Static};
return {
type: "bi.vtape",
@ -23972,6 +23989,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
forceCenter: true,
cls: "bi-border-top bi-high-light",
shadow: true,
textHeight: c.buttonHeight - 1,
text: BI.i18nText("BI-Basic_Clear"),
listeners: [{
eventName: BI.TextButton.EVENT_CHANGE,
@ -23983,6 +24001,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Current_Quarter"),
ref: function () {
@ -23999,6 +24018,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
forceCenter: true,
cls: "bi-border-top bi-high-light",
shadow: true,
textHeight: c.buttonHeight - 1,
text: BI.i18nText("BI-Basic_OK"),
listeners: [{
eventName: BI.TextButton.EVENT_CHANGE,

12
public/css/app.css

@ -51,8 +51,8 @@ textarea::-webkit-scrollbar-thumb:hover {
.bi-theme-dark div::-webkit-scrollbar,
.bi-theme-dark textarea::-webkit-scrollbar {
-webkit-appearance: none;
background-color: rgba(240, 243, 247, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
background-color: rgba(208, 212, 218, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dd0d4da,endColorstr=#0dd0d4da);
width: 6px;
height: 6px;
}
@ -61,11 +61,11 @@ textarea::-webkit-scrollbar-thumb:hover {
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
background-color: rgba(240, 243, 247, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4df0f3f7,endColorstr=#4df0f3f7);
background-color: rgba(208, 212, 218, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dd0d4da,endColorstr=#4dd0d4da);
}
.bi-theme-dark div::-webkit-scrollbar-thumb:hover,
.bi-theme-dark textarea::-webkit-scrollbar-thumb:hover {
background-color: rgba(240, 243, 247, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3f0f3f7,endColorstr=#b3f0f3f7);
background-color: rgba(208, 212, 218, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3d0d4da,endColorstr=#b3d0d4da);
}

9
src/base/single/tip/tip.toast.js

@ -49,17 +49,16 @@ BI.Toast = BI.inherit(BI.Tip, {
}
var items = [{
type: "bi.center_adapt",
type: "bi.icon_button",
disableSelected: true,
cls: cls + " toast-icon",
items: [{
type: "bi.icon"
}],
width: 36
}, {
el: {
type: "bi.label",
whiteSpace: "normal",
text: o.text,
textHeight: 16,
textAlign: "left"
},
rgap: o.autoClose ? this._const.hgap : 0
@ -83,7 +82,7 @@ BI.Toast = BI.inherit(BI.Tip, {
type: "bi.horizontal_adapt",
element: this,
items: items,
vgap: 5,
vgap: 7,
columnSize: columnSize
});
},

6
src/case/combo/iconcombo/trigger.iconcombo.js

@ -30,7 +30,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, {
cls: "icon-combo-trigger-icon",
iconCls: iconCls,
disableSelected: true,
width: o.isShowDown ? o.width - 2 : o.width,
width: o.isShowDown ? o.width - 12 : o.width,
height: o.height,
iconWidth: o.iconWidth,
iconHeight: o.iconHeight,
@ -39,7 +39,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, {
this.down = BI.createWidget({
type: "bi.icon_button",
disableSelected: true,
cls: "icon-combo-down-icon trigger-triangle-font",
cls: "icon-combo-down-icon trigger-triangle-font font-size-12",
width: 12,
height: 8,
selected: BI.isNotEmptyString(iconCls)
@ -56,7 +56,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, {
bottom: 0
}, {
el: this.down,
right: 0,
right: 3,
bottom: 0
}]
});

2
src/case/segment/button.segment.js

@ -26,7 +26,7 @@ BI.SegmentButton = BI.inherit(BI.BasicButton, {
this.text = BI.createWidget({
type: "bi.label",
element: this,
height: opts.height - 2,
textHeight: opts.height,
whiteSpace: opts.whiteSpace,
text: opts.text,
value: opts.value,

2
src/css/base/segment/segment.css

@ -20,7 +20,7 @@
}
.bi-segment.disabled > .center-element,
.bi-segment.disabled > .first-element {
border-color: #F0F3F7;
border-color: #d0d4da;
}
.bi-theme-dark .bi-segment > .center-element {
overflow: hidden;

4
src/css/base/single/button/button.css

@ -163,8 +163,8 @@ body .bi-button.button-error.disabled.base-disabled,
#body .bi-button.button-error.disabled.base-disabled,
body .bi-button.button-warning.disabled.base-disabled,
#body .bi-button.button-warning.disabled.base-disabled {
background: #F0F3F7 !important;
border-color: #F0F3F7 !important;
background: #d0d4da !important;
border-color: #d0d4da !important;
}
body .bi-button.button-common.disabled,
#body .bi-button.button-common.disabled,

16
src/css/base/table/table.css

@ -63,8 +63,8 @@
border-radius: 5px;
}
.bi-theme-dark .scrollbar-layout-main {
background-color: rgba(240, 243, 247, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
background-color: rgba(208, 212, 218, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dd0d4da,endColorstr=#0dd0d4da);
}
.scrollbar-layout-main-vertical {
bottom: 0;
@ -86,8 +86,8 @@
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d878d9f,endColorstr=#0d878d9f);
}
.bi-theme-dark .scrollbar-layout-main-horizontal {
background-color: rgba(240, 243, 247, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
background-color: rgba(208, 212, 218, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dd0d4da,endColorstr=#0dd0d4da);
}
/* Touching the scroll-track directly makes the scroll-track bolder */
.scrollbar-layout-main-horizontal.public-scrollbar-main-active,
@ -144,8 +144,8 @@
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d878d9f,endColorstr=#4d878d9f);
}
.bi-theme-dark .public-scrollbar-face:after {
background-color: rgba(240, 243, 247, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4df0f3f7,endColorstr=#4df0f3f7);
background-color: rgba(208, 212, 218, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dd0d4da,endColorstr=#4dd0d4da);
}
.public-scrollbar-main:hover .public-scrollbar-face:after,
.public-scrollbar-main-active .public-scrollbar-face:after,
@ -156,8 +156,8 @@
.bi-theme-dark .public-scrollbar-main:hover .public-scrollbar-face:after,
.bi-theme-dark .public-scrollbar-main-active .public-scrollbar-face:after,
.bi-theme-dark .public-scrollbar-face-active:after {
background-color: rgba(240, 243, 247, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3f0f3f7,endColorstr=#b3f0f3f7);
background-color: rgba(208, 212, 218, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3d0d4da,endColorstr=#b3d0d4da);
}
.horizontal-scrollbar {
bottom: 0;

14
src/css/core/utils/common.css

@ -17,7 +17,7 @@ textarea {
color: #9ea6b2 !important;
}
.base-disabled .b-font:before {
color: #9ea6b2 !important;
color: #d0d4da !important;
}
.bi-theme-dark .base-disabled {
color: #878d9f !important;
@ -29,7 +29,7 @@ textarea {
color: #878d9f !important;
}
.bi-theme-dark .base-disabled .b-font:before {
color: #878d9f !important;
color: #606479 !important;
}
.base-invalid {
cursor: default !important;
@ -866,7 +866,7 @@ textarea {
color: #9ea6b2 !important;
}
.bi-list-item-select.disabled.bi-high-light-border {
border-color: #F0F3F7;
border-color: #d0d4da;
}
.bi-list-item-select.disabled.hover,
.bi-list-item-select.disabled.active {
@ -887,7 +887,7 @@ textarea {
}
.bi-list-item-select.disabled.hover.bi-high-light-border,
.bi-list-item-select.disabled.active.bi-high-light-border {
border-color: #F0F3F7;
border-color: #d0d4da;
}
.bi-list-item-select2:hover,
.bi-list-item-select2.hover {
@ -910,6 +910,12 @@ textarea {
.bi-list-item-select2.active .bi-high-light {
color: #ffffff;
}
.bi-list-item-select2.disabled:hover,
.bi-list-item-select2.disabled.hover,
.bi-list-item-select2.disabled:active,
.bi-list-item-select2.disabled.active {
background-color: #ffffff !important;
}
.bi-theme-dark .bi-list-item-select:hover,
.bi-theme-dark .bi-list-item-select.hover {
color: #ffffff;

12
src/css/resource/app.css

@ -51,8 +51,8 @@ textarea::-webkit-scrollbar-thumb:hover {
.bi-theme-dark div::-webkit-scrollbar,
.bi-theme-dark textarea::-webkit-scrollbar {
-webkit-appearance: none;
background-color: rgba(240, 243, 247, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
background-color: rgba(208, 212, 218, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dd0d4da,endColorstr=#0dd0d4da);
width: 6px;
height: 6px;
}
@ -61,11 +61,11 @@ textarea::-webkit-scrollbar-thumb:hover {
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
background-color: rgba(240, 243, 247, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4df0f3f7,endColorstr=#4df0f3f7);
background-color: rgba(208, 212, 218, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dd0d4da,endColorstr=#4dd0d4da);
}
.bi-theme-dark div::-webkit-scrollbar-thumb:hover,
.bi-theme-dark textarea::-webkit-scrollbar-thumb:hover {
background-color: rgba(240, 243, 247, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3f0f3f7,endColorstr=#b3f0f3f7);
background-color: rgba(208, 212, 218, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3d0d4da,endColorstr=#b3d0d4da);
}

11
src/css/widget/singleslider/slider/widget.css

@ -21,3 +21,14 @@
top: 4px;
left: -10px;
}
.bi-single-slider-button .slider-button.disabled {
border-color: #d0d4da;
}
.bi-single-slider-button .slider-button.disabled:hover,
.bi-single-slider-button .slider-button.disabled.hover {
background-color: #f7f8fa;
width: 16px;
height: 16px;
top: 6px;
left: -8px;
}

9
src/less/core/utils/common.less

@ -22,7 +22,7 @@ textarea {
color: @color-bi-text-disabled !important;
}
& .b-font:before {
color: @color-bi-text-disabled !important;
color: @color-bi-icon-disabled !important;
}
}
@ -36,7 +36,7 @@ textarea {
color: @color-bi-text-disabled-theme-dark !important;
}
& .b-font:before {
color: @color-bi-text-disabled-theme-dark !important;
color: @color-bi-icon-disabled-theme-dark !important;
}
}
}
@ -884,6 +884,11 @@ textarea {
color: @color-bi-text;
}
}
&.disabled {
&:hover, &.hover, &:active, &.active {
background-color: @color-bi-background-default !important;
}
}
}
.bi-theme-dark {

4
src/less/lib/colors.less

@ -18,6 +18,10 @@
@color-bi-text-disabled: @font-color-disabled;
//深色主题灰化字体颜色
@color-bi-text-disabled-theme-dark: @font-color-disabled-theme-dark;
//灰化图标色
@color-bi-icon-disabled: @font-color-light-disabled;
//深色主题灰化图标颜色
@color-bi-icon-disabled-theme-dark: @font-color-light-disabled-theme-dark;
//提示字体颜色
@color-bi-text-tips: @font-color-tips;
//成功字体颜色

6
src/less/lib/constant.less

@ -59,7 +59,7 @@
@background-color-dark: #d4dadd;
@background-color-light-gray: #F2F4F7;
@background-color-dark-gray: #d0d4da;
@background-color-disabled: #F0F3F7;
@background-color-disabled: #d0d4da;
@background-color-yellow: #ffc101;//
@background-color-negative: #ff4949;
@ -87,10 +87,10 @@
@border-color-normal-success: #eddea2;
//split color
@border-color-disabled: #F0F3F7;
@border-color-disabled: #d0d4da;
//scroll color
@scroll-color: #878d9f;
@scroll-color-theme-dark: #F0F3F7;
@scroll-color-theme-dark: #d0d4da;
@water-mark-color-theme-dark: #878d9f;

10
src/less/widget/singleslider/slider/widget.slider.less

@ -18,5 +18,15 @@
top: 4px;
left: -10px;
}
&.disabled {
border-color: @color-bi-border-disabled;
&:hover, &.hover {
background-color: @color-bi-background-normal;
width: 16px;
height: 16px;
top: 6px;
left: -8px;
}
}
}
}

8
src/widget/dynamicdate/dynamicdate.popup.js

@ -1,6 +1,7 @@
BI.DynamicDatePopup = BI.inherit(BI.Widget, {
constants: {
tabHeight: 30
tabHeight: 30,
buttonHeight: 24
},
props: {
@ -11,7 +12,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
_init: function () {
BI.DynamicDatePopup.superclass._init.apply(this, arguments);
var self = this, opts = this.options;
var self = this, opts = this.options, c = this.constants;
this.storeValue = {type: BI.DynamicDateCombo.Static};
BI.createWidget({
element: this,
@ -27,6 +28,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
cls: "bi-high-light bi-border-top",
shadow: true,
text: BI.i18nText("BI-Basic_Clear"),
textHeight: c.buttonHeight - 1,
listeners: [{
eventName: BI.TextButton.EVENT_CHANGE,
action: function () {
@ -38,6 +40,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
forceCenter: true,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
shadow: true,
textHeight: c.buttonHeight - 1,
text: BI.i18nText("BI-Multi_Date_Today"),
ref: function () {
self.textButton = this;
@ -52,6 +55,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-high-light bi-border-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_OK"),
listeners: [{

8
src/widget/dynamicdatetime/dynamicdatetime.popup.js

@ -1,6 +1,7 @@
BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
constants: {
tabHeight: 30
tabHeight: 30,
buttonHeight: 24
},
props: {
@ -11,7 +12,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
_init: function () {
BI.DynamicDateTimePopup.superclass._init.apply(this, arguments);
var self = this, opts = this.options;
var self = this, opts = this.options, c = this.constants;
this.storeValue = {type: BI.DynamicDateCombo.Static};
BI.createWidget({
element: this,
@ -25,6 +26,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-high-light bi-border-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Clear"),
listeners: [{
@ -37,6 +39,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Multi_Date_Today"),
ref: function () {
@ -52,6 +55,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-high-light bi-border-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_OK"),
listeners: [{

2
src/widget/numbereditor/number.editor.js

@ -31,7 +31,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
errorText: o.errorText
});
this.editor.on(BI.TextEditor.EVENT_CHANGE, function () {
o.value = this.getValue();
o.value = BI.parseFloat(this.getValue());
self.fireEvent(BI.NumberEditor.EVENT_CHANGE);
});
this.editor.on(BI.TextEditor.EVENT_CONFIRM, function () {

8
src/widget/year/popup.year.js

@ -7,7 +7,8 @@
*/
BI.DynamicYearPopup = BI.inherit(BI.Widget, {
constants: {
tabHeight: 30
tabHeight: 30,
buttonHeight: 24
},
props: {
@ -20,7 +21,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
},
render: function () {
var self = this, opts = this.options;
var self = this, opts = this.options, c = this.constants;
this.storeValue = {type: BI.DynamicYearCombo.Static};
return {
type: "bi.vtape",
@ -33,6 +34,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Clear"),
listeners: [{
@ -44,6 +46,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
}, {
type: "bi.text_button",
forceCenter: true,
textHeight: c.buttonHeight - 1,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
shadow: true,
text: BI.i18nText("BI-Basic_Current_Year"),
@ -60,6 +63,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_OK"),
listeners: [{

8
src/widget/yearmonth/popup.yearmonth.js

@ -7,7 +7,8 @@
*/
BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
constants: {
tabHeight: 30
tabHeight: 30,
buttonHeight: 24
},
props: {
@ -20,7 +21,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
},
render: function () {
var self = this, opts = this.options;
var self = this, opts = this.options, c = this.constants;
this.storeValue = {type: BI.DynamicYearMonthCombo.Static};
return {
type: "bi.vtape",
@ -33,6 +34,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Clear"),
listeners: [{
@ -45,6 +47,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Current_Month"),
ref: function () {
@ -60,6 +63,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_OK"),
listeners: [{

8
src/widget/yearquarter/popup.yearquarter.js

@ -1,6 +1,7 @@
BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
constants: {
tabHeight: 30
tabHeight: 30,
buttonHeight: 24
},
props: {
@ -13,7 +14,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
},
render: function () {
var self = this, opts = this.options;
var self = this, opts = this.options, c = this.constants;
this.storeValue = {type: BI.DynamicYearQuarterCombo.Static};
return {
type: "bi.vtape",
@ -27,6 +28,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
forceCenter: true,
cls: "bi-border-top bi-high-light",
shadow: true,
textHeight: c.buttonHeight - 1,
text: BI.i18nText("BI-Basic_Clear"),
listeners: [{
eventName: BI.TextButton.EVENT_CHANGE,
@ -38,6 +40,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Current_Quarter"),
ref: function () {
@ -54,6 +57,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
forceCenter: true,
cls: "bi-border-top bi-high-light",
shadow: true,
textHeight: c.buttonHeight - 1,
text: BI.i18nText("BI-Basic_OK"),
listeners: [{
eventName: BI.TextButton.EVENT_CHANGE,

12
ui/css/app.css

@ -51,8 +51,8 @@ textarea::-webkit-scrollbar-thumb:hover {
.bi-theme-dark div::-webkit-scrollbar,
.bi-theme-dark textarea::-webkit-scrollbar {
-webkit-appearance: none;
background-color: rgba(240, 243, 247, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
background-color: rgba(208, 212, 218, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dd0d4da,endColorstr=#0dd0d4da);
width: 6px;
height: 6px;
}
@ -61,11 +61,11 @@ textarea::-webkit-scrollbar-thumb:hover {
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
background-color: rgba(240, 243, 247, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4df0f3f7,endColorstr=#4df0f3f7);
background-color: rgba(208, 212, 218, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dd0d4da,endColorstr=#4dd0d4da);
}
.bi-theme-dark div::-webkit-scrollbar-thumb:hover,
.bi-theme-dark textarea::-webkit-scrollbar-thumb:hover {
background-color: rgba(240, 243, 247, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3f0f3f7,endColorstr=#b3f0f3f7);
background-color: rgba(208, 212, 218, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3d0d4da,endColorstr=#b3d0d4da);
}

Loading…
Cancel
Save