fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

update

es6
guy 4 years ago
parent
029b546642
commit
43bfb7e13e
5 changed files with 16 additions and 16 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
  2. 2
      src/core/wrapper/layout/flex/flex.horizontal.js
  3. 2
      src/core/wrapper/layout/flex/flex.vertical.js
  4. 2
      src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js
  5. 2
      src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.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: [""], // important让文字shrink为1 columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important让文字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: [""], // important让文字shrink为1 columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important让文字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: [""], // important让文字shrink为1 columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important让文字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: [""], // important让文字shrink为1 columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important让文字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: [""], // important让文字shrink为1 columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important让文字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: [""], // important让文字shrink为1 columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important让文字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: [""], // important让文字shrink为1 columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important让文字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: [""], // important让文字shrink为1 columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important让文字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: [""], // important让文字shrink为1 columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important让文字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: [""], // important让文字shrink为1 columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important让文字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: [""], // important让文字shrink为1 columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important让文字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: [""], // important让文字shrink为1 columnSize: [o.whiteSpace === "normal" ? "auto" : ""], // important让文字shrink为1
element: this, element: this,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
items: [this.text] items: [this.text]

2
src/core/wrapper/layout/flex/flex.horizontal.js
Unescape View File

@ -34,7 +34,7 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
w.element.css({ w.element.css({
position: "relative" position: "relative"
}); });
if (o.horizontalAlign !== BI.HorizontalAlign.Stretch && o.columnSize[i] !== "") { if (o.horizontalAlign !== BI.HorizontalAlign.Stretch && o.columnSize[i] !== "auto") {
w.element.css({ w.element.css({
"flex-shrink": "0" "flex-shrink": "0"
}); });

2
src/core/wrapper/layout/flex/flex.vertical.js
Unescape View File

@ -33,7 +33,7 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
w.element.css({ w.element.css({
position: "relative" position: "relative"
}); });
if (o.verticalAlign !== BI.VerticalAlign.Stretch && o.rowSize[i] !== "") { if (o.verticalAlign !== BI.VerticalAlign.Stretch && o.rowSize[i] !== "auto") {
w.element.css({ w.element.css({
"flex-shrink": "0" "flex-shrink": "0"
}); });

2
src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js
Unescape View File

@ -35,7 +35,7 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
w.element.css({ w.element.css({
position: "relative" position: "relative"
}); });
if (o.horizontalAlign !== BI.HorizontalAlign.Stretch && o.columnSize[i] !== "") { if (o.horizontalAlign !== BI.HorizontalAlign.Stretch && o.columnSize[i] !== "auto") {
w.element.css({ w.element.css({
"flex-shrink": "0" "flex-shrink": "0"
}); });

2
src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js
Unescape View File

@ -35,7 +35,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
w.element.css({ w.element.css({
position: "relative" position: "relative"
}); });
if (o.verticalAlign !== BI.VerticalAlign.Stretch && o.rowSize[i] !== "") { if (o.verticalAlign !== BI.VerticalAlign.Stretch && o.rowSize[i] !== "auto") {
w.element.css({ w.element.css({
"flex-shrink": "0" "flex-shrink": "0"
}); });

Write Preview
Loading…
Cancel
Save