Browse Source

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

* commit 'fdb47e61dbb58219393474c1a77d35cb92a664f9':
  BI-32924
es6
windy 6 years ago
parent
commit
bd3fdd6c2e
  1. 4
      dist/base.css
  2. 10
      dist/bundle.css
  3. 7
      dist/bundle.ie.js
  4. 6
      dist/bundle.ie.min.js
  5. 7
      dist/bundle.js
  6. 2
      dist/bundle.min.css
  7. 6
      dist/bundle.min.js
  8. 6
      dist/core.css
  9. 7
      dist/core.js
  10. 6
      dist/core_without_normalize.css
  11. 10
      dist/fineui.css
  12. 7
      dist/fineui.ie.js
  13. 6
      dist/fineui.ie.min.js
  14. 7
      dist/fineui.js
  15. 2
      dist/fineui.min.css
  16. 6
      dist/fineui.min.js
  17. 7
      dist/fineui_without_jquery_polyfill.js
  18. 7
      dist/utils.js
  19. 6
      dist/utils.min.js
  20. 7
      src/core/func/date.js
  21. 2
      src/css/base/single/button/button.css
  22. 2
      src/css/base/single/tip/tip.css
  23. 6
      src/css/core/utils/common.css
  24. 2
      src/less/lib/constant.less

4
dist/base.css vendored

@ -960,7 +960,7 @@ body .bi-button.button-warning.clear .b-font:before,
body .bi-button.button-error,
#body .bi-button.button-error {
background-color: #ff4949;
border-color: #e85050;
border-color: #FF4949;
}
body .bi-button.button-error,
#body .bi-button.button-error,
@ -1360,7 +1360,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
}
.bi-tooltip.tooltip-warning {
background: #ff4949;
border: 1px solid #e85050;
border: 1px solid #FF4949;
}
.bi-branch-tree .bi-branch-tree-view {
min-width: 300px;

10
dist/bundle.css vendored

@ -1066,7 +1066,7 @@ textarea {
color: #ff4949;
}
.bi-list-item-select.button-warning.bi-high-light-border {
border-color: #e85050;
border-color: #FF4949;
}
.bi-list-item-select.button-warning:hover,
.bi-list-item-select.button-warning.hover {
@ -1087,7 +1087,7 @@ textarea {
}
.bi-list-item-select.button-warning:hover.bi-high-light-border,
.bi-list-item-select.button-warning.hover.bi-high-light-border {
border-color: #e85050;
border-color: #FF4949;
}
.bi-list-item-select.button-warning:active,
.bi-list-item-select.button-warning.active {
@ -1108,7 +1108,7 @@ textarea {
}
.bi-list-item-select.button-warning:active.bi-high-light-border,
.bi-list-item-select.button-warning.active.bi-high-light-border {
border-color: #e85050;
border-color: #FF4949;
}
.bi-list-item-select.disabled {
color: #9ea6b2 !important;
@ -2914,7 +2914,7 @@ body .bi-button.button-warning.clear .b-font:before,
body .bi-button.button-error,
#body .bi-button.button-error {
background-color: #ff4949;
border-color: #e85050;
border-color: #FF4949;
}
body .bi-button.button-error,
#body .bi-button.button-error,
@ -3314,7 +3314,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
}
.bi-tooltip.tooltip-warning {
background: #ff4949;
border: 1px solid #e85050;
border: 1px solid #FF4949;
}
.bi-branch-tree .bi-branch-tree-view {
min-width: 300px;

7
dist/bundle.ie.js vendored

@ -17814,8 +17814,11 @@ _.extend(BI, {
var d = BI.getDate(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0);
var week = d.getDay();
var startOfWeek = BI.StartOfWeek % 7;
if (date.getMonth() === 0 && date.getDate() <= week) {
return 1;
if (date.getMonth() === 0) {
var formatWeek = (week + 8 - startOfWeek) % 7;
if(date.getDate() <= (formatWeek === 0 ? 7 : formatWeek)) {
return 1;
}
}
d.setDate(date.getDate() - (week < startOfWeek ? (7 + week - startOfWeek) : (week - startOfWeek)));
var ms = d.valueOf(); // GMT

6
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

7
dist/bundle.js vendored

@ -17814,8 +17814,11 @@ _.extend(BI, {
var d = BI.getDate(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0);
var week = d.getDay();
var startOfWeek = BI.StartOfWeek % 7;
if (date.getMonth() === 0 && date.getDate() <= week) {
return 1;
if (date.getMonth() === 0) {
var formatWeek = (week + 8 - startOfWeek) % 7;
if(date.getDate() <= (formatWeek === 0 ? 7 : formatWeek)) {
return 1;
}
}
d.setDate(date.getDate() - (week < startOfWeek ? (7 + week - startOfWeek) : (week - startOfWeek)));
var ms = d.valueOf(); // GMT

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

6
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

6
dist/core.css vendored

@ -1066,7 +1066,7 @@ textarea {
color: #ff4949;
}
.bi-list-item-select.button-warning.bi-high-light-border {
border-color: #e85050;
border-color: #FF4949;
}
.bi-list-item-select.button-warning:hover,
.bi-list-item-select.button-warning.hover {
@ -1087,7 +1087,7 @@ textarea {
}
.bi-list-item-select.button-warning:hover.bi-high-light-border,
.bi-list-item-select.button-warning.hover.bi-high-light-border {
border-color: #e85050;
border-color: #FF4949;
}
.bi-list-item-select.button-warning:active,
.bi-list-item-select.button-warning.active {
@ -1108,7 +1108,7 @@ textarea {
}
.bi-list-item-select.button-warning:active.bi-high-light-border,
.bi-list-item-select.button-warning.active.bi-high-light-border {
border-color: #e85050;
border-color: #FF4949;
}
.bi-list-item-select.disabled {
color: #9ea6b2 !important;

7
dist/core.js vendored

@ -17814,8 +17814,11 @@ _.extend(BI, {
var d = BI.getDate(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0);
var week = d.getDay();
var startOfWeek = BI.StartOfWeek % 7;
if (date.getMonth() === 0 && date.getDate() <= week) {
return 1;
if (date.getMonth() === 0) {
var formatWeek = (week + 8 - startOfWeek) % 7;
if(date.getDate() <= (formatWeek === 0 ? 7 : formatWeek)) {
return 1;
}
}
d.setDate(date.getDate() - (week < startOfWeek ? (7 + week - startOfWeek) : (week - startOfWeek)));
var ms = d.valueOf(); // GMT

6
dist/core_without_normalize.css vendored

@ -785,7 +785,7 @@ textarea {
color: #ff4949;
}
.bi-list-item-select.button-warning.bi-high-light-border {
border-color: #e85050;
border-color: #FF4949;
}
.bi-list-item-select.button-warning:hover,
.bi-list-item-select.button-warning.hover {
@ -806,7 +806,7 @@ textarea {
}
.bi-list-item-select.button-warning:hover.bi-high-light-border,
.bi-list-item-select.button-warning.hover.bi-high-light-border {
border-color: #e85050;
border-color: #FF4949;
}
.bi-list-item-select.button-warning:active,
.bi-list-item-select.button-warning.active {
@ -827,7 +827,7 @@ textarea {
}
.bi-list-item-select.button-warning:active.bi-high-light-border,
.bi-list-item-select.button-warning.active.bi-high-light-border {
border-color: #e85050;
border-color: #FF4949;
}
.bi-list-item-select.disabled {
color: #9ea6b2 !important;

10
dist/fineui.css vendored

@ -1066,7 +1066,7 @@ textarea {
color: #ff4949;
}
.bi-list-item-select.button-warning.bi-high-light-border {
border-color: #e85050;
border-color: #FF4949;
}
.bi-list-item-select.button-warning:hover,
.bi-list-item-select.button-warning.hover {
@ -1087,7 +1087,7 @@ textarea {
}
.bi-list-item-select.button-warning:hover.bi-high-light-border,
.bi-list-item-select.button-warning.hover.bi-high-light-border {
border-color: #e85050;
border-color: #FF4949;
}
.bi-list-item-select.button-warning:active,
.bi-list-item-select.button-warning.active {
@ -1108,7 +1108,7 @@ textarea {
}
.bi-list-item-select.button-warning:active.bi-high-light-border,
.bi-list-item-select.button-warning.active.bi-high-light-border {
border-color: #e85050;
border-color: #FF4949;
}
.bi-list-item-select.disabled {
color: #9ea6b2 !important;
@ -2914,7 +2914,7 @@ body .bi-button.button-warning.clear .b-font:before,
body .bi-button.button-error,
#body .bi-button.button-error {
background-color: #ff4949;
border-color: #e85050;
border-color: #FF4949;
}
body .bi-button.button-error,
#body .bi-button.button-error,
@ -3314,7 +3314,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
}
.bi-tooltip.tooltip-warning {
background: #ff4949;
border: 1px solid #e85050;
border: 1px solid #FF4949;
}
.bi-branch-tree .bi-branch-tree-view {
min-width: 300px;

7
dist/fineui.ie.js vendored

@ -18056,8 +18056,11 @@ _.extend(BI, {
var d = BI.getDate(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0);
var week = d.getDay();
var startOfWeek = BI.StartOfWeek % 7;
if (date.getMonth() === 0 && date.getDate() <= week) {
return 1;
if (date.getMonth() === 0) {
var formatWeek = (week + 8 - startOfWeek) % 7;
if(date.getDate() <= (formatWeek === 0 ? 7 : formatWeek)) {
return 1;
}
}
d.setDate(date.getDate() - (week < startOfWeek ? (7 + week - startOfWeek) : (week - startOfWeek)));
var ms = d.valueOf(); // GMT

6
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

7
dist/fineui.js vendored

@ -18056,8 +18056,11 @@ _.extend(BI, {
var d = BI.getDate(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0);
var week = d.getDay();
var startOfWeek = BI.StartOfWeek % 7;
if (date.getMonth() === 0 && date.getDate() <= week) {
return 1;
if (date.getMonth() === 0) {
var formatWeek = (week + 8 - startOfWeek) % 7;
if(date.getDate() <= (formatWeek === 0 ? 7 : formatWeek)) {
return 1;
}
}
d.setDate(date.getDate() - (week < startOfWeek ? (7 + week - startOfWeek) : (week - startOfWeek)));
var ms = d.valueOf(); // GMT

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

6
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

7
dist/fineui_without_jquery_polyfill.js vendored

@ -17560,8 +17560,11 @@ _.extend(BI, {
var d = BI.getDate(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0);
var week = d.getDay();
var startOfWeek = BI.StartOfWeek % 7;
if (date.getMonth() === 0 && date.getDate() <= week) {
return 1;
if (date.getMonth() === 0) {
var formatWeek = (week + 8 - startOfWeek) % 7;
if(date.getDate() <= (formatWeek === 0 ? 7 : formatWeek)) {
return 1;
}
}
d.setDate(date.getDate() - (week < startOfWeek ? (7 + week - startOfWeek) : (week - startOfWeek)));
var ms = d.valueOf(); // GMT

7
dist/utils.js vendored

@ -10595,8 +10595,11 @@ _.extend(BI, {
var d = BI.getDate(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0);
var week = d.getDay();
var startOfWeek = BI.StartOfWeek % 7;
if (date.getMonth() === 0 && date.getDate() <= week) {
return 1;
if (date.getMonth() === 0) {
var formatWeek = (week + 8 - startOfWeek) % 7;
if(date.getDate() <= (formatWeek === 0 ? 7 : formatWeek)) {
return 1;
}
}
d.setDate(date.getDate() - (week < startOfWeek ? (7 + week - startOfWeek) : (week - startOfWeek)));
var ms = d.valueOf(); // GMT

6
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

7
src/core/func/date.js

@ -49,8 +49,11 @@ _.extend(BI, {
var d = BI.getDate(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0);
var week = d.getDay();
var startOfWeek = BI.StartOfWeek % 7;
if (date.getMonth() === 0 && date.getDate() <= week) {
return 1;
if (date.getMonth() === 0) {
var formatWeek = (week + 8 - startOfWeek) % 7;
if(date.getDate() <= (formatWeek === 0 ? 7 : formatWeek)) {
return 1;
}
}
d.setDate(date.getDate() - (week < startOfWeek ? (7 + week - startOfWeek) : (week - startOfWeek)));
var ms = d.valueOf(); // GMT

2
src/css/base/single/button/button.css

@ -136,7 +136,7 @@ body .bi-button.button-warning.clear .b-font:before,
body .bi-button.button-error,
#body .bi-button.button-error {
background-color: #ff4949;
border-color: #e85050;
border-color: #FF4949;
}
body .bi-button.button-error,
#body .bi-button.button-error,

2
src/css/base/single/tip/tip.css

@ -65,5 +65,5 @@
}
.bi-tooltip.tooltip-warning {
background: #ff4949;
border: 1px solid #e85050;
border: 1px solid #FF4949;
}

6
src/css/core/utils/common.css

@ -785,7 +785,7 @@ textarea {
color: #ff4949;
}
.bi-list-item-select.button-warning.bi-high-light-border {
border-color: #e85050;
border-color: #FF4949;
}
.bi-list-item-select.button-warning:hover,
.bi-list-item-select.button-warning.hover {
@ -806,7 +806,7 @@ textarea {
}
.bi-list-item-select.button-warning:hover.bi-high-light-border,
.bi-list-item-select.button-warning.hover.bi-high-light-border {
border-color: #e85050;
border-color: #FF4949;
}
.bi-list-item-select.button-warning:active,
.bi-list-item-select.button-warning.active {
@ -827,7 +827,7 @@ textarea {
}
.bi-list-item-select.button-warning:active.bi-high-light-border,
.bi-list-item-select.button-warning.active.bi-high-light-border {
border-color: #e85050;
border-color: #FF4949;
}
.bi-list-item-select.disabled {
color: #9ea6b2 !important;

2
src/less/lib/constant.less

@ -87,7 +87,7 @@
@border-color-highlight: #3685f2;
@border-color-warning: #fbb03b;
@border-color-negative: #e85050;
@border-color-negative: #FF4949;
@border-color-success: #13cd66;
@border-color-light-negative: #f4cbcb;
@border-color-normal-success: #eddea2;

Loading…
Cancel
Save