Browse Source

Merge pull request #889 in VISUAL/fineui from ~DAILER/fineui:master to master

* commit '93018e44d06c456f4b9a0913e982b3d1185ebe70':
  build
  update i18n
  build
  无JIRA任务 fix:文件上传控件对http error 的处理.(集群下nginx限制文件大小导致413错误,因为未做处理导致触发了EVENT_UPLOAD)
es6
Dailer 5 years ago
parent
commit
64e0fc533d
  1. 9
      dist/2.0/fineui.ie.js
  2. 18
      dist/2.0/fineui.ie.min.js
  3. 9
      dist/2.0/fineui.js
  4. 48
      dist/2.0/fineui.min.js
  5. 6
      dist/base.js
  6. 9
      dist/bundle.ie.js
  7. 18
      dist/bundle.ie.min.js
  8. 9
      dist/bundle.js
  9. 48
      dist/bundle.min.js
  10. 3
      dist/config.js
  11. 6
      dist/fineui.ie.js
  12. 16
      dist/fineui.ie.min.js
  13. 6
      dist/fineui.js
  14. 48
      dist/fineui.min.js
  15. 3
      dist/utils.js
  16. 4
      dist/utils.min.js
  17. 3
      i18n/i18n.cn.js
  18. 1
      i18n/i18n.en.js
  19. 6
      src/base/single/input/file.js

9
dist/2.0/fineui.ie.js vendored

@ -45298,7 +45298,11 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/**
self_.clean(); // remove files from list
self_.hide(); // hide progress bars and enable input file
// BI.Msg.toast("onload");
if (200 > xhr.status || xhr.status > 399) {
BI.Msg.toast(BI.i18nText("BI-Upload_File_Error"), {level: "error"});
self.fireEvent(BI.File.EVENT_ERROR);
return;
}
self.fireEvent(BI.File.EVENT_UPLOADED);
// enable again the submit button/element
}, 1000);
@ -84479,7 +84483,7 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
"BI-Word_Align_Right": "文字居右",
"BI-Summary_Values": "汇总",
"BI-Basic_Clear": "清除",
"BI-Upload_File_Size_Error": "文件大小不支",
"BI-Upload_File_Size_Error": "文件大小不支",
"BI-Up_Page": "向上翻页",
"BI-Basic_Simple_Sunday": "日",
"BI-Multi_Date_Relative_Current_Time": "相对当前时间",
@ -84491,6 +84495,7 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
"BI-Continue_Select": "继续选择",
"BI-Please_Input_Positive_Integer": "请输入正整数",
"BI-Upload_File_Type_Error": "文件类型不支持",
"BI-Upload_File_Error": "文件上传失败",
"BI-Basic_Friday": "星期五",
"BI-Down_Page": "向下翻页",
"BI-Basic_Monday": "星期一",

18
dist/2.0/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

9
dist/2.0/fineui.js vendored

@ -45702,7 +45702,11 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/**
self_.clean(); // remove files from list
self_.hide(); // hide progress bars and enable input file
// BI.Msg.toast("onload");
if (200 > xhr.status || xhr.status > 399) {
BI.Msg.toast(BI.i18nText("BI-Upload_File_Error"), {level: "error"});
self.fireEvent(BI.File.EVENT_ERROR);
return;
}
self.fireEvent(BI.File.EVENT_UPLOADED);
// enable again the submit button/element
}, 1000);
@ -84807,7 +84811,7 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
"BI-Word_Align_Right": "文字居右",
"BI-Summary_Values": "汇总",
"BI-Basic_Clear": "清除",
"BI-Upload_File_Size_Error": "文件大小不支",
"BI-Upload_File_Size_Error": "文件大小不支",
"BI-Up_Page": "向上翻页",
"BI-Basic_Simple_Sunday": "日",
"BI-Multi_Date_Relative_Current_Time": "相对当前时间",
@ -84819,6 +84823,7 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
"BI-Continue_Select": "继续选择",
"BI-Please_Input_Positive_Integer": "请输入正整数",
"BI-Upload_File_Type_Error": "文件类型不支持",
"BI-Upload_File_Error": "文件上传失败",
"BI-Basic_Friday": "星期五",
"BI-Down_Page": "向下翻页",
"BI-Basic_Monday": "星期一",

48
dist/2.0/fineui.min.js vendored

File diff suppressed because one or more lines are too long

6
dist/base.js vendored

@ -9860,7 +9860,11 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/**
self_.clean(); // remove files from list
self_.hide(); // hide progress bars and enable input file
// BI.Msg.toast("onload");
if (200 > xhr.status || xhr.status > 399) {
BI.Msg.toast(BI.i18nText("BI-Upload_File_Error"), {level: "error"});
self.fireEvent(BI.File.EVENT_ERROR);
return;
}
self.fireEvent(BI.File.EVENT_UPLOADED);
// enable again the submit button/element
}, 1000);

9
dist/bundle.ie.js vendored

@ -45298,7 +45298,11 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/**
self_.clean(); // remove files from list
self_.hide(); // hide progress bars and enable input file
// BI.Msg.toast("onload");
if (200 > xhr.status || xhr.status > 399) {
BI.Msg.toast(BI.i18nText("BI-Upload_File_Error"), {level: "error"});
self.fireEvent(BI.File.EVENT_ERROR);
return;
}
self.fireEvent(BI.File.EVENT_UPLOADED);
// enable again the submit button/element
}, 1000);
@ -84479,7 +84483,7 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
"BI-Word_Align_Right": "文字居右",
"BI-Summary_Values": "汇总",
"BI-Basic_Clear": "清除",
"BI-Upload_File_Size_Error": "文件大小不支",
"BI-Upload_File_Size_Error": "文件大小不支",
"BI-Up_Page": "向上翻页",
"BI-Basic_Simple_Sunday": "日",
"BI-Multi_Date_Relative_Current_Time": "相对当前时间",
@ -84491,6 +84495,7 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
"BI-Continue_Select": "继续选择",
"BI-Please_Input_Positive_Integer": "请输入正整数",
"BI-Upload_File_Type_Error": "文件类型不支持",
"BI-Upload_File_Error": "文件上传失败",
"BI-Basic_Friday": "星期五",
"BI-Down_Page": "向下翻页",
"BI-Basic_Monday": "星期一",

18
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

9
dist/bundle.js vendored

@ -45702,7 +45702,11 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/**
self_.clean(); // remove files from list
self_.hide(); // hide progress bars and enable input file
// BI.Msg.toast("onload");
if (200 > xhr.status || xhr.status > 399) {
BI.Msg.toast(BI.i18nText("BI-Upload_File_Error"), {level: "error"});
self.fireEvent(BI.File.EVENT_ERROR);
return;
}
self.fireEvent(BI.File.EVENT_UPLOADED);
// enable again the submit button/element
}, 1000);
@ -84807,7 +84811,7 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
"BI-Word_Align_Right": "文字居右",
"BI-Summary_Values": "汇总",
"BI-Basic_Clear": "清除",
"BI-Upload_File_Size_Error": "文件大小不支",
"BI-Upload_File_Size_Error": "文件大小不支",
"BI-Up_Page": "向上翻页",
"BI-Basic_Simple_Sunday": "日",
"BI-Multi_Date_Relative_Current_Time": "相对当前时间",
@ -84819,6 +84823,7 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
"BI-Continue_Select": "继续选择",
"BI-Please_Input_Positive_Integer": "请输入正整数",
"BI-Upload_File_Type_Error": "文件类型不支持",
"BI-Upload_File_Error": "文件上传失败",
"BI-Basic_Friday": "星期五",
"BI-Down_Page": "向下翻页",
"BI-Basic_Monday": "星期一",

48
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

3
dist/config.js vendored

@ -91,7 +91,7 @@ BI.i18n = {
"BI-Word_Align_Right": "文字居右",
"BI-Summary_Values": "汇总",
"BI-Basic_Clear": "清除",
"BI-Upload_File_Size_Error": "文件大小不支",
"BI-Upload_File_Size_Error": "文件大小不支",
"BI-Up_Page": "向上翻页",
"BI-Basic_Simple_Sunday": "日",
"BI-Multi_Date_Relative_Current_Time": "相对当前时间",
@ -103,6 +103,7 @@ BI.i18n = {
"BI-Continue_Select": "继续选择",
"BI-Please_Input_Positive_Integer": "请输入正整数",
"BI-Upload_File_Type_Error": "文件类型不支持",
"BI-Upload_File_Error": "文件上传失败",
"BI-Basic_Friday": "星期五",
"BI-Down_Page": "向下翻页",
"BI-Basic_Monday": "星期一",

6
dist/fineui.ie.js vendored

@ -45543,7 +45543,11 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/**
self_.clean(); // remove files from list
self_.hide(); // hide progress bars and enable input file
// BI.Msg.toast("onload");
if (200 > xhr.status || xhr.status > 399) {
BI.Msg.toast(BI.i18nText("BI-Upload_File_Error"), {level: "error"});
self.fireEvent(BI.File.EVENT_ERROR);
return;
}
self.fireEvent(BI.File.EVENT_UPLOADED);
// enable again the submit button/element
}, 1000);

16
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

6
dist/fineui.js vendored

@ -45947,7 +45947,11 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/**
self_.clean(); // remove files from list
self_.hide(); // hide progress bars and enable input file
// BI.Msg.toast("onload");
if (200 > xhr.status || xhr.status > 399) {
BI.Msg.toast(BI.i18nText("BI-Upload_File_Error"), {level: "error"});
self.fireEvent(BI.File.EVENT_ERROR);
return;
}
self.fireEvent(BI.File.EVENT_UPLOADED);
// enable again the submit button/element
}, 1000);

48
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

3
dist/utils.js vendored

@ -15912,7 +15912,7 @@ BI.Region.prototype = {
"BI-Word_Align_Right": "文字居右",
"BI-Summary_Values": "汇总",
"BI-Basic_Clear": "清除",
"BI-Upload_File_Size_Error": "文件大小不支",
"BI-Upload_File_Size_Error": "文件大小不支",
"BI-Up_Page": "向上翻页",
"BI-Basic_Simple_Sunday": "日",
"BI-Multi_Date_Relative_Current_Time": "相对当前时间",
@ -15924,6 +15924,7 @@ BI.Region.prototype = {
"BI-Continue_Select": "继续选择",
"BI-Please_Input_Positive_Integer": "请输入正整数",
"BI-Upload_File_Type_Error": "文件类型不支持",
"BI-Upload_File_Error": "文件上传失败",
"BI-Basic_Friday": "星期五",
"BI-Down_Page": "向下翻页",
"BI-Basic_Monday": "星期一",

4
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

3
i18n/i18n.cn.js

@ -90,7 +90,7 @@ BI.i18n = {
"BI-Word_Align_Right": "文字居右",
"BI-Summary_Values": "汇总",
"BI-Basic_Clear": "清除",
"BI-Upload_File_Size_Error": "文件大小不支",
"BI-Upload_File_Size_Error": "文件大小不支",
"BI-Up_Page": "向上翻页",
"BI-Basic_Simple_Sunday": "日",
"BI-Multi_Date_Relative_Current_Time": "相对当前时间",
@ -102,6 +102,7 @@ BI.i18n = {
"BI-Continue_Select": "继续选择",
"BI-Please_Input_Positive_Integer": "请输入正整数",
"BI-Upload_File_Type_Error": "文件类型不支持",
"BI-Upload_File_Error": "文件上传失败",
"BI-Basic_Friday": "星期五",
"BI-Down_Page": "向下翻页",
"BI-Basic_Monday": "星期一",

1
i18n/i18n.en.js

@ -102,6 +102,7 @@ BI.i18n = {
"BI-Continue_Select": "Continue Select",
"BI-Please_Input_Positive_Integer": "Please Input Positive Integer",
"BI-Upload_File_Type_Error": "",
"BI-Upload_File_Error": "",
"BI-Basic_Friday": "Friday",
"BI-Down_Page": "Down",
"BI-Basic_Monday": "Monday",

6
src/base/single/input/file.js

@ -472,7 +472,11 @@
self_.clean(); // remove files from list
self_.hide(); // hide progress bars and enable input file
// BI.Msg.toast("onload");
if (200 > xhr.status || xhr.status > 399) {
BI.Msg.toast(BI.i18nText("BI-Upload_File_Error"), {level: "error"});
self.fireEvent(BI.File.EVENT_ERROR);
return;
}
self.fireEvent(BI.File.EVENT_UPLOADED);
// enable again the submit button/element
}, 1000);

Loading…
Cancel
Save