Browse Source

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

* commit '77c5d751f64bb9d94743e7ca9a86952d3423374b':
  无JIRA任务 统一一下日期print格式和switch样式
es6
windy 6 years ago
parent
commit
490badd419
  1. 21
      dist/base.css
  2. 21
      dist/bundle.css
  3. 4
      dist/bundle.ie.js
  4. 6
      dist/bundle.ie.min.js
  5. 4
      dist/bundle.js
  6. 2
      dist/bundle.min.css
  7. 4
      dist/bundle.min.js
  8. 21
      dist/fineui.css
  9. 4
      dist/fineui.ie.js
  10. 6
      dist/fineui.ie.min.js
  11. 4
      dist/fineui.js
  12. 2
      dist/fineui.min.css
  13. 4
      dist/fineui.min.js
  14. 4
      dist/fineui_without_jquery_polyfill.js
  15. 2
      dist/utils.min.js
  16. 4
      dist/widget.js
  17. 21
      src/css/base/single/button/switch.css
  18. 23
      src/less/base/single/button/switch.less
  19. 2
      src/widget/dynamicdate/dynamicdate.trigger.js
  20. 2
      src/widget/dynamicdatetime/dynamicdatetime.trigger.js

21
dist/base.css vendored

@ -1211,7 +1211,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
-webkit-border-radius: 40px 40px 40px 40px; -webkit-border-radius: 40px 40px 40px 40px;
-moz-border-radius: 40px 40px 40px 40px; -moz-border-radius: 40px 40px 40px 40px;
border-radius: 40px 40px 40px 40px; border-radius: 40px 40px 40px 40px;
background-color: #d4dadd; background-color: #d0d4da;
} }
.bi-switch:active, .bi-switch:active,
.bi-switch.active { .bi-switch.active {
@ -1222,6 +1222,25 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
-moz-border-radius: 9px 9px 9px 9px; -moz-border-radius: 9px 9px 9px 9px;
border-radius: 9px 9px 9px 9px; border-radius: 9px 9px 9px 9px;
} }
.bi-switch.disabled {
background-color: #F2F4F7;
}
.bi-switch.disabled:active {
background-color: #F2F4F7;
}
.bi-theme-dark .bi-switch {
background-color: #606479;
}
.bi-theme-dark .bi-switch:active,
.bi-theme-dark .bi-switch.active {
background-color: #3685f2;
}
.bi-theme-dark .bi-switch.disabled {
background-color: #2F3149;
}
.bi-theme-dark .bi-switch.disabled:active {
background-color: #2F3149;
}
.bi-multifile-editor .multifile-editor { .bi-multifile-editor .multifile-editor {
text-align: right; text-align: right;

21
dist/bundle.css vendored

@ -3165,7 +3165,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
-webkit-border-radius: 40px 40px 40px 40px; -webkit-border-radius: 40px 40px 40px 40px;
-moz-border-radius: 40px 40px 40px 40px; -moz-border-radius: 40px 40px 40px 40px;
border-radius: 40px 40px 40px 40px; border-radius: 40px 40px 40px 40px;
background-color: #d4dadd; background-color: #d0d4da;
} }
.bi-switch:active, .bi-switch:active,
.bi-switch.active { .bi-switch.active {
@ -3176,6 +3176,25 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
-moz-border-radius: 9px 9px 9px 9px; -moz-border-radius: 9px 9px 9px 9px;
border-radius: 9px 9px 9px 9px; border-radius: 9px 9px 9px 9px;
} }
.bi-switch.disabled {
background-color: #F2F4F7;
}
.bi-switch.disabled:active {
background-color: #F2F4F7;
}
.bi-theme-dark .bi-switch {
background-color: #606479;
}
.bi-theme-dark .bi-switch:active,
.bi-theme-dark .bi-switch.active {
background-color: #3685f2;
}
.bi-theme-dark .bi-switch.disabled {
background-color: #2F3149;
}
.bi-theme-dark .bi-switch.disabled:active {
background-color: #2F3149;
}
.bi-multifile-editor .multifile-editor { .bi-multifile-editor .multifile-editor {
text-align: right; text-align: right;

4
dist/bundle.ie.js vendored

@ -61744,7 +61744,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
}, },
_setInnerValue: function (date) { _setInnerValue: function (date) {
var dateStr = BI.print(date, "%Y-%x-%e"); var dateStr = BI.print(date, "%Y-%X-%e");
this.editor.setState(dateStr); this.editor.setState(dateStr);
this.editor.setValue(dateStr); this.editor.setValue(dateStr);
}, },
@ -62747,7 +62747,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
}, },
_setInnerValue: function (date) { _setInnerValue: function (date) {
var dateStr = BI.print(date, "%Y-%x-%e %H:%M:%S"); var dateStr = BI.print(date, "%Y-%X-%e %H:%M:%S");
this.editor.setState(dateStr); this.editor.setState(dateStr);
this.editor.setValue(dateStr); this.editor.setValue(dateStr);
}, },

6
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/bundle.js vendored

@ -62295,7 +62295,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
}, },
_setInnerValue: function (date) { _setInnerValue: function (date) {
var dateStr = BI.print(date, "%Y-%x-%e"); var dateStr = BI.print(date, "%Y-%X-%e");
this.editor.setState(dateStr); this.editor.setState(dateStr);
this.editor.setValue(dateStr); this.editor.setValue(dateStr);
}, },
@ -63298,7 +63298,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
}, },
_setInnerValue: function (date) { _setInnerValue: function (date) {
var dateStr = BI.print(date, "%Y-%x-%e %H:%M:%S"); var dateStr = BI.print(date, "%Y-%X-%e %H:%M:%S");
this.editor.setState(dateStr); this.editor.setState(dateStr);
this.editor.setValue(dateStr); this.editor.setValue(dateStr);
}, },

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

21
dist/fineui.css vendored

@ -3165,7 +3165,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
-webkit-border-radius: 40px 40px 40px 40px; -webkit-border-radius: 40px 40px 40px 40px;
-moz-border-radius: 40px 40px 40px 40px; -moz-border-radius: 40px 40px 40px 40px;
border-radius: 40px 40px 40px 40px; border-radius: 40px 40px 40px 40px;
background-color: #d4dadd; background-color: #d0d4da;
} }
.bi-switch:active, .bi-switch:active,
.bi-switch.active { .bi-switch.active {
@ -3176,6 +3176,25 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
-moz-border-radius: 9px 9px 9px 9px; -moz-border-radius: 9px 9px 9px 9px;
border-radius: 9px 9px 9px 9px; border-radius: 9px 9px 9px 9px;
} }
.bi-switch.disabled {
background-color: #F2F4F7;
}
.bi-switch.disabled:active {
background-color: #F2F4F7;
}
.bi-theme-dark .bi-switch {
background-color: #606479;
}
.bi-theme-dark .bi-switch:active,
.bi-theme-dark .bi-switch.active {
background-color: #3685f2;
}
.bi-theme-dark .bi-switch.disabled {
background-color: #2F3149;
}
.bi-theme-dark .bi-switch.disabled:active {
background-color: #2F3149;
}
.bi-multifile-editor .multifile-editor { .bi-multifile-editor .multifile-editor {
text-align: right; text-align: right;

4
dist/fineui.ie.js vendored

@ -61986,7 +61986,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
}, },
_setInnerValue: function (date) { _setInnerValue: function (date) {
var dateStr = BI.print(date, "%Y-%x-%e"); var dateStr = BI.print(date, "%Y-%X-%e");
this.editor.setState(dateStr); this.editor.setState(dateStr);
this.editor.setValue(dateStr); this.editor.setValue(dateStr);
}, },
@ -62989,7 +62989,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
}, },
_setInnerValue: function (date) { _setInnerValue: function (date) {
var dateStr = BI.print(date, "%Y-%x-%e %H:%M:%S"); var dateStr = BI.print(date, "%Y-%X-%e %H:%M:%S");
this.editor.setState(dateStr); this.editor.setState(dateStr);
this.editor.setValue(dateStr); this.editor.setValue(dateStr);
}, },

6
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/fineui.js vendored

@ -62537,7 +62537,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
}, },
_setInnerValue: function (date) { _setInnerValue: function (date) {
var dateStr = BI.print(date, "%Y-%x-%e"); var dateStr = BI.print(date, "%Y-%X-%e");
this.editor.setState(dateStr); this.editor.setState(dateStr);
this.editor.setValue(dateStr); this.editor.setValue(dateStr);
}, },
@ -63540,7 +63540,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
}, },
_setInnerValue: function (date) { _setInnerValue: function (date) {
var dateStr = BI.print(date, "%Y-%x-%e %H:%M:%S"); var dateStr = BI.print(date, "%Y-%X-%e %H:%M:%S");
this.editor.setState(dateStr); this.editor.setState(dateStr);
this.editor.setValue(dateStr); this.editor.setValue(dateStr);
}, },

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

4
dist/fineui_without_jquery_polyfill.js vendored

@ -45421,7 +45421,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
}, },
_setInnerValue: function (date) { _setInnerValue: function (date) {
var dateStr = BI.print(date, "%Y-%x-%e"); var dateStr = BI.print(date, "%Y-%X-%e");
this.editor.setState(dateStr); this.editor.setState(dateStr);
this.editor.setValue(dateStr); this.editor.setValue(dateStr);
}, },
@ -46424,7 +46424,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
}, },
_setInnerValue: function (date) { _setInnerValue: function (date) {
var dateStr = BI.print(date, "%Y-%x-%e %H:%M:%S"); var dateStr = BI.print(date, "%Y-%X-%e %H:%M:%S");
this.editor.setState(dateStr); this.editor.setState(dateStr);
this.editor.setValue(dateStr); this.editor.setValue(dateStr);
}, },

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/widget.js vendored

@ -3650,7 +3650,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
}, },
_setInnerValue: function (date) { _setInnerValue: function (date) {
var dateStr = BI.print(date, "%Y-%x-%e"); var dateStr = BI.print(date, "%Y-%X-%e");
this.editor.setState(dateStr); this.editor.setState(dateStr);
this.editor.setValue(dateStr); this.editor.setValue(dateStr);
}, },
@ -4653,7 +4653,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
}, },
_setInnerValue: function (date) { _setInnerValue: function (date) {
var dateStr = BI.print(date, "%Y-%x-%e %H:%M:%S"); var dateStr = BI.print(date, "%Y-%X-%e %H:%M:%S");
this.editor.setState(dateStr); this.editor.setState(dateStr);
this.editor.setValue(dateStr); this.editor.setValue(dateStr);
}, },

21
src/css/base/single/button/switch.css

@ -2,7 +2,7 @@
-webkit-border-radius: 40px 40px 40px 40px; -webkit-border-radius: 40px 40px 40px 40px;
-moz-border-radius: 40px 40px 40px 40px; -moz-border-radius: 40px 40px 40px 40px;
border-radius: 40px 40px 40px 40px; border-radius: 40px 40px 40px 40px;
background-color: #d4dadd; background-color: #d0d4da;
} }
.bi-switch:active, .bi-switch:active,
.bi-switch.active { .bi-switch.active {
@ -13,3 +13,22 @@
-moz-border-radius: 9px 9px 9px 9px; -moz-border-radius: 9px 9px 9px 9px;
border-radius: 9px 9px 9px 9px; border-radius: 9px 9px 9px 9px;
} }
.bi-switch.disabled {
background-color: #F2F4F7;
}
.bi-switch.disabled:active {
background-color: #F2F4F7;
}
.bi-theme-dark .bi-switch {
background-color: #606479;
}
.bi-theme-dark .bi-switch:active,
.bi-theme-dark .bi-switch.active {
background-color: #3685f2;
}
.bi-theme-dark .bi-switch.disabled {
background-color: #2F3149;
}
.bi-theme-dark .bi-switch.disabled:active {
background-color: #2F3149;
}

23
src/less/base/single/button/switch.less

@ -2,11 +2,32 @@
.bi-switch{ .bi-switch{
.border-radius(40px 40px 40px 40px); .border-radius(40px 40px 40px 40px);
background-color: @background-color-dark; background-color: @color-bi-background-dark-gray;
&:active, &.active { &:active, &.active {
background-color: @color-bi-background-highlight; background-color: @color-bi-background-highlight;
} }
& .circle-button{ & .circle-button{
.border-radius(9px 9px 9px 9px); .border-radius(9px 9px 9px 9px);
} }
&.disabled {
background-color: @color-bi-background-disabled;
&:active {
background-color: @color-bi-background-disabled;
}
}
}
.bi-theme-dark {
.bi-switch{
background-color: @color-bi-background-dark-gray-theme-dark;
&:active, &.active {
background-color: @color-bi-background-highlight;
}
&.disabled {
background-color: @color-bi-background-disabled-theme-dark;
&:active {
background-color: @color-bi-background-disabled-theme-dark;
}
}
}
} }

2
src/widget/dynamicdate/dynamicdate.trigger.js

@ -162,7 +162,7 @@ BI.DynamicDateTrigger = BI.inherit(BI.Trigger, {
}, },
_setInnerValue: function (date) { _setInnerValue: function (date) {
var dateStr = BI.print(date, "%Y-%x-%e"); var dateStr = BI.print(date, "%Y-%X-%e");
this.editor.setState(dateStr); this.editor.setState(dateStr);
this.editor.setValue(dateStr); this.editor.setValue(dateStr);
}, },

2
src/widget/dynamicdatetime/dynamicdatetime.trigger.js

@ -165,7 +165,7 @@ BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, {
}, },
_setInnerValue: function (date) { _setInnerValue: function (date) {
var dateStr = BI.print(date, "%Y-%x-%e %H:%M:%S"); var dateStr = BI.print(date, "%Y-%X-%e %H:%M:%S");
this.editor.setState(dateStr); this.editor.setState(dateStr);
this.editor.setValue(dateStr); this.editor.setValue(dateStr);
}, },

Loading…
Cancel
Save