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
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
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
baichixing
Neos
Commits
7bd44047
Commit
7bd44047
authored
Jun 17, 2024
by
BBeretta
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat/language-translation (merge conflicts don)
parent
4f345f56
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
src/ui/BuildDeck/index.tsx
src/ui/BuildDeck/index.tsx
+2
-2
src/ui/Duel/Message/PositionModal/index.tsx
src/ui/Duel/Message/PositionModal/index.tsx
+1
-1
No files found.
src/ui/BuildDeck/index.tsx
View file @
7bd44047
...
@@ -11,6 +11,7 @@ import { App, Button, Input, message, Space, Tooltip } from "antd";
...
@@ -11,6 +11,7 @@ import { App, Button, Input, message, Space, Tooltip } from "antd";
import
{
HTML5toTouch
}
from
"
rdndmb-html5-to-touch
"
;
import
{
HTML5toTouch
}
from
"
rdndmb-html5-to-touch
"
;
import
{
useEffect
,
useState
}
from
"
react
"
;
import
{
useEffect
,
useState
}
from
"
react
"
;
import
{
DndProvider
}
from
"
react-dnd-multi-backend
"
;
import
{
DndProvider
}
from
"
react-dnd-multi-backend
"
;
import
{
useTranslation
}
from
"
react-i18next
"
;
import
{
LoaderFunction
}
from
"
react-router-dom
"
;
import
{
LoaderFunction
}
from
"
react-router-dom
"
;
import
{
proxy
,
useSnapshot
}
from
"
valtio
"
;
import
{
proxy
,
useSnapshot
}
from
"
valtio
"
;
import
{
subscribeKey
}
from
"
valtio/utils
"
;
import
{
subscribeKey
}
from
"
valtio/utils
"
;
...
@@ -39,7 +40,6 @@ import {
...
@@ -39,7 +40,6 @@ import {
editingDeckToIDeck
,
editingDeckToIDeck
,
iDeckToEditingDeck
,
iDeckToEditingDeck
,
}
from
"
./utils
"
;
}
from
"
./utils
"
;
import
{
useTranslation
}
from
"
react-i18next
"
;
export
const
loader
:
LoaderFunction
=
async
()
=>
{
export
const
loader
:
LoaderFunction
=
async
()
=>
{
// 必须先加载卡组,不然页面会崩溃
// 必须先加载卡组,不然页面会崩溃
...
@@ -329,4 +329,4 @@ const HigherCardDetail: React.FC = () => {
...
@@ -329,4 +329,4 @@ const HigherCardDetail: React.FC = () => {
onClose=
{
()
=>
(
selectedCard
.
open
=
false
)
}
onClose=
{
()
=>
(
selectedCard
.
open
=
false
)
}
/>
/>
);
);
};
};
\ No newline at end of file
src/ui/Duel/Message/PositionModal/index.tsx
View file @
7bd44047
...
@@ -17,7 +17,7 @@ const defaultProps = { isOpen: false, positions: [] };
...
@@ -17,7 +17,7 @@ const defaultProps = { isOpen: false, positions: [] };
const
localStore
=
proxy
<
PositionModalProps
>
(
defaultProps
);
const
localStore
=
proxy
<
PositionModalProps
>
(
defaultProps
);
const
language
=
localStorage
.
getItem
(
"
language
"
);
const
language
=
localStorage
.
getItem
(
"
language
"
);
const
title
=
language
!=
"
cn
"
?
"
Please select a position
"
:
"
请选择表示形式
"
;
const
title
=
language
!=
=
"
cn
"
?
"
Please select a position
"
:
"
请选择表示形式
"
;
export
const
PositionModal
=
()
=>
{
export
const
PositionModal
=
()
=>
{
const
{
isOpen
,
positions
}
=
useSnapshot
(
localStore
);
const
{
isOpen
,
positions
}
=
useSnapshot
(
localStore
);
...
...
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