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

Merge pull request #348 in FUI/fineui from ~FAY/fineui:master to master 

* commit '4a65dac78e72fca369971338d8d22dce6993a7c0':
  update
  update
  Revert "update"
  update
  update
es6
guy 7 years ago
parent
04d9ab307a 4a65dac78e
commit
d98912473c
12 changed files with 68 additions and 116 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      dist/_fineui.min.js
  2. 38
      dist/bundle.js
  3. 18
      dist/bundle.min.js
  4. 20
      dist/fineui.min.js
  5. 38
      dist/widget.js
  6. 5
      src/widget/month/trigger.month.js
  7. 6
      src/widget/multitree/trigger/multi.tree.button.checkselected.js
  8. 5
      src/widget/quarter/trigger.quarter.js
  9. 4
      src/widget/singleselect/trigger/editor.singleselect.js
  10. 6
      src/widget/year/trigger.year.js
  11. 6
      src/widget/yearmonth/trigger.yearmonth.js
  12. 6
      src/widget/yearquarter/trigger.yearquarter.js

20
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

38
dist/bundle.js vendored
Unescape View File

@ -95060,8 +95060,7 @@ BI.shortcut("bi.month_popup", BI.MonthPopup);/**
BI.MonthTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
errorText: BI.i18nText("BI-Month_Trigger_Error_Text")
vgap: 2
},
_defaultConfig: function () {
@ -95085,7 +95084,7 @@ BI.MonthTrigger = BI.inherit(BI.Trigger, {
hgap: c.hgap,
vgap: c.vgap,
allowBlank: true,
errorText: c.errorText
errorText: BI.i18nText("BI-Month_Trigger_Error_Text")
});
this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {
self.fireEvent(BI.MonthTrigger.EVENT_FOCUS);
@ -100405,10 +100404,6 @@ BI.shortcut("bi.multi_tree_search_pane", BI.MultiTreeSearchPane);/**
*/
BI.MultiTreeCheckSelectedButton = BI.inherit(BI.Single, {
_const: {
checkSelected: BI.i18nText("BI-Check_Selected")
},
_defaultConfig: function () {
return BI.extend(BI.MultiTreeCheckSelectedButton.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-tree-check-selected-button",
@ -100432,7 +100427,7 @@ BI.MultiTreeCheckSelectedButton = BI.inherit(BI.Single, {
cls: "trigger-check-selected",
invisible: true,
hgap: 4,
text: this._const.checkSelected,
text: BI.i18nText("BI-Check_Selected"),
textAlign: "center",
textHeight: 15
});
@ -102030,8 +102025,7 @@ BI.QuarterTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
textWidth: 40,
errorText: BI.i18nText("BI-Quarter_Trigger_Error_Text")
textWidth: 40
},
_defaultConfig: function () {
@ -102055,7 +102049,7 @@ BI.QuarterTrigger = BI.inherit(BI.Trigger, {
hgap: c.hgap,
vgap: c.vgap,
allowBlank: true,
errorText: c.errorText
errorText: BI.i18nText("BI-Quarter_Trigger_Error_Text")
});
this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {
self.fireEvent(BI.QuarterTrigger.EVENT_FOCUS);
@ -104971,10 +104965,6 @@ BI.shortcut("bi.single_select_insert_list", BI.SingleSelectInsertList);
*/
BI.SingleSelectEditor = BI.inherit(BI.Widget, {
_const: {
checkSelected: BI.i18nText("BI-Check_Selected")
},
_defaultConfig: function () {
return BI.extend(BI.SingleSelectEditor.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-single-select-editor",
@ -108466,9 +108456,7 @@ BI.DynamicYearPopup.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.dynamic_year_popup", BI.DynamicYearPopup);BI.DynamicYearTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
errorTextInvalid: BI.i18nText("BI-Year_Trigger_Invalid_Text")
vgap: 2
},
_defaultConfig: function () {
@ -108496,7 +108484,7 @@ BI.shortcut("bi.dynamic_year_popup", BI.DynamicYearPopup);BI.DynamicYearTrigger
watermark: BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: true,
errorText: function (v) {
return !BI.isPositiveInteger(v) ? c.errorText : c.errorTextInvalid;
return !BI.isPositiveInteger(v) ? BI.i18nText("BI-Please_Input_Positive_Integer") : BI.i18nText("BI-Year_Trigger_Invalid_Text");
}
});
this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {
@ -109175,9 +109163,7 @@ BI.DynamicYearMonthPopup.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.dynamic_year_month_popup", BI.DynamicYearMonthPopup);BI.DynamicYearMonthTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
errorTextInvalid: BI.i18nText("BI-Year_Trigger_Invalid_Text")
vgap: 2
},
props: {
@ -109246,7 +109232,7 @@ BI.shortcut("bi.dynamic_year_month_popup", BI.DynamicYearMonthPopup);BI.DynamicY
},
watermark: BI.i18nText("BI-Basic_Unrestricted"),
errorText: function (v) {
return !BI.isPositiveInteger(v) ? c.errorText : c.errorTextInvalid;
return !BI.isPositiveInteger(v) ? BI.i18nText("BI-Please_Input_Positive_Integer") : BI.i18nText("BI-Year_Trigger_Invalid_Text");
},
hgap: c.hgap,
vgap: c.vgap,
@ -110098,9 +110084,7 @@ BI.DynamicYearQuarterPopup.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
errorTextInvalid: BI.i18nText("BI-Year_Trigger_Invalid_Text")
vgap: 2
},
props: {
@ -110168,7 +110152,7 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
return false;
},
errorText: function (v) {
return !BI.isPositiveInteger(v) ? c.errorText : c.errorTextInvalid;
return !BI.isPositiveInteger(v) ? BI.i18nText("BI-Please_Input_Positive_Integer") : BI.i18nText("BI-Year_Trigger_Invalid_Text");
},
watermark: BI.i18nText("BI-Basic_Unrestricted"),
hgap: c.hgap,

18
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

20
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

38
dist/widget.js vendored
Unescape View File

@ -7923,8 +7923,7 @@ BI.shortcut("bi.month_popup", BI.MonthPopup);/**
BI.MonthTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
errorText: BI.i18nText("BI-Month_Trigger_Error_Text")
vgap: 2
},
_defaultConfig: function () {
@ -7948,7 +7947,7 @@ BI.MonthTrigger = BI.inherit(BI.Trigger, {
hgap: c.hgap,
vgap: c.vgap,
allowBlank: true,
errorText: c.errorText
errorText: BI.i18nText("BI-Month_Trigger_Error_Text")
});
this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {
self.fireEvent(BI.MonthTrigger.EVENT_FOCUS);
@ -13268,10 +13267,6 @@ BI.shortcut("bi.multi_tree_search_pane", BI.MultiTreeSearchPane);/**
*/
BI.MultiTreeCheckSelectedButton = BI.inherit(BI.Single, {
_const: {
checkSelected: BI.i18nText("BI-Check_Selected")
},
_defaultConfig: function () {
return BI.extend(BI.MultiTreeCheckSelectedButton.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-tree-check-selected-button",
@ -13295,7 +13290,7 @@ BI.MultiTreeCheckSelectedButton = BI.inherit(BI.Single, {
cls: "trigger-check-selected",
invisible: true,
hgap: 4,
text: this._const.checkSelected,
text: BI.i18nText("BI-Check_Selected"),
textAlign: "center",
textHeight: 15
});
@ -14893,8 +14888,7 @@ BI.QuarterTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
textWidth: 40,
errorText: BI.i18nText("BI-Quarter_Trigger_Error_Text")
textWidth: 40
},
_defaultConfig: function () {
@ -14918,7 +14912,7 @@ BI.QuarterTrigger = BI.inherit(BI.Trigger, {
hgap: c.hgap,
vgap: c.vgap,
allowBlank: true,
errorText: c.errorText
errorText: BI.i18nText("BI-Quarter_Trigger_Error_Text")
});
this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {
self.fireEvent(BI.QuarterTrigger.EVENT_FOCUS);
@ -17834,10 +17828,6 @@ BI.shortcut("bi.single_select_insert_list", BI.SingleSelectInsertList);
*/
BI.SingleSelectEditor = BI.inherit(BI.Widget, {
_const: {
checkSelected: BI.i18nText("BI-Check_Selected")
},
_defaultConfig: function () {
return BI.extend(BI.SingleSelectEditor.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-single-select-editor",
@ -21329,9 +21319,7 @@ BI.DynamicYearPopup.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.dynamic_year_popup", BI.DynamicYearPopup);BI.DynamicYearTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
errorTextInvalid: BI.i18nText("BI-Year_Trigger_Invalid_Text")
vgap: 2
},
_defaultConfig: function () {
@ -21359,7 +21347,7 @@ BI.shortcut("bi.dynamic_year_popup", BI.DynamicYearPopup);BI.DynamicYearTrigger
watermark: BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: true,
errorText: function (v) {
return !BI.isPositiveInteger(v) ? c.errorText : c.errorTextInvalid;
return !BI.isPositiveInteger(v) ? BI.i18nText("BI-Please_Input_Positive_Integer") : BI.i18nText("BI-Year_Trigger_Invalid_Text");
}
});
this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {
@ -22038,9 +22026,7 @@ BI.DynamicYearMonthPopup.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.dynamic_year_month_popup", BI.DynamicYearMonthPopup);BI.DynamicYearMonthTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
errorTextInvalid: BI.i18nText("BI-Year_Trigger_Invalid_Text")
vgap: 2
},
props: {
@ -22109,7 +22095,7 @@ BI.shortcut("bi.dynamic_year_month_popup", BI.DynamicYearMonthPopup);BI.DynamicY
},
watermark: BI.i18nText("BI-Basic_Unrestricted"),
errorText: function (v) {
return !BI.isPositiveInteger(v) ? c.errorText : c.errorTextInvalid;
return !BI.isPositiveInteger(v) ? BI.i18nText("BI-Please_Input_Positive_Integer") : BI.i18nText("BI-Year_Trigger_Invalid_Text");
},
hgap: c.hgap,
vgap: c.vgap,
@ -22961,9 +22947,7 @@ BI.DynamicYearQuarterPopup.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
errorTextInvalid: BI.i18nText("BI-Year_Trigger_Invalid_Text")
vgap: 2
},
props: {
@ -23031,7 +23015,7 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
return false;
},
errorText: function (v) {
return !BI.isPositiveInteger(v) ? c.errorText : c.errorTextInvalid;
return !BI.isPositiveInteger(v) ? BI.i18nText("BI-Please_Input_Positive_Integer") : BI.i18nText("BI-Year_Trigger_Invalid_Text");
},
watermark: BI.i18nText("BI-Basic_Unrestricted"),
hgap: c.hgap,

5
src/widget/month/trigger.month.js
Unescape View File

@ -8,8 +8,7 @@
BI.MonthTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
errorText: BI.i18nText("BI-Month_Trigger_Error_Text")
vgap: 2
},
_defaultConfig: function () {
@ -33,7 +32,7 @@ BI.MonthTrigger = BI.inherit(BI.Trigger, {
hgap: c.hgap,
vgap: c.vgap,
allowBlank: true,
errorText: c.errorText
errorText: BI.i18nText("BI-Month_Trigger_Error_Text")
});
this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {
self.fireEvent(BI.MonthTrigger.EVENT_FOCUS);

6
src/widget/multitree/trigger/multi.tree.button.checkselected.js
Unescape View File

@ -6,10 +6,6 @@
*/
BI.MultiTreeCheckSelectedButton = BI.inherit(BI.Single, {
_const: {
checkSelected: BI.i18nText("BI-Check_Selected")
},
_defaultConfig: function () {
return BI.extend(BI.MultiTreeCheckSelectedButton.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-tree-check-selected-button",
@ -33,7 +29,7 @@ BI.MultiTreeCheckSelectedButton = BI.inherit(BI.Single, {
cls: "trigger-check-selected",
invisible: true,
hgap: 4,
text: this._const.checkSelected,
text: BI.i18nText("BI-Check_Selected"),
textAlign: "center",
textHeight: 15
});

5
src/widget/quarter/trigger.quarter.js
Unescape View File

@ -9,8 +9,7 @@ BI.QuarterTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
textWidth: 40,
errorText: BI.i18nText("BI-Quarter_Trigger_Error_Text")
textWidth: 40
},
_defaultConfig: function () {
@ -34,7 +33,7 @@ BI.QuarterTrigger = BI.inherit(BI.Trigger, {
hgap: c.hgap,
vgap: c.vgap,
allowBlank: true,
errorText: c.errorText
errorText: BI.i18nText("BI-Quarter_Trigger_Error_Text")
});
this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {
self.fireEvent(BI.QuarterTrigger.EVENT_FOCUS);

4
src/widget/singleselect/trigger/editor.singleselect.js
Unescape View File

@ -6,10 +6,6 @@
*/
BI.SingleSelectEditor = BI.inherit(BI.Widget, {
_const: {
checkSelected: BI.i18nText("BI-Check_Selected")
},
_defaultConfig: function () {
return BI.extend(BI.SingleSelectEditor.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-single-select-editor",

6
src/widget/year/trigger.year.js
Unescape View File

@ -1,9 +1,7 @@
BI.DynamicYearTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
errorTextInvalid: BI.i18nText("BI-Year_Trigger_Invalid_Text")
vgap: 2
},
_defaultConfig: function () {
@ -31,7 +29,7 @@ BI.DynamicYearTrigger = BI.inherit(BI.Trigger, {
watermark: BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: true,
errorText: function (v) {
return !BI.isPositiveInteger(v) ? c.errorText : c.errorTextInvalid;
return !BI.isPositiveInteger(v) ? BI.i18nText("BI-Please_Input_Positive_Integer") : BI.i18nText("BI-Year_Trigger_Invalid_Text");
}
});
this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {

6
src/widget/yearmonth/trigger.yearmonth.js
Unescape View File

@ -1,9 +1,7 @@
BI.DynamicYearMonthTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
errorTextInvalid: BI.i18nText("BI-Year_Trigger_Invalid_Text")
vgap: 2
},
props: {
@ -72,7 +70,7 @@ BI.DynamicYearMonthTrigger = BI.inherit(BI.Trigger, {
},
watermark: BI.i18nText("BI-Basic_Unrestricted"),
errorText: function (v) {
return !BI.isPositiveInteger(v) ? c.errorText : c.errorTextInvalid;
return !BI.isPositiveInteger(v) ? BI.i18nText("BI-Please_Input_Positive_Integer") : BI.i18nText("BI-Year_Trigger_Invalid_Text");
},
hgap: c.hgap,
vgap: c.vgap,

6
src/widget/yearquarter/trigger.yearquarter.js
Unescape View File

@ -1,9 +1,7 @@
BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
errorTextInvalid: BI.i18nText("BI-Year_Trigger_Invalid_Text")
vgap: 2
},
props: {
@ -71,7 +69,7 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
return false;
},
errorText: function (v) {
return !BI.isPositiveInteger(v) ? c.errorText : c.errorTextInvalid;
return !BI.isPositiveInteger(v) ? BI.i18nText("BI-Please_Input_Positive_Integer") : BI.i18nText("BI-Year_Trigger_Invalid_Text");
},
watermark: BI.i18nText("BI-Basic_Unrestricted"),
hgap: c.hgap,

Write Preview
Loading…
Cancel
Save