diff --git a/shared/src/commonMain/kotlin/com/bricks/mp/core/BricksRenderer.kt b/shared/src/commonMain/kotlin/com/bricks/mp/core/BricksRenderer.kt index b91ae06..1dcaba1 100644 --- a/shared/src/commonMain/kotlin/com/bricks/mp/core/BricksRenderer.kt +++ b/shared/src/commonMain/kotlin/com/bricks/mp/core/BricksRenderer.kt @@ -13,7 +13,7 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width -import androidx.compose.foundation.layout.weight + import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.foundation.horizontalScroll @@ -50,12 +50,10 @@ fun RenderWidget( // 布局 "HBox", "FHBox" -> RenderHBox(resolvedWidget, actionDispatcher) "VBox", "FVBox" -> RenderVBox(resolvedWidget, actionDispatcher) - "Filler", "HFiller" -> { - Spacer(modifier = Modifier.weight(1f)) + "Filler", "HFiller", "VFiller" -> { + Spacer(modifier = Modifier.size(8.dp)) } - "VFiller" -> Spacer(modifier = Modifier.height( - WidgetOptions.getString(resolvedWidget.options, "height", "16").toFloatOrNull()?.dp ?: 16.dp - )) + "ResponsiveBox" -> RenderResponsiveBox(resolvedWidget, actionDispatcher) // 输入 diff --git a/shared/src/jvmMain/kotlin/com/bricks/Main.kt b/shared/src/jvmMain/kotlin/com/bricks/Main.kt index e0cf71e..3a89723 100644 --- a/shared/src/jvmMain/kotlin/com/bricks/Main.kt +++ b/shared/src/jvmMain/kotlin/com/bricks/Main.kt @@ -281,7 +281,7 @@ fun MainAppScreen( context: BricksContext, http: BricksHttp, sageClient: SageClient, - scope: androidx.compose.runtime.CoroutineScope, + scope: kotlinx.coroutines.CoroutineScope, onLogout: () -> Unit, onNavigate: (String) -> Unit ) {