Browse Source

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

# Conflicts:
#	bi/base.js
#	dist/bundle.min.css
es6
guy 7 years ago
parent
commit
be48f61d04
  1. 21
      bi/base.css
  2. 2
      bi/core.js
  3. 21
      dist/base.css
  4. 21
      dist/bundle.css
  5. 2
      dist/bundle.js
  6. 2
      dist/bundle.min.css
  7. 2
      dist/bundle.min.js
  8. 2
      dist/core.js
  9. 2
      src/core/model.js
  10. 5
      src/css/base/formula/codemirror.css
  11. 16
      src/css/base/single/editor/editor.code.css
  12. 6
      src/less/base/formula/codemirror.less
  13. 18
      src/less/base/single/editor/editor.code.less

21
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;
}

2
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 () {

21
dist/base.css vendored

@ -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;
}

21
dist/bundle.css vendored

@ -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;
}

2
dist/bundle.js vendored

@ -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 () {

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

2
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/core.js vendored

@ -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 () {

2
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 () {

5
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;

16
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;
}

6
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"] {

18
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;
}
}
Loading…
Cancel
Save