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

Merge pull request #944 in VISUAL/fineui from ~ZHENFEI.LI/fineui:master to master 

* commit '87225eca8e85c13794c3ae4259d131f7455305b5':
  CHART-9360 refactor: 根据comment优化代码
  CHART-9360 fix: 调整数值区间控件，使之能接受watermark和allowBlank
es6
Zhenfei.Li 6 years ago
parent
af2d9226af 87225eca8e
commit
7d8423b27a
17 changed files with 279 additions and 261 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. 16
      dist/2.0/fineui.ie.js
  2. 58
      dist/2.0/fineui.ie.min.js
  3. 16
      dist/2.0/fineui.js
  4. 74
      dist/2.0/fineui.min.js
  5. 4
      dist/base.js
  6. 16
      dist/bundle.ie.js
  7. 58
      dist/bundle.ie.min.js
  8. 16
      dist/bundle.js
  9. 74
      dist/bundle.min.js
  10. 16
      dist/fineui.ie.js
  11. 58
      dist/fineui.ie.min.js
  12. 16
      dist/fineui.js
  13. 74
      dist/fineui.min.js
  14. 16
      dist/fineui_without_jquery_polyfill.js
  15. 4
      dist/utils.min.js
  16. 12
      dist/widget.js
  17. 12
      src/widget/numberinterval/numberinterval.js

16
dist/2.0/fineui.ie.js vendored
Unescape View File

@ -45191,8 +45191,8 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
handler: BI.emptyFn, handler: BI.emptyFn,
width: 16, width: 16,
height: 16, height: 16,
iconWidth: 14, iconWidth: 16,
iconHeight: 14 iconHeight: 16
}, },
render: function () { render: function () {
@ -74375,7 +74375,9 @@ BI.NumberInterval = BI.inherit(BI.Single, {
extraCls: "bi-number-interval", extraCls: "bi-number-interval",
height: 24, height: 24,
validation: "valid", validation: "valid",
closeMin: true closeMin: true,
allowBlank: true,
watermark: BI.i18nText("BI-Basic_Unrestricted")
}); });
}, },
_init: function () { _init: function () {
@ -74384,8 +74386,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.smallEditor = BI.createWidget({ this.smallEditor = BI.createWidget({
type: "bi.number_interval_single_editor", type: "bi.number_interval_single_editor",
height: o.height - 2, height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: o.watermark,
allowBlank: true, allowBlank: o.allowBlank,
value: o.min, value: o.min,
level: "warning", level: "warning",
tipType: "success", tipType: "success",
@ -74424,8 +74426,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.bigEditor = BI.createWidget({ this.bigEditor = BI.createWidget({
type: "bi.number_interval_single_editor", type: "bi.number_interval_single_editor",
height: o.height - 2, height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: o.watermark,
allowBlank: true, allowBlank: o.allowBlank,
value: o.max, value: o.max,
level: "warning", level: "warning",
tipType: "success", tipType: "success",

58
dist/2.0/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

16
dist/2.0/fineui.js vendored
Unescape View File

@ -45595,8 +45595,8 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
handler: BI.emptyFn, handler: BI.emptyFn,
width: 16, width: 16,
height: 16, height: 16,
iconWidth: 14, iconWidth: 16,
iconHeight: 14 iconHeight: 16
}, },
render: function () { render: function () {
@ -74779,7 +74779,9 @@ BI.NumberInterval = BI.inherit(BI.Single, {
extraCls: "bi-number-interval", extraCls: "bi-number-interval",
height: 24, height: 24,
validation: "valid", validation: "valid",
closeMin: true closeMin: true,
allowBlank: true,
watermark: BI.i18nText("BI-Basic_Unrestricted")
}); });
}, },
_init: function () { _init: function () {
@ -74788,8 +74790,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.smallEditor = BI.createWidget({ this.smallEditor = BI.createWidget({
type: "bi.number_interval_single_editor", type: "bi.number_interval_single_editor",
height: o.height - 2, height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: o.watermark,
allowBlank: true, allowBlank: o.allowBlank,
value: o.min, value: o.min,
level: "warning", level: "warning",
tipType: "success", tipType: "success",
@ -74828,8 +74830,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.bigEditor = BI.createWidget({ this.bigEditor = BI.createWidget({
type: "bi.number_interval_single_editor", type: "bi.number_interval_single_editor",
height: o.height - 2, height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: o.watermark,
allowBlank: true, allowBlank: o.allowBlank,
value: o.max, value: o.max,
level: "warning", level: "warning",
tipType: "success", tipType: "success",

74
dist/2.0/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/base.js vendored
Unescape View File

@ -9704,8 +9704,8 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
handler: BI.emptyFn, handler: BI.emptyFn,
width: 16, width: 16,
height: 16, height: 16,
iconWidth: 14, iconWidth: 16,
iconHeight: 14 iconHeight: 16
}, },
render: function () { render: function () {

16
dist/bundle.ie.js vendored
Unescape View File

@ -45191,8 +45191,8 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
handler: BI.emptyFn, handler: BI.emptyFn,
width: 16, width: 16,
height: 16, height: 16,
iconWidth: 14, iconWidth: 16,
iconHeight: 14 iconHeight: 16
}, },
render: function () { render: function () {
@ -74375,7 +74375,9 @@ BI.NumberInterval = BI.inherit(BI.Single, {
extraCls: "bi-number-interval", extraCls: "bi-number-interval",
height: 24, height: 24,
validation: "valid", validation: "valid",
closeMin: true closeMin: true,
allowBlank: true,
watermark: BI.i18nText("BI-Basic_Unrestricted")
}); });
}, },
_init: function () { _init: function () {
@ -74384,8 +74386,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.smallEditor = BI.createWidget({ this.smallEditor = BI.createWidget({
type: "bi.number_interval_single_editor", type: "bi.number_interval_single_editor",
height: o.height - 2, height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: o.watermark,
allowBlank: true, allowBlank: o.allowBlank,
value: o.min, value: o.min,
level: "warning", level: "warning",
tipType: "success", tipType: "success",
@ -74424,8 +74426,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.bigEditor = BI.createWidget({ this.bigEditor = BI.createWidget({
type: "bi.number_interval_single_editor", type: "bi.number_interval_single_editor",
height: o.height - 2, height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: o.watermark,
allowBlank: true, allowBlank: o.allowBlank,
value: o.max, value: o.max,
level: "warning", level: "warning",
tipType: "success", tipType: "success",

58
dist/bundle.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

16
dist/bundle.js vendored
Unescape View File

@ -45595,8 +45595,8 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
handler: BI.emptyFn, handler: BI.emptyFn,
width: 16, width: 16,
height: 16, height: 16,
iconWidth: 14, iconWidth: 16,
iconHeight: 14 iconHeight: 16
}, },
render: function () { render: function () {
@ -74779,7 +74779,9 @@ BI.NumberInterval = BI.inherit(BI.Single, {
extraCls: "bi-number-interval", extraCls: "bi-number-interval",
height: 24, height: 24,
validation: "valid", validation: "valid",
closeMin: true closeMin: true,
allowBlank: true,
watermark: BI.i18nText("BI-Basic_Unrestricted")
}); });
}, },
_init: function () { _init: function () {
@ -74788,8 +74790,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.smallEditor = BI.createWidget({ this.smallEditor = BI.createWidget({
type: "bi.number_interval_single_editor", type: "bi.number_interval_single_editor",
height: o.height - 2, height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: o.watermark,
allowBlank: true, allowBlank: o.allowBlank,
value: o.min, value: o.min,
level: "warning", level: "warning",
tipType: "success", tipType: "success",
@ -74828,8 +74830,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.bigEditor = BI.createWidget({ this.bigEditor = BI.createWidget({
type: "bi.number_interval_single_editor", type: "bi.number_interval_single_editor",
height: o.height - 2, height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: o.watermark,
allowBlank: true, allowBlank: o.allowBlank,
value: o.max, value: o.max,
level: "warning", level: "warning",
tipType: "success", tipType: "success",

74
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

16
dist/fineui.ie.js vendored
Unescape View File

@ -45436,8 +45436,8 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
handler: BI.emptyFn, handler: BI.emptyFn,
width: 16, width: 16,
height: 16, height: 16,
iconWidth: 14, iconWidth: 16,
iconHeight: 14 iconHeight: 16
}, },
render: function () { render: function () {
@ -74620,7 +74620,9 @@ BI.NumberInterval = BI.inherit(BI.Single, {
extraCls: "bi-number-interval", extraCls: "bi-number-interval",
height: 24, height: 24,
validation: "valid", validation: "valid",
closeMin: true closeMin: true,
allowBlank: true,
watermark: BI.i18nText("BI-Basic_Unrestricted")
}); });
}, },
_init: function () { _init: function () {
@ -74629,8 +74631,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.smallEditor = BI.createWidget({ this.smallEditor = BI.createWidget({
type: "bi.number_interval_single_editor", type: "bi.number_interval_single_editor",
height: o.height - 2, height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: o.watermark,
allowBlank: true, allowBlank: o.allowBlank,
value: o.min, value: o.min,
level: "warning", level: "warning",
tipType: "success", tipType: "success",
@ -74669,8 +74671,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.bigEditor = BI.createWidget({ this.bigEditor = BI.createWidget({
type: "bi.number_interval_single_editor", type: "bi.number_interval_single_editor",
height: o.height - 2, height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: o.watermark,
allowBlank: true, allowBlank: o.allowBlank,
value: o.max, value: o.max,
level: "warning", level: "warning",
tipType: "success", tipType: "success",

58
dist/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

16
dist/fineui.js vendored
Unescape View File

@ -45840,8 +45840,8 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
handler: BI.emptyFn, handler: BI.emptyFn,
width: 16, width: 16,
height: 16, height: 16,
iconWidth: 14, iconWidth: 16,
iconHeight: 14 iconHeight: 16
}, },
render: function () { render: function () {
@ -75024,7 +75024,9 @@ BI.NumberInterval = BI.inherit(BI.Single, {
extraCls: "bi-number-interval", extraCls: "bi-number-interval",
height: 24, height: 24,
validation: "valid", validation: "valid",
closeMin: true closeMin: true,
allowBlank: true,
watermark: BI.i18nText("BI-Basic_Unrestricted")
}); });
}, },
_init: function () { _init: function () {
@ -75033,8 +75035,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.smallEditor = BI.createWidget({ this.smallEditor = BI.createWidget({
type: "bi.number_interval_single_editor", type: "bi.number_interval_single_editor",
height: o.height - 2, height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: o.watermark,
allowBlank: true, allowBlank: o.allowBlank,
value: o.min, value: o.min,
level: "warning", level: "warning",
tipType: "success", tipType: "success",
@ -75073,8 +75075,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.bigEditor = BI.createWidget({ this.bigEditor = BI.createWidget({
type: "bi.number_interval_single_editor", type: "bi.number_interval_single_editor",
height: o.height - 2, height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: o.watermark,
allowBlank: true, allowBlank: o.allowBlank,
value: o.max, value: o.max,
level: "warning", level: "warning",
tipType: "success", tipType: "success",

74
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

16
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -33036,8 +33036,8 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
handler: BI.emptyFn, handler: BI.emptyFn,
width: 16, width: 16,
height: 16, height: 16,
iconWidth: 14, iconWidth: 16,
iconHeight: 14 iconHeight: 16
}, },
render: function () { render: function () {
@ -57433,7 +57433,9 @@ BI.NumberInterval = BI.inherit(BI.Single, {
extraCls: "bi-number-interval", extraCls: "bi-number-interval",
height: 24, height: 24,
validation: "valid", validation: "valid",
closeMin: true closeMin: true,
allowBlank: true,
watermark: BI.i18nText("BI-Basic_Unrestricted")
}); });
}, },
_init: function () { _init: function () {
@ -57442,8 +57444,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.smallEditor = BI.createWidget({ this.smallEditor = BI.createWidget({
type: "bi.number_interval_single_editor", type: "bi.number_interval_single_editor",
height: o.height - 2, height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: o.watermark,
allowBlank: true, allowBlank: o.allowBlank,
value: o.min, value: o.min,
level: "warning", level: "warning",
tipType: "success", tipType: "success",
@ -57482,8 +57484,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.bigEditor = BI.createWidget({ this.bigEditor = BI.createWidget({
type: "bi.number_interval_single_editor", type: "bi.number_interval_single_editor",
height: o.height - 2, height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: o.watermark,
allowBlank: true, allowBlank: o.allowBlank,
value: o.max, value: o.max,
level: "warning", level: "warning",
tipType: "success", tipType: "success",

4
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

12
dist/widget.js vendored
Unescape View File

@ -14557,7 +14557,9 @@ BI.NumberInterval = BI.inherit(BI.Single, {
extraCls: "bi-number-interval", extraCls: "bi-number-interval",
height: 24, height: 24,
validation: "valid", validation: "valid",
closeMin: true closeMin: true,
allowBlank: true,
watermark: BI.i18nText("BI-Basic_Unrestricted")
}); });
}, },
_init: function () { _init: function () {
@ -14566,8 +14568,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.smallEditor = BI.createWidget({ this.smallEditor = BI.createWidget({
type: "bi.number_interval_single_editor", type: "bi.number_interval_single_editor",
height: o.height - 2, height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: o.watermark,
allowBlank: true, allowBlank: o.allowBlank,
value: o.min, value: o.min,
level: "warning", level: "warning",
tipType: "success", tipType: "success",
@ -14606,8 +14608,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.bigEditor = BI.createWidget({ this.bigEditor = BI.createWidget({
type: "bi.number_interval_single_editor", type: "bi.number_interval_single_editor",
height: o.height - 2, height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: o.watermark,
allowBlank: true, allowBlank: o.allowBlank,
value: o.max, value: o.max,
level: "warning", level: "warning",
tipType: "success", tipType: "success",

12
src/widget/numberinterval/numberinterval.js
Unescape View File

@ -26,7 +26,9 @@ BI.NumberInterval = BI.inherit(BI.Single, {
extraCls: "bi-number-interval", extraCls: "bi-number-interval",
height: 24, height: 24,
validation: "valid", validation: "valid",
closeMin: true closeMin: true,
allowBlank: true,
watermark: BI.i18nText("BI-Basic_Unrestricted")
}); });
}, },
_init: function () { _init: function () {
@ -35,8 +37,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.smallEditor = BI.createWidget({ this.smallEditor = BI.createWidget({
type: "bi.number_interval_single_editor", type: "bi.number_interval_single_editor",
height: o.height - 2, height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: o.watermark,
allowBlank: true, allowBlank: o.allowBlank,
value: o.min, value: o.min,
level: "warning", level: "warning",
tipType: "success", tipType: "success",
@ -75,8 +77,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.bigEditor = BI.createWidget({ this.bigEditor = BI.createWidget({
type: "bi.number_interval_single_editor", type: "bi.number_interval_single_editor",
height: o.height - 2, height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: o.watermark,
allowBlank: true, allowBlank: o.allowBlank,
value: o.max, value: o.max,
level: "warning", level: "warning",
tipType: "success", tipType: "success",

Write Preview
Loading…
Cancel
Save