Browse Source

Merge pull request #342 in FUI/fineui from ~LEI.WANG/fineui:master to master

* commit '85330b021d4313a10a32a14598d36160f25ac0c8':
  no message
  BI-17963 1. bi.code_editor应该在初始化时应该根据传入的style初始化样式(该组件提供了setStyle getStyle方法) 2. bi.textarea_editor存在属性style按照逻辑应该调用setStyle
es6
guy 7 years ago
parent
commit
81e6c5b486
  1. 62
      dist/_fineui.min.js
  2. 8
      dist/base.js
  3. 10
      dist/bundle.js
  4. 62
      dist/bundle.min.js
  5. 62
      dist/fineui.min.js
  6. 2
      dist/fix/fix.compact.js
  7. 6
      src/base/single/editor/editor.code.js
  8. 2
      src/base/single/editor/editor.textarea.js

62
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

8
dist/base.js vendored

@ -18175,7 +18175,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
items: [{
el: this.watermark,
top: 0,
left: o.lineNumbers ? 5 : 30 + 5
left: o.lineNumbers ? 30 + 5 : 5
}]
});
@ -18184,6 +18184,10 @@ BI.CodeEditor = BI.inherit(BI.Single, {
self.setValue(o.value);
});
}
if (BI.isNotNull(o.style)) {
self.setStyle(o.style);
}
},
_setEnable: function (b) {
@ -18769,7 +18773,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
self.setValue(o.value);
}
if (BI.isNotNull(o.style)) {
self.setValue(o.style);
self.setStyle(o.style);
}
this._checkWaterMark();
},

10
dist/bundle.js vendored

@ -53696,7 +53696,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
items: [{
el: this.watermark,
top: 0,
left: o.lineNumbers ? 5 : 30 + 5
left: o.lineNumbers ? 30 + 5 : 5
}]
});
@ -53705,6 +53705,10 @@ BI.CodeEditor = BI.inherit(BI.Single, {
self.setValue(o.value);
});
}
if (BI.isNotNull(o.style)) {
self.setStyle(o.style);
}
},
_setEnable: function (b) {
@ -54290,7 +54294,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
self.setValue(o.value);
}
if (BI.isNotNull(o.style)) {
self.setValue(o.style);
self.setStyle(o.style);
}
this._checkWaterMark();
},
@ -111363,7 +111367,7 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
needPop = true;
}
this.store = this._store();
this.store && (this.store._widget = this);
this.store && this.store._widget = this;
needPop && popTarget();
needPop = false;
pushTarget(this.store);

62
dist/bundle.min.js 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

2
dist/fix/fix.compact.js vendored

@ -115,7 +115,7 @@
needPop = true;
}
this.store = this._store();
this.store && (this.store._widget = this);
this.store && this.store._widget = this;
needPop && popTarget();
needPop = false;
pushTarget(this.store);

6
src/base/single/editor/editor.code.js

@ -84,7 +84,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
items: [{
el: this.watermark,
top: 0,
left: o.lineNumbers ? 5 : 30 + 5
left: o.lineNumbers ? 30 + 5 : 5
}]
});
@ -93,6 +93,10 @@ BI.CodeEditor = BI.inherit(BI.Single, {
self.setValue(o.value);
});
}
if (BI.isNotNull(o.style)) {
self.setStyle(o.style);
}
},
_setEnable: function (b) {

2
src/base/single/editor/editor.textarea.js

@ -65,7 +65,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
self.setValue(o.value);
}
if (BI.isNotNull(o.style)) {
self.setValue(o.style);
self.setStyle(o.style);
}
this._checkWaterMark();
},

Loading…
Cancel
Save