diff --git a/bi/base.js b/bi/base.js
index d6f385308..382be5a93 100644
--- a/bi/base.js
+++ b/bi/base.js
@@ -17543,6 +17543,7 @@ BI.Editor = BI.inherit(BI.Single, {
rgap: 0,
tgap: 0,
bgap: 0,
+ //title,warningTitle这两个属性没用
tipType: "warning",
inputType: "text",
validationChecker: BI.emptyFn,
@@ -17560,6 +17561,7 @@ BI.Editor = BI.inherit(BI.Single, {
this.editor = this.addWidget(BI.createWidget({
type: "bi.input",
element: "",
+ root: true,
watermark: o.watermark,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
@@ -17579,7 +17581,6 @@ BI.Editor = BI.inherit(BI.Single, {
type: "bi.label",
cls: "bi-water-mark",
text: this.options.watermark,
- height: this.options.height,
forceCenter: true,
height: o.height - 2 * (o.vgap + o.tgap),
whiteSpace: "nowrap",
diff --git a/bi/core.js b/bi/core.js
index 7d6a75020..304ef4664 100644
--- a/bi/core.js
+++ b/bi/core.js
@@ -6018,6 +6018,14 @@ Date.HOUR = 60 * Date.MINUTE;
Date.DAY = 24 * Date.HOUR;
Date.WEEK = 7 * Date.DAY;
+/**
+ * 获取时区
+ * @returns {String}
+ */
+Date.prototype.getTimezone = function () {
+ return this.toString().replace(/^.* (?:\((.*)\)|([A-Z]{1,4})(?:[\-+][0-9]{4})?(?: -?\d+)?)$/, "$1$2").replace(/[^A-Z]/g, "");
+};
+
/** Returns the number of days in the current month */
Date.prototype.getMonthDays = function (month) {
var year = this.getFullYear();
diff --git a/docs/base.js b/docs/base.js
index d6f385308..382be5a93 100644
--- a/docs/base.js
+++ b/docs/base.js
@@ -17543,6 +17543,7 @@ BI.Editor = BI.inherit(BI.Single, {
rgap: 0,
tgap: 0,
bgap: 0,
+ //title,warningTitle这两个属性没用
tipType: "warning",
inputType: "text",
validationChecker: BI.emptyFn,
@@ -17560,6 +17561,7 @@ BI.Editor = BI.inherit(BI.Single, {
this.editor = this.addWidget(BI.createWidget({
type: "bi.input",
element: "",
+ root: true,
watermark: o.watermark,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
@@ -17579,7 +17581,6 @@ BI.Editor = BI.inherit(BI.Single, {
type: "bi.label",
cls: "bi-water-mark",
text: this.options.watermark,
- height: this.options.height,
forceCenter: true,
height: o.height - 2 * (o.vgap + o.tgap),
whiteSpace: "nowrap",
diff --git a/docs/core.js b/docs/core.js
index 14ffbdf52..c5b0bd751 100644
--- a/docs/core.js
+++ b/docs/core.js
@@ -23514,6 +23514,14 @@ Date.HOUR = 60 * Date.MINUTE;
Date.DAY = 24 * Date.HOUR;
Date.WEEK = 7 * Date.DAY;
+/**
+ * 获取时区
+ * @returns {String}
+ */
+Date.prototype.getTimezone = function () {
+ return this.toString().replace(/^.* (?:\((.*)\)|([A-Z]{1,4})(?:[\-+][0-9]{4})?(?: -?\d+)?)$/, "$1$2").replace(/[^A-Z]/g, "");
+};
+
/** Returns the number of days in the current month */
Date.prototype.getMonthDays = function (month) {
var year = this.getFullYear();
diff --git a/src/base/single/editor/editor.js b/src/base/single/editor/editor.js
index 12f7fbf5a..44b7781ec 100644
--- a/src/base/single/editor/editor.js
+++ b/src/base/single/editor/editor.js
@@ -14,6 +14,7 @@ BI.Editor = BI.inherit(BI.Single, {
rgap: 0,
tgap: 0,
bgap: 0,
+ //title,warningTitle这两个属性没用
tipType: "warning",
inputType: "text",
validationChecker: BI.emptyFn,
@@ -31,6 +32,7 @@ BI.Editor = BI.inherit(BI.Single, {
this.editor = this.addWidget(BI.createWidget({
type: "bi.input",
element: "",
+ root: true,
watermark: o.watermark,
validationChecker: o.validationChecker,
quitChecker: o.quitChecker,
@@ -50,7 +52,6 @@ BI.Editor = BI.inherit(BI.Single, {
type: "bi.label",
cls: "bi-water-mark",
text: this.options.watermark,
- height: this.options.height,
forceCenter: true,
height: o.height - 2 * (o.vgap + o.tgap),
whiteSpace: "nowrap",
diff --git a/src/core/proto/date.js b/src/core/proto/date.js
index 75e833c6a..c8292a94d 100644
--- a/src/core/proto/date.js
+++ b/src/core/proto/date.js
@@ -66,6 +66,14 @@ Date.HOUR = 60 * Date.MINUTE;
Date.DAY = 24 * Date.HOUR;
Date.WEEK = 7 * Date.DAY;
+/**
+ * 获取时区
+ * @returns {String}
+ */
+Date.prototype.getTimezone = function () {
+ return this.toString().replace(/^.* (?:\((.*)\)|([A-Z]{1,4})(?:[\-+][0-9]{4})?(?: -?\d+)?)$/, "$1$2").replace(/[^A-Z]/g, "");
+};
+
/** Returns the number of days in the current month */
Date.prototype.getMonthDays = function (month) {
var year = this.getFullYear();