diff --git a/YLErpWeb/wwwroot/Scripts/MyJs.js b/YLErpWeb/wwwroot/Scripts/MyJs.js index 67d1ee4c..a8d98099 100644 --- a/YLErpWeb/wwwroot/Scripts/MyJs.js +++ b/YLErpWeb/wwwroot/Scripts/MyJs.js @@ -1,4 +1,4 @@ -$(function () { +$(function () { try { $.datepicker._gotoToday = function (id) { $(id).datepicker('setDate', new Date()).datepicker('hide').blur(); diff --git a/YLErpWeb/wwwroot/Statics/bundles/bundle.js b/YLErpWeb/wwwroot/Statics/bundles/bundle.js index 06ac26d4..cae56fdf 100644 --- a/YLErpWeb/wwwroot/Statics/bundles/bundle.js +++ b/YLErpWeb/wwwroot/Statics/bundles/bundle.js @@ -14389,6 +14389,7 @@ $.fn.selectpicker.Constructor.DEFAULTS = Object.assign($.fn.selectpicker.Constru if (!event) return false; _chnInput = -1; + this._enterFired = false; // 每次按键先清 Enter 标记;仅在回车分支重新置位,避免误触发 let charCode = event.which || event.keyCode; @@ -14422,6 +14423,7 @@ $.fn.selectpicker.Constructor.DEFAULTS = Object.assign($.fn.selectpicker.Constru return _options.precision > 0 && !event.shiftKey && checkDotInput.call(this); case 13: //enter case 108: //enter + this._enterFired = true; // 标记回车触发,供 __change 区分"回车"与"失焦" $(this).blur(); return true; case 67: //ctrl+c @@ -14526,7 +14528,9 @@ $.fn.selectpicker.Constructor.DEFAULTS = Object.assign($.fn.selectpicker.Constru else if (_options.append === '‱') f /= 10000; } - _options.onchange && _options.onchange(f, this.value); + let isEnter = !!this._enterFired; + this._enterFired = false; + _options.onchange && _options.onchange(f, this.value, isEnter); } //功能禁用 @@ -14600,9 +14604,10 @@ $.fn.selectpicker.Constructor.DEFAULTS = Object.assign($.fn.selectpicker.Constru this.inputctrl.setValue(this.value) }, methods: { - onchange(value, text) { + onchange(value, text, isEnter) { this.init = false; this.$emit('input', this.ret_type === 1 ? text : value); + if (isEnter) this.$emit('enter', this.ret_type === 1 ? text : value); } }, watch: {