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

Merge pull request #1117 in VISUAL/fineui from ~WINDY/fineui:master to master 

* commit '29ba88d93c781b2e1a0eea0bb66f29105c006bce':
  REPORT-21270 && BI-50853: fix: 补充valuechooser的水印和默认值配置
es6
windy 5 years ago
parent
9bb381bbf3 29ba88d93c
commit
bef357ff5e
15 changed files with 171 additions and 18 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. 21
      dist/2.0/fineui.ie.js
  2. 21
      dist/2.0/fineui.js
  3. 21
      dist/bundle.ie.js
  4. 21
      dist/bundle.js
  5. 21
      dist/fineui.ie.js
  6. 21
      dist/fineui.js
  7. 21
      dist/fineui_without_jquery_polyfill.js
  8. 21
      dist/widget.js
  9. 2
      src/component/treevaluechooser/combo.listtreevaluechooser.js
  10. 2
      src/component/treevaluechooser/combo.treevaluechooser.insert.js
  11. 2
      src/component/treevaluechooser/combo.treevaluechooser.js
  12. 4
      src/widget/dynamicdatetime/dynamicdatetime.timeselect.js
  13. 2
      src/widget/multitree/multi.tree.combo.js
  14. 1
      src/widget/multitree/multi.tree.list.combo.js
  15. 8
      src/widget/numbereditor/number.editor.js

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

@ -66173,7 +66173,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
}, { }, {
eventName: BI.SignEditor.EVENT_CHANGE, eventName: BI.SignEditor.EVENT_CHANGE,
action: function () { action: function () {
var value = self._autoSwitch(this.getValue(), BI.DynamicDateTimeSelect.HOUR); var value = self._autoSwitch(this.getLastChangedValue(), BI.DynamicDateTimeSelect.HOUR);
this.setValue(value); this.setValue(value);
} }
}], }],
@ -66209,7 +66209,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
}, { }, {
eventName: BI.SignEditor.EVENT_CHANGE, eventName: BI.SignEditor.EVENT_CHANGE,
action: function () { action: function () {
var value = self._autoSwitch(this.getValue(), BI.DynamicDateTimeSelect.MINUTE); var value = self._autoSwitch(this.getLastChangedValue(), BI.DynamicDateTimeSelect.MINUTE);
this.setValue(value); this.setValue(value);
} }
}], }],
@ -75934,6 +75934,8 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
type: "bi.multi_select_trigger", type: "bi.multi_select_trigger",
height: o.height, height: o.height,
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
text: o.text,
watermark: o.watermark,
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
offset: this.constants.offset offset: this.constants.offset
@ -76529,6 +76531,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
type: "bi.multi_select_trigger", type: "bi.multi_select_trigger",
allowEdit: o.allowEdit, allowEdit: o.allowEdit,
text: o.text, text: o.text,
watermark: o.watermark,
height: o.height, height: o.height,
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
// adapter: this.popup, // adapter: this.popup,
@ -77622,6 +77625,14 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
this.bottomBtn.setEnable(!!v); this.bottomBtn.setEnable(!!v);
}, },
getLastValidValue: function () {
return this.editor.getLastValidValue();
},
getLastChangedValue: function () {
return this.editor.getLastChangedValue();
},
getValue: function () { getValue: function () {
return this.options.value; return this.options.value;
}, },
@ -88525,6 +88536,8 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser,
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_tree_list_combo", type: "bi.multi_tree_list_combo",
element: this, element: this,
text: o.text,
watermark: o.watermark,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
width: o.width, width: o.width,
@ -88610,6 +88623,8 @@ BI.TreeValueChooserInsertCombo = BI.inherit(BI.AbstractTreeValueChooser, {
} }
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_tree_insert_combo", type: "bi.multi_tree_insert_combo",
text: o.text,
watermark: o.watermark,
element: this, element: this,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
@ -88696,6 +88711,8 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
} }
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_tree_combo", type: "bi.multi_tree_combo",
text: o.text,
watermark: o.watermark,
element: this, element: this,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),

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

@ -66577,7 +66577,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
}, { }, {
eventName: BI.SignEditor.EVENT_CHANGE, eventName: BI.SignEditor.EVENT_CHANGE,
action: function () { action: function () {
var value = self._autoSwitch(this.getValue(), BI.DynamicDateTimeSelect.HOUR); var value = self._autoSwitch(this.getLastChangedValue(), BI.DynamicDateTimeSelect.HOUR);
this.setValue(value); this.setValue(value);
} }
}], }],
@ -66613,7 +66613,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
}, { }, {
eventName: BI.SignEditor.EVENT_CHANGE, eventName: BI.SignEditor.EVENT_CHANGE,
action: function () { action: function () {
var value = self._autoSwitch(this.getValue(), BI.DynamicDateTimeSelect.MINUTE); var value = self._autoSwitch(this.getLastChangedValue(), BI.DynamicDateTimeSelect.MINUTE);
this.setValue(value); this.setValue(value);
} }
}], }],
@ -76338,6 +76338,8 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
type: "bi.multi_select_trigger", type: "bi.multi_select_trigger",
height: o.height, height: o.height,
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
text: o.text,
watermark: o.watermark,
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
offset: this.constants.offset offset: this.constants.offset
@ -76933,6 +76935,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
type: "bi.multi_select_trigger", type: "bi.multi_select_trigger",
allowEdit: o.allowEdit, allowEdit: o.allowEdit,
text: o.text, text: o.text,
watermark: o.watermark,
height: o.height, height: o.height,
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
// adapter: this.popup, // adapter: this.popup,
@ -78026,6 +78029,14 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
this.bottomBtn.setEnable(!!v); this.bottomBtn.setEnable(!!v);
}, },
getLastValidValue: function () {
return this.editor.getLastValidValue();
},
getLastChangedValue: function () {
return this.editor.getLastChangedValue();
},
getValue: function () { getValue: function () {
return this.options.value; return this.options.value;
}, },
@ -88929,6 +88940,8 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser,
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_tree_list_combo", type: "bi.multi_tree_list_combo",
element: this, element: this,
text: o.text,
watermark: o.watermark,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
width: o.width, width: o.width,
@ -89014,6 +89027,8 @@ BI.TreeValueChooserInsertCombo = BI.inherit(BI.AbstractTreeValueChooser, {
} }
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_tree_insert_combo", type: "bi.multi_tree_insert_combo",
text: o.text,
watermark: o.watermark,
element: this, element: this,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
@ -89100,6 +89115,8 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
} }
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_tree_combo", type: "bi.multi_tree_combo",
text: o.text,
watermark: o.watermark,
element: this, element: this,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),

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

@ -66173,7 +66173,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
}, { }, {
eventName: BI.SignEditor.EVENT_CHANGE, eventName: BI.SignEditor.EVENT_CHANGE,
action: function () { action: function () {
var value = self._autoSwitch(this.getValue(), BI.DynamicDateTimeSelect.HOUR); var value = self._autoSwitch(this.getLastChangedValue(), BI.DynamicDateTimeSelect.HOUR);
this.setValue(value); this.setValue(value);
} }
}], }],
@ -66209,7 +66209,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
}, { }, {
eventName: BI.SignEditor.EVENT_CHANGE, eventName: BI.SignEditor.EVENT_CHANGE,
action: function () { action: function () {
var value = self._autoSwitch(this.getValue(), BI.DynamicDateTimeSelect.MINUTE); var value = self._autoSwitch(this.getLastChangedValue(), BI.DynamicDateTimeSelect.MINUTE);
this.setValue(value); this.setValue(value);
} }
}], }],
@ -75934,6 +75934,8 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
type: "bi.multi_select_trigger", type: "bi.multi_select_trigger",
height: o.height, height: o.height,
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
text: o.text,
watermark: o.watermark,
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
offset: this.constants.offset offset: this.constants.offset
@ -76529,6 +76531,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
type: "bi.multi_select_trigger", type: "bi.multi_select_trigger",
allowEdit: o.allowEdit, allowEdit: o.allowEdit,
text: o.text, text: o.text,
watermark: o.watermark,
height: o.height, height: o.height,
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
// adapter: this.popup, // adapter: this.popup,
@ -77622,6 +77625,14 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
this.bottomBtn.setEnable(!!v); this.bottomBtn.setEnable(!!v);
}, },
getLastValidValue: function () {
return this.editor.getLastValidValue();
},
getLastChangedValue: function () {
return this.editor.getLastChangedValue();
},
getValue: function () { getValue: function () {
return this.options.value; return this.options.value;
}, },
@ -88525,6 +88536,8 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser,
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_tree_list_combo", type: "bi.multi_tree_list_combo",
element: this, element: this,
text: o.text,
watermark: o.watermark,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
width: o.width, width: o.width,
@ -88610,6 +88623,8 @@ BI.TreeValueChooserInsertCombo = BI.inherit(BI.AbstractTreeValueChooser, {
} }
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_tree_insert_combo", type: "bi.multi_tree_insert_combo",
text: o.text,
watermark: o.watermark,
element: this, element: this,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
@ -88696,6 +88711,8 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
} }
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_tree_combo", type: "bi.multi_tree_combo",
text: o.text,
watermark: o.watermark,
element: this, element: this,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),

21
dist/bundle.js vendored
Unescape View File

@ -66577,7 +66577,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
}, { }, {
eventName: BI.SignEditor.EVENT_CHANGE, eventName: BI.SignEditor.EVENT_CHANGE,
action: function () { action: function () {
var value = self._autoSwitch(this.getValue(), BI.DynamicDateTimeSelect.HOUR); var value = self._autoSwitch(this.getLastChangedValue(), BI.DynamicDateTimeSelect.HOUR);
this.setValue(value); this.setValue(value);
} }
}], }],
@ -66613,7 +66613,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
}, { }, {
eventName: BI.SignEditor.EVENT_CHANGE, eventName: BI.SignEditor.EVENT_CHANGE,
action: function () { action: function () {
var value = self._autoSwitch(this.getValue(), BI.DynamicDateTimeSelect.MINUTE); var value = self._autoSwitch(this.getLastChangedValue(), BI.DynamicDateTimeSelect.MINUTE);
this.setValue(value); this.setValue(value);
} }
}], }],
@ -76338,6 +76338,8 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
type: "bi.multi_select_trigger", type: "bi.multi_select_trigger",
height: o.height, height: o.height,
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
text: o.text,
watermark: o.watermark,
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
offset: this.constants.offset offset: this.constants.offset
@ -76933,6 +76935,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
type: "bi.multi_select_trigger", type: "bi.multi_select_trigger",
allowEdit: o.allowEdit, allowEdit: o.allowEdit,
text: o.text, text: o.text,
watermark: o.watermark,
height: o.height, height: o.height,
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
// adapter: this.popup, // adapter: this.popup,
@ -78026,6 +78029,14 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
this.bottomBtn.setEnable(!!v); this.bottomBtn.setEnable(!!v);
}, },
getLastValidValue: function () {
return this.editor.getLastValidValue();
},
getLastChangedValue: function () {
return this.editor.getLastChangedValue();
},
getValue: function () { getValue: function () {
return this.options.value; return this.options.value;
}, },
@ -88929,6 +88940,8 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser,
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_tree_list_combo", type: "bi.multi_tree_list_combo",
element: this, element: this,
text: o.text,
watermark: o.watermark,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
width: o.width, width: o.width,
@ -89014,6 +89027,8 @@ BI.TreeValueChooserInsertCombo = BI.inherit(BI.AbstractTreeValueChooser, {
} }
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_tree_insert_combo", type: "bi.multi_tree_insert_combo",
text: o.text,
watermark: o.watermark,
element: this, element: this,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
@ -89100,6 +89115,8 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
} }
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_tree_combo", type: "bi.multi_tree_combo",
text: o.text,
watermark: o.watermark,
element: this, element: this,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),

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

@ -66418,7 +66418,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
}, { }, {
eventName: BI.SignEditor.EVENT_CHANGE, eventName: BI.SignEditor.EVENT_CHANGE,
action: function () { action: function () {
var value = self._autoSwitch(this.getValue(), BI.DynamicDateTimeSelect.HOUR); var value = self._autoSwitch(this.getLastChangedValue(), BI.DynamicDateTimeSelect.HOUR);
this.setValue(value); this.setValue(value);
} }
}], }],
@ -66454,7 +66454,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
}, { }, {
eventName: BI.SignEditor.EVENT_CHANGE, eventName: BI.SignEditor.EVENT_CHANGE,
action: function () { action: function () {
var value = self._autoSwitch(this.getValue(), BI.DynamicDateTimeSelect.MINUTE); var value = self._autoSwitch(this.getLastChangedValue(), BI.DynamicDateTimeSelect.MINUTE);
this.setValue(value); this.setValue(value);
} }
}], }],
@ -76179,6 +76179,8 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
type: "bi.multi_select_trigger", type: "bi.multi_select_trigger",
height: o.height, height: o.height,
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
text: o.text,
watermark: o.watermark,
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
offset: this.constants.offset offset: this.constants.offset
@ -76774,6 +76776,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
type: "bi.multi_select_trigger", type: "bi.multi_select_trigger",
allowEdit: o.allowEdit, allowEdit: o.allowEdit,
text: o.text, text: o.text,
watermark: o.watermark,
height: o.height, height: o.height,
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
// adapter: this.popup, // adapter: this.popup,
@ -77867,6 +77870,14 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
this.bottomBtn.setEnable(!!v); this.bottomBtn.setEnable(!!v);
}, },
getLastValidValue: function () {
return this.editor.getLastValidValue();
},
getLastChangedValue: function () {
return this.editor.getLastChangedValue();
},
getValue: function () { getValue: function () {
return this.options.value; return this.options.value;
}, },
@ -88770,6 +88781,8 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser,
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_tree_list_combo", type: "bi.multi_tree_list_combo",
element: this, element: this,
text: o.text,
watermark: o.watermark,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
width: o.width, width: o.width,
@ -88855,6 +88868,8 @@ BI.TreeValueChooserInsertCombo = BI.inherit(BI.AbstractTreeValueChooser, {
} }
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_tree_insert_combo", type: "bi.multi_tree_insert_combo",
text: o.text,
watermark: o.watermark,
element: this, element: this,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
@ -88941,6 +88956,8 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
} }
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_tree_combo", type: "bi.multi_tree_combo",
text: o.text,
watermark: o.watermark,
element: this, element: this,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),

21
dist/fineui.js vendored
Unescape View File

@ -66822,7 +66822,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
}, { }, {
eventName: BI.SignEditor.EVENT_CHANGE, eventName: BI.SignEditor.EVENT_CHANGE,
action: function () { action: function () {
var value = self._autoSwitch(this.getValue(), BI.DynamicDateTimeSelect.HOUR); var value = self._autoSwitch(this.getLastChangedValue(), BI.DynamicDateTimeSelect.HOUR);
this.setValue(value); this.setValue(value);
} }
}], }],
@ -66858,7 +66858,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
}, { }, {
eventName: BI.SignEditor.EVENT_CHANGE, eventName: BI.SignEditor.EVENT_CHANGE,
action: function () { action: function () {
var value = self._autoSwitch(this.getValue(), BI.DynamicDateTimeSelect.MINUTE); var value = self._autoSwitch(this.getLastChangedValue(), BI.DynamicDateTimeSelect.MINUTE);
this.setValue(value); this.setValue(value);
} }
}], }],
@ -76583,6 +76583,8 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
type: "bi.multi_select_trigger", type: "bi.multi_select_trigger",
height: o.height, height: o.height,
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
text: o.text,
watermark: o.watermark,
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
offset: this.constants.offset offset: this.constants.offset
@ -77178,6 +77180,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
type: "bi.multi_select_trigger", type: "bi.multi_select_trigger",
allowEdit: o.allowEdit, allowEdit: o.allowEdit,
text: o.text, text: o.text,
watermark: o.watermark,
height: o.height, height: o.height,
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
// adapter: this.popup, // adapter: this.popup,
@ -78271,6 +78274,14 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
this.bottomBtn.setEnable(!!v); this.bottomBtn.setEnable(!!v);
}, },
getLastValidValue: function () {
return this.editor.getLastValidValue();
},
getLastChangedValue: function () {
return this.editor.getLastChangedValue();
},
getValue: function () { getValue: function () {
return this.options.value; return this.options.value;
}, },
@ -89174,6 +89185,8 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser,
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_tree_list_combo", type: "bi.multi_tree_list_combo",
element: this, element: this,
text: o.text,
watermark: o.watermark,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
width: o.width, width: o.width,
@ -89259,6 +89272,8 @@ BI.TreeValueChooserInsertCombo = BI.inherit(BI.AbstractTreeValueChooser, {
} }
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_tree_insert_combo", type: "bi.multi_tree_insert_combo",
text: o.text,
watermark: o.watermark,
element: this, element: this,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
@ -89345,6 +89360,8 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
} }
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_tree_combo", type: "bi.multi_tree_combo",
text: o.text,
watermark: o.watermark,
element: this, element: this,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),

21
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -49122,7 +49122,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
}, { }, {
eventName: BI.SignEditor.EVENT_CHANGE, eventName: BI.SignEditor.EVENT_CHANGE,
action: function () { action: function () {
var value = self._autoSwitch(this.getValue(), BI.DynamicDateTimeSelect.HOUR); var value = self._autoSwitch(this.getLastChangedValue(), BI.DynamicDateTimeSelect.HOUR);
this.setValue(value); this.setValue(value);
} }
}], }],
@ -49158,7 +49158,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
}, { }, {
eventName: BI.SignEditor.EVENT_CHANGE, eventName: BI.SignEditor.EVENT_CHANGE,
action: function () { action: function () {
var value = self._autoSwitch(this.getValue(), BI.DynamicDateTimeSelect.MINUTE); var value = self._autoSwitch(this.getLastChangedValue(), BI.DynamicDateTimeSelect.MINUTE);
this.setValue(value); this.setValue(value);
} }
}], }],
@ -58883,6 +58883,8 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
type: "bi.multi_select_trigger", type: "bi.multi_select_trigger",
height: o.height, height: o.height,
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
text: o.text,
watermark: o.watermark,
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
offset: this.constants.offset offset: this.constants.offset
@ -59478,6 +59480,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
type: "bi.multi_select_trigger", type: "bi.multi_select_trigger",
allowEdit: o.allowEdit, allowEdit: o.allowEdit,
text: o.text, text: o.text,
watermark: o.watermark,
height: o.height, height: o.height,
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
// adapter: this.popup, // adapter: this.popup,
@ -60571,6 +60574,14 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
this.bottomBtn.setEnable(!!v); this.bottomBtn.setEnable(!!v);
}, },
getLastValidValue: function () {
return this.editor.getLastValidValue();
},
getLastChangedValue: function () {
return this.editor.getLastChangedValue();
},
getValue: function () { getValue: function () {
return this.options.value; return this.options.value;
}, },
@ -71474,6 +71485,8 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser,
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_tree_list_combo", type: "bi.multi_tree_list_combo",
element: this, element: this,
text: o.text,
watermark: o.watermark,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
width: o.width, width: o.width,
@ -71559,6 +71572,8 @@ BI.TreeValueChooserInsertCombo = BI.inherit(BI.AbstractTreeValueChooser, {
} }
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_tree_insert_combo", type: "bi.multi_tree_insert_combo",
text: o.text,
watermark: o.watermark,
element: this, element: this,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
@ -71645,6 +71660,8 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
} }
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_tree_combo", type: "bi.multi_tree_combo",
text: o.text,
watermark: o.watermark,
element: this, element: this,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),

21
dist/widget.js vendored
Unescape View File

@ -4233,7 +4233,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
}, { }, {
eventName: BI.SignEditor.EVENT_CHANGE, eventName: BI.SignEditor.EVENT_CHANGE,
action: function () { action: function () {
var value = self._autoSwitch(this.getValue(), BI.DynamicDateTimeSelect.HOUR); var value = self._autoSwitch(this.getLastChangedValue(), BI.DynamicDateTimeSelect.HOUR);
this.setValue(value); this.setValue(value);
} }
}], }],
@ -4269,7 +4269,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
}, { }, {
eventName: BI.SignEditor.EVENT_CHANGE, eventName: BI.SignEditor.EVENT_CHANGE,
action: function () { action: function () {
var value = self._autoSwitch(this.getValue(), BI.DynamicDateTimeSelect.MINUTE); var value = self._autoSwitch(this.getLastChangedValue(), BI.DynamicDateTimeSelect.MINUTE);
this.setValue(value); this.setValue(value);
} }
}], }],
@ -13994,6 +13994,8 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
type: "bi.multi_select_trigger", type: "bi.multi_select_trigger",
height: o.height, height: o.height,
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
text: o.text,
watermark: o.watermark,
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
offset: this.constants.offset offset: this.constants.offset
@ -14589,6 +14591,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
type: "bi.multi_select_trigger", type: "bi.multi_select_trigger",
allowEdit: o.allowEdit, allowEdit: o.allowEdit,
text: o.text, text: o.text,
watermark: o.watermark,
height: o.height, height: o.height,
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
// adapter: this.popup, // adapter: this.popup,
@ -15682,6 +15685,14 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
this.bottomBtn.setEnable(!!v); this.bottomBtn.setEnable(!!v);
}, },
getLastValidValue: function () {
return this.editor.getLastValidValue();
},
getLastChangedValue: function () {
return this.editor.getLastChangedValue();
},
getValue: function () { getValue: function () {
return this.options.value; return this.options.value;
}, },
@ -26585,6 +26596,8 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser,
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_tree_list_combo", type: "bi.multi_tree_list_combo",
element: this, element: this,
text: o.text,
watermark: o.watermark,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
width: o.width, width: o.width,
@ -26670,6 +26683,8 @@ BI.TreeValueChooserInsertCombo = BI.inherit(BI.AbstractTreeValueChooser, {
} }
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_tree_insert_combo", type: "bi.multi_tree_insert_combo",
text: o.text,
watermark: o.watermark,
element: this, element: this,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
@ -26756,6 +26771,8 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
} }
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_tree_combo", type: "bi.multi_tree_combo",
text: o.text,
watermark: o.watermark,
element: this, element: this,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),

2
src/component/treevaluechooser/combo.listtreevaluechooser.js
Unescape View File

@ -26,6 +26,8 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser,
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_tree_list_combo", type: "bi.multi_tree_list_combo",
element: this, element: this,
text: o.text,
watermark: o.watermark,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
width: o.width, width: o.width,

2
src/component/treevaluechooser/combo.treevaluechooser.insert.js
Unescape View File

@ -25,6 +25,8 @@ BI.TreeValueChooserInsertCombo = BI.inherit(BI.AbstractTreeValueChooser, {
} }
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_tree_insert_combo", type: "bi.multi_tree_insert_combo",
text: o.text,
watermark: o.watermark,
element: this, element: this,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),

2
src/component/treevaluechooser/combo.treevaluechooser.js
Unescape View File

@ -25,6 +25,8 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
} }
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_tree_combo", type: "bi.multi_tree_combo",
text: o.text,
watermark: o.watermark,
element: this, element: this,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),

4
src/widget/dynamicdatetime/dynamicdatetime.timeselect.js
Unescape View File

@ -36,7 +36,7 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, {
}, { }, {
eventName: BI.SignEditor.EVENT_CHANGE, eventName: BI.SignEditor.EVENT_CHANGE,
action: function () { action: function () {
var value = self._autoSwitch(this.getValue(), BI.DynamicDateTimeSelect.HOUR); var value = self._autoSwitch(this.getLastChangedValue(), BI.DynamicDateTimeSelect.HOUR);
this.setValue(value); this.setValue(value);
} }
}], }],
@ -72,7 +72,7 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, {
}, { }, {
eventName: BI.SignEditor.EVENT_CHANGE, eventName: BI.SignEditor.EVENT_CHANGE,
action: function () { action: function () {
var value = self._autoSwitch(this.getValue(), BI.DynamicDateTimeSelect.MINUTE); var value = self._autoSwitch(this.getLastChangedValue(), BI.DynamicDateTimeSelect.MINUTE);
this.setValue(value); this.setValue(value);
} }
}], }],

2
src/widget/multitree/multi.tree.combo.js
Unescape View File

@ -38,6 +38,8 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
type: "bi.multi_select_trigger", type: "bi.multi_select_trigger",
height: o.height, height: o.height,
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
text: o.text,
watermark: o.watermark,
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
offset: this.constants.offset offset: this.constants.offset

1
src/widget/multitree/multi.tree.list.combo.js
Unescape View File

@ -39,6 +39,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
type: "bi.multi_select_trigger", type: "bi.multi_select_trigger",
allowEdit: o.allowEdit, allowEdit: o.allowEdit,
text: o.text, text: o.text,
watermark: o.watermark,
height: o.height, height: o.height,
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
// adapter: this.popup, // adapter: this.popup,

8
src/widget/numbereditor/number.editor.js
Unescape View File

@ -105,6 +105,14 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
this.bottomBtn.setEnable(!!v); this.bottomBtn.setEnable(!!v);
}, },
getLastValidValue: function () {
return this.editor.getLastValidValue();
},
getLastChangedValue: function () {
return this.editor.getLastChangedValue();
},
getValue: function () { getValue: function () {
return this.options.value; return this.options.value;
}, },

Write Preview
Loading…
Cancel
Save