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

Merge pull request #495 in VISUAL/fineui from ~LEI.WANG/fineui:master to master 

* commit 'b2e88c48cbf479a46661601db35a716c91e8ee11':
  BI-26037
  BI-26037 r语言编辑器不需要分析匹配，容易与R语言的语法冲突
es6
imp 6 years ago
parent
c97ea9b743 b2e88c48cb
commit
205c82db15
8 changed files with 290714 additions and 290691 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 44
      dist/_fineui.min.js
  2. 34
      dist/base.js
  3. 34
      dist/bundle.js
  4. 10
      dist/bundle.min.js
  5. 34
      dist/fineui.js
  6. 44
      dist/fineui.min.js
  7. 31
      src/base/single/editor/editor.code.js

44
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

34
dist/base.js vendored
Unescape View File

@ -18123,6 +18123,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
lineHeight: 2, lineHeight: 2,
readOnly: false, readOnly: false,
lineNumbers: false, lineNumbers: false,
paramMatch: true, // 用来判断是否需要在代码中匹配参数，默认为true, R语言是不需要匹配参数
// 参数显示值构造函数 // 参数显示值构造函数
paramFormatter: function (v) { paramFormatter: function (v) {
return v; return v;
@ -18135,9 +18136,9 @@ BI.CodeEditor = BI.inherit(BI.Single, {
var conf = { var conf = {
textWrapping: true, textWrapping: true,
lineWrapping: true, lineWrapping: true,
lineNumbers: false, lineNumbers: o.lineNumbers,
readOnly: o.readOnly, readOnly: o.readOnly,
//解决插入字段由括号或其他特殊字符包围时分裂的bug // 解决插入字段由括号或其他特殊字符包围时分裂的bug
specialChars: /[\u0000-\u001f\u007f\u00ad\u200c-\u200f\u2028\u2029\ufeff]/ specialChars: /[\u0000-\u001f\u007f\u00ad\u200c-\u200f\u2028\u2029\ufeff]/
}; };
o.readOnly && (conf.cursorBlinkRate = -1); o.readOnly && (conf.cursorBlinkRate = -1);
@ -18276,19 +18277,23 @@ BI.CodeEditor = BI.inherit(BI.Single, {
}, },
setValue: function (v) { setValue: function (v) {
var self = this, result; var self = this, o = this.options, result;
this.refresh(); this.refresh();
self.editor.setValue(""); self.editor.setValue("");
result = this._analyzeContent(v || ""); if(o.paramMatch) {
BI.each(result, function (i, item) { result = this._analyzeContent(v || "");
var fieldRegx = /\$[\{][^\}]*[\}]/; BI.each(result, function (i, item) {
var str = item.match(fieldRegx); var fieldRegx = /\$[\{][^\}]*[\}]/;
if (BI.isNotEmptyArray(str)) { var str = item.match(fieldRegx);
self.insertParam(str[0].substring(2, item.length - 1)); if (BI.isNotEmptyArray(str)) {
} else { self.insertParam(str[0].substring(2, item.length - 1));
self.insertString(item); } else {
} self.insertString(item);
}); }
});
}else {
self.editor.setValue(v);
}
this._checkWaterMark(); this._checkWaterMark();
}, },
@ -18319,7 +18324,8 @@ BI.CodeEditor = BI.inherit(BI.Single, {
BI.CodeEditor.EVENT_CHANGE = "EVENT_CHANGE"; BI.CodeEditor.EVENT_CHANGE = "EVENT_CHANGE";
BI.CodeEditor.EVENT_BLUR = "EVENT_BLUR"; BI.CodeEditor.EVENT_BLUR = "EVENT_BLUR";
BI.CodeEditor.EVENT_FOCUS = "EVENT_FOCUS"; BI.CodeEditor.EVENT_FOCUS = "EVENT_FOCUS";
BI.shortcut("bi.code_editor", BI.CodeEditor);/** BI.shortcut("bi.code_editor", BI.CodeEditor);
/**
* Created by GUY on 2015/4/15. * Created by GUY on 2015/4/15.
* @class BI.Editor * @class BI.Editor
* @extends BI.Single * @extends BI.Single

34
dist/bundle.js vendored
Unescape View File

@ -53894,6 +53894,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
lineHeight: 2, lineHeight: 2,
readOnly: false, readOnly: false,
lineNumbers: false, lineNumbers: false,
paramMatch: true, // 用来判断是否需要在代码中匹配参数，默认为true, R语言是不需要匹配参数
// 参数显示值构造函数 // 参数显示值构造函数
paramFormatter: function (v) { paramFormatter: function (v) {
return v; return v;
@ -53906,9 +53907,9 @@ BI.CodeEditor = BI.inherit(BI.Single, {
var conf = { var conf = {
textWrapping: true, textWrapping: true,
lineWrapping: true, lineWrapping: true,
lineNumbers: false, lineNumbers: o.lineNumbers,
readOnly: o.readOnly, readOnly: o.readOnly,
//解决插入字段由括号或其他特殊字符包围时分裂的bug // 解决插入字段由括号或其他特殊字符包围时分裂的bug
specialChars: /[\u0000-\u001f\u007f\u00ad\u200c-\u200f\u2028\u2029\ufeff]/ specialChars: /[\u0000-\u001f\u007f\u00ad\u200c-\u200f\u2028\u2029\ufeff]/
}; };
o.readOnly && (conf.cursorBlinkRate = -1); o.readOnly && (conf.cursorBlinkRate = -1);
@ -54047,19 +54048,23 @@ BI.CodeEditor = BI.inherit(BI.Single, {
}, },
setValue: function (v) { setValue: function (v) {
var self = this, result; var self = this, o = this.options, result;
this.refresh(); this.refresh();
self.editor.setValue(""); self.editor.setValue("");
result = this._analyzeContent(v || ""); if(o.paramMatch) {
BI.each(result, function (i, item) { result = this._analyzeContent(v || "");
var fieldRegx = /\$[\{][^\}]*[\}]/; BI.each(result, function (i, item) {
var str = item.match(fieldRegx); var fieldRegx = /\$[\{][^\}]*[\}]/;
if (BI.isNotEmptyArray(str)) { var str = item.match(fieldRegx);
self.insertParam(str[0].substring(2, item.length - 1)); if (BI.isNotEmptyArray(str)) {
} else { self.insertParam(str[0].substring(2, item.length - 1));
self.insertString(item); } else {
} self.insertString(item);
}); }
});
}else {
self.editor.setValue(v);
}
this._checkWaterMark(); this._checkWaterMark();
}, },
@ -54090,7 +54095,8 @@ BI.CodeEditor = BI.inherit(BI.Single, {
BI.CodeEditor.EVENT_CHANGE = "EVENT_CHANGE"; BI.CodeEditor.EVENT_CHANGE = "EVENT_CHANGE";
BI.CodeEditor.EVENT_BLUR = "EVENT_BLUR"; BI.CodeEditor.EVENT_BLUR = "EVENT_BLUR";
BI.CodeEditor.EVENT_FOCUS = "EVENT_FOCUS"; BI.CodeEditor.EVENT_FOCUS = "EVENT_FOCUS";
BI.shortcut("bi.code_editor", BI.CodeEditor);/** BI.shortcut("bi.code_editor", BI.CodeEditor);
/**
* Created by GUY on 2015/4/15. * Created by GUY on 2015/4/15.
* @class BI.Editor * @class BI.Editor
* @extends BI.Single * @extends BI.Single

10
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

34
dist/fineui.js vendored
Unescape View File

@ -54143,6 +54143,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
lineHeight: 2, lineHeight: 2,
readOnly: false, readOnly: false,
lineNumbers: false, lineNumbers: false,
paramMatch: true, // 用来判断是否需要在代码中匹配参数，默认为true, R语言是不需要匹配参数
// 参数显示值构造函数 // 参数显示值构造函数
paramFormatter: function (v) { paramFormatter: function (v) {
return v; return v;
@ -54155,9 +54156,9 @@ BI.CodeEditor = BI.inherit(BI.Single, {
var conf = { var conf = {
textWrapping: true, textWrapping: true,
lineWrapping: true, lineWrapping: true,
lineNumbers: false, lineNumbers: o.lineNumbers,
readOnly: o.readOnly, readOnly: o.readOnly,
//解决插入字段由括号或其他特殊字符包围时分裂的bug // 解决插入字段由括号或其他特殊字符包围时分裂的bug
specialChars: /[\u0000-\u001f\u007f\u00ad\u200c-\u200f\u2028\u2029\ufeff]/ specialChars: /[\u0000-\u001f\u007f\u00ad\u200c-\u200f\u2028\u2029\ufeff]/
}; };
o.readOnly && (conf.cursorBlinkRate = -1); o.readOnly && (conf.cursorBlinkRate = -1);
@ -54296,19 +54297,23 @@ BI.CodeEditor = BI.inherit(BI.Single, {
}, },
setValue: function (v) { setValue: function (v) {
var self = this, result; var self = this, o = this.options, result;
this.refresh(); this.refresh();
self.editor.setValue(""); self.editor.setValue("");
result = this._analyzeContent(v || ""); if(o.paramMatch) {
BI.each(result, function (i, item) { result = this._analyzeContent(v || "");
var fieldRegx = /\$[\{][^\}]*[\}]/; BI.each(result, function (i, item) {
var str = item.match(fieldRegx); var fieldRegx = /\$[\{][^\}]*[\}]/;
if (BI.isNotEmptyArray(str)) { var str = item.match(fieldRegx);
self.insertParam(str[0].substring(2, item.length - 1)); if (BI.isNotEmptyArray(str)) {
} else { self.insertParam(str[0].substring(2, item.length - 1));
self.insertString(item); } else {
} self.insertString(item);
}); }
});
}else {
self.editor.setValue(v);
}
this._checkWaterMark(); this._checkWaterMark();
}, },
@ -54339,7 +54344,8 @@ BI.CodeEditor = BI.inherit(BI.Single, {
BI.CodeEditor.EVENT_CHANGE = "EVENT_CHANGE"; BI.CodeEditor.EVENT_CHANGE = "EVENT_CHANGE";
BI.CodeEditor.EVENT_BLUR = "EVENT_BLUR"; BI.CodeEditor.EVENT_BLUR = "EVENT_BLUR";
BI.CodeEditor.EVENT_FOCUS = "EVENT_FOCUS"; BI.CodeEditor.EVENT_FOCUS = "EVENT_FOCUS";
BI.shortcut("bi.code_editor", BI.CodeEditor);/** BI.shortcut("bi.code_editor", BI.CodeEditor);
/**
* Created by GUY on 2015/4/15. * Created by GUY on 2015/4/15.
* @class BI.Editor * @class BI.Editor
* @extends BI.Single * @extends BI.Single

44
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

31
src/base/single/editor/editor.code.js
Unescape View File

@ -13,6 +13,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
lineHeight: 2, lineHeight: 2,
readOnly: false, readOnly: false,
lineNumbers: false, lineNumbers: false,
paramMatch: true, // 用来判断是否需要在代码中匹配参数，默认为true, R语言是不需要匹配参数
// 参数显示值构造函数 // 参数显示值构造函数
paramFormatter: function (v) { paramFormatter: function (v) {
return v; return v;
@ -25,9 +26,9 @@ BI.CodeEditor = BI.inherit(BI.Single, {
var conf = { var conf = {
textWrapping: true, textWrapping: true,
lineWrapping: true, lineWrapping: true,
lineNumbers: false, lineNumbers: o.lineNumbers,
readOnly: o.readOnly, readOnly: o.readOnly,
//解决插入字段由括号或其他特殊字符包围时分裂的bug // 解决插入字段由括号或其他特殊字符包围时分裂的bug
specialChars: /[\u0000-\u001f\u007f\u00ad\u200c-\u200f\u2028\u2029\ufeff]/ specialChars: /[\u0000-\u001f\u007f\u00ad\u200c-\u200f\u2028\u2029\ufeff]/
}; };
o.readOnly && (conf.cursorBlinkRate = -1); o.readOnly && (conf.cursorBlinkRate = -1);
@ -166,19 +167,23 @@ BI.CodeEditor = BI.inherit(BI.Single, {
}, },
setValue: function (v) { setValue: function (v) {
var self = this, result; var self = this, o = this.options, result;
this.refresh(); this.refresh();
self.editor.setValue(""); self.editor.setValue("");
result = this._analyzeContent(v || ""); if(o.paramMatch) {
BI.each(result, function (i, item) { result = this._analyzeContent(v || "");
var fieldRegx = /\$[\{][^\}]*[\}]/; BI.each(result, function (i, item) {
var str = item.match(fieldRegx); var fieldRegx = /\$[\{][^\}]*[\}]/;
if (BI.isNotEmptyArray(str)) { var str = item.match(fieldRegx);
self.insertParam(str[0].substring(2, item.length - 1)); if (BI.isNotEmptyArray(str)) {
} else { self.insertParam(str[0].substring(2, item.length - 1));
self.insertString(item); } else {
} self.insertString(item);
}); }
});
}else {
self.editor.setValue(v);
}
this._checkWaterMark(); this._checkWaterMark();
}, },

Write Preview
Loading…
Cancel
Save