caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://www.finedevelop.com:2015/scm/~guy/fineui

es6
iapyang 7 years ago
parent
813f983b8a 135ec5c402
commit
b0f6bcc7d8
20 changed files with 46 additions and 84 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. 3
      bi/base.js
  2. 12
      bi/case.js
  3. 4
      bi/widget.js
  4. 3
      dist/base.js
  5. 30
      dist/bundle.js
  6. 32
      dist/bundle.min.js
  7. 12
      dist/case.js
  8. 11
      dist/demo.js
  9. 4
      dist/widget.js
  10. 2
      src/base/single/editor/editor.js
  11. 1
      src/base/single/input/input.js
  12. 2
      src/case/editor/editor.shelter.js
  13. 2
      src/case/editor/editor.sign.initial.js
  14. 2
      src/case/editor/editor.sign.js
  15. 2
      src/case/editor/editor.state.js
  16. 1
      src/case/editor/editor.state.simple.js
  17. 2
      src/case/editor/editor.text.js
  18. 1
      src/case/trigger/trigger.editor.js
  19. 2
      src/widget/multiselect/multiselect.combo.js
  20. 2
      src/widget/multiselectlist/multiselectlist.js

3
bi/base.js
Unescape View File

@ -17933,7 +17933,6 @@ BI.Editor = BI.inherit(BI.Single, {
inputType: "text",
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,
mouseOut: false,
allowBlank: false,
watermark: "",
errorText: ""
@ -17950,7 +17949,6 @@ BI.Editor = BI.inherit(BI.Single, {
watermark: o.watermark,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
mouseOut: o.mouseOut,
allowBlank: o.allowBlank
}));
this.editor.element.css({
@ -19253,7 +19251,6 @@ BI.Input = BI.inherit(BI.Single, {
element: "<input/>",
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,//按确定键能否退出编辑
mouseOut: false,
allowBlank: false
})
},

12
bi/case.js
Unescape View File

@ -6661,7 +6661,6 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
bgap: 0,
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,
mouseOut: false,
allowBlank: true,
watermark: "",
errorText: "",
@ -6685,7 +6684,6 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
value: o.value,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
mouseOut: o.mouseOut,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText
@ -6918,7 +6916,6 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
bgap: 0,
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,
mouseOut: false,
allowBlank: true,
watermark: "",
errorText: "",
@ -6943,7 +6940,6 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
value: o.value,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
mouseOut: o.mouseOut,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText
@ -7189,7 +7185,6 @@ BI.SignEditor = BI.inherit(BI.Widget, {
bgap: 0,
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,
mouseOut: false,
allowBlank: true,
watermark: "",
errorText: "",
@ -7212,7 +7207,6 @@ BI.SignEditor = BI.inherit(BI.Widget, {
value: o.value,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
mouseOut: o.mouseOut,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText
@ -7449,7 +7443,6 @@ BI.StateEditor = BI.inherit(BI.Widget, {
bgap: 0,
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,
mouseOut: false,
allowBlank: true,
watermark: "",
errorText: "",
@ -7472,7 +7465,6 @@ BI.StateEditor = BI.inherit(BI.Widget, {
value: o.value,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
mouseOut: o.mouseOut,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText
@ -7747,7 +7739,6 @@ BI.SimpleStateEditor = BI.inherit(BI.Widget, {
value: o.value,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
mouseOut: o.mouseOut,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText
@ -7978,7 +7969,6 @@ BI.TextEditor = BI.inherit(BI.Widget, {
bgap: 0,
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,
mouseOut: false,
allowBlank: false,
watermark: "",
errorText: "",
@ -8007,7 +7997,6 @@ BI.TextEditor = BI.inherit(BI.Widget, {
value: o.value,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
mouseOut: o.mouseOut,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText
@ -12455,7 +12444,6 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
value: o.value,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
mouseOut: false,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText

4
bi/widget.js
Unescape View File

@ -8345,7 +8345,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
},
getValue: function () {
return this.storeValue;
return BI.deepClone(this.storeValue);
},
populate: function () {
@ -9749,7 +9749,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
},
getValue: function () {
return this.storeValue;
return BI.deepClone(this.storeValue);
},
populate: function () {

3
dist/base.js vendored
Unescape View File

@ -17933,7 +17933,6 @@ BI.Editor = BI.inherit(BI.Single, {
inputType: "text",
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,
mouseOut: false,
allowBlank: false,
watermark: "",
errorText: ""
@ -17950,7 +17949,6 @@ BI.Editor = BI.inherit(BI.Single, {
watermark: o.watermark,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
mouseOut: o.mouseOut,
allowBlank: o.allowBlank
}));
this.editor.element.css({
@ -19253,7 +19251,6 @@ BI.Input = BI.inherit(BI.Single, {
element: "<input/>",
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,//按确定键能否退出编辑
mouseOut: false,
allowBlank: false
})
},

30
dist/bundle.js vendored
Unescape View File

@ -46662,7 +46662,6 @@ BI.Editor = BI.inherit(BI.Single, {
inputType: "text",
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,
mouseOut: false,
allowBlank: false,
watermark: "",
errorText: ""
@ -46679,7 +46678,6 @@ BI.Editor = BI.inherit(BI.Single, {
watermark: o.watermark,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
mouseOut: o.mouseOut,
allowBlank: o.allowBlank
}));
this.editor.element.css({
@ -47982,7 +47980,6 @@ BI.Input = BI.inherit(BI.Single, {
element: "<input/>",
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,//按确定键能否退出编辑
mouseOut: false,
allowBlank: false
})
},
@ -70920,7 +70917,6 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
bgap: 0,
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,
mouseOut: false,
allowBlank: true,
watermark: "",
errorText: "",
@ -70944,7 +70940,6 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
value: o.value,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
mouseOut: o.mouseOut,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText
@ -71177,7 +71172,6 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
bgap: 0,
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,
mouseOut: false,
allowBlank: true,
watermark: "",
errorText: "",
@ -71202,7 +71196,6 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
value: o.value,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
mouseOut: o.mouseOut,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText
@ -71448,7 +71441,6 @@ BI.SignEditor = BI.inherit(BI.Widget, {
bgap: 0,
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,
mouseOut: false,
allowBlank: true,
watermark: "",
errorText: "",
@ -71471,7 +71463,6 @@ BI.SignEditor = BI.inherit(BI.Widget, {
value: o.value,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
mouseOut: o.mouseOut,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText
@ -71708,7 +71699,6 @@ BI.StateEditor = BI.inherit(BI.Widget, {
bgap: 0,
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,
mouseOut: false,
allowBlank: true,
watermark: "",
errorText: "",
@ -71731,7 +71721,6 @@ BI.StateEditor = BI.inherit(BI.Widget, {
value: o.value,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
mouseOut: o.mouseOut,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText
@ -72006,7 +71995,6 @@ BI.SimpleStateEditor = BI.inherit(BI.Widget, {
value: o.value,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
mouseOut: o.mouseOut,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText
@ -72237,7 +72225,6 @@ BI.TextEditor = BI.inherit(BI.Widget, {
bgap: 0,
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,
mouseOut: false,
allowBlank: false,
watermark: "",
errorText: "",
@ -72266,7 +72253,6 @@ BI.TextEditor = BI.inherit(BI.Widget, {
value: o.value,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
mouseOut: o.mouseOut,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText
@ -76714,7 +76700,6 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
value: o.value,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
mouseOut: false,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText
@ -85354,7 +85339,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
},
getValue: function () {
return this.storeValue;
return BI.deepClone(this.storeValue);
},
populate: function () {
@ -86758,7 +86743,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
},
getValue: function () {
return this.storeValue;
return BI.deepClone(this.storeValue);
},
populate: function () {
@ -93677,4 +93662,15 @@ BI.i18n = {
"BI-Basic_Simple_Thursday": "四",
"BI-Basic_Simple_Friday": "五",
"BI-Basic_Simple_Saturday": "六",
"BI-Multi_Date_Year": "年",
"BI-Multi_Date_Month": "月",
"BI-Multi_Date_Quarter": "季度",
"BI-Basic_Unrestricted": "无限制",
"BI-Quarter_1": "第1季度",
"BI-Quarter_2": "第2季度",
"BI-Quarter_3": "第3季度",
"BI-Quarter_4": "第4季度",
"BI-Basic_Value": "值",
"BI-Load_More": "加载更多",
"BI-Select_All": "全选"
};

32
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

12
dist/case.js vendored
Unescape View File

@ -6661,7 +6661,6 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
bgap: 0,
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,
mouseOut: false,
allowBlank: true,
watermark: "",
errorText: "",
@ -6685,7 +6684,6 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
value: o.value,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
mouseOut: o.mouseOut,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText
@ -6918,7 +6916,6 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
bgap: 0,
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,
mouseOut: false,
allowBlank: true,
watermark: "",
errorText: "",
@ -6943,7 +6940,6 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
value: o.value,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
mouseOut: o.mouseOut,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText
@ -7189,7 +7185,6 @@ BI.SignEditor = BI.inherit(BI.Widget, {
bgap: 0,
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,
mouseOut: false,
allowBlank: true,
watermark: "",
errorText: "",
@ -7212,7 +7207,6 @@ BI.SignEditor = BI.inherit(BI.Widget, {
value: o.value,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
mouseOut: o.mouseOut,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText
@ -7449,7 +7443,6 @@ BI.StateEditor = BI.inherit(BI.Widget, {
bgap: 0,
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,
mouseOut: false,
allowBlank: true,
watermark: "",
errorText: "",
@ -7472,7 +7465,6 @@ BI.StateEditor = BI.inherit(BI.Widget, {
value: o.value,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
mouseOut: o.mouseOut,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText
@ -7747,7 +7739,6 @@ BI.SimpleStateEditor = BI.inherit(BI.Widget, {
value: o.value,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
mouseOut: o.mouseOut,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText
@ -7978,7 +7969,6 @@ BI.TextEditor = BI.inherit(BI.Widget, {
bgap: 0,
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,
mouseOut: false,
allowBlank: false,
watermark: "",
errorText: "",
@ -8007,7 +7997,6 @@ BI.TextEditor = BI.inherit(BI.Widget, {
value: o.value,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
mouseOut: o.mouseOut,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText
@ -12455,7 +12444,6 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
value: o.value,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
mouseOut: false,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText

11
dist/demo.js vendored
Unescape View File

@ -18,6 +18,17 @@ BI.i18n = {
"BI-Basic_Simple_Thursday": "四",
"BI-Basic_Simple_Friday": "五",
"BI-Basic_Simple_Saturday": "六",
"BI-Multi_Date_Year": "年",
"BI-Multi_Date_Month": "月",
"BI-Multi_Date_Quarter": "季度",
"BI-Basic_Unrestricted": "无限制",
"BI-Quarter_1": "第1季度",
"BI-Quarter_2": "第2季度",
"BI-Quarter_3": "第3季度",
"BI-Quarter_4": "第4季度",
"BI-Basic_Value": "值",
"BI-Load_More": "加载更多",
"BI-Select_All": "全选"
};$(function () {
var ref;
BI.createWidget({

4
dist/widget.js vendored
Unescape View File

@ -8345,7 +8345,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
},
getValue: function () {
return this.storeValue;
return BI.deepClone(this.storeValue);
},
populate: function () {
@ -9749,7 +9749,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
},
getValue: function () {
return this.storeValue;
return BI.deepClone(this.storeValue);
},
populate: function () {

2
src/base/single/editor/editor.js
Unescape View File

@ -19,7 +19,6 @@ BI.Editor = BI.inherit(BI.Single, {
inputType: "text",
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,
mouseOut: false,
allowBlank: false,
watermark: "",
errorText: ""
@ -36,7 +35,6 @@ BI.Editor = BI.inherit(BI.Single, {
watermark: o.watermark,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
mouseOut: o.mouseOut,
allowBlank: o.allowBlank
}));
this.editor.element.css({

1
src/base/single/input/input.js
Unescape View File

@ -12,7 +12,6 @@ BI.Input = BI.inherit(BI.Single, {
element: "<input/>",
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,//按确定键能否退出编辑
mouseOut: false,
allowBlank: false
})
},

2
src/case/editor/editor.shelter.js
Unescape View File

@ -17,7 +17,6 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
bgap: 0,
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,
mouseOut: false,
allowBlank: true,
watermark: "",
errorText: "",
@ -41,7 +40,6 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
value: o.value,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
mouseOut: o.mouseOut,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText

2
src/case/editor/editor.sign.initial.js
Unescape View File

@ -14,7 +14,6 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
bgap: 0,
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,
mouseOut: false,
allowBlank: true,
watermark: "",
errorText: "",
@ -39,7 +38,6 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
value: o.value,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
mouseOut: o.mouseOut,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText

2
src/case/editor/editor.sign.js
Unescape View File

@ -17,7 +17,6 @@ BI.SignEditor = BI.inherit(BI.Widget, {
bgap: 0,
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,
mouseOut: false,
allowBlank: true,
watermark: "",
errorText: "",
@ -40,7 +39,6 @@ BI.SignEditor = BI.inherit(BI.Widget, {
value: o.value,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
mouseOut: o.mouseOut,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText

2
src/case/editor/editor.state.js
Unescape View File

@ -17,7 +17,6 @@ BI.StateEditor = BI.inherit(BI.Widget, {
bgap: 0,
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,
mouseOut: false,
allowBlank: true,
watermark: "",
errorText: "",
@ -40,7 +39,6 @@ BI.StateEditor = BI.inherit(BI.Widget, {
value: o.value,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
mouseOut: o.mouseOut,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText

1
src/case/editor/editor.state.simple.js
Unescape View File

@ -40,7 +40,6 @@ BI.SimpleStateEditor = BI.inherit(BI.Widget, {
value: o.value,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
mouseOut: o.mouseOut,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText

2
src/case/editor/editor.text.js
Unescape View File

@ -16,7 +16,6 @@ BI.TextEditor = BI.inherit(BI.Widget, {
bgap: 0,
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,
mouseOut: false,
allowBlank: false,
watermark: "",
errorText: "",
@ -45,7 +44,6 @@ BI.TextEditor = BI.inherit(BI.Widget, {
value: o.value,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
mouseOut: o.mouseOut,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText

1
src/case/trigger/trigger.editor.js
Unescape View File

@ -34,7 +34,6 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
value: o.value,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
mouseOut: false,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText

2
src/widget/multiselect/multiselect.combo.js
Unescape View File

@ -356,7 +356,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
},
getValue: function () {
return this.storeValue;
return BI.deepClone(this.storeValue);
},
populate: function () {

2
src/widget/multiselectlist/multiselectlist.js
Unescape View File

@ -322,7 +322,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
},
getValue: function () {
return this.storeValue;
return BI.deepClone(this.storeValue);
},
populate: function () {

Write Preview
Loading…
Cancel
Save