iOS:fix when LayoutSpec.MOST and weight both setted

This commit is contained in:
pengfei.zhou
2020-04-10 16:14:27 +08:00
committed by osborn
parent 528e6625b5
commit b266fdaa20
3 changed files with 35 additions and 63 deletions

View File

@@ -1,64 +1,34 @@
import { Group, Panel, text, gravity, Color, LayoutSpec, vlayout, hlayout, scroller, IVLayout, IHLayout, layoutConfig, stack, Gravity, flexlayout } from "doric";
import { FlexDirection, Wrap, Justify, Align, FlexTypedValue } from "doric/lib/src/util/flexbox";
const colors = [
"#f0932b",
"#eb4d4b",
"#6ab04c",
"#e056fd",
"#686de0",
"#30336b",
]
function box(idx = 0) {
return stack([], {
flexConfig: {
width: 20,
height: 20,
},
backgroundColor: Color.parse(colors[idx || 0])
})
}
function boxStr(str: string, idx = 0) {
return text({
width: 20,
height: 20,
text: str,
textColor: Color.WHITE,
layoutConfig: layoutConfig().just(),
backgroundColor: Color.parse(colors[idx || 0])
})
}
function label(str: string) {
return text({
text: str,
textSize: 16,
})
}
import { colors } from "./utils";
@Entry
class LayoutDemo extends Panel {
build(root: Group) {
flexlayout(
[
box(0),
box(1),
box(2),
box(3),
box(4),
box(0),
box(1),
box(2),
box(3),
box(4),
box(0),
box(1),
box(2),
box(3),
box(4),
stack([], {
flexConfig: {
width: 100,
height: 100,
},
backgroundColor: colors[0]
}),
stack([], {
flexConfig: {
width: 100,
height: 100,
},
backgroundColor: colors[1],
}),
stack([], {
flexConfig: {
width: 100,
height: 100,
},
backgroundColor: colors[2],
}),
],
{
layoutConfig: layoutConfig().fit(),