fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #400 in FUI/fineui from ~WINDY/fui:master to master 

* commit '81a64ef4f3b12930407a86cabe820b200ae393da':
  update
  update
  BI-19867
  BI-19718
  BI-21038
  BI-21030
es6
guy 7 years ago
parent
181ec8b7b7 81a64ef4f3
commit
5de41efa35
20 changed files with 365 additions and 182 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      demo/version.js
  2. 82
      dist/_fineui.min.js
  3. 7
      dist/base.js
  4. 41
      dist/bundle.js
  5. 84
      dist/bundle.min.js
  6. 1
      dist/case.js
  7. 3
      dist/config.js
  8. 105
      dist/demo.js
  9. 41
      dist/fineui.js
  10. 82
      dist/fineui.min.js
  11. 29
      dist/widget.js
  12. 4
      public/js/index.js
  13. 7
      src/base/single/single.js
  14. 1
      src/case/richeditor/plugins/combo.fontfamily.js
  15. 4
      src/widget/datepane/card.static.datepane.js
  16. 7
      src/widget/datetime/datetime.select.js
  17. 1
      src/widget/datetimepane/card.static.datetimepane.js
  18. 15
      src/widget/dynamicdatetime/dynamicdatetime.timeselect.js
  19. 2
      src/widget/intervalslider/intervalslider.js
  20. 4
      ui/js/index.js

3
demo/version.js
Unescape View File

@ -160,5 +160,6 @@ BI.i18n = {
"BI-Apple_Light": "苹方-light", "BI-Apple_Light": "苹方-light",
"BI-Font_Family": "字体", "BI-Font_Family": "字体",
"BI-Basic_Please_Input_Content": "请输入内容", "BI-Basic_Please_Input_Content": "请输入内容",
"BI-Basic_Please_Enter_Number_Between": "请输入{R1}-{R2}的值" "BI-Basic_Please_Enter_Number_Between": "请输入{R1}-{R2}的值",
"BI-Word_Align_Center": "文字居中"
}; };

82
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

7
dist/base.js vendored
Unescape View File

@ -342,7 +342,8 @@ BI.Single = BI.inherit(BI.Widget, {
title: null, title: null,
warningTitle: null, warningTitle: null,
tipType: null, // success或warning tipType: null, // success或warning
value: null value: null,
belowMouse: false // title是否跟随鼠标
}); });
}, },
@ -371,7 +372,9 @@ BI.Single = BI.inherit(BI.Widget, {
var self = this, o = this.options; var self = this, o = this.options;
if (BI.isKey(o.title) || BI.isKey(o.warningTitle) if (BI.isKey(o.title) || BI.isKey(o.warningTitle)
|| BI.isFunction(o.title) || BI.isFunction(o.warningTitle)) { || BI.isFunction(o.title) || BI.isFunction(o.warningTitle)) {
this.enableHover(); this.enableHover({
belowMouse: o.belowMouse
});
} }
}, },

41
dist/bundle.js vendored
Unescape View File

@ -36108,7 +36108,8 @@ BI.Single = BI.inherit(BI.Widget, {
title: null, title: null,
warningTitle: null, warningTitle: null,
tipType: null, // success或warning tipType: null, // success或warning
value: null value: null,
belowMouse: false // title是否跟随鼠标
}); });
}, },
@ -36137,7 +36138,9 @@ BI.Single = BI.inherit(BI.Widget, {
var self = this, o = this.options; var self = this, o = this.options;
if (BI.isKey(o.title) || BI.isKey(o.warningTitle) if (BI.isKey(o.title) || BI.isKey(o.warningTitle)
|| BI.isFunction(o.title) || BI.isFunction(o.warningTitle)) { || BI.isFunction(o.title) || BI.isFunction(o.warningTitle)) {
this.enableHover(); this.enableHover({
belowMouse: o.belowMouse
});
} }
}, },
@ -83941,7 +83944,6 @@ BI.shortcut("bi.rich_editor_color_chooser", BI.RichEditorColorChooser);BI.RichEd
el: this.trigger, el: this.trigger,
adjustLength: 1, adjustLength: 1,
popup: { popup: {
maxWidth: 70,
minWidth: 70, minWidth: 70,
el: { el: {
type: "bi.button_group", type: "bi.button_group",
@ -88685,9 +88687,9 @@ BI.StaticDatePaneCard = BI.inherit(BI.Widget, {
} }
self.selectedTime = { self.selectedTime = {
year: value.year, year: value.year,
month: value.month, month: value.month
day: day
}; };
day !== 0 && (self.selectedTime.day = day);
self.calendar.setSelect(BI.Calendar.getPageByDateJSON(self.selectedTime)); self.calendar.setSelect(BI.Calendar.getPageByDateJSON(self.selectedTime));
self.calendar.setValue(self.selectedTime); self.calendar.setValue(self.selectedTime);
day !== 0 && self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE); day !== 0 && self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE);
@ -89224,7 +89226,12 @@ BI.DateTimeSelect = BI.inherit(BI.Widget, {
type: "bi.sign_editor", type: "bi.sign_editor",
value: this._alertInEditorValue(o.min), value: this._alertInEditorValue(o.min),
allowBlank: false, allowBlank: false,
errorText: BI.i18nText("BI-Please_Input_Natural_Number"), errorText: function (v) {
if(BI.isNumeric(v)) {
return BI.i18nText("BI-Please_Input_Natural_Number");
}
return BI.i18nText("BI-Numerical_Interval_Input_Data");
},
validationChecker: function (v) { validationChecker: function (v) {
return BI.isNaturalNumber(v); return BI.isNaturalNumber(v);
} }
@ -89412,6 +89419,7 @@ BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);BI.StaticDateTimePaneCar
month: value.month, month: value.month,
day: day day: day
}); });
day !== 0 && (self.selectedTime.day = day);
self.calendar.setSelect(BI.Calendar.getPageByDateJSON(self.selectedTime)); self.calendar.setSelect(BI.Calendar.getPageByDateJSON(self.selectedTime));
self.calendar.setValue(self.selectedTime); self.calendar.setValue(self.selectedTime);
day !== 0 && self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE); day !== 0 && self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE);
@ -92043,8 +92051,11 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
validationChecker: function (v) { validationChecker: function (v) {
return BI.isNaturalNumber(v) && BI.parseInt(v) < 24; return BI.isNaturalNumber(v) && BI.parseInt(v) < 24;
}, },
errorText: function () { errorText: function (v) {
if(BI.isNumeric(v)) {
return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-23\""); return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-23\"");
}
return BI.i18nText("BI-Numerical_Interval_Input_Data");
}, },
listeners: [{ listeners: [{
eventName: BI.SignEditor.EVENT_CONFIRM, eventName: BI.SignEditor.EVENT_CONFIRM,
@ -92077,8 +92088,11 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
validationChecker: function (v) { validationChecker: function (v) {
return BI.isNaturalNumber(v) && BI.parseInt(v) < 60; return BI.isNaturalNumber(v) && BI.parseInt(v) < 60;
}, },
errorText: function () { errorText: function (v) {
if(BI.isNumeric(v)) {
return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-59\""); return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-59\"");
}
return BI.i18nText("BI-Numerical_Interval_Input_Data");
}, },
listeners: [{ listeners: [{
eventName: BI.SignEditor.EVENT_CONFIRM, eventName: BI.SignEditor.EVENT_CONFIRM,
@ -92109,8 +92123,11 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
validationChecker: function (v) { validationChecker: function (v) {
return BI.isNaturalNumber(v) && BI.parseInt(v) < 60; return BI.isNaturalNumber(v) && BI.parseInt(v) < 60;
}, },
errorText: function () { errorText: function (v) {
if(BI.isNumeric(v)) {
return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-59\""); return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-59\"");
}
return BI.i18nText("BI-Numerical_Interval_Input_Data");
}, },
listeners: [{ listeners: [{
eventName: BI.SignEditor.EVENT_CONFIRM, eventName: BI.SignEditor.EVENT_CONFIRM,
@ -94724,7 +94741,7 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
}, },
_setErrorText: function () { _setErrorText: function () {
var errorText = BI.i18nText("BI-Please_Enter") + this.min + "-" + this.max + BI.i18nText("BI-Basic_De") + BI.i18nText("BI-Basic_Number"); var errorText = BI.i18nText("BI-Basic_Please_Enter_Number_Between", this.min, this.max);
this.labelOne.setErrorText(errorText); this.labelOne.setErrorText(errorText);
this.labelTwo.setErrorText(errorText); this.labelTwo.setErrorText(errorText);
}, },
@ -112752,5 +112769,7 @@ BI.i18n = {
"BI-Microsoft_YaHei": "微软雅黑", "BI-Microsoft_YaHei": "微软雅黑",
"BI-Apple_Light": "苹方-light", "BI-Apple_Light": "苹方-light",
"BI-Font_Family": "字体", "BI-Font_Family": "字体",
"BI-Basic_Please_Input_Content": "请输入内容" "BI-Basic_Please_Input_Content": "请输入内容",
"BI-Word_Align_Center": "文字居中",
"BI-Basic_Please_Enter_Number_Between": "请输入{R1}-{R2}的值"
}; };

84
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
dist/case.js vendored
Unescape View File

@ -11468,7 +11468,6 @@ BI.shortcut("bi.rich_editor_color_chooser", BI.RichEditorColorChooser);BI.RichEd
el: this.trigger, el: this.trigger,
adjustLength: 1, adjustLength: 1,
popup: { popup: {
maxWidth: 70,
minWidth: 70, minWidth: 70,
el: { el: {
type: "bi.button_group", type: "bi.button_group",

3
dist/config.js vendored
Unescape View File

@ -160,5 +160,6 @@ BI.i18n = {
"BI-Apple_Light": "苹方-light", "BI-Apple_Light": "苹方-light",
"BI-Font_Family": "字体", "BI-Font_Family": "字体",
"BI-Basic_Please_Input_Content": "请输入内容", "BI-Basic_Please_Input_Content": "请输入内容",
"BI-Basic_Please_Enter_Number_Between": "请输入{R1}-{R2}的值" "BI-Basic_Please_Enter_Number_Between": "请输入{R1}-{R2}的值",
"BI-Word_Align_Center": "文字居中"
}; };

105
dist/demo.js vendored
Unescape View File

@ -11014,6 +11014,111 @@ BI.shortcut("demo.tmp", Demo.Func);
}); });
BI.shortcut("demo.fix_global_watcher", Demo.Fix); BI.shortcut("demo.fix_global_watcher", Demo.Fix);
}());(function () {
var State = BI.inherit(Fix.Model, {
state: function () {
return {
name: "原始属性",
info: {
age: 12,
sex: "male",
birth: {
year: 2018,
month: 9,
day: 11
}
},
career: [{
a: 1,
b: 2,
c: 3
}]
};
},
computed: {
b: function () {
return this.model.name + "-计算属性";
},
birth: function () {
return this.model.info.birth;
}
}
});
Demo.Fix = BI.inherit(BI.Widget, {
_store: function () {
return new State();
},
watch: {
b: function () {
this.button.setText(this.model.b);
},
"birth.**": function () {
console.log(123);
}
},
render: function () {
var self = this;
return {
type: "bi.vertical",
items: [{
el: {
type: "bi.button",
ref: function () {
self.button = this;
},
handler: function () {
self.model.name = "这是改变后的属性";
},
text: this.model.b
}
}, {
el: {
type: "bi.button",
ref: function () {
self.button = this;
},
handler: function () {
self.model.birth.year = 2019;
},
text: "birthYearButton"
}
}, {
el: {
type: "bi.button",
ref: function () {
self.button = this;
},
handler: function () {
self.model.career.push({
year: 2017,
month: 3,
day: 24
});
},
text: "careerAddButton"
}
}, {
el: {
type: "bi.button",
ref: function () {
self.button = this;
},
handler: function () {
self.model.career[0].a = 24;
},
text: "careerChangeButton"
}
}]
};
},
mounted: function () {
}
});
BI.shortcut("demo.fix_immutable", Demo.Fix);
}());/** }());/**
* @Author: Young * @Author: Young
* @CreationDate 2017-11-06 10:32 * @CreationDate 2017-11-06 10:32

41
dist/fineui.js vendored
Unescape View File

@ -36351,7 +36351,8 @@ BI.Single = BI.inherit(BI.Widget, {
title: null, title: null,
warningTitle: null, warningTitle: null,
tipType: null, // success或warning tipType: null, // success或warning
value: null value: null,
belowMouse: false // title是否跟随鼠标
}); });
}, },
@ -36380,7 +36381,9 @@ BI.Single = BI.inherit(BI.Widget, {
var self = this, o = this.options; var self = this, o = this.options;
if (BI.isKey(o.title) || BI.isKey(o.warningTitle) if (BI.isKey(o.title) || BI.isKey(o.warningTitle)
|| BI.isFunction(o.title) || BI.isFunction(o.warningTitle)) { || BI.isFunction(o.title) || BI.isFunction(o.warningTitle)) {
this.enableHover(); this.enableHover({
belowMouse: o.belowMouse
});
} }
}, },
@ -84184,7 +84187,6 @@ BI.shortcut("bi.rich_editor_color_chooser", BI.RichEditorColorChooser);BI.RichEd
el: this.trigger, el: this.trigger,
adjustLength: 1, adjustLength: 1,
popup: { popup: {
maxWidth: 70,
minWidth: 70, minWidth: 70,
el: { el: {
type: "bi.button_group", type: "bi.button_group",
@ -88928,9 +88930,9 @@ BI.StaticDatePaneCard = BI.inherit(BI.Widget, {
} }
self.selectedTime = { self.selectedTime = {
year: value.year, year: value.year,
month: value.month, month: value.month
day: day
}; };
day !== 0 && (self.selectedTime.day = day);
self.calendar.setSelect(BI.Calendar.getPageByDateJSON(self.selectedTime)); self.calendar.setSelect(BI.Calendar.getPageByDateJSON(self.selectedTime));
self.calendar.setValue(self.selectedTime); self.calendar.setValue(self.selectedTime);
day !== 0 && self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE); day !== 0 && self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE);
@ -89467,7 +89469,12 @@ BI.DateTimeSelect = BI.inherit(BI.Widget, {
type: "bi.sign_editor", type: "bi.sign_editor",
value: this._alertInEditorValue(o.min), value: this._alertInEditorValue(o.min),
allowBlank: false, allowBlank: false,
errorText: BI.i18nText("BI-Please_Input_Natural_Number"), errorText: function (v) {
if(BI.isNumeric(v)) {
return BI.i18nText("BI-Please_Input_Natural_Number");
}
return BI.i18nText("BI-Numerical_Interval_Input_Data");
},
validationChecker: function (v) { validationChecker: function (v) {
return BI.isNaturalNumber(v); return BI.isNaturalNumber(v);
} }
@ -89655,6 +89662,7 @@ BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);BI.StaticDateTimePaneCar
month: value.month, month: value.month,
day: day day: day
}); });
day !== 0 && (self.selectedTime.day = day);
self.calendar.setSelect(BI.Calendar.getPageByDateJSON(self.selectedTime)); self.calendar.setSelect(BI.Calendar.getPageByDateJSON(self.selectedTime));
self.calendar.setValue(self.selectedTime); self.calendar.setValue(self.selectedTime);
day !== 0 && self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE); day !== 0 && self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE);
@ -92286,8 +92294,11 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
validationChecker: function (v) { validationChecker: function (v) {
return BI.isNaturalNumber(v) && BI.parseInt(v) < 24; return BI.isNaturalNumber(v) && BI.parseInt(v) < 24;
}, },
errorText: function () { errorText: function (v) {
if(BI.isNumeric(v)) {
return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-23\""); return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-23\"");
}
return BI.i18nText("BI-Numerical_Interval_Input_Data");
}, },
listeners: [{ listeners: [{
eventName: BI.SignEditor.EVENT_CONFIRM, eventName: BI.SignEditor.EVENT_CONFIRM,
@ -92320,8 +92331,11 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
validationChecker: function (v) { validationChecker: function (v) {
return BI.isNaturalNumber(v) && BI.parseInt(v) < 60; return BI.isNaturalNumber(v) && BI.parseInt(v) < 60;
}, },
errorText: function () { errorText: function (v) {
if(BI.isNumeric(v)) {
return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-59\""); return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-59\"");
}
return BI.i18nText("BI-Numerical_Interval_Input_Data");
}, },
listeners: [{ listeners: [{
eventName: BI.SignEditor.EVENT_CONFIRM, eventName: BI.SignEditor.EVENT_CONFIRM,
@ -92352,8 +92366,11 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
validationChecker: function (v) { validationChecker: function (v) {
return BI.isNaturalNumber(v) && BI.parseInt(v) < 60; return BI.isNaturalNumber(v) && BI.parseInt(v) < 60;
}, },
errorText: function () { errorText: function (v) {
if(BI.isNumeric(v)) {
return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-59\""); return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-59\"");
}
return BI.i18nText("BI-Numerical_Interval_Input_Data");
}, },
listeners: [{ listeners: [{
eventName: BI.SignEditor.EVENT_CONFIRM, eventName: BI.SignEditor.EVENT_CONFIRM,
@ -94967,7 +94984,7 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
}, },
_setErrorText: function () { _setErrorText: function () {
var errorText = BI.i18nText("BI-Please_Enter") + this.min + "-" + this.max + BI.i18nText("BI-Basic_De") + BI.i18nText("BI-Basic_Number"); var errorText = BI.i18nText("BI-Basic_Please_Enter_Number_Between", this.min, this.max);
this.labelOne.setErrorText(errorText); this.labelOne.setErrorText(errorText);
this.labelTwo.setErrorText(errorText); this.labelTwo.setErrorText(errorText);
}, },
@ -112995,5 +113012,7 @@ BI.i18n = {
"BI-Microsoft_YaHei": "微软雅黑", "BI-Microsoft_YaHei": "微软雅黑",
"BI-Apple_Light": "苹方-light", "BI-Apple_Light": "苹方-light",
"BI-Font_Family": "字体", "BI-Font_Family": "字体",
"BI-Basic_Please_Input_Content": "请输入内容" "BI-Basic_Please_Input_Content": "请输入内容",
"BI-Word_Align_Center": "文字居中",
"BI-Basic_Please_Enter_Number_Between": "请输入{R1}-{R2}的值"
}; };

82
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

29
dist/widget.js vendored
Unescape View File

@ -1127,9 +1127,9 @@ BI.StaticDatePaneCard = BI.inherit(BI.Widget, {
} }
self.selectedTime = { self.selectedTime = {
year: value.year, year: value.year,
month: value.month, month: value.month
day: day
}; };
day !== 0 && (self.selectedTime.day = day);
self.calendar.setSelect(BI.Calendar.getPageByDateJSON(self.selectedTime)); self.calendar.setSelect(BI.Calendar.getPageByDateJSON(self.selectedTime));
self.calendar.setValue(self.selectedTime); self.calendar.setValue(self.selectedTime);
day !== 0 && self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE); day !== 0 && self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE);
@ -1666,7 +1666,12 @@ BI.DateTimeSelect = BI.inherit(BI.Widget, {
type: "bi.sign_editor", type: "bi.sign_editor",
value: this._alertInEditorValue(o.min), value: this._alertInEditorValue(o.min),
allowBlank: false, allowBlank: false,
errorText: BI.i18nText("BI-Please_Input_Natural_Number"), errorText: function (v) {
if(BI.isNumeric(v)) {
return BI.i18nText("BI-Please_Input_Natural_Number");
}
return BI.i18nText("BI-Numerical_Interval_Input_Data");
},
validationChecker: function (v) { validationChecker: function (v) {
return BI.isNaturalNumber(v); return BI.isNaturalNumber(v);
} }
@ -1854,6 +1859,7 @@ BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);BI.StaticDateTimePaneCar
month: value.month, month: value.month,
day: day day: day
}); });
day !== 0 && (self.selectedTime.day = day);
self.calendar.setSelect(BI.Calendar.getPageByDateJSON(self.selectedTime)); self.calendar.setSelect(BI.Calendar.getPageByDateJSON(self.selectedTime));
self.calendar.setValue(self.selectedTime); self.calendar.setValue(self.selectedTime);
day !== 0 && self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE); day !== 0 && self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE);
@ -4485,8 +4491,11 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
validationChecker: function (v) { validationChecker: function (v) {
return BI.isNaturalNumber(v) && BI.parseInt(v) < 24; return BI.isNaturalNumber(v) && BI.parseInt(v) < 24;
}, },
errorText: function () { errorText: function (v) {
if(BI.isNumeric(v)) {
return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-23\""); return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-23\"");
}
return BI.i18nText("BI-Numerical_Interval_Input_Data");
}, },
listeners: [{ listeners: [{
eventName: BI.SignEditor.EVENT_CONFIRM, eventName: BI.SignEditor.EVENT_CONFIRM,
@ -4519,8 +4528,11 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
validationChecker: function (v) { validationChecker: function (v) {
return BI.isNaturalNumber(v) && BI.parseInt(v) < 60; return BI.isNaturalNumber(v) && BI.parseInt(v) < 60;
}, },
errorText: function () { errorText: function (v) {
if(BI.isNumeric(v)) {
return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-59\""); return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-59\"");
}
return BI.i18nText("BI-Numerical_Interval_Input_Data");
}, },
listeners: [{ listeners: [{
eventName: BI.SignEditor.EVENT_CONFIRM, eventName: BI.SignEditor.EVENT_CONFIRM,
@ -4551,8 +4563,11 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
validationChecker: function (v) { validationChecker: function (v) {
return BI.isNaturalNumber(v) && BI.parseInt(v) < 60; return BI.isNaturalNumber(v) && BI.parseInt(v) < 60;
}, },
errorText: function () { errorText: function (v) {
if(BI.isNumeric(v)) {
return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-59\""); return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-59\"");
}
return BI.i18nText("BI-Numerical_Interval_Input_Data");
}, },
listeners: [{ listeners: [{
eventName: BI.SignEditor.EVENT_CONFIRM, eventName: BI.SignEditor.EVENT_CONFIRM,
@ -7166,7 +7181,7 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
}, },
_setErrorText: function () { _setErrorText: function () {
var errorText = BI.i18nText("BI-Please_Enter") + this.min + "-" + this.max + BI.i18nText("BI-Basic_De") + BI.i18nText("BI-Basic_Number"); var errorText = BI.i18nText("BI-Basic_Please_Enter_Number_Between", this.min, this.max);
this.labelOne.setErrorText(errorText); this.labelOne.setErrorText(errorText);
this.labelTwo.setErrorText(errorText); this.labelTwo.setErrorText(errorText);
}, },

4
public/js/index.js
Unescape View File

@ -159,5 +159,7 @@ BI.i18n = {
"BI-Microsoft_YaHei": "微软雅黑", "BI-Microsoft_YaHei": "微软雅黑",
"BI-Apple_Light": "苹方-light", "BI-Apple_Light": "苹方-light",
"BI-Font_Family": "字体", "BI-Font_Family": "字体",
"BI-Basic_Please_Input_Content": "请输入内容" "BI-Basic_Please_Input_Content": "请输入内容",
"BI-Word_Align_Center": "文字居中",
"BI-Basic_Please_Enter_Number_Between": "请输入{R1}-{R2}的值"
}; };

7
src/base/single/single.js
Unescape View File

@ -18,7 +18,8 @@ BI.Single = BI.inherit(BI.Widget, {
title: null, title: null,
warningTitle: null, warningTitle: null,
tipType: null, // success或warning tipType: null, // success或warning
value: null value: null,
belowMouse: false // title是否跟随鼠标
}); });
}, },
@ -47,7 +48,9 @@ BI.Single = BI.inherit(BI.Widget, {
var self = this, o = this.options; var self = this, o = this.options;
if (BI.isKey(o.title) || BI.isKey(o.warningTitle) if (BI.isKey(o.title) || BI.isKey(o.warningTitle)
|| BI.isFunction(o.title) || BI.isFunction(o.warningTitle)) { || BI.isFunction(o.title) || BI.isFunction(o.warningTitle)) {
this.enableHover(); this.enableHover({
belowMouse: o.belowMouse
});
} }
}, },

1
src/case/richeditor/plugins/combo.fontfamily.js
Unescape View File

@ -25,7 +25,6 @@ BI.RichEditorFontChooser = BI.inherit(BI.RichEditorAction, {
el: this.trigger, el: this.trigger,
adjustLength: 1, adjustLength: 1,
popup: { popup: {
maxWidth: 70,
minWidth: 70, minWidth: 70,
el: { el: {
type: "bi.button_group", type: "bi.button_group",

4
src/widget/datepane/card.static.datepane.js
Unescape View File

@ -38,9 +38,9 @@ BI.StaticDatePaneCard = BI.inherit(BI.Widget, {
} }
self.selectedTime = { self.selectedTime = {
year: value.year, year: value.year,
month: value.month, month: value.month
day: day
}; };
day !== 0 && (self.selectedTime.day = day);
self.calendar.setSelect(BI.Calendar.getPageByDateJSON(self.selectedTime)); self.calendar.setSelect(BI.Calendar.getPageByDateJSON(self.selectedTime));
self.calendar.setValue(self.selectedTime); self.calendar.setValue(self.selectedTime);
day !== 0 && self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE); day !== 0 && self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE);

7
src/widget/datetime/datetime.select.js
Unescape View File

@ -17,7 +17,12 @@ BI.DateTimeSelect = BI.inherit(BI.Widget, {
type: "bi.sign_editor", type: "bi.sign_editor",
value: this._alertInEditorValue(o.min), value: this._alertInEditorValue(o.min),
allowBlank: false, allowBlank: false,
errorText: BI.i18nText("BI-Please_Input_Natural_Number"), errorText: function (v) {
if(BI.isNumeric(v)) {
return BI.i18nText("BI-Please_Input_Natural_Number");
}
return BI.i18nText("BI-Numerical_Interval_Input_Data");
},
validationChecker: function (v) { validationChecker: function (v) {
return BI.isNaturalNumber(v); return BI.isNaturalNumber(v);
} }

1
src/widget/datetimepane/card.static.datetimepane.js
Unescape View File

@ -38,6 +38,7 @@ BI.StaticDateTimePaneCard = BI.inherit(BI.Widget, {
month: value.month, month: value.month,
day: day day: day
}); });
day !== 0 && (self.selectedTime.day = day);
self.calendar.setSelect(BI.Calendar.getPageByDateJSON(self.selectedTime)); self.calendar.setSelect(BI.Calendar.getPageByDateJSON(self.selectedTime));
self.calendar.setValue(self.selectedTime); self.calendar.setValue(self.selectedTime);
day !== 0 && self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE); day !== 0 && self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE);

15
src/widget/dynamicdatetime/dynamicdatetime.timeselect.js
Unescape View File

@ -19,8 +19,11 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, {
validationChecker: function (v) { validationChecker: function (v) {
return BI.isNaturalNumber(v) && BI.parseInt(v) < 24; return BI.isNaturalNumber(v) && BI.parseInt(v) < 24;
}, },
errorText: function () { errorText: function (v) {
if(BI.isNumeric(v)) {
return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-23\""); return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-23\"");
}
return BI.i18nText("BI-Numerical_Interval_Input_Data");
}, },
listeners: [{ listeners: [{
eventName: BI.SignEditor.EVENT_CONFIRM, eventName: BI.SignEditor.EVENT_CONFIRM,
@ -53,8 +56,11 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, {
validationChecker: function (v) { validationChecker: function (v) {
return BI.isNaturalNumber(v) && BI.parseInt(v) < 60; return BI.isNaturalNumber(v) && BI.parseInt(v) < 60;
}, },
errorText: function () { errorText: function (v) {
if(BI.isNumeric(v)) {
return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-59\""); return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-59\"");
}
return BI.i18nText("BI-Numerical_Interval_Input_Data");
}, },
listeners: [{ listeners: [{
eventName: BI.SignEditor.EVENT_CONFIRM, eventName: BI.SignEditor.EVENT_CONFIRM,
@ -85,8 +91,11 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, {
validationChecker: function (v) { validationChecker: function (v) {
return BI.isNaturalNumber(v) && BI.parseInt(v) < 60; return BI.isNaturalNumber(v) && BI.parseInt(v) < 60;
}, },
errorText: function () { errorText: function (v) {
if(BI.isNumeric(v)) {
return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-59\""); return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-59\"");
}
return BI.i18nText("BI-Numerical_Interval_Input_Data");
}, },
listeners: [{ listeners: [{
eventName: BI.SignEditor.EVENT_CONFIRM, eventName: BI.SignEditor.EVENT_CONFIRM,

2
src/widget/intervalslider/intervalslider.js
Unescape View File

@ -383,7 +383,7 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
}, },
_setErrorText: function () { _setErrorText: function () {
var errorText = BI.i18nText("BI-Please_Enter") + this.min + "-" + this.max + BI.i18nText("BI-Basic_De") + BI.i18nText("BI-Basic_Number"); var errorText = BI.i18nText("BI-Basic_Please_Enter_Number_Between", this.min, this.max);
this.labelOne.setErrorText(errorText); this.labelOne.setErrorText(errorText);
this.labelTwo.setErrorText(errorText); this.labelTwo.setErrorText(errorText);
}, },

4
ui/js/index.js
Unescape View File

@ -159,5 +159,7 @@ BI.i18n = {
"BI-Microsoft_YaHei": "微软雅黑", "BI-Microsoft_YaHei": "微软雅黑",
"BI-Apple_Light": "苹方-light", "BI-Apple_Light": "苹方-light",
"BI-Font_Family": "字体", "BI-Font_Family": "字体",
"BI-Basic_Please_Input_Content": "请输入内容" "BI-Basic_Please_Input_Content": "请输入内容",
"BI-Word_Align_Center": "文字居中",
"BI-Basic_Please_Enter_Number_Between": "请输入{R1}-{R2}的值"
}; };
Write Preview
Loading…
Cancel
Save