From 04f57b4bd2ba60c8cfe4a8efbbbb3cebbadafe8f Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Mon, 5 Aug 2019 09:35:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?REPORT-20250=20fix:=20=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=B0=B4=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/2.0/fineui.ie.js | 2 ++ dist/2.0/fineui.js | 2 ++ dist/bundle.ie.js | 2 ++ dist/bundle.js | 2 ++ dist/fineui.ie.js | 2 ++ dist/fineui.js | 2 ++ dist/fineui_without_jquery_polyfill.js | 2 ++ dist/widget.js | 2 ++ src/widget/multilayerselecttree/multilayerselecttree.trigger.js | 1 + src/widget/multilayersingletree/multilayersingletree.trigger.js | 1 + 10 files changed, 18 insertions(+) diff --git a/dist/2.0/fineui.ie.js b/dist/2.0/fineui.ie.js index 14df704efb..33d63a2fc0 100644 --- a/dist/2.0/fineui.ie.js +++ b/dist/2.0/fineui.ie.js @@ -69030,6 +69030,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", + watermark: BI.i18nText("BI-Basic_Search"), listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { @@ -70005,6 +70006,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", + watermark: BI.i18nText("BI-Basic_Search"), listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { diff --git a/dist/2.0/fineui.js b/dist/2.0/fineui.js index 0d564ec9a0..1bf1251a7b 100644 --- a/dist/2.0/fineui.js +++ b/dist/2.0/fineui.js @@ -69434,6 +69434,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", + watermark: BI.i18nText("BI-Basic_Search"), listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { @@ -70409,6 +70410,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", + watermark: BI.i18nText("BI-Basic_Search"), listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { diff --git a/dist/bundle.ie.js b/dist/bundle.ie.js index 14df704efb..33d63a2fc0 100644 --- a/dist/bundle.ie.js +++ b/dist/bundle.ie.js @@ -69030,6 +69030,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", + watermark: BI.i18nText("BI-Basic_Search"), listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { @@ -70005,6 +70006,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", + watermark: BI.i18nText("BI-Basic_Search"), listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { diff --git a/dist/bundle.js b/dist/bundle.js index 0d564ec9a0..1bf1251a7b 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -69434,6 +69434,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", + watermark: BI.i18nText("BI-Basic_Search"), listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { @@ -70409,6 +70410,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", + watermark: BI.i18nText("BI-Basic_Search"), listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { diff --git a/dist/fineui.ie.js b/dist/fineui.ie.js index fc4c614114..5b0eeb989a 100644 --- a/dist/fineui.ie.js +++ b/dist/fineui.ie.js @@ -69275,6 +69275,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", + watermark: BI.i18nText("BI-Basic_Search"), listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { @@ -70250,6 +70251,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", + watermark: BI.i18nText("BI-Basic_Search"), listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { diff --git a/dist/fineui.js b/dist/fineui.js index c3e505cda7..8446737774 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -69679,6 +69679,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", + watermark: BI.i18nText("BI-Basic_Search"), listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { @@ -70654,6 +70655,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", + watermark: BI.i18nText("BI-Basic_Search"), listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { diff --git a/dist/fineui_without_jquery_polyfill.js b/dist/fineui_without_jquery_polyfill.js index b033c8ba82..02c84a1853 100644 --- a/dist/fineui_without_jquery_polyfill.js +++ b/dist/fineui_without_jquery_polyfill.js @@ -52285,6 +52285,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", + watermark: BI.i18nText("BI-Basic_Search"), listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { @@ -53260,6 +53261,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", + watermark: BI.i18nText("BI-Basic_Search"), listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { diff --git a/dist/widget.js b/dist/widget.js index 6ec64b18fc..b0553e5516 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -7097,6 +7097,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", + watermark: BI.i18nText("BI-Basic_Search"), listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { @@ -8072,6 +8073,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", + watermark: BI.i18nText("BI-Basic_Search"), listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { diff --git a/src/widget/multilayerselecttree/multilayerselecttree.trigger.js b/src/widget/multilayerselecttree/multilayerselecttree.trigger.js index 72bc3c97ec..c953bed7fe 100644 --- a/src/widget/multilayerselecttree/multilayerselecttree.trigger.js +++ b/src/widget/multilayerselecttree/multilayerselecttree.trigger.js @@ -34,6 +34,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", + watermark: BI.i18nText("BI-Basic_Search"), listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { diff --git a/src/widget/multilayersingletree/multilayersingletree.trigger.js b/src/widget/multilayersingletree/multilayersingletree.trigger.js index a1ee9e257d..46a2a219ff 100644 --- a/src/widget/multilayersingletree/multilayersingletree.trigger.js +++ b/src/widget/multilayersingletree/multilayersingletree.trigger.js @@ -34,6 +34,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", + watermark: BI.i18nText("BI-Basic_Search"), listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { From dd0ceee346f2607ce9013d31f467a5371e2caeea Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Mon, 5 Aug 2019 10:14:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20value=E6=B2=A1=E4=BC=A0=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=9A=84=E6=98=AF[null]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/2.0/fineui.ie.js | 8 ++++++-- dist/2.0/fineui.js | 8 ++++++-- dist/bundle.ie.js | 8 ++++++-- dist/bundle.js | 8 ++++++-- dist/fineui.ie.js | 8 ++++++-- dist/fineui.js | 8 ++++++-- dist/fineui_without_jquery_polyfill.js | 8 ++++++-- dist/widget.js | 8 ++++++-- .../multilayerselecttree.leveltree.js | 4 +++- .../multilayersingletree.leveltree.js | 4 +++- 10 files changed, 54 insertions(+), 18 deletions(-) diff --git a/dist/2.0/fineui.ie.js b/dist/2.0/fineui.ie.js index 33d63a2fc0..c84babc5d0 100644 --- a/dist/2.0/fineui.ie.js +++ b/dist/2.0/fineui.ie.js @@ -68909,7 +68909,9 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Pane, { }, getValue: function () { - return BI.isArray(this.storeValue) ? this.storeValue : [this.storeValue]; + return BI.isArray(this.storeValue) ? + this.storeValue : BI.isNull(this.storeValue) ? + [] : [this.storeValue]; }, getAllLeaves: function () { @@ -69885,7 +69887,9 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Pane, { }, getValue: function () { - return BI.isArray(this.storeValue) ? this.storeValue : [this.storeValue]; + return BI.isArray(this.storeValue) ? + this.storeValue : BI.isNull(this.storeValue) ? + [] : [this.storeValue]; }, getAllLeaves: function () { diff --git a/dist/2.0/fineui.js b/dist/2.0/fineui.js index 1bf1251a7b..a0f366ca30 100644 --- a/dist/2.0/fineui.js +++ b/dist/2.0/fineui.js @@ -69313,7 +69313,9 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Pane, { }, getValue: function () { - return BI.isArray(this.storeValue) ? this.storeValue : [this.storeValue]; + return BI.isArray(this.storeValue) ? + this.storeValue : BI.isNull(this.storeValue) ? + [] : [this.storeValue]; }, getAllLeaves: function () { @@ -70289,7 +70291,9 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Pane, { }, getValue: function () { - return BI.isArray(this.storeValue) ? this.storeValue : [this.storeValue]; + return BI.isArray(this.storeValue) ? + this.storeValue : BI.isNull(this.storeValue) ? + [] : [this.storeValue]; }, getAllLeaves: function () { diff --git a/dist/bundle.ie.js b/dist/bundle.ie.js index 33d63a2fc0..c84babc5d0 100644 --- a/dist/bundle.ie.js +++ b/dist/bundle.ie.js @@ -68909,7 +68909,9 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Pane, { }, getValue: function () { - return BI.isArray(this.storeValue) ? this.storeValue : [this.storeValue]; + return BI.isArray(this.storeValue) ? + this.storeValue : BI.isNull(this.storeValue) ? + [] : [this.storeValue]; }, getAllLeaves: function () { @@ -69885,7 +69887,9 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Pane, { }, getValue: function () { - return BI.isArray(this.storeValue) ? this.storeValue : [this.storeValue]; + return BI.isArray(this.storeValue) ? + this.storeValue : BI.isNull(this.storeValue) ? + [] : [this.storeValue]; }, getAllLeaves: function () { diff --git a/dist/bundle.js b/dist/bundle.js index 1bf1251a7b..a0f366ca30 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -69313,7 +69313,9 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Pane, { }, getValue: function () { - return BI.isArray(this.storeValue) ? this.storeValue : [this.storeValue]; + return BI.isArray(this.storeValue) ? + this.storeValue : BI.isNull(this.storeValue) ? + [] : [this.storeValue]; }, getAllLeaves: function () { @@ -70289,7 +70291,9 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Pane, { }, getValue: function () { - return BI.isArray(this.storeValue) ? this.storeValue : [this.storeValue]; + return BI.isArray(this.storeValue) ? + this.storeValue : BI.isNull(this.storeValue) ? + [] : [this.storeValue]; }, getAllLeaves: function () { diff --git a/dist/fineui.ie.js b/dist/fineui.ie.js index 5b0eeb989a..c477c2cca8 100644 --- a/dist/fineui.ie.js +++ b/dist/fineui.ie.js @@ -69154,7 +69154,9 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Pane, { }, getValue: function () { - return BI.isArray(this.storeValue) ? this.storeValue : [this.storeValue]; + return BI.isArray(this.storeValue) ? + this.storeValue : BI.isNull(this.storeValue) ? + [] : [this.storeValue]; }, getAllLeaves: function () { @@ -70130,7 +70132,9 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Pane, { }, getValue: function () { - return BI.isArray(this.storeValue) ? this.storeValue : [this.storeValue]; + return BI.isArray(this.storeValue) ? + this.storeValue : BI.isNull(this.storeValue) ? + [] : [this.storeValue]; }, getAllLeaves: function () { diff --git a/dist/fineui.js b/dist/fineui.js index 8446737774..199c519c86 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -69558,7 +69558,9 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Pane, { }, getValue: function () { - return BI.isArray(this.storeValue) ? this.storeValue : [this.storeValue]; + return BI.isArray(this.storeValue) ? + this.storeValue : BI.isNull(this.storeValue) ? + [] : [this.storeValue]; }, getAllLeaves: function () { @@ -70534,7 +70536,9 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Pane, { }, getValue: function () { - return BI.isArray(this.storeValue) ? this.storeValue : [this.storeValue]; + return BI.isArray(this.storeValue) ? + this.storeValue : BI.isNull(this.storeValue) ? + [] : [this.storeValue]; }, getAllLeaves: function () { diff --git a/dist/fineui_without_jquery_polyfill.js b/dist/fineui_without_jquery_polyfill.js index 02c84a1853..b28fd66641 100644 --- a/dist/fineui_without_jquery_polyfill.js +++ b/dist/fineui_without_jquery_polyfill.js @@ -52164,7 +52164,9 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Pane, { }, getValue: function () { - return BI.isArray(this.storeValue) ? this.storeValue : [this.storeValue]; + return BI.isArray(this.storeValue) ? + this.storeValue : BI.isNull(this.storeValue) ? + [] : [this.storeValue]; }, getAllLeaves: function () { @@ -53140,7 +53142,9 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Pane, { }, getValue: function () { - return BI.isArray(this.storeValue) ? this.storeValue : [this.storeValue]; + return BI.isArray(this.storeValue) ? + this.storeValue : BI.isNull(this.storeValue) ? + [] : [this.storeValue]; }, getAllLeaves: function () { diff --git a/dist/widget.js b/dist/widget.js index b0553e5516..7c504257b6 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -6976,7 +6976,9 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Pane, { }, getValue: function () { - return BI.isArray(this.storeValue) ? this.storeValue : [this.storeValue]; + return BI.isArray(this.storeValue) ? + this.storeValue : BI.isNull(this.storeValue) ? + [] : [this.storeValue]; }, getAllLeaves: function () { @@ -7952,7 +7954,9 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Pane, { }, getValue: function () { - return BI.isArray(this.storeValue) ? this.storeValue : [this.storeValue]; + return BI.isArray(this.storeValue) ? + this.storeValue : BI.isNull(this.storeValue) ? + [] : [this.storeValue]; }, getAllLeaves: function () { diff --git a/src/widget/multilayerselecttree/multilayerselecttree.leveltree.js b/src/widget/multilayerselecttree/multilayerselecttree.leveltree.js index 9309de5aef..79705505ca 100644 --- a/src/widget/multilayerselecttree/multilayerselecttree.leveltree.js +++ b/src/widget/multilayerselecttree/multilayerselecttree.leveltree.js @@ -159,7 +159,9 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Pane, { }, getValue: function () { - return BI.isArray(this.storeValue) ? this.storeValue : [this.storeValue]; + return BI.isArray(this.storeValue) ? + this.storeValue : BI.isNull(this.storeValue) ? + [] : [this.storeValue]; }, getAllLeaves: function () { diff --git a/src/widget/multilayersingletree/multilayersingletree.leveltree.js b/src/widget/multilayersingletree/multilayersingletree.leveltree.js index 0de4d5a54b..ae11c36b61 100644 --- a/src/widget/multilayersingletree/multilayersingletree.leveltree.js +++ b/src/widget/multilayersingletree/multilayersingletree.leveltree.js @@ -158,7 +158,9 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Pane, { }, getValue: function () { - return BI.isArray(this.storeValue) ? this.storeValue : [this.storeValue]; + return BI.isArray(this.storeValue) ? + this.storeValue : BI.isNull(this.storeValue) ? + [] : [this.storeValue]; }, getAllLeaves: function () { From f0c3117871b644c63b968979e18d41c3086f28ab Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Mon, 5 Aug 2019 15:12:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?CHART-9789=20fix:=20=E6=97=B6=E5=8C=BA?= =?UTF-8?q?=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/2.0/fineui.ie.js | 2 +- dist/2.0/fineui.js | 2 +- dist/bundle.ie.js | 2 +- dist/bundle.js | 2 +- dist/core.js | 2 +- dist/fineui.ie.js | 2 +- dist/fineui.js | 2 +- dist/fineui_without_jquery_polyfill.js | 2 +- dist/utils.js | 2 +- src/core/base.js | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dist/2.0/fineui.ie.js b/dist/2.0/fineui.ie.js index c84babc5d0..f682f3977f 100644 --- a/dist/2.0/fineui.ie.js +++ b/dist/2.0/fineui.ie.js @@ -11391,7 +11391,7 @@ if (!_global.BI) { if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) { var localTime = dt.getTime(); // BI-33791 1901年以前的东8区标准是GMT+0805, 统一无论是什么时间,都以整的0800这样的为基准 - var localOffset = new Date().getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数 + var localOffset = dt.getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数 var utc = localTime + localOffset; // utc即GMT时间标准时区 return new Date(utc + BI.timeZone);// + Pool.timeZone.offset); } diff --git a/dist/2.0/fineui.js b/dist/2.0/fineui.js index a0f366ca30..2333664b94 100644 --- a/dist/2.0/fineui.js +++ b/dist/2.0/fineui.js @@ -11391,7 +11391,7 @@ if (!_global.BI) { if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) { var localTime = dt.getTime(); // BI-33791 1901年以前的东8区标准是GMT+0805, 统一无论是什么时间,都以整的0800这样的为基准 - var localOffset = new Date().getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数 + var localOffset = dt.getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数 var utc = localTime + localOffset; // utc即GMT时间标准时区 return new Date(utc + BI.timeZone);// + Pool.timeZone.offset); } diff --git a/dist/bundle.ie.js b/dist/bundle.ie.js index c84babc5d0..f682f3977f 100644 --- a/dist/bundle.ie.js +++ b/dist/bundle.ie.js @@ -11391,7 +11391,7 @@ if (!_global.BI) { if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) { var localTime = dt.getTime(); // BI-33791 1901年以前的东8区标准是GMT+0805, 统一无论是什么时间,都以整的0800这样的为基准 - var localOffset = new Date().getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数 + var localOffset = dt.getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数 var utc = localTime + localOffset; // utc即GMT时间标准时区 return new Date(utc + BI.timeZone);// + Pool.timeZone.offset); } diff --git a/dist/bundle.js b/dist/bundle.js index a0f366ca30..2333664b94 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -11391,7 +11391,7 @@ if (!_global.BI) { if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) { var localTime = dt.getTime(); // BI-33791 1901年以前的东8区标准是GMT+0805, 统一无论是什么时间,都以整的0800这样的为基准 - var localOffset = new Date().getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数 + var localOffset = dt.getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数 var utc = localTime + localOffset; // utc即GMT时间标准时区 return new Date(utc + BI.timeZone);// + Pool.timeZone.offset); } diff --git a/dist/core.js b/dist/core.js index 286e4994c1..1147c8e75f 100644 --- a/dist/core.js +++ b/dist/core.js @@ -11391,7 +11391,7 @@ if (!_global.BI) { if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) { var localTime = dt.getTime(); // BI-33791 1901年以前的东8区标准是GMT+0805, 统一无论是什么时间,都以整的0800这样的为基准 - var localOffset = new Date().getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数 + var localOffset = dt.getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数 var utc = localTime + localOffset; // utc即GMT时间标准时区 return new Date(utc + BI.timeZone);// + Pool.timeZone.offset); } diff --git a/dist/fineui.ie.js b/dist/fineui.ie.js index c477c2cca8..f94e6c653c 100644 --- a/dist/fineui.ie.js +++ b/dist/fineui.ie.js @@ -11636,7 +11636,7 @@ if (!_global.BI) { if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) { var localTime = dt.getTime(); // BI-33791 1901年以前的东8区标准是GMT+0805, 统一无论是什么时间,都以整的0800这样的为基准 - var localOffset = new Date().getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数 + var localOffset = dt.getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数 var utc = localTime + localOffset; // utc即GMT时间标准时区 return new Date(utc + BI.timeZone);// + Pool.timeZone.offset); } diff --git a/dist/fineui.js b/dist/fineui.js index 199c519c86..23b49c538d 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -11636,7 +11636,7 @@ if (!_global.BI) { if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) { var localTime = dt.getTime(); // BI-33791 1901年以前的东8区标准是GMT+0805, 统一无论是什么时间,都以整的0800这样的为基准 - var localOffset = new Date().getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数 + var localOffset = dt.getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数 var utc = localTime + localOffset; // utc即GMT时间标准时区 return new Date(utc + BI.timeZone);// + Pool.timeZone.offset); } diff --git a/dist/fineui_without_jquery_polyfill.js b/dist/fineui_without_jquery_polyfill.js index b28fd66641..2f3f2797af 100644 --- a/dist/fineui_without_jquery_polyfill.js +++ b/dist/fineui_without_jquery_polyfill.js @@ -11391,7 +11391,7 @@ if (!_global.BI) { if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) { var localTime = dt.getTime(); // BI-33791 1901年以前的东8区标准是GMT+0805, 统一无论是什么时间,都以整的0800这样的为基准 - var localOffset = new Date().getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数 + var localOffset = dt.getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数 var utc = localTime + localOffset; // utc即GMT时间标准时区 return new Date(utc + BI.timeZone);// + Pool.timeZone.offset); } diff --git a/dist/utils.js b/dist/utils.js index 758bc8b634..f45f436e55 100644 --- a/dist/utils.js +++ b/dist/utils.js @@ -12170,7 +12170,7 @@ if (!_global.BI) { if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) { var localTime = dt.getTime(); // BI-33791 1901年以前的东8区标准是GMT+0805, 统一无论是什么时间,都以整的0800这样的为基准 - var localOffset = new Date().getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数 + var localOffset = dt.getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数 var utc = localTime + localOffset; // utc即GMT时间标准时区 return new Date(utc + BI.timeZone);// + Pool.timeZone.offset); } diff --git a/src/core/base.js b/src/core/base.js index 1ea3bf25bd..b61508040b 100644 --- a/src/core/base.js +++ b/src/core/base.js @@ -1212,7 +1212,7 @@ if (!_global.BI) { if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) { var localTime = dt.getTime(); // BI-33791 1901年以前的东8区标准是GMT+0805, 统一无论是什么时间,都以整的0800这样的为基准 - var localOffset = new Date().getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数 + var localOffset = dt.getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数 var utc = localTime + localOffset; // utc即GMT时间标准时区 return new Date(utc + BI.timeZone);// + Pool.timeZone.offset); }