Browse Source

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

* commit '75b78bf7602032b034aca286356b9bfcd41a04a2':
  no message
  处理bi.code_editor中存在R语言$字符
  BI-19439 【5.0数据挖掘】R语言集成,编码框中输入符号$,保存之后会被清除掉 还原之前bi.code_editor中不正确的正则匹配,否则会出现代码输入框不能显示"$"字符的问题
es6
guy 7 years ago
parent
commit
d2553f39f9
  1. 2
      dist/_fineui.min.js
  2. 2
      dist/base.js
  3. 2
      dist/bundle.js
  4. 2
      dist/bundle.min.js
  5. 2
      dist/fineui.js
  6. 2
      dist/fineui.min.js
  7. 2
      src/base/single/editor/editor.code.js

2
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/base.js vendored

@ -18250,7 +18250,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
}, },
_analyzeContent: function (v) { _analyzeContent: function (v) {
var regx = /\$[\{][^\}]*[\}]|[^\$\{]*[^\$\{]/g; var regx = /\$[\{][^\}]*[\}]|[^\$\{]*[^\$\{]|\$[^\{]*[^\$\{]/g;
return v.match(regx); return v.match(regx);
}, },

2
dist/bundle.js vendored

@ -54016,7 +54016,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
}, },
_analyzeContent: function (v) { _analyzeContent: function (v) {
var regx = /\$[\{][^\}]*[\}]|[^\$\{]*[^\$\{]/g; var regx = /\$[\{][^\}]*[\}]|[^\$\{]*[^\$\{]|\$[^\{]*[^\$\{]/g;
return v.match(regx); return v.match(regx);
}, },

2
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.js vendored

@ -54259,7 +54259,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
}, },
_analyzeContent: function (v) { _analyzeContent: function (v) {
var regx = /\$[\{][^\}]*[\}]|[^\$\{]*[^\$\{]/g; var regx = /\$[\{][^\}]*[\}]|[^\$\{]*[^\$\{]|\$[^\{]*[^\$\{]/g;
return v.match(regx); return v.match(regx);
}, },

2
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

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

@ -159,7 +159,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
}, },
_analyzeContent: function (v) { _analyzeContent: function (v) {
var regx = /\$[\{][^\}]*[\}]|[^\$\{]*[^\$\{]/g; var regx = /\$[\{][^\}]*[\}]|[^\$\{]*[^\$\{]|\$[^\{]*[^\$\{]/g;
return v.match(regx); return v.match(regx);
}, },

Loading…
Cancel
Save