diff --git a/dist/2.0/fineui.ie.js b/dist/2.0/fineui.ie.js index 14df704ef..f682f3977 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); } @@ -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 () { @@ -69030,6 +69032,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 () { @@ -69884,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 () { @@ -70005,6 +70010,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 0d564ec9a..2333664b9 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); } @@ -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 () { @@ -69434,6 +69436,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 () { @@ -70288,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 () { @@ -70409,6 +70414,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 14df704ef..f682f3977 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); } @@ -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 () { @@ -69030,6 +69032,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 () { @@ -69884,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 () { @@ -70005,6 +70010,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 0d564ec9a..2333664b9 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); } @@ -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 () { @@ -69434,6 +69436,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 () { @@ -70288,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 () { @@ -70409,6 +70414,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/core.js b/dist/core.js index 286e4994c..1147c8e75 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 fc4c61411..f94e6c653 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); } @@ -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 () { @@ -69275,6 +69277,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 () { @@ -70129,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 () { @@ -70250,6 +70255,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 c3e505cda..23b49c538 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); } @@ -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 () { @@ -69679,6 +69681,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 () { @@ -70533,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 () { @@ -70654,6 +70659,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 b033c8ba8..2f3f2797a 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); } @@ -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 () { @@ -52285,6 +52287,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 () { @@ -53139,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 () { @@ -53260,6 +53265,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/utils.js b/dist/utils.js index 758bc8b63..f45f436e5 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/dist/widget.js b/dist/widget.js index 6ec64b18f..7c504257b 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 () { @@ -7097,6 +7099,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 () { @@ -7951,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 () { @@ -8072,6 +8077,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/core/base.js b/src/core/base.js index 1ea3bf25b..b61508040 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); } diff --git a/src/widget/multilayerselecttree/multilayerselecttree.leveltree.js b/src/widget/multilayerselecttree/multilayerselecttree.leveltree.js index 9309de5ae..79705505c 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/multilayerselecttree/multilayerselecttree.trigger.js b/src/widget/multilayerselecttree/multilayerselecttree.trigger.js index 72bc3c97e..c953bed7f 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.leveltree.js b/src/widget/multilayersingletree/multilayersingletree.leveltree.js index 0de4d5a54..ae11c36b6 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 () { diff --git a/src/widget/multilayersingletree/multilayersingletree.trigger.js b/src/widget/multilayersingletree/multilayersingletree.trigger.js index a1ee9e257..46a2a219f 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 () {