From 5db2268d031f0d4e18156d73538f9fbad59dc15c Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Wed, 9 Sep 2020 14:37:57 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20lab?=
 =?UTF-8?q?el=E6=8F=90=E4=BE=9B=E5=A4=9A=E8=A1=8C=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E6=BA=A2=E5=87=BA=E6=98=BE=E7=A4=BA...=EF=BC=88=E4=BB=85webkit?=
 =?UTF-8?q?=EF=BC=89"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d1a3b2418e85c2bb492f657c4e988fb231b3aa74.
---
 changelog.md                   |  3 ---
 demo/js/base/demo.label.js     |  8 --------
 src/base/single/label/label.js |  1 -
 src/base/single/text.js        | 17 ++++-------------
 4 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/changelog.md b/changelog.md
index 3a43f6b23..4865f27b5 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,7 +1,4 @@
 # 更新日志
-2.0(2020-09)
-- bi.label支持多行文本溢出显示...(仅支持webkit内核)
-
 2.0(2020-08)
 - bi.sign_editor支持显示值居左/居中/居右显示
 - bi.iframe新增EVENT_LOADED事件
diff --git a/demo/js/base/demo.label.js b/demo/js/base/demo.label.js
index e9a69daf7..0f5158f13 100644
--- a/demo/js/base/demo.label.js
+++ b/demo/js/base/demo.label.js
@@ -104,14 +104,6 @@ Demo.Label = BI.inherit(BI.Widget, {
                 textWidth: 200,
                 textHeight: 30,
                 height: 60
-            }, {
-                type: "bi.label",
-                cls: "layout-bg1",
-                text: "label设置了宽度, 并且设置了显示行数是2行, 无论输入多少文本，在允许换行的情况下只会显示2行，并在第二行结尾出现...",
-                textAlign: "left",
-                width: 300,
-                lineNumber: 2,
-                whiteSpace: "normal"
             }, {
                 type: "bi.left",
                 items: [{
diff --git a/src/base/single/label/label.js b/src/base/single/label/label.js
index 362083dc2..101fdeb3d 100644
--- a/src/base/single/label/label.js
+++ b/src/base/single/label/label.js
@@ -17,7 +17,6 @@ BI.Label = BI.inherit(BI.AbstractLabel, {
             textAlign: o.textAlign,
             whiteSpace: o.whiteSpace,
             lineHeight: o.textHeight,
-            lineNumber: o.lineNumber,
             text: o.text,
             value: o.value,
             py: o.py,
diff --git a/src/base/single/text.js b/src/base/single/text.js
index 2272fb15b..823843bfc 100644
--- a/src/base/single/text.js
+++ b/src/base/single/text.js
@@ -20,8 +20,7 @@
             bgap: 0,
             text: "",
             py: "",
-            highLight: false,
-            lineNumber: null,
+            highLight: false
         },
 
         render: function () {
@@ -55,20 +54,12 @@
             if (BI.isWidthOrHeight(o.maxWidth)) {
                 this.element.css({maxWidth: o.maxWidth});
             }
-            var cssObj = {
+            this.element.css({
                 textAlign: o.textAlign,
                 whiteSpace: this._getTextWrap(),
                 textOverflow: o.whiteSpace === "nowrap" ? "ellipsis" : "",
-                overflow: o.whiteSpace === "nowrap" ? "" : (BI.isWidthOrHeight(o.height) ? "auto" : ""),
-            };
-            if (BI.isNumber(o.lineNumber)) {
-                BI.extend(cssObj, {
-                    display: "-webkit-box",
-                    "-webkit-line-clamp": o.lineNumber + "",
-                    "-webkit-box-orient": "vertical",
-                });
-            }
-            this.element.css(cssObj);
+                overflow: o.whiteSpace === "nowrap" ? "" : (BI.isWidthOrHeight(o.height) ? "auto" : "")
+            });
             if (o.handler && o.handler !== BI.emptyFn) {
                 this.text = BI.createWidget({
                     type: "bi.layout",