Browse Source

Merge pull request #1059 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit 'f0c3117871b644c63b968979e18d41c3086f28ab':
  CHART-9789 fix: 时区相关
  fix: value没传返回的是[null]
  REPORT-20250 fix: 搜索状态水印
es6
guy 5 years ago
parent
commit
b773c9cfae
  1. 12
      dist/2.0/fineui.ie.js
  2. 12
      dist/2.0/fineui.js
  3. 12
      dist/bundle.ie.js
  4. 12
      dist/bundle.js
  5. 2
      dist/core.js
  6. 12
      dist/fineui.ie.js
  7. 12
      dist/fineui.js
  8. 12
      dist/fineui_without_jquery_polyfill.js
  9. 2
      dist/utils.js
  10. 10
      dist/widget.js
  11. 2
      src/core/base.js
  12. 4
      src/widget/multilayerselecttree/multilayerselecttree.leveltree.js
  13. 1
      src/widget/multilayerselecttree/multilayerselecttree.trigger.js
  14. 4
      src/widget/multilayersingletree/multilayersingletree.leveltree.js
  15. 1
      src/widget/multilayersingletree/multilayersingletree.trigger.js

12
dist/2.0/fineui.ie.js vendored

@ -11391,7 +11391,7 @@ if (!_global.BI) {
if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) { if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) {
var localTime = dt.getTime(); var localTime = dt.getTime();
// BI-33791 1901年以前的东8区标准是GMT+0805, 统一无论是什么时间,都以整的0800这样的为基准 // BI-33791 1901年以前的东8区标准是GMT+0805, 统一无论是什么时间,都以整的0800这样的为基准
var localOffset = new Date().getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数 var localOffset = dt.getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数
var utc = localTime + localOffset; // utc即GMT时间标准时区 var utc = localTime + localOffset; // utc即GMT时间标准时区
return new Date(utc + BI.timeZone);// + Pool.timeZone.offset); return new Date(utc + BI.timeZone);// + Pool.timeZone.offset);
} }
@ -68909,7 +68909,9 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Pane, {
}, },
getValue: function () { 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 () { getAllLeaves: function () {
@ -69030,6 +69032,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, {
value: o.value, value: o.value,
height: o.height, height: o.height,
tipText: "", tipText: "",
watermark: BI.i18nText("BI-Basic_Search"),
listeners: [{ listeners: [{
eventName: BI.StateEditor.EVENT_FOCUS, eventName: BI.StateEditor.EVENT_FOCUS,
action: function () { action: function () {
@ -69884,7 +69887,9 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Pane, {
}, },
getValue: function () { 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 () { getAllLeaves: function () {
@ -70005,6 +70010,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, {
value: o.value, value: o.value,
height: o.height, height: o.height,
tipText: "", tipText: "",
watermark: BI.i18nText("BI-Basic_Search"),
listeners: [{ listeners: [{
eventName: BI.StateEditor.EVENT_FOCUS, eventName: BI.StateEditor.EVENT_FOCUS,
action: function () { action: function () {

12
dist/2.0/fineui.js vendored

@ -11391,7 +11391,7 @@ if (!_global.BI) {
if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) { if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) {
var localTime = dt.getTime(); var localTime = dt.getTime();
// BI-33791 1901年以前的东8区标准是GMT+0805, 统一无论是什么时间,都以整的0800这样的为基准 // BI-33791 1901年以前的东8区标准是GMT+0805, 统一无论是什么时间,都以整的0800这样的为基准
var localOffset = new Date().getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数 var localOffset = dt.getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数
var utc = localTime + localOffset; // utc即GMT时间标准时区 var utc = localTime + localOffset; // utc即GMT时间标准时区
return new Date(utc + BI.timeZone);// + Pool.timeZone.offset); return new Date(utc + BI.timeZone);// + Pool.timeZone.offset);
} }
@ -69313,7 +69313,9 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Pane, {
}, },
getValue: function () { 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 () { getAllLeaves: function () {
@ -69434,6 +69436,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, {
value: o.value, value: o.value,
height: o.height, height: o.height,
tipText: "", tipText: "",
watermark: BI.i18nText("BI-Basic_Search"),
listeners: [{ listeners: [{
eventName: BI.StateEditor.EVENT_FOCUS, eventName: BI.StateEditor.EVENT_FOCUS,
action: function () { action: function () {
@ -70288,7 +70291,9 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Pane, {
}, },
getValue: function () { 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 () { getAllLeaves: function () {
@ -70409,6 +70414,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, {
value: o.value, value: o.value,
height: o.height, height: o.height,
tipText: "", tipText: "",
watermark: BI.i18nText("BI-Basic_Search"),
listeners: [{ listeners: [{
eventName: BI.StateEditor.EVENT_FOCUS, eventName: BI.StateEditor.EVENT_FOCUS,
action: function () { action: function () {

12
dist/bundle.ie.js vendored

@ -11391,7 +11391,7 @@ if (!_global.BI) {
if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) { if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) {
var localTime = dt.getTime(); var localTime = dt.getTime();
// BI-33791 1901年以前的东8区标准是GMT+0805, 统一无论是什么时间,都以整的0800这样的为基准 // BI-33791 1901年以前的东8区标准是GMT+0805, 统一无论是什么时间,都以整的0800这样的为基准
var localOffset = new Date().getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数 var localOffset = dt.getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数
var utc = localTime + localOffset; // utc即GMT时间标准时区 var utc = localTime + localOffset; // utc即GMT时间标准时区
return new Date(utc + BI.timeZone);// + Pool.timeZone.offset); return new Date(utc + BI.timeZone);// + Pool.timeZone.offset);
} }
@ -68909,7 +68909,9 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Pane, {
}, },
getValue: function () { 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 () { getAllLeaves: function () {
@ -69030,6 +69032,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, {
value: o.value, value: o.value,
height: o.height, height: o.height,
tipText: "", tipText: "",
watermark: BI.i18nText("BI-Basic_Search"),
listeners: [{ listeners: [{
eventName: BI.StateEditor.EVENT_FOCUS, eventName: BI.StateEditor.EVENT_FOCUS,
action: function () { action: function () {
@ -69884,7 +69887,9 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Pane, {
}, },
getValue: function () { 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 () { getAllLeaves: function () {
@ -70005,6 +70010,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, {
value: o.value, value: o.value,
height: o.height, height: o.height,
tipText: "", tipText: "",
watermark: BI.i18nText("BI-Basic_Search"),
listeners: [{ listeners: [{
eventName: BI.StateEditor.EVENT_FOCUS, eventName: BI.StateEditor.EVENT_FOCUS,
action: function () { action: function () {

12
dist/bundle.js vendored

@ -11391,7 +11391,7 @@ if (!_global.BI) {
if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) { if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) {
var localTime = dt.getTime(); var localTime = dt.getTime();
// BI-33791 1901年以前的东8区标准是GMT+0805, 统一无论是什么时间,都以整的0800这样的为基准 // BI-33791 1901年以前的东8区标准是GMT+0805, 统一无论是什么时间,都以整的0800这样的为基准
var localOffset = new Date().getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数 var localOffset = dt.getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数
var utc = localTime + localOffset; // utc即GMT时间标准时区 var utc = localTime + localOffset; // utc即GMT时间标准时区
return new Date(utc + BI.timeZone);// + Pool.timeZone.offset); return new Date(utc + BI.timeZone);// + Pool.timeZone.offset);
} }
@ -69313,7 +69313,9 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Pane, {
}, },
getValue: function () { 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 () { getAllLeaves: function () {
@ -69434,6 +69436,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, {
value: o.value, value: o.value,
height: o.height, height: o.height,
tipText: "", tipText: "",
watermark: BI.i18nText("BI-Basic_Search"),
listeners: [{ listeners: [{
eventName: BI.StateEditor.EVENT_FOCUS, eventName: BI.StateEditor.EVENT_FOCUS,
action: function () { action: function () {
@ -70288,7 +70291,9 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Pane, {
}, },
getValue: function () { 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 () { getAllLeaves: function () {
@ -70409,6 +70414,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, {
value: o.value, value: o.value,
height: o.height, height: o.height,
tipText: "", tipText: "",
watermark: BI.i18nText("BI-Basic_Search"),
listeners: [{ listeners: [{
eventName: BI.StateEditor.EVENT_FOCUS, eventName: BI.StateEditor.EVENT_FOCUS,
action: function () { action: function () {

2
dist/core.js vendored

@ -11391,7 +11391,7 @@ if (!_global.BI) {
if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) { if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) {
var localTime = dt.getTime(); var localTime = dt.getTime();
// BI-33791 1901年以前的东8区标准是GMT+0805, 统一无论是什么时间,都以整的0800这样的为基准 // BI-33791 1901年以前的东8区标准是GMT+0805, 统一无论是什么时间,都以整的0800这样的为基准
var localOffset = new Date().getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数 var localOffset = dt.getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数
var utc = localTime + localOffset; // utc即GMT时间标准时区 var utc = localTime + localOffset; // utc即GMT时间标准时区
return new Date(utc + BI.timeZone);// + Pool.timeZone.offset); return new Date(utc + BI.timeZone);// + Pool.timeZone.offset);
} }

12
dist/fineui.ie.js vendored

@ -11636,7 +11636,7 @@ if (!_global.BI) {
if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) { if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) {
var localTime = dt.getTime(); var localTime = dt.getTime();
// BI-33791 1901年以前的东8区标准是GMT+0805, 统一无论是什么时间,都以整的0800这样的为基准 // BI-33791 1901年以前的东8区标准是GMT+0805, 统一无论是什么时间,都以整的0800这样的为基准
var localOffset = new Date().getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数 var localOffset = dt.getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数
var utc = localTime + localOffset; // utc即GMT时间标准时区 var utc = localTime + localOffset; // utc即GMT时间标准时区
return new Date(utc + BI.timeZone);// + Pool.timeZone.offset); return new Date(utc + BI.timeZone);// + Pool.timeZone.offset);
} }
@ -69154,7 +69154,9 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Pane, {
}, },
getValue: function () { 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 () { getAllLeaves: function () {
@ -69275,6 +69277,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, {
value: o.value, value: o.value,
height: o.height, height: o.height,
tipText: "", tipText: "",
watermark: BI.i18nText("BI-Basic_Search"),
listeners: [{ listeners: [{
eventName: BI.StateEditor.EVENT_FOCUS, eventName: BI.StateEditor.EVENT_FOCUS,
action: function () { action: function () {
@ -70129,7 +70132,9 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Pane, {
}, },
getValue: function () { 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 () { getAllLeaves: function () {
@ -70250,6 +70255,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, {
value: o.value, value: o.value,
height: o.height, height: o.height,
tipText: "", tipText: "",
watermark: BI.i18nText("BI-Basic_Search"),
listeners: [{ listeners: [{
eventName: BI.StateEditor.EVENT_FOCUS, eventName: BI.StateEditor.EVENT_FOCUS,
action: function () { action: function () {

12
dist/fineui.js vendored

@ -11636,7 +11636,7 @@ if (!_global.BI) {
if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) { if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) {
var localTime = dt.getTime(); var localTime = dt.getTime();
// BI-33791 1901年以前的东8区标准是GMT+0805, 统一无论是什么时间,都以整的0800这样的为基准 // BI-33791 1901年以前的东8区标准是GMT+0805, 统一无论是什么时间,都以整的0800这样的为基准
var localOffset = new Date().getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数 var localOffset = dt.getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数
var utc = localTime + localOffset; // utc即GMT时间标准时区 var utc = localTime + localOffset; // utc即GMT时间标准时区
return new Date(utc + BI.timeZone);// + Pool.timeZone.offset); return new Date(utc + BI.timeZone);// + Pool.timeZone.offset);
} }
@ -69558,7 +69558,9 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Pane, {
}, },
getValue: function () { 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 () { getAllLeaves: function () {
@ -69679,6 +69681,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, {
value: o.value, value: o.value,
height: o.height, height: o.height,
tipText: "", tipText: "",
watermark: BI.i18nText("BI-Basic_Search"),
listeners: [{ listeners: [{
eventName: BI.StateEditor.EVENT_FOCUS, eventName: BI.StateEditor.EVENT_FOCUS,
action: function () { action: function () {
@ -70533,7 +70536,9 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Pane, {
}, },
getValue: function () { 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 () { getAllLeaves: function () {
@ -70654,6 +70659,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, {
value: o.value, value: o.value,
height: o.height, height: o.height,
tipText: "", tipText: "",
watermark: BI.i18nText("BI-Basic_Search"),
listeners: [{ listeners: [{
eventName: BI.StateEditor.EVENT_FOCUS, eventName: BI.StateEditor.EVENT_FOCUS,
action: function () { action: function () {

12
dist/fineui_without_jquery_polyfill.js vendored

@ -11391,7 +11391,7 @@ if (!_global.BI) {
if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) { if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) {
var localTime = dt.getTime(); var localTime = dt.getTime();
// BI-33791 1901年以前的东8区标准是GMT+0805, 统一无论是什么时间,都以整的0800这样的为基准 // BI-33791 1901年以前的东8区标准是GMT+0805, 统一无论是什么时间,都以整的0800这样的为基准
var localOffset = new Date().getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数 var localOffset = dt.getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数
var utc = localTime + localOffset; // utc即GMT时间标准时区 var utc = localTime + localOffset; // utc即GMT时间标准时区
return new Date(utc + BI.timeZone);// + Pool.timeZone.offset); return new Date(utc + BI.timeZone);// + Pool.timeZone.offset);
} }
@ -52164,7 +52164,9 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Pane, {
}, },
getValue: function () { 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 () { getAllLeaves: function () {
@ -52285,6 +52287,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, {
value: o.value, value: o.value,
height: o.height, height: o.height,
tipText: "", tipText: "",
watermark: BI.i18nText("BI-Basic_Search"),
listeners: [{ listeners: [{
eventName: BI.StateEditor.EVENT_FOCUS, eventName: BI.StateEditor.EVENT_FOCUS,
action: function () { action: function () {
@ -53139,7 +53142,9 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Pane, {
}, },
getValue: function () { 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 () { getAllLeaves: function () {
@ -53260,6 +53265,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, {
value: o.value, value: o.value,
height: o.height, height: o.height,
tipText: "", tipText: "",
watermark: BI.i18nText("BI-Basic_Search"),
listeners: [{ listeners: [{
eventName: BI.StateEditor.EVENT_FOCUS, eventName: BI.StateEditor.EVENT_FOCUS,
action: function () { action: function () {

2
dist/utils.js vendored

@ -12170,7 +12170,7 @@ if (!_global.BI) {
if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) { if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) {
var localTime = dt.getTime(); var localTime = dt.getTime();
// BI-33791 1901年以前的东8区标准是GMT+0805, 统一无论是什么时间,都以整的0800这样的为基准 // BI-33791 1901年以前的东8区标准是GMT+0805, 统一无论是什么时间,都以整的0800这样的为基准
var localOffset = new Date().getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数 var localOffset = dt.getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数
var utc = localTime + localOffset; // utc即GMT时间标准时区 var utc = localTime + localOffset; // utc即GMT时间标准时区
return new Date(utc + BI.timeZone);// + Pool.timeZone.offset); return new Date(utc + BI.timeZone);// + Pool.timeZone.offset);
} }

10
dist/widget.js vendored

@ -6976,7 +6976,9 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Pane, {
}, },
getValue: function () { 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 () { getAllLeaves: function () {
@ -7097,6 +7099,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, {
value: o.value, value: o.value,
height: o.height, height: o.height,
tipText: "", tipText: "",
watermark: BI.i18nText("BI-Basic_Search"),
listeners: [{ listeners: [{
eventName: BI.StateEditor.EVENT_FOCUS, eventName: BI.StateEditor.EVENT_FOCUS,
action: function () { action: function () {
@ -7951,7 +7954,9 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Pane, {
}, },
getValue: function () { 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 () { getAllLeaves: function () {
@ -8072,6 +8077,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, {
value: o.value, value: o.value,
height: o.height, height: o.height,
tipText: "", tipText: "",
watermark: BI.i18nText("BI-Basic_Search"),
listeners: [{ listeners: [{
eventName: BI.StateEditor.EVENT_FOCUS, eventName: BI.StateEditor.EVENT_FOCUS,
action: function () { action: function () {

2
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])))) { if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) {
var localTime = dt.getTime(); var localTime = dt.getTime();
// BI-33791 1901年以前的东8区标准是GMT+0805, 统一无论是什么时间,都以整的0800这样的为基准 // BI-33791 1901年以前的东8区标准是GMT+0805, 统一无论是什么时间,都以整的0800这样的为基准
var localOffset = new Date().getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数 var localOffset = dt.getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数
var utc = localTime + localOffset; // utc即GMT时间标准时区 var utc = localTime + localOffset; // utc即GMT时间标准时区
return new Date(utc + BI.timeZone);// + Pool.timeZone.offset); return new Date(utc + BI.timeZone);// + Pool.timeZone.offset);
} }

4
src/widget/multilayerselecttree/multilayerselecttree.leveltree.js

@ -159,7 +159,9 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Pane, {
}, },
getValue: function () { 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 () { getAllLeaves: function () {

1
src/widget/multilayerselecttree/multilayerselecttree.trigger.js

@ -34,6 +34,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, {
value: o.value, value: o.value,
height: o.height, height: o.height,
tipText: "", tipText: "",
watermark: BI.i18nText("BI-Basic_Search"),
listeners: [{ listeners: [{
eventName: BI.StateEditor.EVENT_FOCUS, eventName: BI.StateEditor.EVENT_FOCUS,
action: function () { action: function () {

4
src/widget/multilayersingletree/multilayersingletree.leveltree.js

@ -158,7 +158,9 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Pane, {
}, },
getValue: function () { 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 () { getAllLeaves: function () {

1
src/widget/multilayersingletree/multilayersingletree.trigger.js

@ -34,6 +34,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, {
value: o.value, value: o.value,
height: o.height, height: o.height,
tipText: "", tipText: "",
watermark: BI.i18nText("BI-Basic_Search"),
listeners: [{ listeners: [{
eventName: BI.StateEditor.EVENT_FOCUS, eventName: BI.StateEditor.EVENT_FOCUS,
action: function () { action: function () {

Loading…
Cancel
Save