Browse Source

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

* commit 'd1f6035563bdeabc954205a534a71c85b7b1367d':
  update
  update
  update
  更新
  update
  update
  update
  update
  无JIRA任务 populate的时候更新一下items
es6
imp 6 years ago
parent
commit
02aadd0ef7
  1. 3
      dist/base.css
  2. 2
      dist/base.js
  3. 3
      dist/bundle.css
  4. 7
      dist/bundle.ie.js
  5. 56
      dist/bundle.ie.min.js
  6. 7
      dist/bundle.js
  7. 2
      dist/bundle.min.css
  8. 56
      dist/bundle.min.js
  9. 1
      dist/case.js
  10. 25
      dist/demo.js
  11. 3
      dist/fineui.css
  12. 7
      dist/fineui.ie.js
  13. 56
      dist/fineui.ie.min.js
  14. 7
      dist/fineui.js
  15. 2
      dist/fineui.min.css
  16. 56
      dist/fineui.min.js
  17. 7
      dist/fineui_without_jquery_polyfill.js
  18. 2
      dist/utils.min.js
  19. 4
      dist/widget.js
  20. 2
      src/base/pane.js
  21. 1
      src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
  22. 3
      src/css/base/pane.css
  23. 5
      src/less/base/pane.less
  24. 2
      src/widget/dynamicdatetime/dynamicdatetime.timeselect.js
  25. 2
      src/widget/editor/editor.search.js

3
dist/base.css vendored

@ -654,6 +654,9 @@
border-radius: 2px;
}
.bi-pane {
min-height: 25px;
}
.bi-pane.loading-status {
min-height: 55px;
}
.bi-pane .loading-container {

2
dist/base.js vendored

@ -305,6 +305,7 @@ BI.Pane = BI.inherit(BI.Widget, {
}]
});
}
this.element.addClass("loading-status");
},
loaded: function () {
@ -314,6 +315,7 @@ BI.Pane = BI.inherit(BI.Widget, {
this._loading && (this._loading = null);
o.onLoaded();
self.fireEvent(BI.Pane.EVENT_LOADED);
this.element.removeClass("loading-status");
},
check: function () {

3
dist/bundle.css vendored

@ -2608,6 +2608,9 @@ textarea {
border-radius: 2px;
}
.bi-pane {
min-height: 25px;
}
.bi-pane.loading-status {
min-height: 55px;
}
.bi-pane .loading-container {

7
dist/bundle.ie.js vendored

@ -35199,6 +35199,7 @@ BI.Pane = BI.inherit(BI.Widget, {
}]
});
}
this.element.addClass("loading-status");
},
loaded: function () {
@ -35208,6 +35209,7 @@ BI.Pane = BI.inherit(BI.Widget, {
this._loading && (this._loading = null);
o.onLoaded();
self.fireEvent(BI.Pane.EVENT_LOADED);
this.element.removeClass("loading-status");
},
check: function () {
@ -53152,6 +53154,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
},
populate: function (items) {
this.options.items = items;
this.combo.populate(items);
},
@ -62598,7 +62601,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
default:
break;
}
if(v.length === 1 && BI.parseInt(v) > limit) {
if(value.length === 1 && BI.parseInt(value) > limit) {
value = "0" + value;
}
if (value.length === 2) {
@ -62955,7 +62958,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
this.clear = BI.createWidget({
type: "bi.icon_button",
stopEvent: true,
cls: "circle-close-font"
cls: "close-font"
});
this.clear.on(BI.IconButton.EVENT_CHANGE, function () {
self.setValue("");

56
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

7
dist/bundle.js vendored

@ -35738,6 +35738,7 @@ BI.Pane = BI.inherit(BI.Widget, {
}]
});
}
this.element.addClass("loading-status");
},
loaded: function () {
@ -35747,6 +35748,7 @@ BI.Pane = BI.inherit(BI.Widget, {
this._loading && (this._loading = null);
o.onLoaded();
self.fireEvent(BI.Pane.EVENT_LOADED);
this.element.removeClass("loading-status");
},
check: function () {
@ -53691,6 +53693,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
},
populate: function (items) {
this.options.items = items;
this.combo.populate(items);
},
@ -63137,7 +63140,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
default:
break;
}
if(v.length === 1 && BI.parseInt(v) > limit) {
if(value.length === 1 && BI.parseInt(value) > limit) {
value = "0" + value;
}
if (value.length === 2) {
@ -63494,7 +63497,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
this.clear = BI.createWidget({
type: "bi.icon_button",
stopEvent: true,
cls: "circle-close-font"
cls: "close-font"
});
this.clear.on(BI.IconButton.EVENT_CHANGE, function () {
self.setValue("");

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

56
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

1
dist/case.js vendored

@ -4820,6 +4820,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
},
populate: function (items) {
this.options.items = items;
this.combo.populate(items);
},

25
dist/demo.js vendored

@ -6041,7 +6041,30 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
};
}
});
BI.shortcut("demo.htape", Demo.HtapeLayout);/**
BI.shortcut("demo.htape", Demo.HtapeLayout);Demo.InlineVerticalLayout = BI.inherit(BI.Widget, {
props: {
baseCls: "demo-absolute"
},
render: function () {
return {
type: "bi.inline_vertical_adapt",
items: [{
type: "bi.label",
text: "绝对布局",
cls: "layout-bg1",
width: 300,
height: 200
}, {
type: "bi.label",
text: "绝对布局",
cls: "layout-bg1",
width: 300,
height: 100
}]
};
}
});
BI.shortcut("demo.inline_vertical", Demo.InlineVerticalLayout);/**
* Created by User on 2017/3/22.
*/
Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {

3
dist/fineui.css vendored

@ -2608,6 +2608,9 @@ textarea {
border-radius: 2px;
}
.bi-pane {
min-height: 25px;
}
.bi-pane.loading-status {
min-height: 55px;
}
.bi-pane .loading-container {

7
dist/fineui.ie.js vendored

@ -35441,6 +35441,7 @@ BI.Pane = BI.inherit(BI.Widget, {
}]
});
}
this.element.addClass("loading-status");
},
loaded: function () {
@ -35450,6 +35451,7 @@ BI.Pane = BI.inherit(BI.Widget, {
this._loading && (this._loading = null);
o.onLoaded();
self.fireEvent(BI.Pane.EVENT_LOADED);
this.element.removeClass("loading-status");
},
check: function () {
@ -53394,6 +53396,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
},
populate: function (items) {
this.options.items = items;
this.combo.populate(items);
},
@ -62840,7 +62843,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
default:
break;
}
if(v.length === 1 && BI.parseInt(v) > limit) {
if(value.length === 1 && BI.parseInt(value) > limit) {
value = "0" + value;
}
if (value.length === 2) {
@ -63197,7 +63200,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
this.clear = BI.createWidget({
type: "bi.icon_button",
stopEvent: true,
cls: "circle-close-font"
cls: "close-font"
});
this.clear.on(BI.IconButton.EVENT_CHANGE, function () {
self.setValue("");

56
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

7
dist/fineui.js vendored

@ -35980,6 +35980,7 @@ BI.Pane = BI.inherit(BI.Widget, {
}]
});
}
this.element.addClass("loading-status");
},
loaded: function () {
@ -35989,6 +35990,7 @@ BI.Pane = BI.inherit(BI.Widget, {
this._loading && (this._loading = null);
o.onLoaded();
self.fireEvent(BI.Pane.EVENT_LOADED);
this.element.removeClass("loading-status");
},
check: function () {
@ -53933,6 +53935,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
},
populate: function (items) {
this.options.items = items;
this.combo.populate(items);
},
@ -63379,7 +63382,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
default:
break;
}
if(v.length === 1 && BI.parseInt(v) > limit) {
if(value.length === 1 && BI.parseInt(value) > limit) {
value = "0" + value;
}
if (value.length === 2) {
@ -63736,7 +63739,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
this.clear = BI.createWidget({
type: "bi.icon_button",
stopEvent: true,
cls: "circle-close-font"
cls: "close-font"
});
this.clear.on(BI.IconButton.EVENT_CHANGE, function () {
self.setValue("");

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

56
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

7
dist/fineui_without_jquery_polyfill.js vendored

@ -24548,6 +24548,7 @@ BI.Pane = BI.inherit(BI.Widget, {
}]
});
}
this.element.addClass("loading-status");
},
loaded: function () {
@ -24557,6 +24558,7 @@ BI.Pane = BI.inherit(BI.Widget, {
this._loading && (this._loading = null);
o.onLoaded();
self.fireEvent(BI.Pane.EVENT_LOADED);
this.element.removeClass("loading-status");
},
check: function () {
@ -37014,6 +37016,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
},
populate: function (items) {
this.options.items = items;
this.combo.populate(items);
},
@ -46261,7 +46264,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
default:
break;
}
if(v.length === 1 && BI.parseInt(v) > limit) {
if(value.length === 1 && BI.parseInt(value) > limit) {
value = "0" + value;
}
if (value.length === 2) {
@ -46618,7 +46621,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
this.clear = BI.createWidget({
type: "bi.icon_button",
stopEvent: true,
cls: "circle-close-font"
cls: "close-font"
});
this.clear.on(BI.IconButton.EVENT_CHANGE, function () {
self.setValue("");

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/widget.js vendored

@ -4436,7 +4436,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
default:
break;
}
if(v.length === 1 && BI.parseInt(v) > limit) {
if(value.length === 1 && BI.parseInt(value) > limit) {
value = "0" + value;
}
if (value.length === 2) {
@ -4793,7 +4793,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
this.clear = BI.createWidget({
type: "bi.icon_button",
stopEvent: true,
cls: "circle-close-font"
cls: "close-font"
});
this.clear.on(BI.IconButton.EVENT_CHANGE, function () {
self.setValue("");

2
src/base/pane.js

@ -104,6 +104,7 @@ BI.Pane = BI.inherit(BI.Widget, {
}]
});
}
this.element.addClass("loading-status");
},
loaded: function () {
@ -113,6 +114,7 @@ BI.Pane = BI.inherit(BI.Widget, {
this._loading && (this._loading = null);
o.onLoaded();
self.fireEvent(BI.Pane.EVENT_LOADED);
this.element.removeClass("loading-status");
},
check: function () {

1
src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js

@ -138,6 +138,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
},
populate: function (items) {
this.options.items = items;
this.combo.populate(items);
},

3
src/css/base/pane.css

@ -1,4 +1,7 @@
.bi-pane {
min-height: 25px;
}
.bi-pane.loading-status {
min-height: 55px;
}
.bi-pane .loading-container {

5
src/less/base/pane.less

@ -2,7 +2,10 @@
@import "../image";
@import "../lib/icon";
.bi-pane {
min-height: 55px;
min-height: 25px;
&.loading-status{
min-height: 55px;
}
& .loading-container {
.background-color(@color-bi-background-normal, 0);
}

2
src/widget/dynamicdatetime/dynamicdatetime.timeselect.js

@ -148,7 +148,7 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, {
default:
break;
}
if(v.length === 1 && BI.parseInt(v) > limit) {
if(value.length === 1 && BI.parseInt(value) > limit) {
value = "0" + value;
}
if (value.length === 2) {

2
src/widget/editor/editor.search.js

@ -30,7 +30,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
this.clear = BI.createWidget({
type: "bi.icon_button",
stopEvent: true,
cls: "circle-close-font"
cls: "close-font"
});
this.clear.on(BI.IconButton.EVENT_CHANGE, function () {
self.setValue("");

Loading…
Cancel
Save