fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~windy/fineui 

# Conflicts:
#	dist/bundle.min.js
#	dist/fineui.min.js
#	dist/utils.min.js
es6
windy 6 years ago
parent
0a90731d33 44a1a29a28
commit
03c53d58d4
33 changed files with 194 additions and 128 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Gruntfile.js
  2. 8
      dist/base.css
  3. 20
      dist/base.js
  4. 8
      dist/bundle.css
  5. 56
      dist/bundle.js
  6. 2
      dist/bundle.min.css
  7. 15
      dist/case.js
  8. 21
      dist/core.js
  9. 8
      dist/fineui.css
  10. 56
      dist/fineui.js
  11. 2
      dist/fineui.min.css
  12. 55
      dist/fineui_without_jquery_polyfill.js
  13. 10
      src/base/collection/collection.js
  14. 10
      src/base/grid/grid.js
  15. 6
      src/case/combo/bubblecombo/popup.bubble.js
  16. 2
      src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
  17. 4
      src/case/layer/panel.js
  18. 0
      src/core/platform/web/ajax.js
  19. 0
      src/core/platform/web/config.js
  20. 0
      src/core/platform/web/detectElementResize.js
  21. 1
      src/core/platform/web/dom.js
  22. 0
      src/core/platform/web/eventlistener.js
  23. 0
      src/core/platform/web/function.js
  24. 0
      src/core/platform/web/jquery/_jquery.js
  25. 0
      src/core/platform/web/jquery/event.js
  26. 0
      src/core/platform/web/jquery/extend.js
  27. 0
      src/core/platform/web/jquery/fn.js
  28. 0
      src/core/platform/web/load.js
  29. 20
      src/core/wrapper/layout.js
  30. 5
      src/css/base/combo/combo.css
  31. 3
      src/css/base/layer/panel.css
  32. 5
      src/less/base/combo/combo.searchtextvalue.less
  33. 3
      src/less/base/layer/panel.less

2
Gruntfile.js
Unescape View File

@ -126,7 +126,7 @@ module.exports = function (grunt) {
"src/core/wrapper/layout.js",
"src/core/plugin.js",
"src/core/**/*.js",
"!src/core/platform/dom/**/*.js",
"!src/core/platform/web/**/*.js",
"src/data/data.js",
"src/data/**/*.js",

8
dist/base.css vendored
Unescape View File

@ -526,6 +526,11 @@
.bi-search-text-value-combo .trigger-icon-button {
font-size: 16px;
}
.bi-search-text-value-combo .search-text-value-trigger {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
}
.bi-search-text-value-combo.combo-error .bi-search-text-value-trigger .bi-text-button {
color: #ff4949;
}
@ -622,9 +627,6 @@
-moz-border-radius: 2px;
border-radius: 2px;
}
.bi-panel .panel-title {
background-color: #F2F4F7;
}
.bi-panel .panel-title .panel-title-text {
cursor: text;
font-size: 14px;

20
dist/base.js vendored
Unescape View File

@ -2596,11 +2596,13 @@ BI.CollectionView = BI.inherit(BI.Widget, {
this._calculateSizeAndPositionData();
this._populate();
}
},
mounted: function () {
var o = this.options;
if (o.scrollLeft !== 0 || o.scrollTop !== 0) {
BI.nextTick(function () {
self.element.scrollTop(o.scrollTop);
self.element.scrollLeft(o.scrollLeft);
});
this.element.scrollTop(o.scrollTop);
this.element.scrollLeft(o.scrollLeft);
}
},
@ -5338,11 +5340,13 @@ BI.GridView = BI.inherit(BI.Widget, {
if (o.items.length > 0) {
this._populate();
}
},
mounted: function () {
var o = this.options;
if (o.scrollLeft !== 0 || o.scrollTop !== 0) {
BI.nextTick(function () {
self.element.scrollTop(o.scrollTop);
self.element.scrollLeft(o.scrollLeft);
});
this.element.scrollTop(o.scrollTop);
this.element.scrollLeft(o.scrollLeft);
}
},

8
dist/bundle.css vendored
Unescape View File

@ -2480,6 +2480,11 @@ textarea {
.bi-search-text-value-combo .trigger-icon-button {
font-size: 16px;
}
.bi-search-text-value-combo .search-text-value-trigger {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
}
.bi-search-text-value-combo.combo-error .bi-search-text-value-trigger .bi-text-button {
color: #ff4949;
}
@ -2576,9 +2581,6 @@ textarea {
-moz-border-radius: 2px;
border-radius: 2px;
}
.bi-panel .panel-title {
background-color: #F2F4F7;
}
.bi-panel .panel-title .panel-title-text {
cursor: text;
font-size: 14px;

56
dist/bundle.js vendored
Unescape View File

@ -14976,10 +14976,12 @@ BI.Layout = BI.inherit(BI.Widget, {
added.push(w);
fragment.appendChild(w.element[0]);
});
this._getWrapper().append(fragment);
BI.each(added, function (i, w) {
w._mount();
});
if (this._isMounted) {
this._getWrapper().append(fragment);
BI.each(added, function (i, w) {
w._mount();
});
}
},
prependItems: function (items) {
@ -14995,10 +14997,12 @@ BI.Layout = BI.inherit(BI.Widget, {
added.push(w);
fragment.appendChild(w.element[0]);
}
this._getWrapper().prepend(fragment);
BI.each(added, function (i, w) {
w._mount();
});
if (this._isMounted) {
this._getWrapper().prepend(fragment);
BI.each(added, function (i, w) {
w._mount();
});
}
},
getValue: function () {
@ -19149,6 +19153,7 @@ BI.prepares.push(function () {
toElement.on(eventKey, handler);
});
});
toElement.data(fromElement.data());
var fromChildren = fromElement.children(), toChildren = toElement.children();
if(fromChildren.length !== toChildren.length) {
throw new Error("不匹配");
@ -37947,11 +37952,13 @@ BI.CollectionView = BI.inherit(BI.Widget, {
this._calculateSizeAndPositionData();
this._populate();
}
},
mounted: function () {
var o = this.options;
if (o.scrollLeft !== 0 || o.scrollTop !== 0) {
BI.nextTick(function () {
self.element.scrollTop(o.scrollTop);
self.element.scrollLeft(o.scrollLeft);
});
this.element.scrollTop(o.scrollTop);
this.element.scrollLeft(o.scrollLeft);
}
},
@ -40689,11 +40696,13 @@ BI.GridView = BI.inherit(BI.Widget, {
if (o.items.length > 0) {
this._populate();
}
},
mounted: function () {
var o = this.options;
if (o.scrollLeft !== 0 || o.scrollTop !== 0) {
BI.nextTick(function () {
self.element.scrollTop(o.scrollTop);
self.element.scrollLeft(o.scrollLeft);
});
this.element.scrollTop(o.scrollTop);
this.element.scrollLeft(o.scrollLeft);
}
},
@ -52844,7 +52853,7 @@ BI.shortcut("bi.bubble_bar_popup_view", BI.BubblePopupBarView);
* @extends BI.BubblePopupView
*/
BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
props: {
baseCls: "bi-text-bubble-bar-popup-view",
text: "",
@ -52876,7 +52885,7 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
buttons: [{
type: "bi.button",
value: BI.i18nText("BI-Basic_Cancel"),
ghost: true,
level: "ignore",
height: 24,
handler: function () {
self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, false);
@ -52905,7 +52914,8 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
}
});
BI.TextBubblePopupBarView.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.text_bubble_bar_popup_view", BI.TextBubblePopupBarView);/**
BI.shortcut("bi.text_bubble_bar_popup_view", BI.TextBubblePopupBarView);
/**
* Created by Young's on 2016/4/28.
*/
BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
@ -53563,7 +53573,8 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
});
BI.SearchTextValueCombo.EVENT_CHANGE = "EVENT_CHANGE";
BI.SearchTextValueCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
BI.shortcut("bi.search_text_value_combo", BI.SearchTextValueCombo);/**
BI.shortcut("bi.search_text_value_combo", BI.SearchTextValueCombo);
/**
* Created by Windy on 2018/2/5.
*/
BI.SearchTextValueComboPopup = BI.inherit(BI.Pane, {
@ -55892,7 +55903,7 @@ BI.Panel = BI.inherit(BI.Widget, {
return {
el: {
type: "bi.left_right_vertical_adapt",
cls: "panel-title bi-border-bottom",
cls: "panel-title bi-header-background bi-border-bottom",
height: 29,
items: {
left: [this.text],
@ -55911,7 +55922,8 @@ BI.Panel = BI.inherit(BI.Widget, {
});
BI.Panel.EVENT_CHANGE = "Panel.EVENT_CHANGE";
BI.shortcut("bi.panel", BI.Panel);BI.LinearSegmentButton = BI.inherit(BI.BasicButton, {
BI.shortcut("bi.panel", BI.Panel);
BI.LinearSegmentButton = BI.inherit(BI.BasicButton, {
props: {
extraCls: "bi-line-segment-button bi-list-item-effect",

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

15
dist/case.js vendored
Unescape View File

@ -4110,7 +4110,7 @@ BI.shortcut("bi.bubble_bar_popup_view", BI.BubblePopupBarView);
* @extends BI.BubblePopupView
*/
BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
props: {
baseCls: "bi-text-bubble-bar-popup-view",
text: "",
@ -4142,7 +4142,7 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
buttons: [{
type: "bi.button",
value: BI.i18nText("BI-Basic_Cancel"),
ghost: true,
level: "ignore",
height: 24,
handler: function () {
self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, false);
@ -4171,7 +4171,8 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
}
});
BI.TextBubblePopupBarView.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.text_bubble_bar_popup_view", BI.TextBubblePopupBarView);/**
BI.shortcut("bi.text_bubble_bar_popup_view", BI.TextBubblePopupBarView);
/**
* Created by Young's on 2016/4/28.
*/
BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
@ -4829,7 +4830,8 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
});
BI.SearchTextValueCombo.EVENT_CHANGE = "EVENT_CHANGE";
BI.SearchTextValueCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
BI.shortcut("bi.search_text_value_combo", BI.SearchTextValueCombo);/**
BI.shortcut("bi.search_text_value_combo", BI.SearchTextValueCombo);
/**
* Created by Windy on 2018/2/5.
*/
BI.SearchTextValueComboPopup = BI.inherit(BI.Pane, {
@ -7158,7 +7160,7 @@ BI.Panel = BI.inherit(BI.Widget, {
return {
el: {
type: "bi.left_right_vertical_adapt",
cls: "panel-title bi-border-bottom",
cls: "panel-title bi-header-background bi-border-bottom",
height: 29,
items: {
left: [this.text],
@ -7177,7 +7179,8 @@ BI.Panel = BI.inherit(BI.Widget, {
});
BI.Panel.EVENT_CHANGE = "Panel.EVENT_CHANGE";
BI.shortcut("bi.panel", BI.Panel);BI.LinearSegmentButton = BI.inherit(BI.BasicButton, {
BI.shortcut("bi.panel", BI.Panel);
BI.LinearSegmentButton = BI.inherit(BI.BasicButton, {
props: {
extraCls: "bi-line-segment-button bi-list-item-effect",

21
dist/core.js vendored
Unescape View File

@ -14976,10 +14976,12 @@ BI.Layout = BI.inherit(BI.Widget, {
added.push(w);
fragment.appendChild(w.element[0]);
});
this._getWrapper().append(fragment);
BI.each(added, function (i, w) {
w._mount();
});
if (this._isMounted) {
this._getWrapper().append(fragment);
BI.each(added, function (i, w) {
w._mount();
});
}
},
prependItems: function (items) {
@ -14995,10 +14997,12 @@ BI.Layout = BI.inherit(BI.Widget, {
added.push(w);
fragment.appendChild(w.element[0]);
}
this._getWrapper().prepend(fragment);
BI.each(added, function (i, w) {
w._mount();
});
if (this._isMounted) {
this._getWrapper().prepend(fragment);
BI.each(added, function (i, w) {
w._mount();
});
}
},
getValue: function () {
@ -19149,6 +19153,7 @@ BI.prepares.push(function () {
toElement.on(eventKey, handler);
});
});
toElement.data(fromElement.data());
var fromChildren = fromElement.children(), toChildren = toElement.children();
if(fromChildren.length !== toChildren.length) {
throw new Error("不匹配");

8
dist/fineui.css vendored
Unescape View File

@ -2480,6 +2480,11 @@ textarea {
.bi-search-text-value-combo .trigger-icon-button {
font-size: 16px;
}
.bi-search-text-value-combo .search-text-value-trigger {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
}
.bi-search-text-value-combo.combo-error .bi-search-text-value-trigger .bi-text-button {
color: #ff4949;
}
@ -2576,9 +2581,6 @@ textarea {
-moz-border-radius: 2px;
border-radius: 2px;
}
.bi-panel .panel-title {
background-color: #F2F4F7;
}
.bi-panel .panel-title .panel-title-text {
cursor: text;
font-size: 14px;

56
dist/fineui.js vendored
Unescape View File

@ -15218,10 +15218,12 @@ BI.Layout = BI.inherit(BI.Widget, {
added.push(w);
fragment.appendChild(w.element[0]);
});
this._getWrapper().append(fragment);
BI.each(added, function (i, w) {
w._mount();
});
if (this._isMounted) {
this._getWrapper().append(fragment);
BI.each(added, function (i, w) {
w._mount();
});
}
},
prependItems: function (items) {
@ -15237,10 +15239,12 @@ BI.Layout = BI.inherit(BI.Widget, {
added.push(w);
fragment.appendChild(w.element[0]);
}
this._getWrapper().prepend(fragment);
BI.each(added, function (i, w) {
w._mount();
});
if (this._isMounted) {
this._getWrapper().prepend(fragment);
BI.each(added, function (i, w) {
w._mount();
});
}
},
getValue: function () {
@ -19391,6 +19395,7 @@ BI.prepares.push(function () {
toElement.on(eventKey, handler);
});
});
toElement.data(fromElement.data());
var fromChildren = fromElement.children(), toChildren = toElement.children();
if(fromChildren.length !== toChildren.length) {
throw new Error("不匹配");
@ -38189,11 +38194,13 @@ BI.CollectionView = BI.inherit(BI.Widget, {
this._calculateSizeAndPositionData();
this._populate();
}
},
mounted: function () {
var o = this.options;
if (o.scrollLeft !== 0 || o.scrollTop !== 0) {
BI.nextTick(function () {
self.element.scrollTop(o.scrollTop);
self.element.scrollLeft(o.scrollLeft);
});
this.element.scrollTop(o.scrollTop);
this.element.scrollLeft(o.scrollLeft);
}
},
@ -40931,11 +40938,13 @@ BI.GridView = BI.inherit(BI.Widget, {
if (o.items.length > 0) {
this._populate();
}
},
mounted: function () {
var o = this.options;
if (o.scrollLeft !== 0 || o.scrollTop !== 0) {
BI.nextTick(function () {
self.element.scrollTop(o.scrollTop);
self.element.scrollLeft(o.scrollLeft);
});
this.element.scrollTop(o.scrollTop);
this.element.scrollLeft(o.scrollLeft);
}
},
@ -53086,7 +53095,7 @@ BI.shortcut("bi.bubble_bar_popup_view", BI.BubblePopupBarView);
* @extends BI.BubblePopupView
*/
BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
props: {
baseCls: "bi-text-bubble-bar-popup-view",
text: "",
@ -53118,7 +53127,7 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
buttons: [{
type: "bi.button",
value: BI.i18nText("BI-Basic_Cancel"),
ghost: true,
level: "ignore",
height: 24,
handler: function () {
self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, false);
@ -53147,7 +53156,8 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
}
});
BI.TextBubblePopupBarView.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.text_bubble_bar_popup_view", BI.TextBubblePopupBarView);/**
BI.shortcut("bi.text_bubble_bar_popup_view", BI.TextBubblePopupBarView);
/**
* Created by Young's on 2016/4/28.
*/
BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
@ -53805,7 +53815,8 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
});
BI.SearchTextValueCombo.EVENT_CHANGE = "EVENT_CHANGE";
BI.SearchTextValueCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
BI.shortcut("bi.search_text_value_combo", BI.SearchTextValueCombo);/**
BI.shortcut("bi.search_text_value_combo", BI.SearchTextValueCombo);
/**
* Created by Windy on 2018/2/5.
*/
BI.SearchTextValueComboPopup = BI.inherit(BI.Pane, {
@ -56134,7 +56145,7 @@ BI.Panel = BI.inherit(BI.Widget, {
return {
el: {
type: "bi.left_right_vertical_adapt",
cls: "panel-title bi-border-bottom",
cls: "panel-title bi-header-background bi-border-bottom",
height: 29,
items: {
left: [this.text],
@ -56153,7 +56164,8 @@ BI.Panel = BI.inherit(BI.Widget, {
});
BI.Panel.EVENT_CHANGE = "Panel.EVENT_CHANGE";
BI.shortcut("bi.panel", BI.Panel);BI.LinearSegmentButton = BI.inherit(BI.BasicButton, {
BI.shortcut("bi.panel", BI.Panel);
BI.LinearSegmentButton = BI.inherit(BI.BasicButton, {
props: {
extraCls: "bi-line-segment-button bi-list-item-effect",

2
dist/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

55
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -14722,10 +14722,12 @@ BI.Layout = BI.inherit(BI.Widget, {
added.push(w);
fragment.appendChild(w.element[0]);
});
this._getWrapper().append(fragment);
BI.each(added, function (i, w) {
w._mount();
});
if (this._isMounted) {
this._getWrapper().append(fragment);
BI.each(added, function (i, w) {
w._mount();
});
}
},
prependItems: function (items) {
@ -14741,10 +14743,12 @@ BI.Layout = BI.inherit(BI.Widget, {
added.push(w);
fragment.appendChild(w.element[0]);
}
this._getWrapper().prepend(fragment);
BI.each(added, function (i, w) {
w._mount();
});
if (this._isMounted) {
this._getWrapper().prepend(fragment);
BI.each(added, function (i, w) {
w._mount();
});
}
},
getValue: function () {
@ -25857,11 +25861,13 @@ BI.CollectionView = BI.inherit(BI.Widget, {
this._calculateSizeAndPositionData();
this._populate();
}
},
mounted: function () {
var o = this.options;
if (o.scrollLeft !== 0 || o.scrollTop !== 0) {
BI.nextTick(function () {
self.element.scrollTop(o.scrollTop);
self.element.scrollLeft(o.scrollLeft);
});
this.element.scrollTop(o.scrollTop);
this.element.scrollLeft(o.scrollLeft);
}
},
@ -28599,11 +28605,13 @@ BI.GridView = BI.inherit(BI.Widget, {
if (o.items.length > 0) {
this._populate();
}
},
mounted: function () {
var o = this.options;
if (o.scrollLeft !== 0 || o.scrollTop !== 0) {
BI.nextTick(function () {
self.element.scrollTop(o.scrollTop);
self.element.scrollLeft(o.scrollLeft);
});
this.element.scrollTop(o.scrollTop);
this.element.scrollLeft(o.scrollLeft);
}
},
@ -36021,7 +36029,7 @@ BI.shortcut("bi.bubble_bar_popup_view", BI.BubblePopupBarView);
* @extends BI.BubblePopupView
*/
BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
props: {
baseCls: "bi-text-bubble-bar-popup-view",
text: "",
@ -36053,7 +36061,7 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
buttons: [{
type: "bi.button",
value: BI.i18nText("BI-Basic_Cancel"),
ghost: true,
level: "ignore",
height: 24,
handler: function () {
self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, false);
@ -36082,7 +36090,8 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
}
});
BI.TextBubblePopupBarView.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.text_bubble_bar_popup_view", BI.TextBubblePopupBarView);/**
BI.shortcut("bi.text_bubble_bar_popup_view", BI.TextBubblePopupBarView);
/**
* Created by Young's on 2016/4/28.
*/
BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
@ -36740,7 +36749,8 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
});
BI.SearchTextValueCombo.EVENT_CHANGE = "EVENT_CHANGE";
BI.SearchTextValueCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
BI.shortcut("bi.search_text_value_combo", BI.SearchTextValueCombo);/**
BI.shortcut("bi.search_text_value_combo", BI.SearchTextValueCombo);
/**
* Created by Windy on 2018/2/5.
*/
BI.SearchTextValueComboPopup = BI.inherit(BI.Pane, {
@ -39069,7 +39079,7 @@ BI.Panel = BI.inherit(BI.Widget, {
return {
el: {
type: "bi.left_right_vertical_adapt",
cls: "panel-title bi-border-bottom",
cls: "panel-title bi-header-background bi-border-bottom",
height: 29,
items: {
left: [this.text],
@ -39088,7 +39098,8 @@ BI.Panel = BI.inherit(BI.Widget, {
});
BI.Panel.EVENT_CHANGE = "Panel.EVENT_CHANGE";
BI.shortcut("bi.panel", BI.Panel);BI.LinearSegmentButton = BI.inherit(BI.BasicButton, {
BI.shortcut("bi.panel", BI.Panel);
BI.LinearSegmentButton = BI.inherit(BI.BasicButton, {
props: {
extraCls: "bi-line-segment-button bi-list-item-effect",

10
src/base/collection/collection.js
Unescape View File

@ -59,11 +59,13 @@ BI.CollectionView = BI.inherit(BI.Widget, {
this._calculateSizeAndPositionData();
this._populate();
}
},
mounted: function () {
var o = this.options;
if (o.scrollLeft !== 0 || o.scrollTop !== 0) {
BI.nextTick(function () {
self.element.scrollTop(o.scrollTop);
self.element.scrollLeft(o.scrollLeft);
});
this.element.scrollTop(o.scrollTop);
this.element.scrollLeft(o.scrollLeft);
}
},

10
src/base/grid/grid.js
Unescape View File

@ -61,11 +61,13 @@ BI.GridView = BI.inherit(BI.Widget, {
if (o.items.length > 0) {
this._populate();
}
},
mounted: function () {
var o = this.options;
if (o.scrollLeft !== 0 || o.scrollTop !== 0) {
BI.nextTick(function () {
self.element.scrollTop(o.scrollTop);
self.element.scrollLeft(o.scrollLeft);
});
this.element.scrollTop(o.scrollTop);
this.element.scrollLeft(o.scrollLeft);
}
},

6
src/case/combo/bubblecombo/popup.bubble.js
Unescape View File

@ -124,7 +124,7 @@ BI.shortcut("bi.bubble_bar_popup_view", BI.BubblePopupBarView);
* @extends BI.BubblePopupView
*/
BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
props: {
baseCls: "bi-text-bubble-bar-popup-view",
text: "",
@ -156,7 +156,7 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
buttons: [{
type: "bi.button",
value: BI.i18nText("BI-Basic_Cancel"),
ghost: true,
level: "ignore",
height: 24,
handler: function () {
self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, false);
@ -185,4 +185,4 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
}
});
BI.TextBubblePopupBarView.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.text_bubble_bar_popup_view", BI.TextBubblePopupBarView);
BI.shortcut("bi.text_bubble_bar_popup_view", BI.TextBubblePopupBarView);

2
src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
Unescape View File

@ -153,4 +153,4 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
});
BI.SearchTextValueCombo.EVENT_CHANGE = "EVENT_CHANGE";
BI.SearchTextValueCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
BI.shortcut("bi.search_text_value_combo", BI.SearchTextValueCombo);
BI.shortcut("bi.search_text_value_combo", BI.SearchTextValueCombo);

4
src/case/layer/panel.js
Unescape View File

@ -57,7 +57,7 @@ BI.Panel = BI.inherit(BI.Widget, {
return {
el: {
type: "bi.left_right_vertical_adapt",
cls: "panel-title bi-border-bottom",
cls: "panel-title bi-header-background bi-border-bottom",
height: 29,
items: {
left: [this.text],
@ -76,4 +76,4 @@ BI.Panel = BI.inherit(BI.Widget, {
});
BI.Panel.EVENT_CHANGE = "Panel.EVENT_CHANGE";
BI.shortcut("bi.panel", BI.Panel);
BI.shortcut("bi.panel", BI.Panel);

0
src/core/platform/dom/ajax.js → src/core/platform/web/ajax.js
Unescape View File

0
src/core/platform/dom/config.js → src/core/platform/web/config.js
Unescape View File

0
src/core/platform/dom/detectElementResize.js → src/core/platform/web/detectElementResize.js
Unescape View File

1
src/core/platform/dom/dom.js → src/core/platform/web/dom.js
Unescape View File

@ -15,6 +15,7 @@
toElement.on(eventKey, handler);
});
});
toElement.data(fromElement.data());
var fromChildren = fromElement.children(), toChildren = toElement.children();
if(fromChildren.length !== toChildren.length) {
throw new Error("不匹配");

0
src/core/platform/dom/eventlistener.js → src/core/platform/web/eventlistener.js
Unescape View File

0
src/core/platform/dom/function.js → src/core/platform/web/function.js
Unescape View File

0
src/core/platform/dom/jquery/_jquery.js → src/core/platform/web/jquery/_jquery.js vendored
Unescape View File

0
src/core/platform/dom/jquery/event.js → src/core/platform/web/jquery/event.js vendored
Unescape View File

0
src/core/platform/dom/jquery/extend.js → src/core/platform/web/jquery/extend.js vendored
Unescape View File

0
src/core/platform/dom/jquery/fn.js → src/core/platform/web/jquery/fn.js vendored
Unescape View File

0
src/core/platform/dom/load.js → src/core/platform/web/load.js
Unescape View File

20
src/core/wrapper/layout.js
Unescape View File

@ -307,10 +307,12 @@ BI.Layout = BI.inherit(BI.Widget, {
added.push(w);
fragment.appendChild(w.element[0]);
});
this._getWrapper().append(fragment);
BI.each(added, function (i, w) {
w._mount();
});
if (this._isMounted) {
this._getWrapper().append(fragment);
BI.each(added, function (i, w) {
w._mount();
});
}
},
prependItems: function (items) {
@ -326,10 +328,12 @@ BI.Layout = BI.inherit(BI.Widget, {
added.push(w);
fragment.appendChild(w.element[0]);
}
this._getWrapper().prepend(fragment);
BI.each(added, function (i, w) {
w._mount();
});
if (this._isMounted) {
this._getWrapper().prepend(fragment);
BI.each(added, function (i, w) {
w._mount();
});
}
},
getValue: function () {

5
src/css/base/combo/combo.css
Unescape View File

@ -105,6 +105,11 @@
.bi-search-text-value-combo .trigger-icon-button {
font-size: 16px;
}
.bi-search-text-value-combo .search-text-value-trigger {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
}
.bi-search-text-value-combo.combo-error .bi-search-text-value-trigger .bi-text-button {
color: #ff4949;
}

3
src/css/base/layer/panel.css
Unescape View File

@ -3,9 +3,6 @@
-moz-border-radius: 2px;
border-radius: 2px;
}
.bi-panel .panel-title {
background-color: #F2F4F7;
}
.bi-panel .panel-title .panel-title-text {
cursor: text;
font-size: 14px;

5
src/less/base/combo/combo.searchtextvalue.less
Unescape View File

@ -4,6 +4,9 @@
& .trigger-icon-button{
font-size: 16px;
}
& .search-text-value-trigger{
.border-radius(2px);
}
&.combo-error {
& .bi-search-text-value-trigger{
& .bi-text-button {
@ -17,4 +20,4 @@
.rotate(180deg);
}
}
}
}

3
src/less/base/layer/panel.less
Unescape View File

@ -3,10 +3,9 @@
.bi-panel{
.border-radius(2px);
.panel-title{
background-color: @color-bi-background-light-gray;
& .panel-title-text{
cursor: text;
font-size: @font-size-14;
}
}
}
}

Write Preview
Loading…
Cancel
Save