Browse Source

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

* commit '8512a45a4528b050013206eaa38877994cf1b0af':
  refactor: build
  merge
  merge
  无JIRA任务 fix: adapt布局考虑strech
  DEC-6878 fix: disabled状态下的样式改了 && 还原common.less
es6
guy 6 years ago
parent
commit
d392b04a74
  1. 25
      dist/2.0/fineui.css
  2. 11
      dist/2.0/fineui.ie.js
  3. 44
      dist/2.0/fineui.ie.min.js
  4. 11
      dist/2.0/fineui.js
  5. 2
      dist/2.0/fineui.min.css
  6. 62
      dist/2.0/fineui.min.js
  7. 15
      dist/base.css
  8. 25
      dist/bundle.css
  9. 11
      dist/bundle.ie.js
  10. 44
      dist/bundle.ie.min.js
  11. 11
      dist/bundle.js
  12. 2
      dist/bundle.min.css
  13. 62
      dist/bundle.min.js
  14. 10
      dist/core.css
  15. 11
      dist/core.js
  16. 10
      dist/core_without_normalize.css
  17. 25
      dist/fineui.css
  18. 11
      dist/fineui.ie.js
  19. 44
      dist/fineui.ie.min.js
  20. 11
      dist/fineui.js
  21. 2
      dist/fineui.min.css
  22. 62
      dist/fineui.min.js
  23. 11
      dist/fineui_without_jquery_polyfill.js
  24. 2
      dist/utils.min.js
  25. 3
      src/core/wrapper/layout/adapt/adapt.center.js
  26. 3
      src/core/wrapper/layout/adapt/adapt.horizontal.js
  27. 3
      src/core/wrapper/layout/adapt/adapt.vertical.js
  28. 2
      src/core/wrapper/layout/layout.horizontal.js
  29. 6
      src/css/base/single/input/checkbox.css
  30. 9
      src/css/base/single/input/radio.css
  31. 10
      src/css/core/utils/common.css
  32. 8
      src/less/base/single/input/checkbox.less
  33. 12
      src/less/base/single/input/radio.less
  34. 10
      src/less/core/utils/common.less

25
dist/2.0/fineui.css vendored

@ -563,16 +563,6 @@ textarea {
.bi-high-light-background .bi-textarea {
color: #ffffff;
}
.bi-high-light-background.disabled {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-input {
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-textarea {
color: #9ea6b2 !important;
}
.bi-error-background {
background-color: #ff4949;
color: #ffffff;
@ -3575,6 +3565,12 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-checkbox.disabled .checkbox-context:after {
opacity: 0;
}
.bi-checkbox.disabled.active .checkbox-context {
background-color: #d0d4da;
}
.bi-checkbox.disabled.active .checkbox-context:after {
opacity: 1;
}
.bi-file {
opacity: 0;
filter: alpha(opacity=0);
@ -3625,10 +3621,15 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
-ms-transform: translate(-50%, -50%);
transform: translate(-50%, -50%);
}
.bi-radio.disabled:active .radio-content:after,
.bi-radio.disabled.active .radio-content:after {
.bi-radio.disabled .radio-content:after {
background-color: transparent;
}
.bi-radio.disabled.active .radio-content {
background-color: #d0d4da;
}
.bi-radio.disabled.active .radio-content:after {
background-color: #ffffff;
}
.bi-label {
text-overflow: ellipsis;
overflow-x: hidden;

11
dist/2.0/fineui.ie.js vendored

@ -30596,6 +30596,7 @@ BI.CenterAdaptLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.CenterAdaptLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-center-adapt-layout",
horizontalAlign: BI.HorizontalAlign.Center,
columnSize: [],
scrollx: false,
hgap: 0,
@ -30612,7 +30613,7 @@ BI.CenterAdaptLayout = BI.inherit(BI.Layout, {
return {
type: "bi.horizontal",
verticalAlign: BI.VerticalAlign.Middle,
horizontalAlign: BI.HorizontalAlign.Center,
horizontalAlign: o.horizontalAlign,
columnSize: o.columnSize,
scrollx: o.scrollx,
items: o.items,
@ -30646,6 +30647,7 @@ BI.HorizontalAdaptLayout = BI.inherit(BI.Layout, {
return BI.extend(BI.HorizontalAdaptLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-horizontal-adapt-layout",
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Center,
columnSize: [],
scrollx: false,
hgap: 0,
@ -30662,7 +30664,7 @@ BI.HorizontalAdaptLayout = BI.inherit(BI.Layout, {
return {
type: "bi.horizontal",
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Center,
horizontalAlign: o.horizontalAlign,
columnSize: o.columnSize,
items: o.items,
scrollx: o.scrollx,
@ -30961,6 +30963,7 @@ BI.shortcut("bi.table_adapt", BI.TableAdaptLayout);/**
BI.VerticalAdaptLayout = BI.inherit(BI.Layout, {
props: {
baseCls: "bi-vertical-adapt-layout",
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
scrollx: false,
hgap: 0,
@ -30977,7 +30980,7 @@ BI.VerticalAdaptLayout = BI.inherit(BI.Layout, {
return {
type: "bi.horizontal",
verticalAlign: BI.VerticalAlign.Middle,
horizontalAlign: BI.HorizontalAlign.Left,
horizontalAlign: o.horizontalAlign,
columnSize: o.columnSize,
items: o.items,
scrollx: o.scrollx,
@ -32943,7 +32946,7 @@ BI.HorizontalLayout = BI.inherit(BI.Layout, {
position: "relative",
"white-space": "nowrap",
height: o.verticalAlign === BI.VerticalAlign.Middle ? "100%" : "auto",
width: o.horizontalAlign === BI.HorizontalAlign.Center ? "100%" : "auto",
width: (o.horizontalAlign === BI.HorizontalAlign.Center || o.horizontalAlign === BI.HorizontalAlign.Stretch) ? "100%" : "auto",
"border-spacing": "0px",
border: "none",
"border-collapse": "separate"

44
dist/2.0/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

11
dist/2.0/fineui.js vendored

@ -30596,6 +30596,7 @@ BI.CenterAdaptLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.CenterAdaptLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-center-adapt-layout",
horizontalAlign: BI.HorizontalAlign.Center,
columnSize: [],
scrollx: false,
hgap: 0,
@ -30612,7 +30613,7 @@ BI.CenterAdaptLayout = BI.inherit(BI.Layout, {
return {
type: "bi.horizontal",
verticalAlign: BI.VerticalAlign.Middle,
horizontalAlign: BI.HorizontalAlign.Center,
horizontalAlign: o.horizontalAlign,
columnSize: o.columnSize,
scrollx: o.scrollx,
items: o.items,
@ -30646,6 +30647,7 @@ BI.HorizontalAdaptLayout = BI.inherit(BI.Layout, {
return BI.extend(BI.HorizontalAdaptLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-horizontal-adapt-layout",
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Center,
columnSize: [],
scrollx: false,
hgap: 0,
@ -30662,7 +30664,7 @@ BI.HorizontalAdaptLayout = BI.inherit(BI.Layout, {
return {
type: "bi.horizontal",
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Center,
horizontalAlign: o.horizontalAlign,
columnSize: o.columnSize,
items: o.items,
scrollx: o.scrollx,
@ -30961,6 +30963,7 @@ BI.shortcut("bi.table_adapt", BI.TableAdaptLayout);/**
BI.VerticalAdaptLayout = BI.inherit(BI.Layout, {
props: {
baseCls: "bi-vertical-adapt-layout",
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
scrollx: false,
hgap: 0,
@ -30977,7 +30980,7 @@ BI.VerticalAdaptLayout = BI.inherit(BI.Layout, {
return {
type: "bi.horizontal",
verticalAlign: BI.VerticalAlign.Middle,
horizontalAlign: BI.HorizontalAlign.Left,
horizontalAlign: o.horizontalAlign,
columnSize: o.columnSize,
items: o.items,
scrollx: o.scrollx,
@ -32943,7 +32946,7 @@ BI.HorizontalLayout = BI.inherit(BI.Layout, {
position: "relative",
"white-space": "nowrap",
height: o.verticalAlign === BI.VerticalAlign.Middle ? "100%" : "auto",
width: o.horizontalAlign === BI.HorizontalAlign.Center ? "100%" : "auto",
width: (o.horizontalAlign === BI.HorizontalAlign.Center || o.horizontalAlign === BI.HorizontalAlign.Stretch) ? "100%" : "auto",
"border-spacing": "0px",
border: "none",
"border-collapse": "separate"

2
dist/2.0/fineui.min.css vendored

File diff suppressed because one or more lines are too long

62
dist/2.0/fineui.min.js vendored

File diff suppressed because one or more lines are too long

15
dist/base.css vendored

@ -1407,6 +1407,12 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-checkbox.disabled .checkbox-context:after {
opacity: 0;
}
.bi-checkbox.disabled.active .checkbox-context {
background-color: #d0d4da;
}
.bi-checkbox.disabled.active .checkbox-context:after {
opacity: 1;
}
.bi-file {
opacity: 0;
filter: alpha(opacity=0);
@ -1457,10 +1463,15 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
-ms-transform: translate(-50%, -50%);
transform: translate(-50%, -50%);
}
.bi-radio.disabled:active .radio-content:after,
.bi-radio.disabled.active .radio-content:after {
.bi-radio.disabled .radio-content:after {
background-color: transparent;
}
.bi-radio.disabled.active .radio-content {
background-color: #d0d4da;
}
.bi-radio.disabled.active .radio-content:after {
background-color: #ffffff;
}
.bi-label {
text-overflow: ellipsis;
overflow-x: hidden;

25
dist/bundle.css vendored

@ -563,16 +563,6 @@ textarea {
.bi-high-light-background .bi-textarea {
color: #ffffff;
}
.bi-high-light-background.disabled {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-input {
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-textarea {
color: #9ea6b2 !important;
}
.bi-error-background {
background-color: #ff4949;
color: #ffffff;
@ -3575,6 +3565,12 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-checkbox.disabled .checkbox-context:after {
opacity: 0;
}
.bi-checkbox.disabled.active .checkbox-context {
background-color: #d0d4da;
}
.bi-checkbox.disabled.active .checkbox-context:after {
opacity: 1;
}
.bi-file {
opacity: 0;
filter: alpha(opacity=0);
@ -3625,10 +3621,15 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
-ms-transform: translate(-50%, -50%);
transform: translate(-50%, -50%);
}
.bi-radio.disabled:active .radio-content:after,
.bi-radio.disabled.active .radio-content:after {
.bi-radio.disabled .radio-content:after {
background-color: transparent;
}
.bi-radio.disabled.active .radio-content {
background-color: #d0d4da;
}
.bi-radio.disabled.active .radio-content:after {
background-color: #ffffff;
}
.bi-label {
text-overflow: ellipsis;
overflow-x: hidden;

11
dist/bundle.ie.js vendored

@ -30596,6 +30596,7 @@ BI.CenterAdaptLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.CenterAdaptLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-center-adapt-layout",
horizontalAlign: BI.HorizontalAlign.Center,
columnSize: [],
scrollx: false,
hgap: 0,
@ -30612,7 +30613,7 @@ BI.CenterAdaptLayout = BI.inherit(BI.Layout, {
return {
type: "bi.horizontal",
verticalAlign: BI.VerticalAlign.Middle,
horizontalAlign: BI.HorizontalAlign.Center,
horizontalAlign: o.horizontalAlign,
columnSize: o.columnSize,
scrollx: o.scrollx,
items: o.items,
@ -30646,6 +30647,7 @@ BI.HorizontalAdaptLayout = BI.inherit(BI.Layout, {
return BI.extend(BI.HorizontalAdaptLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-horizontal-adapt-layout",
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Center,
columnSize: [],
scrollx: false,
hgap: 0,
@ -30662,7 +30664,7 @@ BI.HorizontalAdaptLayout = BI.inherit(BI.Layout, {
return {
type: "bi.horizontal",
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Center,
horizontalAlign: o.horizontalAlign,
columnSize: o.columnSize,
items: o.items,
scrollx: o.scrollx,
@ -30961,6 +30963,7 @@ BI.shortcut("bi.table_adapt", BI.TableAdaptLayout);/**
BI.VerticalAdaptLayout = BI.inherit(BI.Layout, {
props: {
baseCls: "bi-vertical-adapt-layout",
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
scrollx: false,
hgap: 0,
@ -30977,7 +30980,7 @@ BI.VerticalAdaptLayout = BI.inherit(BI.Layout, {
return {
type: "bi.horizontal",
verticalAlign: BI.VerticalAlign.Middle,
horizontalAlign: BI.HorizontalAlign.Left,
horizontalAlign: o.horizontalAlign,
columnSize: o.columnSize,
items: o.items,
scrollx: o.scrollx,
@ -32943,7 +32946,7 @@ BI.HorizontalLayout = BI.inherit(BI.Layout, {
position: "relative",
"white-space": "nowrap",
height: o.verticalAlign === BI.VerticalAlign.Middle ? "100%" : "auto",
width: o.horizontalAlign === BI.HorizontalAlign.Center ? "100%" : "auto",
width: (o.horizontalAlign === BI.HorizontalAlign.Center || o.horizontalAlign === BI.HorizontalAlign.Stretch) ? "100%" : "auto",
"border-spacing": "0px",
border: "none",
"border-collapse": "separate"

44
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

11
dist/bundle.js vendored

@ -30596,6 +30596,7 @@ BI.CenterAdaptLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.CenterAdaptLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-center-adapt-layout",
horizontalAlign: BI.HorizontalAlign.Center,
columnSize: [],
scrollx: false,
hgap: 0,
@ -30612,7 +30613,7 @@ BI.CenterAdaptLayout = BI.inherit(BI.Layout, {
return {
type: "bi.horizontal",
verticalAlign: BI.VerticalAlign.Middle,
horizontalAlign: BI.HorizontalAlign.Center,
horizontalAlign: o.horizontalAlign,
columnSize: o.columnSize,
scrollx: o.scrollx,
items: o.items,
@ -30646,6 +30647,7 @@ BI.HorizontalAdaptLayout = BI.inherit(BI.Layout, {
return BI.extend(BI.HorizontalAdaptLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-horizontal-adapt-layout",
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Center,
columnSize: [],
scrollx: false,
hgap: 0,
@ -30662,7 +30664,7 @@ BI.HorizontalAdaptLayout = BI.inherit(BI.Layout, {
return {
type: "bi.horizontal",
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Center,
horizontalAlign: o.horizontalAlign,
columnSize: o.columnSize,
items: o.items,
scrollx: o.scrollx,
@ -30961,6 +30963,7 @@ BI.shortcut("bi.table_adapt", BI.TableAdaptLayout);/**
BI.VerticalAdaptLayout = BI.inherit(BI.Layout, {
props: {
baseCls: "bi-vertical-adapt-layout",
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
scrollx: false,
hgap: 0,
@ -30977,7 +30980,7 @@ BI.VerticalAdaptLayout = BI.inherit(BI.Layout, {
return {
type: "bi.horizontal",
verticalAlign: BI.VerticalAlign.Middle,
horizontalAlign: BI.HorizontalAlign.Left,
horizontalAlign: o.horizontalAlign,
columnSize: o.columnSize,
items: o.items,
scrollx: o.scrollx,
@ -32943,7 +32946,7 @@ BI.HorizontalLayout = BI.inherit(BI.Layout, {
position: "relative",
"white-space": "nowrap",
height: o.verticalAlign === BI.VerticalAlign.Middle ? "100%" : "auto",
width: o.horizontalAlign === BI.HorizontalAlign.Center ? "100%" : "auto",
width: (o.horizontalAlign === BI.HorizontalAlign.Center || o.horizontalAlign === BI.HorizontalAlign.Stretch) ? "100%" : "auto",
"border-spacing": "0px",
border: "none",
"border-collapse": "separate"

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

62
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

10
dist/core.css vendored

@ -563,16 +563,6 @@ textarea {
.bi-high-light-background .bi-textarea {
color: #ffffff;
}
.bi-high-light-background.disabled {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-input {
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-textarea {
color: #9ea6b2 !important;
}
.bi-error-background {
background-color: #ff4949;
color: #ffffff;

11
dist/core.js vendored

@ -30596,6 +30596,7 @@ BI.CenterAdaptLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.CenterAdaptLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-center-adapt-layout",
horizontalAlign: BI.HorizontalAlign.Center,
columnSize: [],
scrollx: false,
hgap: 0,
@ -30612,7 +30613,7 @@ BI.CenterAdaptLayout = BI.inherit(BI.Layout, {
return {
type: "bi.horizontal",
verticalAlign: BI.VerticalAlign.Middle,
horizontalAlign: BI.HorizontalAlign.Center,
horizontalAlign: o.horizontalAlign,
columnSize: o.columnSize,
scrollx: o.scrollx,
items: o.items,
@ -30646,6 +30647,7 @@ BI.HorizontalAdaptLayout = BI.inherit(BI.Layout, {
return BI.extend(BI.HorizontalAdaptLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-horizontal-adapt-layout",
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Center,
columnSize: [],
scrollx: false,
hgap: 0,
@ -30662,7 +30664,7 @@ BI.HorizontalAdaptLayout = BI.inherit(BI.Layout, {
return {
type: "bi.horizontal",
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Center,
horizontalAlign: o.horizontalAlign,
columnSize: o.columnSize,
items: o.items,
scrollx: o.scrollx,
@ -30961,6 +30963,7 @@ BI.shortcut("bi.table_adapt", BI.TableAdaptLayout);/**
BI.VerticalAdaptLayout = BI.inherit(BI.Layout, {
props: {
baseCls: "bi-vertical-adapt-layout",
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
scrollx: false,
hgap: 0,
@ -30977,7 +30980,7 @@ BI.VerticalAdaptLayout = BI.inherit(BI.Layout, {
return {
type: "bi.horizontal",
verticalAlign: BI.VerticalAlign.Middle,
horizontalAlign: BI.HorizontalAlign.Left,
horizontalAlign: o.horizontalAlign,
columnSize: o.columnSize,
items: o.items,
scrollx: o.scrollx,
@ -32943,7 +32946,7 @@ BI.HorizontalLayout = BI.inherit(BI.Layout, {
position: "relative",
"white-space": "nowrap",
height: o.verticalAlign === BI.VerticalAlign.Middle ? "100%" : "auto",
width: o.horizontalAlign === BI.HorizontalAlign.Center ? "100%" : "auto",
width: (o.horizontalAlign === BI.HorizontalAlign.Center || o.horizontalAlign === BI.HorizontalAlign.Stretch) ? "100%" : "auto",
"border-spacing": "0px",
border: "none",
"border-collapse": "separate"

10
dist/core_without_normalize.css vendored

@ -282,16 +282,6 @@ textarea {
.bi-high-light-background .bi-textarea {
color: #ffffff;
}
.bi-high-light-background.disabled {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-input {
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-textarea {
color: #9ea6b2 !important;
}
.bi-error-background {
background-color: #ff4949;
color: #ffffff;

25
dist/fineui.css vendored

@ -563,16 +563,6 @@ textarea {
.bi-high-light-background .bi-textarea {
color: #ffffff;
}
.bi-high-light-background.disabled {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-input {
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-textarea {
color: #9ea6b2 !important;
}
.bi-error-background {
background-color: #ff4949;
color: #ffffff;
@ -3575,6 +3565,12 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-checkbox.disabled .checkbox-context:after {
opacity: 0;
}
.bi-checkbox.disabled.active .checkbox-context {
background-color: #d0d4da;
}
.bi-checkbox.disabled.active .checkbox-context:after {
opacity: 1;
}
.bi-file {
opacity: 0;
filter: alpha(opacity=0);
@ -3625,10 +3621,15 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
-ms-transform: translate(-50%, -50%);
transform: translate(-50%, -50%);
}
.bi-radio.disabled:active .radio-content:after,
.bi-radio.disabled.active .radio-content:after {
.bi-radio.disabled .radio-content:after {
background-color: transparent;
}
.bi-radio.disabled.active .radio-content {
background-color: #d0d4da;
}
.bi-radio.disabled.active .radio-content:after {
background-color: #ffffff;
}
.bi-label {
text-overflow: ellipsis;
overflow-x: hidden;

11
dist/fineui.ie.js vendored

@ -30841,6 +30841,7 @@ BI.CenterAdaptLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.CenterAdaptLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-center-adapt-layout",
horizontalAlign: BI.HorizontalAlign.Center,
columnSize: [],
scrollx: false,
hgap: 0,
@ -30857,7 +30858,7 @@ BI.CenterAdaptLayout = BI.inherit(BI.Layout, {
return {
type: "bi.horizontal",
verticalAlign: BI.VerticalAlign.Middle,
horizontalAlign: BI.HorizontalAlign.Center,
horizontalAlign: o.horizontalAlign,
columnSize: o.columnSize,
scrollx: o.scrollx,
items: o.items,
@ -30891,6 +30892,7 @@ BI.HorizontalAdaptLayout = BI.inherit(BI.Layout, {
return BI.extend(BI.HorizontalAdaptLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-horizontal-adapt-layout",
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Center,
columnSize: [],
scrollx: false,
hgap: 0,
@ -30907,7 +30909,7 @@ BI.HorizontalAdaptLayout = BI.inherit(BI.Layout, {
return {
type: "bi.horizontal",
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Center,
horizontalAlign: o.horizontalAlign,
columnSize: o.columnSize,
items: o.items,
scrollx: o.scrollx,
@ -31206,6 +31208,7 @@ BI.shortcut("bi.table_adapt", BI.TableAdaptLayout);/**
BI.VerticalAdaptLayout = BI.inherit(BI.Layout, {
props: {
baseCls: "bi-vertical-adapt-layout",
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
scrollx: false,
hgap: 0,
@ -31222,7 +31225,7 @@ BI.VerticalAdaptLayout = BI.inherit(BI.Layout, {
return {
type: "bi.horizontal",
verticalAlign: BI.VerticalAlign.Middle,
horizontalAlign: BI.HorizontalAlign.Left,
horizontalAlign: o.horizontalAlign,
columnSize: o.columnSize,
items: o.items,
scrollx: o.scrollx,
@ -33188,7 +33191,7 @@ BI.HorizontalLayout = BI.inherit(BI.Layout, {
position: "relative",
"white-space": "nowrap",
height: o.verticalAlign === BI.VerticalAlign.Middle ? "100%" : "auto",
width: o.horizontalAlign === BI.HorizontalAlign.Center ? "100%" : "auto",
width: (o.horizontalAlign === BI.HorizontalAlign.Center || o.horizontalAlign === BI.HorizontalAlign.Stretch) ? "100%" : "auto",
"border-spacing": "0px",
border: "none",
"border-collapse": "separate"

44
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

11
dist/fineui.js vendored

@ -30841,6 +30841,7 @@ BI.CenterAdaptLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.CenterAdaptLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-center-adapt-layout",
horizontalAlign: BI.HorizontalAlign.Center,
columnSize: [],
scrollx: false,
hgap: 0,
@ -30857,7 +30858,7 @@ BI.CenterAdaptLayout = BI.inherit(BI.Layout, {
return {
type: "bi.horizontal",
verticalAlign: BI.VerticalAlign.Middle,
horizontalAlign: BI.HorizontalAlign.Center,
horizontalAlign: o.horizontalAlign,
columnSize: o.columnSize,
scrollx: o.scrollx,
items: o.items,
@ -30891,6 +30892,7 @@ BI.HorizontalAdaptLayout = BI.inherit(BI.Layout, {
return BI.extend(BI.HorizontalAdaptLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-horizontal-adapt-layout",
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Center,
columnSize: [],
scrollx: false,
hgap: 0,
@ -30907,7 +30909,7 @@ BI.HorizontalAdaptLayout = BI.inherit(BI.Layout, {
return {
type: "bi.horizontal",
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Center,
horizontalAlign: o.horizontalAlign,
columnSize: o.columnSize,
items: o.items,
scrollx: o.scrollx,
@ -31206,6 +31208,7 @@ BI.shortcut("bi.table_adapt", BI.TableAdaptLayout);/**
BI.VerticalAdaptLayout = BI.inherit(BI.Layout, {
props: {
baseCls: "bi-vertical-adapt-layout",
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
scrollx: false,
hgap: 0,
@ -31222,7 +31225,7 @@ BI.VerticalAdaptLayout = BI.inherit(BI.Layout, {
return {
type: "bi.horizontal",
verticalAlign: BI.VerticalAlign.Middle,
horizontalAlign: BI.HorizontalAlign.Left,
horizontalAlign: o.horizontalAlign,
columnSize: o.columnSize,
items: o.items,
scrollx: o.scrollx,
@ -33188,7 +33191,7 @@ BI.HorizontalLayout = BI.inherit(BI.Layout, {
position: "relative",
"white-space": "nowrap",
height: o.verticalAlign === BI.VerticalAlign.Middle ? "100%" : "auto",
width: o.horizontalAlign === BI.HorizontalAlign.Center ? "100%" : "auto",
width: (o.horizontalAlign === BI.HorizontalAlign.Center || o.horizontalAlign === BI.HorizontalAlign.Stretch) ? "100%" : "auto",
"border-spacing": "0px",
border: "none",
"border-collapse": "separate"

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

62
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

11
dist/fineui_without_jquery_polyfill.js vendored

@ -19522,6 +19522,7 @@ BI.CenterAdaptLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.CenterAdaptLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-center-adapt-layout",
horizontalAlign: BI.HorizontalAlign.Center,
columnSize: [],
scrollx: false,
hgap: 0,
@ -19538,7 +19539,7 @@ BI.CenterAdaptLayout = BI.inherit(BI.Layout, {
return {
type: "bi.horizontal",
verticalAlign: BI.VerticalAlign.Middle,
horizontalAlign: BI.HorizontalAlign.Center,
horizontalAlign: o.horizontalAlign,
columnSize: o.columnSize,
scrollx: o.scrollx,
items: o.items,
@ -19572,6 +19573,7 @@ BI.HorizontalAdaptLayout = BI.inherit(BI.Layout, {
return BI.extend(BI.HorizontalAdaptLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-horizontal-adapt-layout",
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Center,
columnSize: [],
scrollx: false,
hgap: 0,
@ -19588,7 +19590,7 @@ BI.HorizontalAdaptLayout = BI.inherit(BI.Layout, {
return {
type: "bi.horizontal",
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Center,
horizontalAlign: o.horizontalAlign,
columnSize: o.columnSize,
items: o.items,
scrollx: o.scrollx,
@ -19887,6 +19889,7 @@ BI.shortcut("bi.table_adapt", BI.TableAdaptLayout);/**
BI.VerticalAdaptLayout = BI.inherit(BI.Layout, {
props: {
baseCls: "bi-vertical-adapt-layout",
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
scrollx: false,
hgap: 0,
@ -19903,7 +19906,7 @@ BI.VerticalAdaptLayout = BI.inherit(BI.Layout, {
return {
type: "bi.horizontal",
verticalAlign: BI.VerticalAlign.Middle,
horizontalAlign: BI.HorizontalAlign.Left,
horizontalAlign: o.horizontalAlign,
columnSize: o.columnSize,
items: o.items,
scrollx: o.scrollx,
@ -21869,7 +21872,7 @@ BI.HorizontalLayout = BI.inherit(BI.Layout, {
position: "relative",
"white-space": "nowrap",
height: o.verticalAlign === BI.VerticalAlign.Middle ? "100%" : "auto",
width: o.horizontalAlign === BI.HorizontalAlign.Center ? "100%" : "auto",
width: (o.horizontalAlign === BI.HorizontalAlign.Center || o.horizontalAlign === BI.HorizontalAlign.Stretch) ? "100%" : "auto",
"border-spacing": "0px",
border: "none",
"border-collapse": "separate"

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

3
src/core/wrapper/layout/adapt/adapt.center.js

@ -7,6 +7,7 @@ BI.CenterAdaptLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.CenterAdaptLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-center-adapt-layout",
horizontalAlign: BI.HorizontalAlign.Center,
columnSize: [],
scrollx: false,
hgap: 0,
@ -23,7 +24,7 @@ BI.CenterAdaptLayout = BI.inherit(BI.Layout, {
return {
type: "bi.horizontal",
verticalAlign: BI.VerticalAlign.Middle,
horizontalAlign: BI.HorizontalAlign.Center,
horizontalAlign: o.horizontalAlign,
columnSize: o.columnSize,
scrollx: o.scrollx,
items: o.items,

3
src/core/wrapper/layout/adapt/adapt.horizontal.js

@ -8,6 +8,7 @@ BI.HorizontalAdaptLayout = BI.inherit(BI.Layout, {
return BI.extend(BI.HorizontalAdaptLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-horizontal-adapt-layout",
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Center,
columnSize: [],
scrollx: false,
hgap: 0,
@ -24,7 +25,7 @@ BI.HorizontalAdaptLayout = BI.inherit(BI.Layout, {
return {
type: "bi.horizontal",
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Center,
horizontalAlign: o.horizontalAlign,
columnSize: o.columnSize,
items: o.items,
scrollx: o.scrollx,

3
src/core/wrapper/layout/adapt/adapt.vertical.js

@ -6,6 +6,7 @@
BI.VerticalAdaptLayout = BI.inherit(BI.Layout, {
props: {
baseCls: "bi-vertical-adapt-layout",
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
scrollx: false,
hgap: 0,
@ -22,7 +23,7 @@ BI.VerticalAdaptLayout = BI.inherit(BI.Layout, {
return {
type: "bi.horizontal",
verticalAlign: BI.VerticalAlign.Middle,
horizontalAlign: BI.HorizontalAlign.Left,
horizontalAlign: o.horizontalAlign,
columnSize: o.columnSize,
items: o.items,
scrollx: o.scrollx,

2
src/core/wrapper/layout/layout.horizontal.js

@ -26,7 +26,7 @@ BI.HorizontalLayout = BI.inherit(BI.Layout, {
position: "relative",
"white-space": "nowrap",
height: o.verticalAlign === BI.VerticalAlign.Middle ? "100%" : "auto",
width: o.horizontalAlign === BI.HorizontalAlign.Center ? "100%" : "auto",
width: (o.horizontalAlign === BI.HorizontalAlign.Center || o.horizontalAlign === BI.HorizontalAlign.Stretch) ? "100%" : "auto",
"border-spacing": "0px",
border: "none",
"border-collapse": "separate"

6
src/css/base/single/input/checkbox.css

@ -28,3 +28,9 @@
.bi-checkbox.disabled .checkbox-context:after {
opacity: 0;
}
.bi-checkbox.disabled.active .checkbox-context {
background-color: #d0d4da;
}
.bi-checkbox.disabled.active .checkbox-context:after {
opacity: 1;
}

9
src/css/base/single/input/radio.css

@ -24,7 +24,12 @@
-ms-transform: translate(-50%, -50%);
transform: translate(-50%, -50%);
}
.bi-radio.disabled:active .radio-content:after,
.bi-radio.disabled.active .radio-content:after {
.bi-radio.disabled .radio-content:after {
background-color: transparent;
}
.bi-radio.disabled.active .radio-content {
background-color: #d0d4da;
}
.bi-radio.disabled.active .radio-content:after {
background-color: #ffffff;
}

10
src/css/core/utils/common.css

@ -282,16 +282,6 @@ textarea {
.bi-high-light-background .bi-textarea {
color: #ffffff;
}
.bi-high-light-background.disabled {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-input {
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-textarea {
color: #9ea6b2 !important;
}
.bi-error-background {
background-color: #ff4949;
color: #ffffff;

8
src/less/base/single/input/checkbox.less

@ -27,5 +27,13 @@
& .checkbox-context:after {
opacity: 0;
}
&.active {
& .checkbox-context {
background-color: @color-bi-background-dark-gray;
&:after {
opacity: 1;
}
}
}
}
}

12
src/less/base/single/input/radio.less

@ -21,9 +21,15 @@
}
}
&.disabled {
&:active, &.active {
& .radio-content:after {
background-color: transparent;
& .radio-content:after {
background-color: transparent;
}
&.active {
& .radio-content {
background-color: @color-bi-background-dark-gray;
&:after {
background-color: @color-bi-background-default;
}
}
}
}

10
src/less/core/utils/common.less

@ -352,16 +352,6 @@ textarea {
& .bi-textarea {
color: @color-bi-text;
}
&.disabled {
background-color: transparent !important;
color: @color-bi-text-disabled !important;
& .bi-input {
color: @color-bi-text-disabled !important;
}
& .bi-textarea {
color: @color-bi-text-disabled !important;
}
}
}
.bi-error-background {

Loading…
Cancel
Save