Browse Source

Merge branch 'master' of ssh://code.fineres.com:7999/~windy/fui

es6
windy 4 years ago
parent
commit
8bff7eb025
  1. 1
      changelog.md
  2. 2
      dist/2.0/fineui.css
  3. 4
      dist/2.0/fineui.ie.min.js
  4. 2
      dist/2.0/fineui.ie.min.js.map
  5. 17
      dist/2.0/fineui.js
  6. 2
      dist/2.0/fineui.js.map
  7. 2
      dist/2.0/fineui.min.css
  8. 4
      dist/2.0/fineui.min.js
  9. 2
      dist/2.0/fineui.min.js.map
  10. 2
      dist/2.0/fineui_without_normalize.css
  11. 2
      dist/2.0/fineui_without_normalize.min.css
  12. 2
      dist/core.css
  13. 17
      dist/core.js
  14. 2
      dist/core.js.map
  15. 2
      dist/demo.css
  16. 17
      dist/demo.js
  17. 2
      dist/demo.js.map
  18. 2
      dist/fineui.css
  19. 4
      dist/fineui.ie.min.js
  20. 2
      dist/fineui.ie.min.js.map
  21. 17
      dist/fineui.js
  22. 2
      dist/fineui.js.map
  23. 2
      dist/fineui.min.css
  24. 4
      dist/fineui.min.js
  25. 2
      dist/fineui.min.js.map
  26. 15
      dist/fineui_without_jquery_polyfill.js
  27. 2
      dist/fineui_without_jquery_polyfill.js.map
  28. 2
      dist/font.css
  29. 2
      dist/resource.css
  30. 2
      dist/utils.js
  31. 2
      dist/utils.min.js
  32. 2
      package.json
  33. 2
      src/base/single/input/file.js

1
changelog.md

@ -1,5 +1,6 @@
# 更新日志 # 更新日志
2.0(2020-11) 2.0(2020-11)
- bi.file上传文件errorMsg默认调用国际化
- 修复了文本标签text传递空字符串后显示value值的问题 - 修复了文本标签text传递空字符串后显示value值的问题
- 限制了title的最大高度 - 限制了title的最大高度
- bi.textarea_editor添加setWatermark方法 - bi.textarea_editor添加setWatermark方法

2
dist/2.0/fineui.css vendored

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.ie.min.js.map vendored

File diff suppressed because one or more lines are too long

17
dist/2.0/fineui.js vendored

@ -1,4 +1,4 @@
/*! time: 2020-11-30 19:40:29 */ /*! time: 2020-12-1 10:00:32 */
/******/ (function(modules) { // webpackBootstrap /******/ (function(modules) { // webpackBootstrap
/******/ // The module cache /******/ // The module cache
/******/ var installedModules = {}; /******/ var installedModules = {};
@ -22276,7 +22276,6 @@ BI.Single = BI.inherit(BI.Widget, {
rgap: 0, rgap: 0,
tgap: 0, tgap: 0,
bgap: 0, bgap: 0,
text: "",
py: "", py: "",
highLight: false highLight: false
}, },
@ -22336,8 +22335,10 @@ BI.Single = BI.inherit(BI.Widget, {
} }
var text = this._getShowText(); var text = this._getShowText();
if (BI.isKey(text)) { if (!BI.isUndefined(text)) {
this.setText(text); this.setText(text);
} else if (BI.isKey(o.value)) {
this.setText(o.value);
} }
if (BI.isKey(o.keyword)) { if (BI.isKey(o.keyword)) {
this.doRedMark(o.keyword); this.doRedMark(o.keyword);
@ -22361,10 +22362,8 @@ BI.Single = BI.inherit(BI.Widget, {
_getShowText: function () { _getShowText: function () {
var o = this.options; var o = this.options;
var text = BI.isFunction(o.text) ? o.text() : o.text; var text = BI.isFunction(o.text) ? o.text() : o.text;
if (!BI.isKey(text)) {
return ""; return BI.isKey(text) ? BI.Text.formatText(text + "") : text;
}
return BI.Text.formatText(text + "");
}, },
_doRedMark: function (keyword) { _doRedMark: function (keyword) {
@ -22446,7 +22445,6 @@ BI.BasicButton = BI.inherit(BI.Single, {
return BI.extend(conf, { return BI.extend(conf, {
_baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer") + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""), _baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer") + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""),
value: "", value: "",
text: "",
stopEvent: false, stopEvent: false,
stopPropagation: false, stopPropagation: false,
selected: false, selected: false,
@ -31221,7 +31219,6 @@ BI.shortcut("bi.radio", BI.Radio);
rgap: 0, rgap: 0,
tgap: 0, tgap: 0,
bgap: 0, bgap: 0,
text: "",
highLight: false, highLight: false,
handler: null handler: null
}); });
@ -85161,7 +85158,7 @@ BI.shortcut("bi.list_part_tree", BI.ListPartTree);
} }
var error = BI.some(_wrap.attach_array, function (index, attach) { var error = BI.some(_wrap.attach_array, function (index, attach) {
if (attach.errorCode) { if (attach.errorCode) {
BI.Msg.toast(attach.errorMsg, { level: "error" }); BI.Msg.toast(BI.i18nText(attach.errorMsg), { level: "error" });
self.fireEvent(BI.File.EVENT_ERROR, attach); self.fireEvent(BI.File.EVENT_ERROR, attach);
return true; return true;
} }

2
dist/2.0/fineui.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.min.css vendored

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.min.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui_without_normalize.css vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui_without_normalize.min.css vendored

File diff suppressed because one or more lines are too long

2
dist/core.css vendored

File diff suppressed because one or more lines are too long

17
dist/core.js vendored

@ -1,4 +1,4 @@
/*! time: 2020-11-30 19:40:29 */ /*! time: 2020-12-1 10:00:32 */
/******/ (function(modules) { // webpackBootstrap /******/ (function(modules) { // webpackBootstrap
/******/ // The module cache /******/ // The module cache
/******/ var installedModules = {}; /******/ var installedModules = {};
@ -22276,7 +22276,6 @@ BI.Single = BI.inherit(BI.Widget, {
rgap: 0, rgap: 0,
tgap: 0, tgap: 0,
bgap: 0, bgap: 0,
text: "",
py: "", py: "",
highLight: false highLight: false
}, },
@ -22336,8 +22335,10 @@ BI.Single = BI.inherit(BI.Widget, {
} }
var text = this._getShowText(); var text = this._getShowText();
if (BI.isKey(text)) { if (!BI.isUndefined(text)) {
this.setText(text); this.setText(text);
} else if (BI.isKey(o.value)) {
this.setText(o.value);
} }
if (BI.isKey(o.keyword)) { if (BI.isKey(o.keyword)) {
this.doRedMark(o.keyword); this.doRedMark(o.keyword);
@ -22361,10 +22362,8 @@ BI.Single = BI.inherit(BI.Widget, {
_getShowText: function () { _getShowText: function () {
var o = this.options; var o = this.options;
var text = BI.isFunction(o.text) ? o.text() : o.text; var text = BI.isFunction(o.text) ? o.text() : o.text;
if (!BI.isKey(text)) {
return ""; return BI.isKey(text) ? BI.Text.formatText(text + "") : text;
}
return BI.Text.formatText(text + "");
}, },
_doRedMark: function (keyword) { _doRedMark: function (keyword) {
@ -22446,7 +22445,6 @@ BI.BasicButton = BI.inherit(BI.Single, {
return BI.extend(conf, { return BI.extend(conf, {
_baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer") + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""), _baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer") + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""),
value: "", value: "",
text: "",
stopEvent: false, stopEvent: false,
stopPropagation: false, stopPropagation: false,
selected: false, selected: false,
@ -31221,7 +31219,6 @@ BI.shortcut("bi.radio", BI.Radio);
rgap: 0, rgap: 0,
tgap: 0, tgap: 0,
bgap: 0, bgap: 0,
text: "",
highLight: false, highLight: false,
handler: null handler: null
}); });
@ -85161,7 +85158,7 @@ BI.shortcut("bi.list_part_tree", BI.ListPartTree);
} }
var error = BI.some(_wrap.attach_array, function (index, attach) { var error = BI.some(_wrap.attach_array, function (index, attach) {
if (attach.errorCode) { if (attach.errorCode) {
BI.Msg.toast(attach.errorMsg, { level: "error" }); BI.Msg.toast(BI.i18nText(attach.errorMsg), { level: "error" });
self.fireEvent(BI.File.EVENT_ERROR, attach); self.fireEvent(BI.File.EVENT_ERROR, attach);
return true; return true;
} }

2
dist/core.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/demo.css vendored

File diff suppressed because one or more lines are too long

17
dist/demo.js vendored

@ -1,4 +1,4 @@
/*! time: 2020-11-30 19:40:29 */ /*! time: 2020-12-1 10:00:32 */
/******/ (function(modules) { // webpackBootstrap /******/ (function(modules) { // webpackBootstrap
/******/ // The module cache /******/ // The module cache
/******/ var installedModules = {}; /******/ var installedModules = {};
@ -22276,7 +22276,6 @@ BI.Single = BI.inherit(BI.Widget, {
rgap: 0, rgap: 0,
tgap: 0, tgap: 0,
bgap: 0, bgap: 0,
text: "",
py: "", py: "",
highLight: false highLight: false
}, },
@ -22336,8 +22335,10 @@ BI.Single = BI.inherit(BI.Widget, {
} }
var text = this._getShowText(); var text = this._getShowText();
if (BI.isKey(text)) { if (!BI.isUndefined(text)) {
this.setText(text); this.setText(text);
} else if (BI.isKey(o.value)) {
this.setText(o.value);
} }
if (BI.isKey(o.keyword)) { if (BI.isKey(o.keyword)) {
this.doRedMark(o.keyword); this.doRedMark(o.keyword);
@ -22361,10 +22362,8 @@ BI.Single = BI.inherit(BI.Widget, {
_getShowText: function () { _getShowText: function () {
var o = this.options; var o = this.options;
var text = BI.isFunction(o.text) ? o.text() : o.text; var text = BI.isFunction(o.text) ? o.text() : o.text;
if (!BI.isKey(text)) {
return ""; return BI.isKey(text) ? BI.Text.formatText(text + "") : text;
}
return BI.Text.formatText(text + "");
}, },
_doRedMark: function (keyword) { _doRedMark: function (keyword) {
@ -22446,7 +22445,6 @@ BI.BasicButton = BI.inherit(BI.Single, {
return BI.extend(conf, { return BI.extend(conf, {
_baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer") + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""), _baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer") + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""),
value: "", value: "",
text: "",
stopEvent: false, stopEvent: false,
stopPropagation: false, stopPropagation: false,
selected: false, selected: false,
@ -31221,7 +31219,6 @@ BI.shortcut("bi.radio", BI.Radio);
rgap: 0, rgap: 0,
tgap: 0, tgap: 0,
bgap: 0, bgap: 0,
text: "",
highLight: false, highLight: false,
handler: null handler: null
}); });
@ -85161,7 +85158,7 @@ BI.shortcut("bi.list_part_tree", BI.ListPartTree);
} }
var error = BI.some(_wrap.attach_array, function (index, attach) { var error = BI.some(_wrap.attach_array, function (index, attach) {
if (attach.errorCode) { if (attach.errorCode) {
BI.Msg.toast(attach.errorMsg, { level: "error" }); BI.Msg.toast(BI.i18nText(attach.errorMsg), { level: "error" });
self.fireEvent(BI.File.EVENT_ERROR, attach); self.fireEvent(BI.File.EVENT_ERROR, attach);
return true; return true;
} }

2
dist/demo.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.css vendored

File diff suppressed because one or more lines are too long

4
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.ie.min.js.map vendored

File diff suppressed because one or more lines are too long

17
dist/fineui.js vendored

@ -1,4 +1,4 @@
/*! time: 2020-11-30 19:40:29 */ /*! time: 2020-12-1 10:00:32 */
/******/ (function(modules) { // webpackBootstrap /******/ (function(modules) { // webpackBootstrap
/******/ // The module cache /******/ // The module cache
/******/ var installedModules = {}; /******/ var installedModules = {};
@ -22276,7 +22276,6 @@ BI.Single = BI.inherit(BI.Widget, {
rgap: 0, rgap: 0,
tgap: 0, tgap: 0,
bgap: 0, bgap: 0,
text: "",
py: "", py: "",
highLight: false highLight: false
}, },
@ -22336,8 +22335,10 @@ BI.Single = BI.inherit(BI.Widget, {
} }
var text = this._getShowText(); var text = this._getShowText();
if (BI.isKey(text)) { if (!BI.isUndefined(text)) {
this.setText(text); this.setText(text);
} else if (BI.isKey(o.value)) {
this.setText(o.value);
} }
if (BI.isKey(o.keyword)) { if (BI.isKey(o.keyword)) {
this.doRedMark(o.keyword); this.doRedMark(o.keyword);
@ -22361,10 +22362,8 @@ BI.Single = BI.inherit(BI.Widget, {
_getShowText: function () { _getShowText: function () {
var o = this.options; var o = this.options;
var text = BI.isFunction(o.text) ? o.text() : o.text; var text = BI.isFunction(o.text) ? o.text() : o.text;
if (!BI.isKey(text)) {
return ""; return BI.isKey(text) ? BI.Text.formatText(text + "") : text;
}
return BI.Text.formatText(text + "");
}, },
_doRedMark: function (keyword) { _doRedMark: function (keyword) {
@ -22446,7 +22445,6 @@ BI.BasicButton = BI.inherit(BI.Single, {
return BI.extend(conf, { return BI.extend(conf, {
_baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer") + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""), _baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer") + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""),
value: "", value: "",
text: "",
stopEvent: false, stopEvent: false,
stopPropagation: false, stopPropagation: false,
selected: false, selected: false,
@ -31221,7 +31219,6 @@ BI.shortcut("bi.radio", BI.Radio);
rgap: 0, rgap: 0,
tgap: 0, tgap: 0,
bgap: 0, bgap: 0,
text: "",
highLight: false, highLight: false,
handler: null handler: null
}); });
@ -85161,7 +85158,7 @@ BI.shortcut("bi.list_part_tree", BI.ListPartTree);
} }
var error = BI.some(_wrap.attach_array, function (index, attach) { var error = BI.some(_wrap.attach_array, function (index, attach) {
if (attach.errorCode) { if (attach.errorCode) {
BI.Msg.toast(attach.errorMsg, { level: "error" }); BI.Msg.toast(BI.i18nText(attach.errorMsg), { level: "error" });
self.fireEvent(BI.File.EVENT_ERROR, attach); self.fireEvent(BI.File.EVENT_ERROR, attach);
return true; return true;
} }

2
dist/fineui.js.map vendored

File diff suppressed because one or more lines are too long

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

2
dist/fineui.min.js.map vendored

File diff suppressed because one or more lines are too long

15
dist/fineui_without_jquery_polyfill.js vendored

@ -1,4 +1,4 @@
/*! time: 2020-11-30 19:40:29 */ /*! time: 2020-12-1 10:00:32 */
/******/ (function(modules) { // webpackBootstrap /******/ (function(modules) { // webpackBootstrap
/******/ // The module cache /******/ // The module cache
/******/ var installedModules = {}; /******/ var installedModules = {};
@ -18303,7 +18303,6 @@ BI.Single = BI.inherit(BI.Widget, {
rgap: 0, rgap: 0,
tgap: 0, tgap: 0,
bgap: 0, bgap: 0,
text: "",
py: "", py: "",
highLight: false highLight: false
}, },
@ -18363,8 +18362,10 @@ BI.Single = BI.inherit(BI.Widget, {
} }
var text = this._getShowText(); var text = this._getShowText();
if (BI.isKey(text)) { if (!BI.isUndefined(text)) {
this.setText(text); this.setText(text);
} else if (BI.isKey(o.value)) {
this.setText(o.value);
} }
if (BI.isKey(o.keyword)) { if (BI.isKey(o.keyword)) {
this.doRedMark(o.keyword); this.doRedMark(o.keyword);
@ -18388,10 +18389,8 @@ BI.Single = BI.inherit(BI.Widget, {
_getShowText: function () { _getShowText: function () {
var o = this.options; var o = this.options;
var text = BI.isFunction(o.text) ? o.text() : o.text; var text = BI.isFunction(o.text) ? o.text() : o.text;
if (!BI.isKey(text)) {
return ""; return BI.isKey(text) ? BI.Text.formatText(text + "") : text;
}
return BI.Text.formatText(text + "");
}, },
_doRedMark: function (keyword) { _doRedMark: function (keyword) {
@ -18473,7 +18472,6 @@ BI.BasicButton = BI.inherit(BI.Single, {
return BI.extend(conf, { return BI.extend(conf, {
_baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer") + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""), _baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer") + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""),
value: "", value: "",
text: "",
stopEvent: false, stopEvent: false,
stopPropagation: false, stopPropagation: false,
selected: false, selected: false,
@ -27248,7 +27246,6 @@ BI.shortcut("bi.radio", BI.Radio);
rgap: 0, rgap: 0,
tgap: 0, tgap: 0,
bgap: 0, bgap: 0,
text: "",
highLight: false, highLight: false,
handler: null handler: null
}); });

2
dist/fineui_without_jquery_polyfill.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/font.css vendored

File diff suppressed because one or more lines are too long

2
dist/resource.css vendored

File diff suppressed because one or more lines are too long

2
dist/utils.js vendored

@ -1,4 +1,4 @@
/*! time: 2020-11-30 19:40:29 */ /*! time: 2020-12-1 10:00:32 */
/******/ (function(modules) { // webpackBootstrap /******/ (function(modules) { // webpackBootstrap
/******/ // The module cache /******/ // The module cache
/******/ var installedModules = {}; /******/ var installedModules = {};

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

2
package.json

@ -1,6 +1,6 @@
{ {
"name": "fineui", "name": "fineui",
"version": "2.0.20201130194156", "version": "2.0.20201201100242",
"description": "fineui", "description": "fineui",
"main": "dist/fineui.min.js", "main": "dist/fineui.min.js",
"types": "dist/lib/index.d.ts", "types": "dist/lib/index.d.ts",

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

@ -525,7 +525,7 @@
} }
var error = BI.some(_wrap.attach_array, function (index, attach) { var error = BI.some(_wrap.attach_array, function (index, attach) {
if (attach.errorCode) { if (attach.errorCode) {
BI.Msg.toast(attach.errorMsg, { level: "error" }); BI.Msg.toast(BI.i18nText(attach.errorMsg), { level: "error" });
self.fireEvent(BI.File.EVENT_ERROR, attach); self.fireEvent(BI.File.EVENT_ERROR, attach);
return true; return true;
} }

Loading…
Cancel
Save