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
6482b896
Commit
6482b896
authored
Sep 06, 2023
by
Chunchi Che
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix DeckBuild crash
parent
5ebda8bb
Pipeline
#23379
passed with stages
in 13 minutes and 30 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
6 deletions
+8
-6
src/stores/deckStore.ts
src/stores/deckStore.ts
+2
-0
src/stores/sideStore.ts
src/stores/sideStore.ts
+1
-3
src/ui/BuildDeck/index.tsx
src/ui/BuildDeck/index.tsx
+5
-3
No files found.
src/stores/deckStore.ts
View file @
6482b896
...
@@ -13,6 +13,8 @@ export interface IDeck {
...
@@ -13,6 +13,8 @@ export interface IDeck {
side
:
number
[];
side
:
number
[];
}
}
export
const
emptyDeck
:
IDeck
=
{
deckName
:
""
,
main
:
[],
extra
:
[],
side
:
[]
};
export
const
deckStore
=
proxy
({
export
const
deckStore
=
proxy
({
decks
:
[]
as
IDeck
[],
decks
:
[]
as
IDeck
[],
...
...
src/stores/sideStore.ts
View file @
6482b896
import
{
proxy
}
from
"
valtio
"
;
import
{
proxy
}
from
"
valtio
"
;
import
{
IDeck
}
from
"
./deckStore
"
;
import
{
emptyDeck
,
IDeck
}
from
"
./deckStore
"
;
import
{
type
NeosStore
}
from
"
./shared
"
;
import
{
type
NeosStore
}
from
"
./shared
"
;
export
enum
SideStage
{
export
enum
SideStage
{
...
@@ -13,8 +13,6 @@ export enum SideStage {
...
@@ -13,8 +13,6 @@ export enum SideStage {
WAITING
=
8
,
// 观战者等待双方玩家
WAITING
=
8
,
// 观战者等待双方玩家
}
}
const
emptyDeck
:
IDeck
=
{
deckName
:
""
,
main
:
[],
extra
:
[],
side
:
[]
};
class
SideStore
implements
NeosStore
{
class
SideStore
implements
NeosStore
{
stage
:
SideStage
=
SideStage
.
NONE
;
stage
:
SideStage
=
SideStage
.
NONE
;
deck
:
IDeck
=
emptyDeck
;
deck
:
IDeck
=
emptyDeck
;
...
...
src/ui/BuildDeck/index.tsx
View file @
6482b896
...
@@ -28,7 +28,7 @@ import { subscribeKey } from "valtio/utils";
...
@@ -28,7 +28,7 @@ import { subscribeKey } from "valtio/utils";
import
{
type
CardMeta
,
searchCards
}
from
"
@/api
"
;
import
{
type
CardMeta
,
searchCards
}
from
"
@/api
"
;
import
{
isToken
}
from
"
@/common
"
;
import
{
isToken
}
from
"
@/common
"
;
import
{
FtsConditions
}
from
"
@/middleware/sqlite/fts
"
;
import
{
FtsConditions
}
from
"
@/middleware/sqlite/fts
"
;
import
{
deckStore
,
type
IDeck
,
initStore
}
from
"
@/stores
"
;
import
{
deckStore
,
emptyDeck
,
type
IDeck
,
initStore
}
from
"
@/stores
"
;
import
{
import
{
Background
,
Background
,
DeckCard
,
DeckCard
,
...
@@ -72,7 +72,9 @@ export const loader: LoaderFunction = async () => {
...
@@ -72,7 +72,9 @@ export const loader: LoaderFunction = async () => {
export
const
Component
:
React
.
FC
=
()
=>
{
export
const
Component
:
React
.
FC
=
()
=>
{
const
snapDecks
=
useSnapshot
(
deckStore
);
const
snapDecks
=
useSnapshot
(
deckStore
);
const
{
progress
}
=
useSnapshot
(
initStore
.
sqlite
);
const
{
progress
}
=
useSnapshot
(
initStore
.
sqlite
);
const
[
selectedDeck
,
setSelectedDeck
]
=
useState
<
IDeck
>
(
deckStore
.
decks
[
0
]);
const
[
selectedDeck
,
setSelectedDeck
]
=
useState
<
IDeck
>
(
deckStore
.
decks
.
at
(
0
)
??
emptyDeck
,
);
const
{
message
}
=
App
.
useApp
();
const
{
message
}
=
App
.
useApp
();
...
@@ -105,7 +107,7 @@ export const Component: React.FC = () => {
...
@@ -105,7 +107,7 @@ export const Component: React.FC = () => {
decks=
{
snapDecks
.
decks
}
decks=
{
snapDecks
.
decks
}
selected=
{
selectedDeck
.
deckName
}
selected=
{
selectedDeck
.
deckName
}
onSelect=
{
(
name
)
=>
onSelect=
{
(
name
)
=>
setSelectedDeck
(
deckStore
.
get
(
name
)
??
deckStore
.
decks
[
0
]
)
setSelectedDeck
(
deckStore
.
get
(
name
)
??
emptyDeck
)
}
}
onDelete=
{
async
(
name
)
=>
await
deckStore
.
delete
(
name
)
}
onDelete=
{
async
(
name
)
=>
await
deckStore
.
delete
(
name
)
}
onDownload=
{
(
name
)
=>
{
onDownload=
{
(
name
)
=>
{
...
...
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