Browse Source

Merge pull request #856 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit 'b6af2ef5de241c461624aa707c4ff49447bd10c4':
  无JIRA任务 refactor: resourceUrl和clipboard.zwf
  无JIRA任务 refactor: 高亮的border和common border一样提供单边class
es6
guy 6 years ago
parent
commit
b2b47dbcab
  1. 2
      demo/version.js
  2. 24
      dist/2.0/fineui.css
  3. 2
      dist/2.0/fineui.ie.js
  4. 4
      dist/2.0/fineui.ie.min.js
  5. 2
      dist/2.0/fineui.js
  6. 2
      dist/2.0/fineui.min.css
  7. 4
      dist/2.0/fineui.min.js
  8. 24
      dist/bundle.css
  9. 2
      dist/bundle.ie.js
  10. 4
      dist/bundle.ie.min.js
  11. 2
      dist/bundle.js
  12. 2
      dist/bundle.min.css
  13. 4
      dist/bundle.min.js
  14. 2
      dist/config.js
  15. 24
      dist/core.css
  16. 24
      dist/core_without_normalize.css
  17. 24
      dist/fineui.css
  18. 2
      dist/fineui.ie.js
  19. 4
      dist/fineui.ie.min.js
  20. 2
      dist/fineui.js
  21. 2
      dist/fineui.min.css
  22. 4
      dist/fineui.min.js
  23. 2
      dist/fineui_without_jquery_polyfill.js
  24. 2
      dist/utils.min.js
  25. 1
      public/js/index.js
  26. 24
      src/css/core/utils/common.css
  27. 28
      src/less/core/utils/common.less
  28. 1
      ui/js/index.js

2
demo/version.js

@ -1 +1 @@
BI.resourceURL = "resource/";

24
dist/2.0/fineui.css vendored

@ -589,6 +589,30 @@ textarea {
.bi-high-light-border.disabled { .bi-high-light-border.disabled {
border-color: #d0d4da !important; border-color: #d0d4da !important;
} }
.bi-high-light-border-top {
border-top: 1px solid #3685f2;
}
.bi-high-light-border-top.disabled {
border-color: #d0d4da !important;
}
.bi-high-light-border-right {
border-right: 1px solid #3685f2;
}
.bi-high-light-border-right.disabled {
border-color: #d0d4da !important;
}
.bi-high-light-border-bottom {
border-bottom: 1px solid #3685f2;
}
.bi-high-light-border-bottom.disabled {
border-color: #d0d4da !important;
}
.bi-high-light-border-left {
border-left: 1px solid #3685f2;
}
.bi-high-light-border-left.disabled {
border-color: #d0d4da !important;
}
.bi-water-mark { .bi-water-mark {
color: #9ea6b2; color: #9ea6b2;
cursor: text; cursor: text;

2
dist/2.0/fineui.ie.js vendored

@ -83886,7 +83886,7 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
// Create the default BI.history. // Create the default BI.history.
BI.history = new History; BI.history = new History;
}());BI.resourceURL = "http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/resource/";BI.i18n = { }());BI.i18n = {
"BI-Multi_Date_Quarter_End": "季度末", "BI-Multi_Date_Quarter_End": "季度末",
"BI-Multi_Date_Month_Begin": "月初", "BI-Multi_Date_Month_Begin": "月初",
"BI-Multi_Date_YMD": "年/月/日", "BI-Multi_Date_YMD": "年/月/日",

4
dist/2.0/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.js vendored

@ -84214,7 +84214,7 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
// Create the default BI.history. // Create the default BI.history.
BI.history = new History; BI.history = new History;
}());BI.resourceURL = "http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/resource/";BI.i18n = { }());BI.i18n = {
"BI-Multi_Date_Quarter_End": "季度末", "BI-Multi_Date_Quarter_End": "季度末",
"BI-Multi_Date_Month_Begin": "月初", "BI-Multi_Date_Month_Begin": "月初",
"BI-Multi_Date_YMD": "年/月/日", "BI-Multi_Date_YMD": "年/月/日",

2
dist/2.0/fineui.min.css vendored

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui.min.js vendored

File diff suppressed because one or more lines are too long

24
dist/bundle.css vendored

@ -589,6 +589,30 @@ textarea {
.bi-high-light-border.disabled { .bi-high-light-border.disabled {
border-color: #d0d4da !important; border-color: #d0d4da !important;
} }
.bi-high-light-border-top {
border-top: 1px solid #3685f2;
}
.bi-high-light-border-top.disabled {
border-color: #d0d4da !important;
}
.bi-high-light-border-right {
border-right: 1px solid #3685f2;
}
.bi-high-light-border-right.disabled {
border-color: #d0d4da !important;
}
.bi-high-light-border-bottom {
border-bottom: 1px solid #3685f2;
}
.bi-high-light-border-bottom.disabled {
border-color: #d0d4da !important;
}
.bi-high-light-border-left {
border-left: 1px solid #3685f2;
}
.bi-high-light-border-left.disabled {
border-color: #d0d4da !important;
}
.bi-water-mark { .bi-water-mark {
color: #9ea6b2; color: #9ea6b2;
cursor: text; cursor: text;

2
dist/bundle.ie.js vendored

@ -83886,7 +83886,7 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
// Create the default BI.history. // Create the default BI.history.
BI.history = new History; BI.history = new History;
}());BI.resourceURL = "http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/resource/";BI.i18n = { }());BI.i18n = {
"BI-Multi_Date_Quarter_End": "季度末", "BI-Multi_Date_Quarter_End": "季度末",
"BI-Multi_Date_Month_Begin": "月初", "BI-Multi_Date_Month_Begin": "月初",
"BI-Multi_Date_YMD": "年/月/日", "BI-Multi_Date_YMD": "年/月/日",

4
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/bundle.js vendored

@ -84214,7 +84214,7 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
// Create the default BI.history. // Create the default BI.history.
BI.history = new History; BI.history = new History;
}());BI.resourceURL = "http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/resource/";BI.i18n = { }());BI.i18n = {
"BI-Multi_Date_Quarter_End": "季度末", "BI-Multi_Date_Quarter_End": "季度末",
"BI-Multi_Date_Month_Begin": "月初", "BI-Multi_Date_Month_Begin": "月初",
"BI-Multi_Date_YMD": "年/月/日", "BI-Multi_Date_YMD": "年/月/日",

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

4
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/config.js vendored

@ -1,4 +1,4 @@
BI.resourceURL = "resource/";
BI.i18n = { BI.i18n = {
"BI-Multi_Date_Quarter_End": "季度末", "BI-Multi_Date_Quarter_End": "季度末",
"BI-Multi_Date_Month_Begin": "月初", "BI-Multi_Date_Month_Begin": "月初",

24
dist/core.css vendored

@ -589,6 +589,30 @@ textarea {
.bi-high-light-border.disabled { .bi-high-light-border.disabled {
border-color: #d0d4da !important; border-color: #d0d4da !important;
} }
.bi-high-light-border-top {
border-top: 1px solid #3685f2;
}
.bi-high-light-border-top.disabled {
border-color: #d0d4da !important;
}
.bi-high-light-border-right {
border-right: 1px solid #3685f2;
}
.bi-high-light-border-right.disabled {
border-color: #d0d4da !important;
}
.bi-high-light-border-bottom {
border-bottom: 1px solid #3685f2;
}
.bi-high-light-border-bottom.disabled {
border-color: #d0d4da !important;
}
.bi-high-light-border-left {
border-left: 1px solid #3685f2;
}
.bi-high-light-border-left.disabled {
border-color: #d0d4da !important;
}
.bi-water-mark { .bi-water-mark {
color: #9ea6b2; color: #9ea6b2;
cursor: text; cursor: text;

24
dist/core_without_normalize.css vendored

@ -308,6 +308,30 @@ textarea {
.bi-high-light-border.disabled { .bi-high-light-border.disabled {
border-color: #d0d4da !important; border-color: #d0d4da !important;
} }
.bi-high-light-border-top {
border-top: 1px solid #3685f2;
}
.bi-high-light-border-top.disabled {
border-color: #d0d4da !important;
}
.bi-high-light-border-right {
border-right: 1px solid #3685f2;
}
.bi-high-light-border-right.disabled {
border-color: #d0d4da !important;
}
.bi-high-light-border-bottom {
border-bottom: 1px solid #3685f2;
}
.bi-high-light-border-bottom.disabled {
border-color: #d0d4da !important;
}
.bi-high-light-border-left {
border-left: 1px solid #3685f2;
}
.bi-high-light-border-left.disabled {
border-color: #d0d4da !important;
}
.bi-water-mark { .bi-water-mark {
color: #9ea6b2; color: #9ea6b2;
cursor: text; cursor: text;

24
dist/fineui.css vendored

@ -589,6 +589,30 @@ textarea {
.bi-high-light-border.disabled { .bi-high-light-border.disabled {
border-color: #d0d4da !important; border-color: #d0d4da !important;
} }
.bi-high-light-border-top {
border-top: 1px solid #3685f2;
}
.bi-high-light-border-top.disabled {
border-color: #d0d4da !important;
}
.bi-high-light-border-right {
border-right: 1px solid #3685f2;
}
.bi-high-light-border-right.disabled {
border-color: #d0d4da !important;
}
.bi-high-light-border-bottom {
border-bottom: 1px solid #3685f2;
}
.bi-high-light-border-bottom.disabled {
border-color: #d0d4da !important;
}
.bi-high-light-border-left {
border-left: 1px solid #3685f2;
}
.bi-high-light-border-left.disabled {
border-color: #d0d4da !important;
}
.bi-water-mark { .bi-water-mark {
color: #9ea6b2; color: #9ea6b2;
cursor: text; cursor: text;

2
dist/fineui.ie.js vendored

@ -84131,4 +84131,4 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);(function () {
} }
} }
BI.watch = Fix.watch; BI.watch = Fix.watch;
}());BI.resourceURL = "file?path=/com/fr/web/ui/resource"; }());

4
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.js vendored

@ -84459,4 +84459,4 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);(function () {
}; };
} }
BI.watch = Fix.watch; BI.watch = Fix.watch;
}());BI.resourceURL = "file?path=/com/fr/web/ui/resource"; }());

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

4
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui_without_jquery_polyfill.js vendored

@ -66746,4 +66746,4 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
}; };
} }
BI.watch = Fix.watch; BI.watch = Fix.watch;
}());BI.resourceURL = "file?path=/com/fr/web/ui/resource"; }());

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

1
public/js/index.js

@ -1 +0,0 @@
BI.resourceURL = "http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/resource/";

24
src/css/core/utils/common.css

@ -308,6 +308,30 @@ textarea {
.bi-high-light-border.disabled { .bi-high-light-border.disabled {
border-color: #d0d4da !important; border-color: #d0d4da !important;
} }
.bi-high-light-border-top {
border-top: 1px solid #3685f2;
}
.bi-high-light-border-top.disabled {
border-color: #d0d4da !important;
}
.bi-high-light-border-right {
border-right: 1px solid #3685f2;
}
.bi-high-light-border-right.disabled {
border-color: #d0d4da !important;
}
.bi-high-light-border-bottom {
border-bottom: 1px solid #3685f2;
}
.bi-high-light-border-bottom.disabled {
border-color: #d0d4da !important;
}
.bi-high-light-border-left {
border-left: 1px solid #3685f2;
}
.bi-high-light-border-left.disabled {
border-color: #d0d4da !important;
}
.bi-water-mark { .bi-water-mark {
color: #9ea6b2; color: #9ea6b2;
cursor: text; cursor: text;

28
src/less/core/utils/common.less

@ -382,6 +382,34 @@ textarea {
} }
} }
.bi-high-light-border-top {
border-top: 1px solid @color-bi-border-highlight;
&.disabled {
border-color: @color-bi-border-disabled !important;
}
}
.bi-high-light-border-right {
border-right: 1px solid @color-bi-border-highlight;
&.disabled {
border-color: @color-bi-border-disabled !important;
}
}
.bi-high-light-border-bottom {
border-bottom: 1px solid @color-bi-border-highlight;
&.disabled {
border-color: @color-bi-border-disabled !important;
}
}
.bi-high-light-border-left {
border-left: 1px solid @color-bi-border-highlight;
&.disabled {
border-color: @color-bi-border-disabled !important;
}
}
//水印 //水印
.bi-water-mark { .bi-water-mark {
color: @font-color-tips; color: @font-color-tips;

1
ui/js/index.js

@ -1 +0,0 @@
BI.resourceURL = "file?path=/com/fr/web/ui/resource";
Loading…
Cancel
Save