Browse Source

BI-24464

master
windy 7 years ago
parent
commit
fc204aaee1
  1. 19
      dist/bundle.css
  2. 3
      dist/bundle.js
  3. 19
      dist/core.css
  4. 19
      dist/core_without_normalize.css
  5. 19
      dist/fineui.css
  6. 3
      dist/fineui.js
  7. 3
      dist/widget.js
  8. 19
      src/css/core/utils/common.css
  9. 22
      src/less/core/utils/common.less
  10. 3
      src/widget/yearquarter/trigger.yearquarter.js

19
dist/bundle.css vendored

@ -439,6 +439,15 @@ textarea {
.bi-high-light .bi-textarea { .bi-high-light .bi-textarea {
color: #3685f2; color: #3685f2;
} }
.bi-error {
color: #ff4949;
}
.bi-error .bi-input {
color: #ff4949;
}
.bi-error .bi-textarea {
color: #ff4949;
}
.bi-high-light-background { .bi-high-light-background {
background-color: #3685f2; background-color: #3685f2;
color: #ffffff; color: #ffffff;
@ -449,6 +458,16 @@ textarea {
.bi-high-light-background .bi-textarea { .bi-high-light-background .bi-textarea {
color: #ffffff; color: #ffffff;
} }
.bi-error-background {
background-color: #ff4949;
color: #ffffff;
}
.bi-error-background .bi-input {
color: #ffffff;
}
.bi-error-background .bi-textarea {
color: #ffffff;
}
.bi-high-light-border { .bi-high-light-border {
border-color: #3685f2; border-color: #3685f2;
} }

3
dist/bundle.js vendored

@ -111985,7 +111985,7 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
}); });
editor.on(BI.SignEditor.EVENT_CHANGE, function () { editor.on(BI.SignEditor.EVENT_CHANGE, function () {
if(isYear) { if(isYear) {
self._autoSwitch(editor.getValue()); self._autoSwitch(editor);
} }
}); });
@ -112018,6 +112018,7 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
if (BI.isNotEmptyString(v) && BI.checkDateLegal(v)) { if (BI.isNotEmptyString(v) && BI.checkDateLegal(v)) {
if (v.length === 4 && this._yearCheck(v)) { if (v.length === 4 && this._yearCheck(v)) {
this._doEditorConfirm(editor); this._doEditorConfirm(editor);
this.fireEvent(BI.DynamicYearQuarterTrigger.EVENT_CONFIRM);
this.quarterEditor.focus(); this.quarterEditor.focus();
} }
} }

19
dist/core.css vendored

@ -439,6 +439,15 @@ textarea {
.bi-high-light .bi-textarea { .bi-high-light .bi-textarea {
color: #3685f2; color: #3685f2;
} }
.bi-error {
color: #ff4949;
}
.bi-error .bi-input {
color: #ff4949;
}
.bi-error .bi-textarea {
color: #ff4949;
}
.bi-high-light-background { .bi-high-light-background {
background-color: #3685f2; background-color: #3685f2;
color: #ffffff; color: #ffffff;
@ -449,6 +458,16 @@ textarea {
.bi-high-light-background .bi-textarea { .bi-high-light-background .bi-textarea {
color: #ffffff; color: #ffffff;
} }
.bi-error-background {
background-color: #ff4949;
color: #ffffff;
}
.bi-error-background .bi-input {
color: #ffffff;
}
.bi-error-background .bi-textarea {
color: #ffffff;
}
.bi-high-light-border { .bi-high-light-border {
border-color: #3685f2; border-color: #3685f2;
} }

19
dist/core_without_normalize.css vendored

@ -161,6 +161,15 @@ textarea {
.bi-high-light .bi-textarea { .bi-high-light .bi-textarea {
color: #3685f2; color: #3685f2;
} }
.bi-error {
color: #ff4949;
}
.bi-error .bi-input {
color: #ff4949;
}
.bi-error .bi-textarea {
color: #ff4949;
}
.bi-high-light-background { .bi-high-light-background {
background-color: #3685f2; background-color: #3685f2;
color: #ffffff; color: #ffffff;
@ -171,6 +180,16 @@ textarea {
.bi-high-light-background .bi-textarea { .bi-high-light-background .bi-textarea {
color: #ffffff; color: #ffffff;
} }
.bi-error-background {
background-color: #ff4949;
color: #ffffff;
}
.bi-error-background .bi-input {
color: #ffffff;
}
.bi-error-background .bi-textarea {
color: #ffffff;
}
.bi-high-light-border { .bi-high-light-border {
border-color: #3685f2; border-color: #3685f2;
} }

19
dist/fineui.css vendored

@ -439,6 +439,15 @@ textarea {
.bi-high-light .bi-textarea { .bi-high-light .bi-textarea {
color: #3685f2; color: #3685f2;
} }
.bi-error {
color: #ff4949;
}
.bi-error .bi-input {
color: #ff4949;
}
.bi-error .bi-textarea {
color: #ff4949;
}
.bi-high-light-background { .bi-high-light-background {
background-color: #3685f2; background-color: #3685f2;
color: #ffffff; color: #ffffff;
@ -449,6 +458,16 @@ textarea {
.bi-high-light-background .bi-textarea { .bi-high-light-background .bi-textarea {
color: #ffffff; color: #ffffff;
} }
.bi-error-background {
background-color: #ff4949;
color: #ffffff;
}
.bi-error-background .bi-input {
color: #ffffff;
}
.bi-error-background .bi-textarea {
color: #ffffff;
}
.bi-high-light-border { .bi-high-light-border {
border-color: #3685f2; border-color: #3685f2;
} }

3
dist/fineui.js vendored

@ -112228,7 +112228,7 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
}); });
editor.on(BI.SignEditor.EVENT_CHANGE, function () { editor.on(BI.SignEditor.EVENT_CHANGE, function () {
if(isYear) { if(isYear) {
self._autoSwitch(editor.getValue()); self._autoSwitch(editor);
} }
}); });
@ -112261,6 +112261,7 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
if (BI.isNotEmptyString(v) && BI.checkDateLegal(v)) { if (BI.isNotEmptyString(v) && BI.checkDateLegal(v)) {
if (v.length === 4 && this._yearCheck(v)) { if (v.length === 4 && this._yearCheck(v)) {
this._doEditorConfirm(editor); this._doEditorConfirm(editor);
this.fireEvent(BI.DynamicYearQuarterTrigger.EVENT_CONFIRM);
this.quarterEditor.focus(); this.quarterEditor.focus();
} }
} }

3
dist/widget.js vendored

@ -24361,7 +24361,7 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
}); });
editor.on(BI.SignEditor.EVENT_CHANGE, function () { editor.on(BI.SignEditor.EVENT_CHANGE, function () {
if(isYear) { if(isYear) {
self._autoSwitch(editor.getValue()); self._autoSwitch(editor);
} }
}); });
@ -24394,6 +24394,7 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
if (BI.isNotEmptyString(v) && BI.checkDateLegal(v)) { if (BI.isNotEmptyString(v) && BI.checkDateLegal(v)) {
if (v.length === 4 && this._yearCheck(v)) { if (v.length === 4 && this._yearCheck(v)) {
this._doEditorConfirm(editor); this._doEditorConfirm(editor);
this.fireEvent(BI.DynamicYearQuarterTrigger.EVENT_CONFIRM);
this.quarterEditor.focus(); this.quarterEditor.focus();
} }
} }

19
src/css/core/utils/common.css

@ -161,6 +161,15 @@ textarea {
.bi-high-light .bi-textarea { .bi-high-light .bi-textarea {
color: #3685f2; color: #3685f2;
} }
.bi-error {
color: #ff4949;
}
.bi-error .bi-input {
color: #ff4949;
}
.bi-error .bi-textarea {
color: #ff4949;
}
.bi-high-light-background { .bi-high-light-background {
background-color: #3685f2; background-color: #3685f2;
color: #ffffff; color: #ffffff;
@ -171,6 +180,16 @@ textarea {
.bi-high-light-background .bi-textarea { .bi-high-light-background .bi-textarea {
color: #ffffff; color: #ffffff;
} }
.bi-error-background {
background-color: #ff4949;
color: #ffffff;
}
.bi-error-background .bi-input {
color: #ffffff;
}
.bi-error-background .bi-textarea {
color: #ffffff;
}
.bi-high-light-border { .bi-high-light-border {
border-color: #3685f2; border-color: #3685f2;
} }

22
src/less/core/utils/common.less

@ -205,6 +205,16 @@ textarea {
} }
} }
.bi-error {
color: @color-bi-text-failure;
& .bi-input {
color: @color-bi-text-failure;
}
& .bi-textarea {
color: @color-bi-text-failure;
}
}
.bi-high-light-background { .bi-high-light-background {
background-color: @color-bi-background-highlight; background-color: @color-bi-background-highlight;
color: @color-bi-text; color: @color-bi-text;
@ -216,6 +226,18 @@ textarea {
} }
} }
.bi-error-background {
background-color: @color-bi-background-failure;
color: @color-bi-text;
& .bi-input {
color: @color-bi-text;
}
& .bi-textarea {
color: @color-bi-text;
}
}
.bi-high-light-border { .bi-high-light-border {
border-color: @color-bi-border-highlight; border-color: @color-bi-border-highlight;
} }

3
src/widget/yearquarter/trigger.yearquarter.js

@ -103,7 +103,7 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
}); });
editor.on(BI.SignEditor.EVENT_CHANGE, function () { editor.on(BI.SignEditor.EVENT_CHANGE, function () {
if(isYear) { if(isYear) {
self._autoSwitch(editor.getValue()); self._autoSwitch(editor);
} }
}); });
@ -136,6 +136,7 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
if (BI.isNotEmptyString(v) && BI.checkDateLegal(v)) { if (BI.isNotEmptyString(v) && BI.checkDateLegal(v)) {
if (v.length === 4 && this._yearCheck(v)) { if (v.length === 4 && this._yearCheck(v)) {
this._doEditorConfirm(editor); this._doEditorConfirm(editor);
this.fireEvent(BI.DynamicYearQuarterTrigger.EVENT_CONFIRM);
this.quarterEditor.focus(); this.quarterEditor.focus();
} }
} }

Loading…
Cancel
Save