Frank
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Pull request #1766: 无JIRA任务 bugfix 

Merge in VISUAL/fineui from ~GUY/fineui:master to master

* commit 'bd1f77e41ae5ef7c57c98e528624600ee5d97aae':
  bugfix
es6
guy 4 years ago
parent
8ac10b4cc7 bd1f77e41a
commit
1cd661ae3b
1 changed files with 12 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      src/base/single/label/abstract.label.js

24
src/base/single/label/abstract.label.js
Unescape View File

@ -59,7 +59,7 @@
BI.createWidget({ BI.createWidget({
type: "bi.center_adapt", type: "bi.center_adapt",
height: o.height, height: o.height,
columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important！ 让文字在normal下shrink为1 columnSize: ["auto"], // important！ 让文字在flex布局下shrink为1
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
element: this, element: this,
items: [ items: [
@ -72,7 +72,7 @@
} }
BI.createWidget({ // 1.2 BI.createWidget({ // 1.2
type: "bi.center_adapt", type: "bi.center_adapt",
columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important！ 让文字在normal下shrink为1 columnSize: ["auto"], // important！ 让文字在flex布局下shrink为1
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
element: this, element: this,
items: [ items: [
@ -95,7 +95,7 @@
this.text = BI.createWidget(json); this.text = BI.createWidget(json);
BI.createWidget({ BI.createWidget({
type: "bi.center_adapt", type: "bi.center_adapt",
columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important！ 让文字在normal下shrink为1 columnSize: ["auto"], // important！ 让文字在flex布局下shrink为1
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
element: this, element: this,
items: [this.text] items: [this.text]
@ -130,7 +130,7 @@
this.text = BI.createWidget(json); this.text = BI.createWidget(json);
BI.createWidget({ BI.createWidget({
type: "bi.center_adapt", type: "bi.center_adapt",
columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important！ 让文字在normal下shrink为1 columnSize: ["auto"], // important！ 让文字在flex布局下shrink为1
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
element: this, element: this,
items: [this.text] items: [this.text]
@ -141,7 +141,7 @@
json.maxWidth = o.textWidth; json.maxWidth = o.textWidth;
BI.createWidget({ BI.createWidget({
type: "bi.center_adapt", type: "bi.center_adapt",
columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important！ 让文字在normal下shrink为1 columnSize: ["auto"], // important！ 让文字在flex布局下shrink为1
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
element: this, element: this,
items: [ items: [
@ -164,7 +164,7 @@
this.text = BI.createWidget(json); this.text = BI.createWidget(json);
BI.createWidget({ BI.createWidget({
type: "bi.center_adapt", type: "bi.center_adapt",
columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important！ 让文字在normal下shrink为1 columnSize: ["auto"], // important！ 让文字在flex布局下shrink为1
scrollable: true, scrollable: true,
element: this, element: this,
items: [this.text] items: [this.text]
@ -201,7 +201,7 @@
})); }));
BI.createWidget({ BI.createWidget({
type: "bi.center_adapt", type: "bi.center_adapt",
columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important！ 让文字在normal下shrink为1 columnSize: ["auto"], // important！ 让文字在flex布局下shrink为1
element: this, element: this,
items: [this.text] items: [this.text]
}); });
@ -218,7 +218,7 @@
BI.createWidget({ BI.createWidget({
type: adaptLayout, type: adaptLayout,
horizontalAlign: o.textAlign, horizontalAlign: o.textAlign,
columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important！ 让文字在normal下shrink为1 columnSize: ["auto"], // important！ 让文字在flex布局下shrink为1
height: o.height, height: o.height,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
element: this, element: this,
@ -233,7 +233,7 @@
BI.createWidget({ // 2.2 BI.createWidget({ // 2.2
type: adaptLayout, type: adaptLayout,
horizontalAlign: o.textAlign, horizontalAlign: o.textAlign,
columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important！ 让文字在normal下shrink为1 columnSize: ["auto"], // important！ 让文字在flex布局下shrink为1
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -271,7 +271,7 @@
BI.createWidget({ // 2.4 BI.createWidget({ // 2.4
type: adaptLayout, type: adaptLayout,
horizontalAlign: o.textAlign, horizontalAlign: o.textAlign,
columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important！ 让文字在normal下shrink为1 columnSize: ["auto"], // important！ 让文字在flex布局下shrink为1
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -291,7 +291,7 @@
BI.createWidget({ // 2.5 BI.createWidget({ // 2.5
type: adaptLayout, type: adaptLayout,
horizontalAlign: o.textAlign, horizontalAlign: o.textAlign,
columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important！ 让文字在normal下shrink为1 columnSize: ["auto"], // important！ 让文字在flex布局下shrink为1
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -340,7 +340,7 @@
BI.createWidget({ BI.createWidget({
type: adaptLayout, type: adaptLayout,
horizontalAlign: o.textAlign, horizontalAlign: o.textAlign,
columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important！ 让文字在normal下shrink为1 columnSize: ["auto"], // important！ 让文字在flex布局下shrink为1
element: this, element: this,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
items: [this.text] items: [this.text]

Write Preview
Loading…
Cancel
Save