diff --git a/YLErpWeb/wwwroot/Scripts/fast/fastVue.base.js b/YLErpWeb/wwwroot/Scripts/fast/fastVue.base.js index f57f9c4a..6c4f3c64 100644 --- a/YLErpWeb/wwwroot/Scripts/fast/fastVue.base.js +++ b/YLErpWeb/wwwroot/Scripts/fast/fastVue.base.js @@ -432,6 +432,7 @@ function __onInput() { if (_ctrlV) { _ctrlV = false; + console.log('[numberInput paste] raw=', this.value, 'append=', _options.append, 'percent=', _options.percent); // 粘贴进来的是显示值(可能带 %/‱ 后缀),先按 __change 同款口径解析为模型值再回显, // 避免 setValue 把显示值再乘以 100/10000(#EQD-5914 债券价格粘贴 ×100) let f = ''; @@ -440,6 +441,7 @@ if (_options.append === '%' || _options.percent == true) f /= 100; else if (_options.append === '‱') f /= 10000; } + console.log('[numberInput paste] parsed=', f); return setValue(f); } if (_chnInput >= 0) { @@ -462,6 +464,7 @@ //输入完成处理 function __change() { + console.log('[numberInput change] raw=', this.value, 'append=', _options.append, 'percent=', _options.percent); let f = ''; if (this.value && this.value !== _options.append) { f = parseFloat(this.value.replaceAll(",", "")) || 0; @@ -469,6 +472,7 @@ else if (_options.append === '‱') f /= 10000; } + console.log('[numberInput change] parsed=', f, 'value=', this.value); _options.onchange && _options.onchange(f, this.value); } diff --git a/YLErpWeb/wwwroot/Statics/bundles/bundle.js b/YLErpWeb/wwwroot/Statics/bundles/bundle.js index 0c9acc5c..a7e28814 100644 --- a/YLErpWeb/wwwroot/Statics/bundles/bundle.js +++ b/YLErpWeb/wwwroot/Statics/bundles/bundle.js @@ -136,11 +136,8 @@ u=-1,i=t[o];++u=e?t:""+Array(e+1-r.length).join(n)+t},l={s:$,z:function(t){var e=-t.utcOffset(),n=Math.abs(e),r=Math.floor(n/60),i=n%60;return(e<=0?"+":"-")+$(r,2,"0")+":"+$(i,2,"0")},m:function t(e,n){if(e.date()4&&(r+=7),n.add(r,t));return o.diff(u,"week")+1},d.isoWeekday=function(t){return this.$utils().u(t)?this.day()||7:this.day(this.day()%7?t:t-7)};var n=d.startOf;d.startOf=function(t,e){var i=this.$utils(),s=!!i.u(e)||e;return"isoweek"===i.p(t)?s?this.date(this.date()-(this.isoWeekday()-1)).startOf("day"):this.date(this.date()-1-(this.isoWeekday()-1)+7).endOf("day"):n.bind(this)(t,e)}}}); - dayjs.extend(dayjs_plugin_weekday); dayjs.extend(dayjs_plugin_isoWeek); /*! @@ -283,7 +280,6 @@ $.extend($.jgrid,{ } }); })(jQuery); - /* * jQuery UI Multiselect * @@ -600,7 +596,6 @@ $.extend($.ui.multiselect, { }); })(jQuery); - // ==ClosureCompiler== // @compilation_level SIMPLE_OPTIMIZATIONS @@ -13303,7 +13298,6 @@ jQuery(selector).each(function() { } }); }; - ;(function($){ /** * jqGrid extension @@ -14489,7 +14483,17 @@ $.fn.selectpicker.Constructor.DEFAULTS = Object.assign($.fn.selectpicker.Constru function __onInput() { if (_ctrlV) { _ctrlV = false; - return setValue(this.value); + console.log('[numberInput paste] raw=', this.value, 'append=', _options.append, 'percent=', _options.percent); + // 粘贴进来的是显示值(可能带 %/‱ 后缀),先按 __change 同款口径解析为模型值再回显, + // 避免 setValue 把显示值再乘以 100/10000(#EQD-5914 债券价格粘贴 ×100) + let f = ''; + if (this.value && this.value !== _options.append) { + f = parseFloat(this.value.replaceAll(",", "")) || 0; + if (_options.append === '%' || _options.percent == true) f /= 100; + else if (_options.append === '‱') f /= 10000; + } + console.log('[numberInput paste] parsed=', f); + return setValue(f); } if (_chnInput >= 0) { __onChineseInput.call(this, _chnInput); @@ -14511,6 +14515,7 @@ $.fn.selectpicker.Constructor.DEFAULTS = Object.assign($.fn.selectpicker.Constru //输入完成处理 function __change() { + console.log('[numberInput change] raw=', this.value, 'append=', _options.append, 'percent=', _options.percent); let f = ''; if (this.value && this.value !== _options.append) { f = parseFloat(this.value.replaceAll(",", "")) || 0; @@ -14518,6 +14523,7 @@ $.fn.selectpicker.Constructor.DEFAULTS = Object.assign($.fn.selectpicker.Constru else if (_options.append === '‱') f /= 10000; } + console.log('[numberInput change] parsed=', f, 'value=', this.value); _options.onchange && _options.onchange(f, this.value); } @@ -14666,9 +14672,9 @@ $.fn.selectpicker.Constructor.DEFAULTS = Object.assign($.fn.selectpicker.Constru } }).datepicker({ - minDate: self.mindate, + minDate: self.mindate ? new Date(self.mindate) : null, beforeShowDay(date) { - return [(!self.maxdate || date <= new Date(self.maxdate)) && (self.noholiday || !ylotc.isHoliday(date))]; + return [(self.noholiday || !ylotc.isHoliday(date))]; }, changeMonth: true, changeYear: true, @@ -15747,7 +15753,6 @@ if (!String.prototype.replaceAll) { return this.replace(new RegExp(oldString, "gm"), newString) } } - var main = main || {}; (function ($) { @@ -15860,4 +15865,4 @@ var main = main || {}; }; }; -})(jQuery); \ No newline at end of file +})(jQuery);