Browse Source

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

* commit '6016f8d9d4f1198b48272c885f0cd434adb5ee6e':
  BI-30423
es6
windy 6 years ago
parent
commit
fd2031f90d
  1. 6
      dist/base.css
  2. 42
      dist/bundle.css
  3. 4
      dist/bundle.js
  4. 2
      dist/bundle.min.css
  5. 16
      dist/bundle.min.js
  6. 4
      dist/case.js
  7. 42
      dist/fineui.css
  8. 4
      dist/fineui.js
  9. 2
      dist/fineui.min.css
  10. 16
      dist/fineui.min.js
  11. 36
      dist/resource.css
  12. 2
      dist/utils.min.js
  13. 36
      public/css/font.css
  14. 3
      src/case/editor/editor.shelter.js
  15. 36
      src/css/resource/font.css
  16. 36
      ui/css/font.css

6
dist/base.css vendored

@ -1162,10 +1162,12 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
border-radius: 2px;
}
.bi-bubble .bubble-error {
background-color: rgba(255, 73, 73, 0.1);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1aff4949,endColorstr=#1aff4949);
background: #ffecec;
color: #ff4949;
}
.bi-theme-dark .bi-bubble .bubble-error {
background: #3A2940;
}
.bi-bubble .bubble-common {
background: #eaf2fd;
color: #3685f2;

42
dist/bundle.css vendored

@ -3116,10 +3116,12 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
border-radius: 2px;
}
.bi-bubble .bubble-error {
background-color: rgba(255, 73, 73, 0.1);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1aff4949,endColorstr=#1aff4949);
background: #ffecec;
color: #ff4949;
}
.bi-theme-dark .bi-bubble .bubble-error {
background: #3A2940;
}
.bi-bubble .bubble-common {
background: #eaf2fd;
color: #3685f2;
@ -4937,69 +4939,69 @@ textarea::-webkit-scrollbar-thumb:hover {
color: inherit;
}
.text-bold-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-bold-font .b-font:before {
content: "\e75b";
content: "\e697";
color: inherit;
}
.text-bold-font.disabled .b-font:before {
content: "\e75b";
content: "\e697";
color: inherit;
}
.text-italic-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-italic-font .b-font:before {
content: "\e75c";
content: "\e69d";
color: inherit;
}
.text-italic-font.disabled .b-font:before {
content: "\e75c";
content: "\e69d";
color: inherit;
}
.text-underline-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-underline-font .b-font:before {
content: "\e75d";
content: "\e69c";
color: inherit;
}
.text-underline-font.disabled .b-font:before {
content: "\e75d";
content: "\e69c";
color: inherit;
}
.text-color-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-color-font .b-font:before {
content: "\e75a";
content: "\e698";
color: inherit;
}
.text-color-font.disabled .b-font:before {
content: "\e75a";
content: "\e698";
color: inherit;
}
.text-background-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-background-font .b-font:before {
content: "\e758";
content: "\e699";
color: inherit;
}
.text-background-font.disabled .b-font:before {
content: "\e758";
content: "\e699";
color: inherit;
}
.text-color-underline-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-color-underline-font .b-font:before {
content: "\e75d";
content: "\e69a";
color: inherit;
}
.text-color-underline-font.disabled .b-font:before {
content: "\e75d";
content: "\e69a";
color: inherit;
}
.text-align-left-font .b-font {

4
dist/bundle.js vendored

@ -54609,6 +54609,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
setValue: function (k) {
this.editor.setValue(k);
this._checkText();
this.text.doRedMark(this.options.keyword);
},
getValue: function () {
@ -54642,7 +54643,8 @@ BI.ShelterEditor.EVENT_RESTRICT = "EVENT_RESTRICT";
BI.ShelterEditor.EVENT_SPACE = "EVENT_SPACE";
BI.ShelterEditor.EVENT_EMPTY = "EVENT_EMPTY";
BI.shortcut("bi.shelter_editor", BI.ShelterEditor);/**
BI.shortcut("bi.shelter_editor", BI.ShelterEditor);
/**
* 带标记的文本框
* Created by GUY on 2015/8/28.
* @class BI.SignEditor

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

16
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/case.js vendored

@ -5975,6 +5975,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
setValue: function (k) {
this.editor.setValue(k);
this._checkText();
this.text.doRedMark(this.options.keyword);
},
getValue: function () {
@ -6008,7 +6009,8 @@ BI.ShelterEditor.EVENT_RESTRICT = "EVENT_RESTRICT";
BI.ShelterEditor.EVENT_SPACE = "EVENT_SPACE";
BI.ShelterEditor.EVENT_EMPTY = "EVENT_EMPTY";
BI.shortcut("bi.shelter_editor", BI.ShelterEditor);/**
BI.shortcut("bi.shelter_editor", BI.ShelterEditor);
/**
* 带标记的文本框
* Created by GUY on 2015/8/28.
* @class BI.SignEditor

42
dist/fineui.css vendored

@ -3116,10 +3116,12 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
border-radius: 2px;
}
.bi-bubble .bubble-error {
background-color: rgba(255, 73, 73, 0.1);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1aff4949,endColorstr=#1aff4949);
background: #ffecec;
color: #ff4949;
}
.bi-theme-dark .bi-bubble .bubble-error {
background: #3A2940;
}
.bi-bubble .bubble-common {
background: #eaf2fd;
color: #3685f2;
@ -4937,69 +4939,69 @@ textarea::-webkit-scrollbar-thumb:hover {
color: inherit;
}
.text-bold-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-bold-font .b-font:before {
content: "\e75b";
content: "\e697";
color: inherit;
}
.text-bold-font.disabled .b-font:before {
content: "\e75b";
content: "\e697";
color: inherit;
}
.text-italic-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-italic-font .b-font:before {
content: "\e75c";
content: "\e69d";
color: inherit;
}
.text-italic-font.disabled .b-font:before {
content: "\e75c";
content: "\e69d";
color: inherit;
}
.text-underline-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-underline-font .b-font:before {
content: "\e75d";
content: "\e69c";
color: inherit;
}
.text-underline-font.disabled .b-font:before {
content: "\e75d";
content: "\e69c";
color: inherit;
}
.text-color-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-color-font .b-font:before {
content: "\e75a";
content: "\e698";
color: inherit;
}
.text-color-font.disabled .b-font:before {
content: "\e75a";
content: "\e698";
color: inherit;
}
.text-background-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-background-font .b-font:before {
content: "\e758";
content: "\e699";
color: inherit;
}
.text-background-font.disabled .b-font:before {
content: "\e758";
content: "\e699";
color: inherit;
}
.text-color-underline-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-color-underline-font .b-font:before {
content: "\e75d";
content: "\e69a";
color: inherit;
}
.text-color-underline-font.disabled .b-font:before {
content: "\e75d";
content: "\e69a";
color: inherit;
}
.text-align-left-font .b-font {

4
dist/fineui.js vendored

@ -54830,6 +54830,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
setValue: function (k) {
this.editor.setValue(k);
this._checkText();
this.text.doRedMark(this.options.keyword);
},
getValue: function () {
@ -54863,7 +54864,8 @@ BI.ShelterEditor.EVENT_RESTRICT = "EVENT_RESTRICT";
BI.ShelterEditor.EVENT_SPACE = "EVENT_SPACE";
BI.ShelterEditor.EVENT_EMPTY = "EVENT_EMPTY";
BI.shortcut("bi.shelter_editor", BI.ShelterEditor);/**
BI.shortcut("bi.shelter_editor", BI.ShelterEditor);
/**
* 带标记的文本框
* Created by GUY on 2015/8/28.
* @class BI.SignEditor

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

16
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

36
dist/resource.css vendored

@ -1130,69 +1130,69 @@ textarea::-webkit-scrollbar-thumb:hover {
color: inherit;
}
.text-bold-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-bold-font .b-font:before {
content: "\e75b";
content: "\e697";
color: inherit;
}
.text-bold-font.disabled .b-font:before {
content: "\e75b";
content: "\e697";
color: inherit;
}
.text-italic-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-italic-font .b-font:before {
content: "\e75c";
content: "\e69d";
color: inherit;
}
.text-italic-font.disabled .b-font:before {
content: "\e75c";
content: "\e69d";
color: inherit;
}
.text-underline-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-underline-font .b-font:before {
content: "\e75d";
content: "\e69c";
color: inherit;
}
.text-underline-font.disabled .b-font:before {
content: "\e75d";
content: "\e69c";
color: inherit;
}
.text-color-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-color-font .b-font:before {
content: "\e75a";
content: "\e698";
color: inherit;
}
.text-color-font.disabled .b-font:before {
content: "\e75a";
content: "\e698";
color: inherit;
}
.text-background-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-background-font .b-font:before {
content: "\e758";
content: "\e699";
color: inherit;
}
.text-background-font.disabled .b-font:before {
content: "\e758";
content: "\e699";
color: inherit;
}
.text-color-underline-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-color-underline-font .b-font:before {
content: "\e75d";
content: "\e69a";
color: inherit;
}
.text-color-underline-font.disabled .b-font:before {
content: "\e75d";
content: "\e69a";
color: inherit;
}
.text-align-left-font .b-font {

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

36
public/css/font.css

@ -715,69 +715,69 @@
color: inherit;
}
.text-bold-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-bold-font .b-font:before {
content: "\e75b";
content: "\e697";
color: inherit;
}
.text-bold-font.disabled .b-font:before {
content: "\e75b";
content: "\e697";
color: inherit;
}
.text-italic-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-italic-font .b-font:before {
content: "\e75c";
content: "\e69d";
color: inherit;
}
.text-italic-font.disabled .b-font:before {
content: "\e75c";
content: "\e69d";
color: inherit;
}
.text-underline-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-underline-font .b-font:before {
content: "\e75d";
content: "\e69c";
color: inherit;
}
.text-underline-font.disabled .b-font:before {
content: "\e75d";
content: "\e69c";
color: inherit;
}
.text-color-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-color-font .b-font:before {
content: "\e75a";
content: "\e698";
color: inherit;
}
.text-color-font.disabled .b-font:before {
content: "\e75a";
content: "\e698";
color: inherit;
}
.text-background-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-background-font .b-font:before {
content: "\e758";
content: "\e699";
color: inherit;
}
.text-background-font.disabled .b-font:before {
content: "\e758";
content: "\e699";
color: inherit;
}
.text-color-underline-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-color-underline-font .b-font:before {
content: "\e75d";
content: "\e69a";
color: inherit;
}
.text-color-underline-font.disabled .b-font:before {
content: "\e75d";
content: "\e69a";
color: inherit;
}
.text-align-left-font .b-font {

3
src/case/editor/editor.shelter.js

@ -224,6 +224,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
setValue: function (k) {
this.editor.setValue(k);
this._checkText();
this.text.doRedMark(this.options.keyword);
},
getValue: function () {
@ -257,4 +258,4 @@ BI.ShelterEditor.EVENT_RESTRICT = "EVENT_RESTRICT";
BI.ShelterEditor.EVENT_SPACE = "EVENT_SPACE";
BI.ShelterEditor.EVENT_EMPTY = "EVENT_EMPTY";
BI.shortcut("bi.shelter_editor", BI.ShelterEditor);
BI.shortcut("bi.shelter_editor", BI.ShelterEditor);

36
src/css/resource/font.css

@ -715,69 +715,69 @@
color: inherit;
}
.text-bold-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-bold-font .b-font:before {
content: "\e75b";
content: "\e697";
color: inherit;
}
.text-bold-font.disabled .b-font:before {
content: "\e75b";
content: "\e697";
color: inherit;
}
.text-italic-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-italic-font .b-font:before {
content: "\e75c";
content: "\e69d";
color: inherit;
}
.text-italic-font.disabled .b-font:before {
content: "\e75c";
content: "\e69d";
color: inherit;
}
.text-underline-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-underline-font .b-font:before {
content: "\e75d";
content: "\e69c";
color: inherit;
}
.text-underline-font.disabled .b-font:before {
content: "\e75d";
content: "\e69c";
color: inherit;
}
.text-color-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-color-font .b-font:before {
content: "\e75a";
content: "\e698";
color: inherit;
}
.text-color-font.disabled .b-font:before {
content: "\e75a";
content: "\e698";
color: inherit;
}
.text-background-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-background-font .b-font:before {
content: "\e758";
content: "\e699";
color: inherit;
}
.text-background-font.disabled .b-font:before {
content: "\e758";
content: "\e699";
color: inherit;
}
.text-color-underline-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-color-underline-font .b-font:before {
content: "\e75d";
content: "\e69a";
color: inherit;
}
.text-color-underline-font.disabled .b-font:before {
content: "\e75d";
content: "\e69a";
color: inherit;
}
.text-align-left-font .b-font {

36
ui/css/font.css

@ -715,69 +715,69 @@
color: inherit;
}
.text-bold-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-bold-font .b-font:before {
content: "\e75b";
content: "\e697";
color: inherit;
}
.text-bold-font.disabled .b-font:before {
content: "\e75b";
content: "\e697";
color: inherit;
}
.text-italic-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-italic-font .b-font:before {
content: "\e75c";
content: "\e69d";
color: inherit;
}
.text-italic-font.disabled .b-font:before {
content: "\e75c";
content: "\e69d";
color: inherit;
}
.text-underline-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-underline-font .b-font:before {
content: "\e75d";
content: "\e69c";
color: inherit;
}
.text-underline-font.disabled .b-font:before {
content: "\e75d";
content: "\e69c";
color: inherit;
}
.text-color-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-color-font .b-font:before {
content: "\e75a";
content: "\e698";
color: inherit;
}
.text-color-font.disabled .b-font:before {
content: "\e75a";
content: "\e698";
color: inherit;
}
.text-background-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-background-font .b-font:before {
content: "\e758";
content: "\e699";
color: inherit;
}
.text-background-font.disabled .b-font:before {
content: "\e758";
content: "\e699";
color: inherit;
}
.text-color-underline-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-color-underline-font .b-font:before {
content: "\e75d";
content: "\e69a";
color: inherit;
}
.text-color-underline-font.disabled .b-font:before {
content: "\e75d";
content: "\e69a";
color: inherit;
}
.text-align-left-font .b-font {

Loading…
Cancel
Save