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

CHART-9360 fix: 调整数值区间控件，使之能接受watermark和allowBlank

es6
Zhenfei.Li 5 years ago
parent
7c737cff58
commit
7dce3ed5ac
17 changed files with 279 additions and 252 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. 15
      dist/2.0/fineui.ie.js
  2. 58
      dist/2.0/fineui.ie.min.js
  3. 15
      dist/2.0/fineui.js
  4. 74
      dist/2.0/fineui.min.js
  5. 4
      dist/base.js
  6. 15
      dist/bundle.ie.js
  7. 58
      dist/bundle.ie.min.js
  8. 15
      dist/bundle.js
  9. 74
      dist/bundle.min.js
  10. 15
      dist/fineui.ie.js
  11. 58
      dist/fineui.ie.min.js
  12. 15
      dist/fineui.js
  13. 74
      dist/fineui.min.js
  14. 15
      dist/fineui_without_jquery_polyfill.js
  15. 4
      dist/utils.min.js
  16. 11
      dist/widget.js
  17. 11
      src/widget/numberinterval/numberinterval.js

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

@ -45191,8 +45191,8 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
handler: BI.emptyFn,
width: 16,
height: 16,
iconWidth: 14,
iconHeight: 14
iconWidth: 16,
iconHeight: 16
},
render: function () {
@ -74354,6 +74354,9 @@ BI.shortcut("bi.number_editor", BI.NumberEditor);// 小于号的值为：0，小
*
*/
BI.NumberInterval = BI.inherit(BI.Single, {
props: {
allowBlank: true
},
constants: {
typeError: "typeBubble",
numberError: "numberBubble",
@ -74384,8 +74387,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.smallEditor = BI.createWidget({
type: "bi.number_interval_single_editor",
height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: true,
watermark: BI.isString(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: o.allowBlank,
value: o.min,
level: "warning",
tipType: "success",
@ -74424,8 +74427,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.bigEditor = BI.createWidget({
type: "bi.number_interval_single_editor",
height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: true,
watermark: BI.isString(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: o.allowBlank,
value: o.max,
level: "warning",
tipType: "success",

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

File diff suppressed because one or more lines are too long

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

@ -45595,8 +45595,8 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
handler: BI.emptyFn,
width: 16,
height: 16,
iconWidth: 14,
iconHeight: 14
iconWidth: 16,
iconHeight: 16
},
render: function () {
@ -74758,6 +74758,9 @@ BI.shortcut("bi.number_editor", BI.NumberEditor);// 小于号的值为：0，小
*
*/
BI.NumberInterval = BI.inherit(BI.Single, {
props: {
allowBlank: true
},
constants: {
typeError: "typeBubble",
numberError: "numberBubble",
@ -74788,8 +74791,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.smallEditor = BI.createWidget({
type: "bi.number_interval_single_editor",
height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: true,
watermark: BI.isString(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: o.allowBlank,
value: o.min,
level: "warning",
tipType: "success",
@ -74828,8 +74831,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.bigEditor = BI.createWidget({
type: "bi.number_interval_single_editor",
height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: true,
watermark: BI.isString(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: o.allowBlank,
value: o.max,
level: "warning",
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,
width: 16,
height: 16,
iconWidth: 14,
iconHeight: 14
iconWidth: 16,
iconHeight: 16
},
render: function () {

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

@ -45191,8 +45191,8 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
handler: BI.emptyFn,
width: 16,
height: 16,
iconWidth: 14,
iconHeight: 14
iconWidth: 16,
iconHeight: 16
},
render: function () {
@ -74354,6 +74354,9 @@ BI.shortcut("bi.number_editor", BI.NumberEditor);// 小于号的值为：0，小
*
*/
BI.NumberInterval = BI.inherit(BI.Single, {
props: {
allowBlank: true
},
constants: {
typeError: "typeBubble",
numberError: "numberBubble",
@ -74384,8 +74387,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.smallEditor = BI.createWidget({
type: "bi.number_interval_single_editor",
height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: true,
watermark: BI.isString(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: o.allowBlank,
value: o.min,
level: "warning",
tipType: "success",
@ -74424,8 +74427,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.bigEditor = BI.createWidget({
type: "bi.number_interval_single_editor",
height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: true,
watermark: BI.isString(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: o.allowBlank,
value: o.max,
level: "warning",
tipType: "success",

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

File diff suppressed because one or more lines are too long

15
dist/bundle.js vendored
Unescape View File

@ -45595,8 +45595,8 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
handler: BI.emptyFn,
width: 16,
height: 16,
iconWidth: 14,
iconHeight: 14
iconWidth: 16,
iconHeight: 16
},
render: function () {
@ -74758,6 +74758,9 @@ BI.shortcut("bi.number_editor", BI.NumberEditor);// 小于号的值为：0，小
*
*/
BI.NumberInterval = BI.inherit(BI.Single, {
props: {
allowBlank: true
},
constants: {
typeError: "typeBubble",
numberError: "numberBubble",
@ -74788,8 +74791,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.smallEditor = BI.createWidget({
type: "bi.number_interval_single_editor",
height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: true,
watermark: BI.isString(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: o.allowBlank,
value: o.min,
level: "warning",
tipType: "success",
@ -74828,8 +74831,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.bigEditor = BI.createWidget({
type: "bi.number_interval_single_editor",
height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: true,
watermark: BI.isString(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: o.allowBlank,
value: o.max,
level: "warning",
tipType: "success",

74
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -45436,8 +45436,8 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
handler: BI.emptyFn,
width: 16,
height: 16,
iconWidth: 14,
iconHeight: 14
iconWidth: 16,
iconHeight: 16
},
render: function () {
@ -74599,6 +74599,9 @@ BI.shortcut("bi.number_editor", BI.NumberEditor);// 小于号的值为：0，小
*
*/
BI.NumberInterval = BI.inherit(BI.Single, {
props: {
allowBlank: true
},
constants: {
typeError: "typeBubble",
numberError: "numberBubble",
@ -74629,8 +74632,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.smallEditor = BI.createWidget({
type: "bi.number_interval_single_editor",
height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: true,
watermark: BI.isString(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: o.allowBlank,
value: o.min,
level: "warning",
tipType: "success",
@ -74669,8 +74672,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.bigEditor = BI.createWidget({
type: "bi.number_interval_single_editor",
height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: true,
watermark: BI.isString(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: o.allowBlank,
value: o.max,
level: "warning",
tipType: "success",

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

File diff suppressed because one or more lines are too long

15
dist/fineui.js vendored
Unescape View File

@ -45840,8 +45840,8 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
handler: BI.emptyFn,
width: 16,
height: 16,
iconWidth: 14,
iconHeight: 14
iconWidth: 16,
iconHeight: 16
},
render: function () {
@ -75003,6 +75003,9 @@ BI.shortcut("bi.number_editor", BI.NumberEditor);// 小于号的值为：0，小
*
*/
BI.NumberInterval = BI.inherit(BI.Single, {
props: {
allowBlank: true
},
constants: {
typeError: "typeBubble",
numberError: "numberBubble",
@ -75033,8 +75036,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.smallEditor = BI.createWidget({
type: "bi.number_interval_single_editor",
height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: true,
watermark: BI.isString(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: o.allowBlank,
value: o.min,
level: "warning",
tipType: "success",
@ -75073,8 +75076,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.bigEditor = BI.createWidget({
type: "bi.number_interval_single_editor",
height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: true,
watermark: BI.isString(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: o.allowBlank,
value: o.max,
level: "warning",
tipType: "success",

74
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

15
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -33036,8 +33036,8 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
handler: BI.emptyFn,
width: 16,
height: 16,
iconWidth: 14,
iconHeight: 14
iconWidth: 16,
iconHeight: 16
},
render: function () {
@ -57412,6 +57412,9 @@ BI.shortcut("bi.number_editor", BI.NumberEditor);// 小于号的值为：0，小
*
*/
BI.NumberInterval = BI.inherit(BI.Single, {
props: {
allowBlank: true
},
constants: {
typeError: "typeBubble",
numberError: "numberBubble",
@ -57442,8 +57445,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.smallEditor = BI.createWidget({
type: "bi.number_interval_single_editor",
height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: true,
watermark: BI.isString(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: o.allowBlank,
value: o.min,
level: "warning",
tipType: "success",
@ -57482,8 +57485,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.bigEditor = BI.createWidget({
type: "bi.number_interval_single_editor",
height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: true,
watermark: BI.isString(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: o.allowBlank,
value: o.max,
level: "warning",
tipType: "success",

4
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

11
dist/widget.js vendored
Unescape View File

@ -14536,6 +14536,9 @@ BI.shortcut("bi.number_editor", BI.NumberEditor);// 小于号的值为：0，小
*
*/
BI.NumberInterval = BI.inherit(BI.Single, {
props: {
allowBlank: true
},
constants: {
typeError: "typeBubble",
numberError: "numberBubble",
@ -14566,8 +14569,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.smallEditor = BI.createWidget({
type: "bi.number_interval_single_editor",
height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: true,
watermark: BI.isString(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: o.allowBlank,
value: o.min,
level: "warning",
tipType: "success",
@ -14606,8 +14609,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.bigEditor = BI.createWidget({
type: "bi.number_interval_single_editor",
height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: true,
watermark: BI.isString(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: o.allowBlank,
value: o.max,
level: "warning",
tipType: "success",

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

@ -5,6 +5,9 @@
*
*/
BI.NumberInterval = BI.inherit(BI.Single, {
props: {
allowBlank: true
},
constants: {
typeError: "typeBubble",
numberError: "numberBubble",
@ -35,8 +38,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.smallEditor = BI.createWidget({
type: "bi.number_interval_single_editor",
height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: true,
watermark: BI.isString(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: o.allowBlank,
value: o.min,
level: "warning",
tipType: "success",
@ -75,8 +78,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.bigEditor = BI.createWidget({
type: "bi.number_interval_single_editor",
height: o.height - 2,
watermark: BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: true,
watermark: BI.isString(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: o.allowBlank,
value: o.max,
level: "warning",
tipType: "success",

Write Preview
Loading…
Cancel
Save