From 3cc5f6116260fd23d467000b11bc78bfa7ab3e54 Mon Sep 17 00:00:00 2001
From: windy <taiyangstorm@gmail.com>
Date: Mon, 30 Nov 2020 22:00:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20revert=20?=
 =?UTF-8?q?label=E5=90=8C=E6=AD=A5value=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 changelog.md            | 1 -
 src/base/single/text.js | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index 0725712a1..d64fa93f2 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,5 @@
 # 更新日志
 2.0(2020-11)
-- 修复了文本标签text传递空字符串后显示value值的问题
 - 限制了title的最大高度
 - bi.textarea_editor添加setWatermark方法
 - 生命周期可以通过属性传递来操作
diff --git a/src/base/single/text.js b/src/base/single/text.js
index 639599d91..823843bfc 100644
--- a/src/base/single/text.js
+++ b/src/base/single/text.js
@@ -80,6 +80,8 @@
             var text = this._getShowText();
             if (BI.isKey(text)) {
                 this.setText(text);
+            } else if (BI.isKey(o.value)) {
+                this.setText(o.value);
             }
             if (BI.isKey(o.keyword)) {
                 this.doRedMark(o.keyword);
@@ -103,6 +105,7 @@
         _getShowText: function () {
             var o = this.options;
             var text = BI.isFunction(o.text) ? o.text() : o.text;
+            text = BI.isKey(text) ? text : o.value;
             if (!BI.isKey(text)) {
                 return "";
             }

From e351830a0cc494bcee8d8a2d6370abf2192ee8ec Mon Sep 17 00:00:00 2001
From: windy <taiyangstorm@gmail.com>
Date: Mon, 30 Nov 2020 23:11:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 changelog.md                            |  1 +
 src/base/single/__test__/text.test.js   | 38 +++++++++++++++++++++++++
 src/base/single/button/button.basic.js  |  1 -
 src/base/single/label/abstract.label.js |  1 -
 src/base/single/text.js                 | 10 ++-----
 5 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/changelog.md b/changelog.md
index d64fa93f2..0725712a1 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,6 @@
 # 更新日志
 2.0(2020-11)
+- 修复了文本标签text传递空字符串后显示value值的问题
 - 限制了title的最大高度
 - bi.textarea_editor添加setWatermark方法
 - 生命周期可以通过属性传递来操作
diff --git a/src/base/single/__test__/text.test.js b/src/base/single/__test__/text.test.js
index 0aa659ac6..9549b2d7e 100644
--- a/src/base/single/__test__/text.test.js
+++ b/src/base/single/__test__/text.test.js
@@ -154,4 +154,42 @@ describe("TextTest", function () {
             done();
         });
     });
+
+    /**
+     * test_author_windy
+     */
+    it("text的value属性", function () {
+        var text = BI.Test.createWidget({
+            type: "bi.text",
+            text: "",
+            value: "aaaa"
+        });
+        expect(text.element.text()).to.equal("");
+        text.destroy();
+    });
+
+    /**
+     * test_author_windy
+     */
+    it("text的value属性1", function () {
+        var text = BI.Test.createWidget({
+            type: "bi.text",
+            value: "aaaa"
+        });
+        expect(text.element.text()).to.equal("aaaa");
+        text.destroy();
+    });
+
+    /**
+     * test_author_windy
+     */
+    it("text的value属性2", function () {
+        var text = BI.Test.createWidget({
+            type: "bi.text",
+            text: null,
+            value: "aaaa"
+        });
+        expect(text.element.text()).to.equal("");
+        text.destroy();
+    });
 });
diff --git a/src/base/single/button/button.basic.js b/src/base/single/button/button.basic.js
index 5240f83e0..fb2f87656 100644
--- a/src/base/single/button/button.basic.js
+++ b/src/base/single/button/button.basic.js
@@ -11,7 +11,6 @@ BI.BasicButton = BI.inherit(BI.Single, {
         return BI.extend(conf, {
             _baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer") + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""),
             value: "",
-            text: "",
             stopEvent: false,
             stopPropagation: false,
             selected: false,
diff --git a/src/base/single/label/abstract.label.js b/src/base/single/label/abstract.label.js
index 2dc09c826..9bf8b9a20 100644
--- a/src/base/single/label/abstract.label.js
+++ b/src/base/single/label/abstract.label.js
@@ -17,7 +17,6 @@
                 rgap: 0,
                 tgap: 0,
                 bgap: 0,
-                text: "",
                 highLight: false,
                 handler: null
             });
diff --git a/src/base/single/text.js b/src/base/single/text.js
index 823843bfc..d300c821f 100644
--- a/src/base/single/text.js
+++ b/src/base/single/text.js
@@ -18,7 +18,6 @@
             rgap: 0,
             tgap: 0,
             bgap: 0,
-            text: "",
             py: "",
             highLight: false
         },
@@ -78,7 +77,7 @@
             }
 
             var text = this._getShowText();
-            if (BI.isKey(text)) {
+            if (!BI.isUndefined(text)) {
                 this.setText(text);
             } else if (BI.isKey(o.value)) {
                 this.setText(o.value);
@@ -105,11 +104,8 @@
         _getShowText: function () {
             var o = this.options;
             var text = BI.isFunction(o.text) ? o.text() : o.text;
-            text = BI.isKey(text) ? text : o.value;
-            if (!BI.isKey(text)) {
-                return "";
-            }
-            return BI.Text.formatText(text + "");
+
+            return BI.isKey(text) ? BI.Text.formatText(text + "") : text;
         },
 
         _doRedMark: function (keyword) {