Browse Source

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

* commit 'fb1257cd636f77ac90a7fda44a1602e63a15585d':
  bi.code_editor控件支持选择行号
es6
guy 7 years ago
parent
commit
98acf1aec6
  1. 6
      dist/_fineui.min.js
  2. 5
      dist/base.js
  3. 5
      dist/bundle.js
  4. 2
      dist/bundle.min.js
  5. 6
      dist/fineui.min.js
  6. 5
      src/base/single/editor/editor.code.js

6
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

5
dist/base.js vendored

@ -18102,6 +18102,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
watermark: "",
lineHeight: 2,
readOnly: false,
lineNumbers: false,
// 参数显示值构造函数
paramFormatter: function (v) {
return v;
@ -18114,7 +18115,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
this.editor = CodeMirror(this.element[0], {
textWrapping: true,
lineWrapping: true,
lineNumbers: false,
lineNumbers: o.lineNumbers,
readOnly: o.readOnly,
// 解决插入字段由括号或其他特殊字符包围时分裂的bug
specialChars: /[\u0000-\u001f\u007f\u00ad\u200c-\u200f\u2028\u2029\ufeff]/
@ -18267,7 +18268,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
focus: function () {
this.editor.focus();
},
blur: function () {
this.editor.getInputField().blur();
},

5
dist/bundle.js vendored

@ -53359,6 +53359,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
watermark: "",
lineHeight: 2,
readOnly: false,
lineNumbers: false,
// 参数显示值构造函数
paramFormatter: function (v) {
return v;
@ -53371,7 +53372,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
this.editor = CodeMirror(this.element[0], {
textWrapping: true,
lineWrapping: true,
lineNumbers: false,
lineNumbers: o.lineNumbers,
readOnly: o.readOnly,
// 解决插入字段由括号或其他特殊字符包围时分裂的bug
specialChars: /[\u0000-\u001f\u007f\u00ad\u200c-\u200f\u2028\u2029\ufeff]/
@ -53524,7 +53525,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
focus: function () {
this.editor.focus();
},
blur: function () {
this.editor.getInputField().blur();
},

2
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

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

@ -12,6 +12,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
watermark: "",
lineHeight: 2,
readOnly: false,
lineNumbers: false,
// 参数显示值构造函数
paramFormatter: function (v) {
return v;
@ -24,7 +25,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
this.editor = CodeMirror(this.element[0], {
textWrapping: true,
lineWrapping: true,
lineNumbers: false,
lineNumbers: o.lineNumbers,
readOnly: o.readOnly,
// 解决插入字段由括号或其他特殊字符包围时分裂的bug
specialChars: /[\u0000-\u001f\u007f\u00ad\u200c-\u200f\u2028\u2029\ufeff]/
@ -177,7 +178,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
focus: function () {
this.editor.focus();
},
blur: function () {
this.editor.getInputField().blur();
},

Loading…
Cancel
Save