Skip to content

Commit 8f3e2cb

Browse files
committed
feat: 迁移至新版 LCUI
1 parent 432c513 commit 8f3e2cb

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

src/app-plugin/index.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ ${router.initCode.map((line) => ` ${line}`).join("\n")}
5858
`#include <locale.h>
5959
#include <LCUI.h>
6060
#include <LCUI/main.h>
61-
${[...router.includeCode, ...components.includeCode, ...router.globalCode]
62-
.filter(Boolean)
63-
.join("\n")}
61+
${[...router.includeCode, ...components.includeCode, ...router.globalCode].join(
62+
"\n"
63+
)}
6464
6565
static void lcui_app_init(void)
6666
{
@@ -80,7 +80,6 @@ static int lcui_app_run(void)
8080
{
8181
return lcui_run();
8282
}
83-
8483
`
8584
);
8685
runXMake(compiler);

src/app-plugin/router.ts

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ function compileAppRoute(appRoute: RouteConfig, context: string) {
125125
.map((line) => (!line ? line : ` ${line};`))
126126
.join("\n"),
127127
"}",
128-
"",
129128
];
130129
}
131130

@@ -150,19 +149,16 @@ export class AppRouterCompiler {
150149
componentsInitCode: [],
151150
initCode: [],
152151
mainInitCode: [],
153-
globalCode: "",
152+
globalCode: [],
154153
};
155154

156155
if (!this.active) {
157156
return result;
158157
}
159158
return {
160-
includeCode: ["#include <ui_router.h>"],
159+
includeCode: ["#include <router.h>"],
161160
baseInitCode: ["lcui_app_router_init();"],
162-
componentsInitCode: [
163-
"ui_register_router_link();",
164-
"ui_register_router_view();",
165-
],
161+
componentsInitCode: [],
166162
initCode: [
167163
'ui_widget_set_attr(ui_root(), "router", "AppRouter");',
168164
"ui_widget_append(ui_root(), ui_create_root_layout());",

0 commit comments

Comments
 (0)