Browse Source

Merge pull request #656 in VISUAL/fineui from ~YOUNG/fineui:master to master

* commit 'd48419d809e0727722b0da8b2715fc6ceb1bd759':
  BI-28955 兼容IE10
  BI-30819【5.0三轮回归】汇总表行表头有字段的情况下,切换为树状展示,报错
master
guy 6 years ago
parent
commit
e6573eedab
  1. 2
      dist/base.css
  2. 2
      dist/base.js
  3. 2
      dist/bundle.css
  4. 2
      dist/bundle.js
  5. 2
      dist/fineui.css
  6. 2
      dist/fineui.js
  7. 2
      dist/fineui_without_jquery_polyfill.js
  8. 2
      src/base/pane.js
  9. 2
      src/css/base/pane.css
  10. 4
      src/less/base/pane.less

2
dist/base.css vendored

@ -997,6 +997,8 @@
} }
.bi-pane { .bi-pane {
min-height: 55px; min-height: 55px;
}
.bi-pane .loading-container {
background-color: rgba(247, 248, 250, 0); background-color: rgba(247, 248, 250, 0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00f7f8fa,endColorstr=#00f7f8fa); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00f7f8fa,endColorstr=#00f7f8fa);
} }

2
dist/base.js vendored

@ -282,6 +282,7 @@ BI.Pane = BI.inherit(BI.Widget, {
if (!BI.Layers.has(this.getName())) { if (!BI.Layers.has(this.getName())) {
BI.createWidget({ BI.createWidget({
type: "bi.absolute_center_adapt", type: "bi.absolute_center_adapt",
cls: "loading-container",
items: [{ items: [{
el: loadingAnimation el: loadingAnimation
}], }],
@ -295,6 +296,7 @@ BI.Pane = BI.inherit(BI.Widget, {
BI.createWidget({ BI.createWidget({
type: "bi.absolute_center_adapt", type: "bi.absolute_center_adapt",
element: this, element: this,
cls: "loading-container",
items: [{ items: [{
el: this._loading, el: this._loading,
left: 0, left: 0,

2
dist/bundle.css vendored

@ -2951,6 +2951,8 @@ textarea {
} }
.bi-pane { .bi-pane {
min-height: 55px; min-height: 55px;
}
.bi-pane .loading-container {
background-color: rgba(247, 248, 250, 0); background-color: rgba(247, 248, 250, 0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00f7f8fa,endColorstr=#00f7f8fa); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00f7f8fa,endColorstr=#00f7f8fa);
} }

2
dist/bundle.js vendored

@ -35578,6 +35578,7 @@ BI.Pane = BI.inherit(BI.Widget, {
if (!BI.Layers.has(this.getName())) { if (!BI.Layers.has(this.getName())) {
BI.createWidget({ BI.createWidget({
type: "bi.absolute_center_adapt", type: "bi.absolute_center_adapt",
cls: "loading-container",
items: [{ items: [{
el: loadingAnimation el: loadingAnimation
}], }],
@ -35591,6 +35592,7 @@ BI.Pane = BI.inherit(BI.Widget, {
BI.createWidget({ BI.createWidget({
type: "bi.absolute_center_adapt", type: "bi.absolute_center_adapt",
element: this, element: this,
cls: "loading-container",
items: [{ items: [{
el: this._loading, el: this._loading,
left: 0, left: 0,

2
dist/fineui.css vendored

@ -2951,6 +2951,8 @@ textarea {
} }
.bi-pane { .bi-pane {
min-height: 55px; min-height: 55px;
}
.bi-pane .loading-container {
background-color: rgba(247, 248, 250, 0); background-color: rgba(247, 248, 250, 0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00f7f8fa,endColorstr=#00f7f8fa); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00f7f8fa,endColorstr=#00f7f8fa);
} }

2
dist/fineui.js vendored

@ -35820,6 +35820,7 @@ BI.Pane = BI.inherit(BI.Widget, {
if (!BI.Layers.has(this.getName())) { if (!BI.Layers.has(this.getName())) {
BI.createWidget({ BI.createWidget({
type: "bi.absolute_center_adapt", type: "bi.absolute_center_adapt",
cls: "loading-container",
items: [{ items: [{
el: loadingAnimation el: loadingAnimation
}], }],
@ -35833,6 +35834,7 @@ BI.Pane = BI.inherit(BI.Widget, {
BI.createWidget({ BI.createWidget({
type: "bi.absolute_center_adapt", type: "bi.absolute_center_adapt",
element: this, element: this,
cls: "loading-container",
items: [{ items: [{
el: this._loading, el: this._loading,
left: 0, left: 0,

2
dist/fineui_without_jquery_polyfill.js vendored

@ -24410,6 +24410,7 @@ BI.Pane = BI.inherit(BI.Widget, {
if (!BI.Layers.has(this.getName())) { if (!BI.Layers.has(this.getName())) {
BI.createWidget({ BI.createWidget({
type: "bi.absolute_center_adapt", type: "bi.absolute_center_adapt",
cls: "loading-container",
items: [{ items: [{
el: loadingAnimation el: loadingAnimation
}], }],
@ -24423,6 +24424,7 @@ BI.Pane = BI.inherit(BI.Widget, {
BI.createWidget({ BI.createWidget({
type: "bi.absolute_center_adapt", type: "bi.absolute_center_adapt",
element: this, element: this,
cls: "loading-container",
items: [{ items: [{
el: this._loading, el: this._loading,
left: 0, left: 0,

2
src/base/pane.js

@ -81,6 +81,7 @@ BI.Pane = BI.inherit(BI.Widget, {
if (!BI.Layers.has(this.getName())) { if (!BI.Layers.has(this.getName())) {
BI.createWidget({ BI.createWidget({
type: "bi.absolute_center_adapt", type: "bi.absolute_center_adapt",
cls: "loading-container",
items: [{ items: [{
el: loadingAnimation el: loadingAnimation
}], }],
@ -94,6 +95,7 @@ BI.Pane = BI.inherit(BI.Widget, {
BI.createWidget({ BI.createWidget({
type: "bi.absolute_center_adapt", type: "bi.absolute_center_adapt",
element: this, element: this,
cls: "loading-container",
items: [{ items: [{
el: this._loading, el: this._loading,
left: 0, left: 0,

2
src/css/base/pane.css

@ -344,6 +344,8 @@
} }
.bi-pane { .bi-pane {
min-height: 55px; min-height: 55px;
}
.bi-pane .loading-container {
background-color: rgba(247, 248, 250, 0); background-color: rgba(247, 248, 250, 0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00f7f8fa,endColorstr=#00f7f8fa); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00f7f8fa,endColorstr=#00f7f8fa);
} }

4
src/less/base/pane.less

@ -2,7 +2,9 @@
@import "../resource/background"; @import "../resource/background";
.bi-pane { .bi-pane {
min-height: 55px; min-height: 55px;
.background-color(@color-bi-background-normal, 0); & .loading-container {
.background-color(@color-bi-background-normal, 0);
}
} }
.bi-loading-widget { .bi-loading-widget {

Loading…
Cancel
Save