Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
N
Neos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
Neos
Commits
f20e1199
Commit
f20e1199
authored
Oct 03, 2023
by
Chunchi Che
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix filter in BuildDeck
parent
6be2bb28
Pipeline
#23666
passed with stages
in 12 minutes and 57 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
1 deletion
+24
-1
src/ui/BuildDeck/index.tsx
src/ui/BuildDeck/index.tsx
+7
-0
src/ui/Layout/index.tsx
src/ui/Layout/index.tsx
+2
-0
src/ui/Layout/utils.ts
src/ui/Layout/utils.ts
+15
-1
No files found.
src/ui/BuildDeck/index.tsx
View file @
f20e1199
...
@@ -70,6 +70,13 @@ export const loader: LoaderFunction = async () => {
...
@@ -70,6 +70,13 @@ export const loader: LoaderFunction = async () => {
});
});
}
}
// 最后,等待I18N文案的加载
if
(
!
initStore
.
i18n
)
{
await
new
Promise
<
void
>
((
rs
)
=>
{
subscribeKey
(
initStore
,
"
i18n
"
,
(
done
)
=>
done
&&
rs
());
});
}
return
null
;
return
null
;
};
};
...
...
src/ui/Layout/index.tsx
View file @
f20e1199
...
@@ -24,6 +24,7 @@ import {
...
@@ -24,6 +24,7 @@ import {
handleSSOLogin
,
handleSSOLogin
,
initDeck
,
initDeck
,
initForbidden
,
initForbidden
,
initI18N
,
initSqlite
,
initSqlite
,
initWASM
,
initWASM
,
}
from
"
./utils
"
;
}
from
"
./utils
"
;
...
@@ -36,6 +37,7 @@ export const loader: LoaderFunction = async () => {
...
@@ -36,6 +37,7 @@ export const loader: LoaderFunction = async () => {
initSqlite
();
initSqlite
();
initWASM
();
initWASM
();
initForbidden
();
initForbidden
();
initI18N
();
return
null
;
return
null
;
};
};
...
...
src/ui/Layout/utils.ts
View file @
f20e1199
import
rustInit
from
"
rust-src
"
;
import
rustInit
from
"
rust-src
"
;
import
{
CookieKeys
,
forbidden
,
getCookie
,
setCookie
}
from
"
@/api
"
;
import
{
CookieKeys
,
forbidden
,
getCookie
,
initStrings
,
setCookie
,
}
from
"
@/api
"
;
import
{
useConfig
}
from
"
@/config
"
;
import
{
useConfig
}
from
"
@/config
"
;
import
{
useEnv
}
from
"
@/hook
"
;
import
{
useEnv
}
from
"
@/hook
"
;
import
sqliteMiddleWare
,
{
sqliteCmd
}
from
"
@/middleware/sqlite
"
;
import
sqliteMiddleWare
,
{
sqliteCmd
}
from
"
@/middleware/sqlite
"
;
...
@@ -49,6 +55,14 @@ export const initForbidden = async () => {
...
@@ -49,6 +55,14 @@ export const initForbidden = async () => {
}
}
};
};
/** 加载I18N文案 */
export
const
initI18N
=
async
()
=>
{
if
(
!
initStore
.
i18n
)
{
await
initStrings
();
initStore
.
i18n
=
true
;
}
};
/** sso登录跳转回来 */
/** sso登录跳转回来 */
export
const
handleSSOLogin
=
async
(
search
:
string
)
=>
{
export
const
handleSSOLogin
=
async
(
search
:
string
)
=>
{
/** 从SSO跳转回的URL之中,解析用户信息 */
/** 从SSO跳转回的URL之中,解析用户信息 */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment