From 0c4e69722735ab321e920613597f0188d6d033a1 Mon Sep 17 00:00:00 2001 From: "Vivy.Pan" Date: Tue, 7 Feb 2023 10:57:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?KERNEL-14215=20fix:slider=E6=BB=91=E5=9D=97?= =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E5=A4=A7=E4=BA=8E=E5=8F=B3=E4=BE=A7=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E4=BA=A4=E6=8D=A2=E7=9A=84=E9=97=AE=E9=A2=98-bug42?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/intervalslider/intervalslider.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/widget/intervalslider/intervalslider.js b/src/widget/intervalslider/intervalslider.js index ab8732ee2..ce07c7451 100644 --- a/src/widget/intervalslider/intervalslider.js +++ b/src/widget/intervalslider/intervalslider.js @@ -94,7 +94,7 @@ export class IntervalSlider extends Single { ); this.labelOne.on(Editor.EVENT_CONFIRM, () => { const oldValueOne = this.valueOne; - const v = parseFloat(this.getValue()); + const v = parseFloat(this.labelOne.getValue()); this.valueOne = v; const percent = this._getPercentByValue(v); const significantPercent = parseFloat(percent.toFixed(1)); // 分成1000份 @@ -123,7 +123,7 @@ export class IntervalSlider extends Single { ); this.labelTwo.on(Editor.EVENT_CONFIRM, () => { const oldValueTwo = this.valueTwo; - const v = parseFloat(this.getValue()); + const v = parseFloat(this.labelTwo.getValue()); this.valueTwo = v; const percent = this._getPercentByValue(v); const significantPercent = parseFloat(percent.toFixed(1)); From 5d8aa7ba0293a9daec8d7a5cad119bb47d200fcf Mon Sep 17 00:00:00 2001 From: "Vivy.Pan" Date: Tue, 7 Feb 2023 12:02:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?KERNEL-14215=20fix:bi.year=5Finterval?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=B8=8B=E6=8B=89=E6=A1=86=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=98=BE=E7=A4=BA-bug40?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/func/date.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/core/func/date.js b/src/core/func/date.js index e35e45cca..f629fb22a 100644 --- a/src/core/func/date.js +++ b/src/core/func/date.js @@ -1,5 +1,6 @@ /** Constants used for time computations */ -import { getDate, getTime, parseInt, i18nText } from "../2.base"; +import { getDate, getTime, parseInt } from "../2.base"; +import { i18nText } from "../utils"; import { StartOfWeek } from "../constant"; import { isKhtml } from "../platform/web"; @@ -343,7 +344,7 @@ export function print(date, str) { s["%Q"] = qr; let re = /%./g; - isKhtml = isKhtml || function () { + const isNewKhtml = isKhtml || function () { if (!_global.navigator) { return false; } @@ -373,7 +374,7 @@ export function print(date, str) { } } - if (!isKhtml()) { + if (!isNewKhtml()) { return str.replace(re, par => s[par] || par); } const a = str.match(re);