Browse Source

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

* commit '8172829e048e8610eba0da579531d4596ef89e26':
  BI-17963 #BUG FIX 修复bi.code_editor: 1. value值为空字符串时,不调用setValue从而无法调用refresh,使得代码行数区域显示错误。 2. 当存在行数区时,应左移水印位置
es6
guy 7 years ago
parent
commit
b6be793df2
  1. 6
      dist/_fineui.min.js
  2. 4
      dist/base.js
  3. 4
      dist/bundle.js
  4. 6
      dist/bundle.min.js
  5. 6
      dist/fineui.min.js
  6. 4
      src/base/single/editor/editor.code.js

6
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/base.js vendored

@ -18174,11 +18174,11 @@ BI.CodeEditor = BI.inherit(BI.Single, {
items: [{ items: [{
el: this.watermark, el: this.watermark,
top: 0, top: 0,
left: 5 left: o.lineNumbers ? 5 : 30 + 5
}] }]
}); });
if (BI.isKey(o.value)) { if (BI.isNumber(o.value) || BI.isString(o.value)) {
BI.nextTick(function () { BI.nextTick(function () {
self.setValue(o.value); self.setValue(o.value);
}); });

4
dist/bundle.js vendored

@ -53431,11 +53431,11 @@ BI.CodeEditor = BI.inherit(BI.Single, {
items: [{ items: [{
el: this.watermark, el: this.watermark,
top: 0, top: 0,
left: 5 left: o.lineNumbers ? 5 : 30 + 5
}] }]
}); });
if (BI.isKey(o.value)) { if (BI.isNumber(o.value) || BI.isString(o.value)) {
BI.nextTick(function () { BI.nextTick(function () {
self.setValue(o.value); self.setValue(o.value);
}); });

6
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

6
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

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

@ -84,11 +84,11 @@ BI.CodeEditor = BI.inherit(BI.Single, {
items: [{ items: [{
el: this.watermark, el: this.watermark,
top: 0, top: 0,
left: 5 left: o.lineNumbers ? 5 : 30 + 5
}] }]
}); });
if (BI.isKey(o.value)) { if (BI.isNumber(o.value) || BI.isString(o.value)) {
BI.nextTick(function () { BI.nextTick(function () {
self.setValue(o.value); self.setValue(o.value);
}); });

Loading…
Cancel
Save