Merge branch 'master' of http://www.finedevelop.com:2015/scm/~guy/fineui

# Conflicts:
#	bi/base.js
#	dist/bundle.min.css

bi/base.css

@@ -275,10 +275,11 @@
   color: #00c;
 }
 .cm-s-default span[class*="fieldName"] {
+  display: inline-block;
   color: white;
-  padding: 1px;
-  margin: 1px 0px;
   background: #3f8ce8;
+  padding: 0 5px;
+  margin: 1px 1px;
 }
 .cm-s-default span[class*="start"] {
   -webkit-border-radius: 3px 0px 0px 3px;
@@ -818,6 +819,22 @@ li.CodeMirror-hint-active {
 /**** custom color(自定义颜色,用于特定场景) ****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
+.bi-code-editor .param {
+  color: #ffffff;
+  padding: 0 5px;
+  margin: 1px 1px;
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  background: #3f8ce8;
+  display: inline-block;
+}
+.bi-code-editor .error-param {
+  color: #e85050;
+  padding: 0 5px;
+  margin: 1px 1px;
+  display: inline-block;
+}
 .bi-editor {
   font-size: 12px;
 }

bi/core.js

@@ -5084,7 +5084,7 @@ BI.Widget = BI.inherit(BI.OB, {
             return this.attributes[attr];
         }
         var sta = _.result(this, "_static");
-        return BI.isFunction(sta[attr]) ? sta[attr].apply(this, BI.values(arguments).slice(1)) : sta[attr];
+        return BI.isFunction(sta[attr]) ? sta[attr].apply(this, Array.prototype.slice.apply(arguments, [1])) : sta[attr];
     },
 
     get: function () {

dist/base.css

@@ -275,10 +275,11 @@
   color: #00c;
 }
 .cm-s-default span[class*="fieldName"] {
+  display: inline-block;
   color: white;
-  padding: 1px;
-  margin: 1px 0px;
   background: #3f8ce8;
+  padding: 0 5px;
+  margin: 1px 1px;
 }
 .cm-s-default span[class*="start"] {
   -webkit-border-radius: 3px 0px 0px 3px;
@@ -818,6 +819,22 @@ li.CodeMirror-hint-active {
 /**** custom color(自定义颜色,用于特定场景) ****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
+.bi-code-editor .param {
+  color: #ffffff;
+  padding: 0 5px;
+  margin: 1px 1px;
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  background: #3f8ce8;
+  display: inline-block;
+}
+.bi-code-editor .error-param {
+  color: #e85050;
+  padding: 0 5px;
+  margin: 1px 1px;
+  display: inline-block;
+}
 .bi-editor {
   font-size: 12px;
 }

dist/bundle.css

@@ -1855,10 +1855,11 @@ i {
   color: #00c;
 }
 .cm-s-default span[class*="fieldName"] {
+  display: inline-block;
   color: white;
-  padding: 1px;
-  margin: 1px 0px;
   background: #3f8ce8;
+  padding: 0 5px;
+  margin: 1px 1px;
 }
 .cm-s-default span[class*="start"] {
   -webkit-border-radius: 3px 0px 0px 3px;
@@ -2398,6 +2399,22 @@ li.CodeMirror-hint-active {
 /**** custom color(自定义颜色,用于特定场景) ****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
+.bi-code-editor .param {
+  color: #ffffff;
+  padding: 0 5px;
+  margin: 1px 1px;
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  background: #3f8ce8;
+  display: inline-block;
+}
+.bi-code-editor .error-param {
+  color: #e85050;
+  padding: 0 5px;
+  margin: 1px 1px;
+  display: inline-block;
+}
 .bi-editor {
   font-size: 12px;
 }

dist/bundle.js

@@ -15124,7 +15124,7 @@ BI.Widget = BI.inherit(BI.OB, {
             return this.attributes[attr];
         }
         var sta = _.result(this, "_static");
-        return BI.isFunction(sta[attr]) ? sta[attr].apply(this, BI.values(arguments).slice(1)) : sta[attr];
+        return BI.isFunction(sta[attr]) ? sta[attr].apply(this, Array.prototype.slice.apply(arguments, [1])) : sta[attr];
     },
 
     get: function () {

dist/core.js

@@ -15073,7 +15073,7 @@ BI.Widget = BI.inherit(BI.OB, {
             return this.attributes[attr];
         }
         var sta = _.result(this, "_static");
-        return BI.isFunction(sta[attr]) ? sta[attr].apply(this, BI.values(arguments).slice(1)) : sta[attr];
+        return BI.isFunction(sta[attr]) ? sta[attr].apply(this, Array.prototype.slice.apply(arguments, [1])) : sta[attr];
     },
 
     get: function () {

src/core/model.js

@@ -290,7 +290,7 @@ BI.Model = BI.inherit(BI.M, {
             return this.attributes[attr];
         }
         var sta = _.result(this, "_static");
-        return BI.isFunction(sta[attr]) ? sta[attr].apply(this, BI.values(arguments).slice(1)) : sta[attr];
+        return BI.isFunction(sta[attr]) ? sta[attr].apply(this, Array.prototype.slice.apply(arguments, [1])) : sta[attr];
     },
 
     get: function () {

src/css/base/formula/codemirror.css

@@ -182,10 +182,11 @@
   color: #00c;
 }
 .cm-s-default span[class*="fieldName"] {
+  display: inline-block;
   color: white;
-  padding: 1px;
-  margin: 1px 0px;
   background: #3f8ce8;
+  padding: 0 5px;
+  margin: 1px 1px;
 }
 .cm-s-default span[class*="start"] {
   -webkit-border-radius: 3px 0px 0px 3px;

src/css/base/single/editor/editor.code.css

@@ -0,0 +1,16 @@
+.bi-code-editor .param {
+  color: #ffffff;
+  padding: 0 5px;
+  margin: 1px 1px;
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  background: #3f8ce8;
+  display: inline-block;
+}
+.bi-code-editor .error-param {
+  color: #e85050;
+  padding: 0 5px;
+  margin: 1px 1px;
+  display: inline-block;
+}

src/less/base/formula/codemirror.less

@@ -242,11 +242,11 @@ div.CodeMirror-overwrite div.CodeMirror-cursor {
 }
 
 .cm-s-default span[class*="fieldName"] {
+  display: inline-block;
   color: white;
-  padding: 1px;
-  margin: 1px 0px;
   background: @color-bi-text-highlight;
-
+  padding: 0 5px;
+  margin: 1px 1px;
 }
 
 .cm-s-default span[class*="start"] {

src/less/base/single/editor/editor.code.less

@@ -0,0 +1,18 @@
+@import "../../../bibase";
+
+.bi-code-editor{
+  & .param {
+    color: @color-bi-text;
+    padding: 0 5px;
+    margin: 1px 1px;
+    .border-radius(2px);
+    background: @color-bi-background-highlight;
+    display: inline-block;
+  }
+  & .error-param {
+    color: @color-bi-text-warning;
+    padding: 0 5px;
+    margin: 1px 1px;
+    display: inline-block;
+  }
+}