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
4a4f028b
Commit
4a4f028b
authored
Jun 09, 2024
by
Chunchi Che
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
8812235d
Pipeline
#27609
passed with stages
in 8 minutes and 54 seconds
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
41 additions
and
8 deletions
+41
-8
src/api/mdproDeck/pull.ts
src/api/mdproDeck/pull.ts
+1
-1
src/ui/BuildDeck/DeckDatabase/DeckResults/index.tsx
src/ui/BuildDeck/DeckDatabase/DeckResults/index.tsx
+31
-2
src/ui/BuildDeck/DeckDatabase/index.tsx
src/ui/BuildDeck/DeckDatabase/index.tsx
+9
-5
No files found.
src/api/mdproDeck/pull.ts
View file @
4a4f028b
...
@@ -9,7 +9,7 @@ const API_PATH = "api/mdpro3/deck/list";
...
@@ -9,7 +9,7 @@ const API_PATH = "api/mdpro3/deck/list";
export
interface
PullReq
{
export
interface
PullReq
{
page
?:
number
;
page
?:
number
;
size
?:
number
;
size
?:
number
;
keyWord
?:
number
;
keyWord
?:
string
;
sortLike
?:
boolean
;
sortLike
?:
boolean
;
sortRank
?:
boolean
;
sortRank
?:
boolean
;
contributor
?:
string
;
contributor
?:
string
;
...
...
src/ui/BuildDeck/DeckDatabase/DeckResults/index.tsx
View file @
4a4f028b
import
React
,
{
memo
}
from
"
react
"
;
import
React
,
{
memo
,
useEffect
}
from
"
react
"
;
import
{
proxy
,
useSnapshot
}
from
"
valtio
"
;
import
{
proxy
,
useSnapshot
}
from
"
valtio
"
;
import
{
pullDecks
}
from
"
@/api
"
;
import
{
MdproDeck
}
from
"
@/api/mdproDeck/schema
"
;
import
{
MdproDeck
}
from
"
@/api/mdproDeck/schema
"
;
import
{
IconFont
}
from
"
@/ui/Shared
"
;
import
{
IconFont
}
from
"
@/ui/Shared
"
;
...
@@ -10,12 +11,38 @@ interface Props {
...
@@ -10,12 +11,38 @@ interface Props {
query
:
string
;
query
:
string
;
page
:
number
;
page
:
number
;
decks
:
MdproDeck
[];
decks
:
MdproDeck
[];
pages
:
number
;
}
}
const
store
=
proxy
<
Props
>
({
query
:
""
,
page
:
1
,
decks
:
[]
});
// TODO: useConfig
const
PAGE_SIZE
=
20
;
const
store
=
proxy
<
Props
>
({
query
:
""
,
page
:
1
,
decks
:
[],
pages
:
0
});
export
const
DeckResults
:
React
.
FC
=
memo
(()
=>
{
export
const
DeckResults
:
React
.
FC
=
memo
(()
=>
{
const
snap
=
useSnapshot
(
store
);
const
snap
=
useSnapshot
(
store
);
useEffect
(()
=>
{
const
update
=
async
()
=>
{
const
resp
=
await
pullDecks
({
page
:
snap
.
page
,
size
:
PAGE_SIZE
,
keyWord
:
snap
.
query
!==
""
?
snap
.
query
:
undefined
,
sortLike
:
true
,
});
if
(
resp
?.
data
)
{
const
{
pages
,
records
:
newDecks
}
=
resp
.
data
;
store
.
pages
=
pages
;
store
.
decks
=
newDecks
;
}
else
{
store
.
decks
=
[];
}
};
update
();
},
[
snap
.
query
,
snap
.
page
]);
return
(
return
(
<>
<>
{
snap
.
decks
.
length
?
(
{
snap
.
decks
.
length
?
(
...
@@ -29,3 +56,5 @@ export const DeckResults: React.FC = memo(() => {
...
@@ -29,3 +56,5 @@ export const DeckResults: React.FC = memo(() => {
</>
</>
);
);
});
});
export
const
freshMdrpoDecks
=
(
query
:
string
)
=>
(
store
.
query
=
query
);
src/ui/BuildDeck/DeckDatabase/index.tsx
View file @
4a4f028b
...
@@ -21,7 +21,7 @@ import { Filter } from "../Filter";
...
@@ -21,7 +21,7 @@ import { Filter } from "../Filter";
import
styles
from
"
../index.module.scss
"
;
import
styles
from
"
../index.module.scss
"
;
import
{
editDeckStore
}
from
"
../store
"
;
import
{
editDeckStore
}
from
"
../store
"
;
import
{
CardResults
}
from
"
./CardResults
"
;
import
{
CardResults
}
from
"
./CardResults
"
;
import
{
DeckResults
}
from
"
./DeckResults
"
;
import
{
DeckResults
,
freshMdrpoDecks
}
from
"
./DeckResults
"
;
/** 卡片库,选择卡片加入正在编辑的卡组 */
/** 卡片库,选择卡片加入正在编辑的卡组 */
export
const
DeckDatabase
:
React
.
FC
=
()
=>
{
export
const
DeckDatabase
:
React
.
FC
=
()
=>
{
...
@@ -68,10 +68,14 @@ export const DeckDatabase: React.FC = () => {
...
@@ -68,10 +68,14 @@ export const DeckDatabase: React.FC = () => {
).
map
(([
label
,
onClick
],
key
)
=>
({
key
,
label
,
onClick
}));
).
map
(([
label
,
onClick
],
key
)
=>
({
key
,
label
,
onClick
}));
const
handleSearch
=
(
conditions
:
FtsConditions
=
searchConditions
)
=>
{
const
handleSearch
=
(
conditions
:
FtsConditions
=
searchConditions
)
=>
{
if
(
showMdproDecks
)
{
freshMdrpoDecks
(
searchWord
);
}
else
{
const
result
=
searchCards
({
query
:
searchWord
,
conditions
})
const
result
=
searchCards
({
query
:
searchWord
,
conditions
})
.
filter
((
card
)
=>
!
isToken
(
card
.
data
.
type
??
0
))
.
filter
((
card
)
=>
!
isToken
(
card
.
data
.
type
??
0
))
.
sort
(
sortRef
.
current
);
// 衍生物不显示
.
sort
(
sortRef
.
current
);
// 衍生物不显示
setSearchCardResult
(()
=>
result
);
setSearchCardResult
(()
=>
result
);
}
};
};
useEffect
(()
=>
{
useEffect
(()
=>
{
...
...
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