Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~windy/fineui

# Conflicts:
#	dist/base.js
#	dist/bundle.js
#	dist/fineui.js

dist/case.js

@@ -10517,11 +10517,13 @@ BI.RichEditorParamAction = BI.inherit(BI.RichEditorAction, {
         var o = this.options;
         var instance = o.editor.instance;
         var image = new Image();
-        var attrs = BI.DOM.getImage(o.paramFormatter(param));
+        var name = o.paramFormatter(param);
+        var attrs = BI.DOM.getImage(name);
         image.src = attrs.src;
         image.alt = param;
         $(image).addClass("rich-editor-param");
         $(image).attr("style", attrs.style);
+        $(image).attr("name", name);
         this.options.editor.insertHTML($("<div>").append(image).html());
         // var sel = this._get$Sel();
         // var wrapper = o.editor.instance.getElm().element;

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

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

src/case/richeditor/bar/action.richeditor.param.js

@@ -45,11 +45,13 @@ BI.RichEditorParamAction = BI.inherit(BI.RichEditorAction, {
         var o = this.options;
         var instance = o.editor.instance;
         var image = new Image();
-        var attrs = BI.DOM.getImage(o.paramFormatter(param));
+        var name = o.paramFormatter(param);
+        var attrs = BI.DOM.getImage(name);
         image.src = attrs.src;
         image.alt = param;
         $(image).addClass("rich-editor-param");
         $(image).attr("style", attrs.style);
+        $(image).attr("name", name);
         this.options.editor.insertHTML($("<div>").append(image).html());
         // var sel = this._get$Sel();
         // var wrapper = o.editor.instance.getElm().element;