From bd1f77e41ae5ef7c57c98e528624600ee5d97aae Mon Sep 17 00:00:00 2001 From: guy Date: Thu, 18 Feb 2021 16:58:52 +0800 Subject: [PATCH] bugfix --- src/base/single/label/abstract.label.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/base/single/label/abstract.label.js b/src/base/single/label/abstract.label.js index 753fe6d6cd..966500cac4 100644 --- a/src/base/single/label/abstract.label.js +++ b/src/base/single/label/abstract.label.js @@ -59,7 +59,7 @@ BI.createWidget({ type: "bi.center_adapt", height: o.height, - columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important！ 让文字在normal下shrink为1 + columnSize: ["auto"], // important！ 让文字在flex布局下shrink为1 scrollable: o.whiteSpace === "normal", element: this, items: [ @@ -72,7 +72,7 @@ } BI.createWidget({ // 1.2 type: "bi.center_adapt", - columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important！ 让文字在normal下shrink为1 + columnSize: ["auto"], // important！ 让文字在flex布局下shrink为1 scrollable: o.whiteSpace === "normal", element: this, items: [ @@ -95,7 +95,7 @@ this.text = BI.createWidget(json); BI.createWidget({ type: "bi.center_adapt", - columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important！ 让文字在normal下shrink为1 + columnSize: ["auto"], // important！ 让文字在flex布局下shrink为1 scrollable: o.whiteSpace === "normal", element: this, items: [this.text] @@ -130,7 +130,7 @@ this.text = BI.createWidget(json); BI.createWidget({ type: "bi.center_adapt", - columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important！ 让文字在normal下shrink为1 + columnSize: ["auto"], // important！ 让文字在flex布局下shrink为1 scrollable: o.whiteSpace === "normal", element: this, items: [this.text] @@ -141,7 +141,7 @@ json.maxWidth = o.textWidth; BI.createWidget({ type: "bi.center_adapt", - columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important！ 让文字在normal下shrink为1 + columnSize: ["auto"], // important！ 让文字在flex布局下shrink为1 scrollable: o.whiteSpace === "normal", element: this, items: [ @@ -164,7 +164,7 @@ this.text = BI.createWidget(json); BI.createWidget({ type: "bi.center_adapt", - columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important！ 让文字在normal下shrink为1 + columnSize: ["auto"], // important！ 让文字在flex布局下shrink为1 scrollable: true, element: this, items: [this.text] @@ -201,7 +201,7 @@ })); BI.createWidget({ type: "bi.center_adapt", - columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important！ 让文字在normal下shrink为1 + columnSize: ["auto"], // important！ 让文字在flex布局下shrink为1 element: this, items: [this.text] }); @@ -218,7 +218,7 @@ BI.createWidget({ type: adaptLayout, horizontalAlign: o.textAlign, - columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important！ 让文字在normal下shrink为1 + columnSize: ["auto"], // important！ 让文字在flex布局下shrink为1 height: o.height, scrollable: o.whiteSpace === "normal", element: this, @@ -233,7 +233,7 @@ BI.createWidget({ // 2.2 type: adaptLayout, horizontalAlign: o.textAlign, - columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important！ 让文字在normal下shrink为1 + columnSize: ["auto"], // important！ 让文字在flex布局下shrink为1 scrollable: o.whiteSpace === "normal", hgap: o.hgap, vgap: o.vgap, @@ -271,7 +271,7 @@ BI.createWidget({ // 2.4 type: adaptLayout, horizontalAlign: o.textAlign, - columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important！ 让文字在normal下shrink为1 + columnSize: ["auto"], // important！ 让文字在flex布局下shrink为1 scrollable: o.whiteSpace === "normal", hgap: o.hgap, vgap: o.vgap, @@ -291,7 +291,7 @@ BI.createWidget({ // 2.5 type: adaptLayout, horizontalAlign: o.textAlign, - columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important！ 让文字在normal下shrink为1 + columnSize: ["auto"], // important！ 让文字在flex布局下shrink为1 scrollable: o.whiteSpace === "normal", hgap: o.hgap, vgap: o.vgap, @@ -340,7 +340,7 @@ BI.createWidget({ type: adaptLayout, horizontalAlign: o.textAlign, - columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important！ 让文字在normal下shrink为1 + columnSize: ["auto"], // important！ 让文字在flex布局下shrink为1 element: this, scrollable: o.whiteSpace === "normal", items: [this.text]