From 029b5466423b87f783ef91382dbbca0c7be677f9 Mon Sep 17 00:00:00 2001 From: guy Date: Thu, 18 Feb 2021 16:25:49 +0800 Subject: [PATCH] update --- src/base/single/label/abstract.label.js | 12 ++++++++++++ src/core/wrapper/layout/flex/flex.horizontal.js | 2 +- src/core/wrapper/layout/flex/flex.vertical.js | 2 +- .../layout/flex/wrapper/flex.wrapper.horizontal.js | 2 +- .../layout/flex/wrapper/flex.wrapper.vertical.js | 2 +- 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/base/single/label/abstract.label.js b/src/base/single/label/abstract.label.js index 0835e57c0..c6ed27bec 100644 --- a/src/base/single/label/abstract.label.js +++ b/src/base/single/label/abstract.label.js @@ -59,6 +59,7 @@ BI.createWidget({ type: "bi.center_adapt", height: o.height, + columnSize: [""], // important让文字shrink为1 scrollable: o.whiteSpace === "normal", element: this, items: [ @@ -71,6 +72,7 @@ } BI.createWidget({ // 1.2 type: "bi.center_adapt", + columnSize: [""], // important让文字shrink为1 scrollable: o.whiteSpace === "normal", element: this, items: [ @@ -93,6 +95,7 @@ this.text = BI.createWidget(json); BI.createWidget({ type: "bi.center_adapt", + columnSize: [""], // important让文字shrink为1 scrollable: o.whiteSpace === "normal", element: this, items: [this.text] @@ -127,6 +130,7 @@ this.text = BI.createWidget(json); BI.createWidget({ type: "bi.center_adapt", + columnSize: [""], // important让文字shrink为1 scrollable: o.whiteSpace === "normal", element: this, items: [this.text] @@ -137,6 +141,7 @@ json.maxWidth = o.textWidth; BI.createWidget({ type: "bi.center_adapt", + columnSize: [""], // important让文字shrink为1 scrollable: o.whiteSpace === "normal", element: this, items: [ @@ -159,6 +164,7 @@ this.text = BI.createWidget(json); BI.createWidget({ type: "bi.center_adapt", + columnSize: [""], // important让文字shrink为1 scrollable: true, element: this, items: [this.text] @@ -195,6 +201,7 @@ })); BI.createWidget({ type: "bi.center_adapt", + columnSize: [""], // important让文字shrink为1 element: this, items: [this.text] }); @@ -211,6 +218,7 @@ BI.createWidget({ type: adaptLayout, horizontalAlign: o.textAlign, + columnSize: [""], // important让文字shrink为1 height: o.height, scrollable: o.whiteSpace === "normal", element: this, @@ -225,6 +233,7 @@ BI.createWidget({ // 2.2 type: adaptLayout, horizontalAlign: o.textAlign, + columnSize: [""], // important让文字shrink为1 scrollable: o.whiteSpace === "normal", hgap: o.hgap, vgap: o.vgap, @@ -262,6 +271,7 @@ BI.createWidget({ // 2.4 type: adaptLayout, horizontalAlign: o.textAlign, + columnSize: [""], // important让文字shrink为1 scrollable: o.whiteSpace === "normal", hgap: o.hgap, vgap: o.vgap, @@ -281,6 +291,7 @@ BI.createWidget({ // 2.5 type: adaptLayout, horizontalAlign: o.textAlign, + columnSize: [""], // important让文字shrink为1 scrollable: o.whiteSpace === "normal", hgap: o.hgap, vgap: o.vgap, @@ -329,6 +340,7 @@ BI.createWidget({ type: adaptLayout, horizontalAlign: o.textAlign, + columnSize: [""], // important让文字shrink为1 element: this, scrollable: o.whiteSpace === "normal", items: [this.text] diff --git a/src/core/wrapper/layout/flex/flex.horizontal.js b/src/core/wrapper/layout/flex/flex.horizontal.js index 307f10e6e..a4957003b 100644 --- a/src/core/wrapper/layout/flex/flex.horizontal.js +++ b/src/core/wrapper/layout/flex/flex.horizontal.js @@ -34,7 +34,7 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, { w.element.css({ position: "relative" }); - if (o.horizontalAlign !== BI.HorizontalAlign.Stretch) { + if (o.horizontalAlign !== BI.HorizontalAlign.Stretch && o.columnSize[i] !== "") { w.element.css({ "flex-shrink": "0" }); diff --git a/src/core/wrapper/layout/flex/flex.vertical.js b/src/core/wrapper/layout/flex/flex.vertical.js index 5170f9cf1..0b5fa88ec 100644 --- a/src/core/wrapper/layout/flex/flex.vertical.js +++ b/src/core/wrapper/layout/flex/flex.vertical.js @@ -33,7 +33,7 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, { w.element.css({ position: "relative" }); - if (o.verticalAlign !== BI.VerticalAlign.Stretch) { + if (o.verticalAlign !== BI.VerticalAlign.Stretch && o.rowSize[i] !== "") { w.element.css({ "flex-shrink": "0" }); diff --git a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js index c722999ed..ec7680f38 100644 --- a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js +++ b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js @@ -35,7 +35,7 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, { w.element.css({ position: "relative" }); - if (o.horizontalAlign !== BI.HorizontalAlign.Stretch) { + if (o.horizontalAlign !== BI.HorizontalAlign.Stretch && o.columnSize[i] !== "") { w.element.css({ "flex-shrink": "0" }); diff --git a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js index cd3c3d887..d979a5421 100644 --- a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js +++ b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js @@ -35,7 +35,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, { w.element.css({ position: "relative" }); - if (o.verticalAlign !== BI.VerticalAlign.Stretch) { + if (o.verticalAlign !== BI.VerticalAlign.Stretch && o.rowSize[i] !== "") { w.element.css({ "flex-shrink": "0" });