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
love_飞影
Neos
Commits
1cce4706
You need to sign in or sign up before continuing.
Commit
1cce4706
authored
Sep 05, 2023
by
zhangshize
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
style: fix lint
parent
c92e6d78
Pipeline
#23373
failed with stages
in 12 minutes and 13 seconds
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
70 additions
and
63 deletions
+70
-63
src/ui/BuildDeck/index.tsx
src/ui/BuildDeck/index.tsx
+17
-12
src/ui/Shared/DeckCard/index.tsx
src/ui/Shared/DeckCard/index.tsx
+7
-5
src/ui/Shared/DeckZone/index.tsx
src/ui/Shared/DeckZone/index.tsx
+46
-46
No files found.
src/ui/BuildDeck/index.tsx
View file @
1cce4706
...
@@ -13,9 +13,9 @@ import {
...
@@ -13,9 +13,9 @@ import {
Dropdown
,
Dropdown
,
Input
,
Input
,
type
MenuProps
,
type
MenuProps
,
message
,
Pagination
,
Pagination
,
Space
,
Space
,
message
,
}
from
"
antd
"
;
}
from
"
antd
"
;
import
{
isEqual
}
from
"
lodash-es
"
;
import
{
isEqual
}
from
"
lodash-es
"
;
import
{
type
OverlayScrollbarsComponentRef
}
from
"
overlayscrollbars-react
"
;
import
{
type
OverlayScrollbarsComponentRef
}
from
"
overlayscrollbars-react
"
;
...
@@ -164,9 +164,12 @@ export const DeckEditor: React.FC<{
...
@@ -164,9 +164,12 @@ export const DeckEditor: React.FC<{
const
handleSwitchCard
=
(
type
:
Type
,
card
:
CardMeta
)
=>
{
const
handleSwitchCard
=
(
type
:
Type
,
card
:
CardMeta
)
=>
{
const
cardType
=
card
.
data
.
type
??
0
;
const
cardType
=
card
.
data
.
type
??
0
;
const
isSide
=
type
===
'
side
'
;
const
isSide
=
type
===
"
side
"
;
const
targetType
=
isSide
?
const
targetType
=
isSide
(
isExtraDeckCard
(
cardType
)
?
'
extra
'
:
'
main
'
)
:
'
side
'
;
?
isExtraDeckCard
(
cardType
)
?
"
extra
"
:
"
main
"
:
"
side
"
;
const
{
result
,
reason
}
=
editDeckStore
.
canAdd
(
card
,
targetType
,
type
);
const
{
result
,
reason
}
=
editDeckStore
.
canAdd
(
card
,
targetType
,
type
);
if
(
result
)
{
if
(
result
)
{
editDeckStore
.
remove
(
type
,
card
);
editDeckStore
.
remove
(
type
,
card
);
...
@@ -174,14 +177,17 @@ export const DeckEditor: React.FC<{
...
@@ -174,14 +177,17 @@ export const DeckEditor: React.FC<{
}
else
{
}
else
{
message
.
error
(
reason
);
message
.
error
(
reason
);
}
}
}
}
;
const
showSelectedCard
=
(
card
:
CardMeta
)
=>
{
const
showSelectedCard
=
(
card
:
CardMeta
)
=>
{
selectedCard
.
id
=
card
.
id
;
selectedCard
.
id
=
card
.
id
;
selectedCard
.
open
=
true
;
selectedCard
.
open
=
true
;
}
}
;
const
handleMouseUp
=
(
type
:
'
main
'
|
'
extra
'
|
'
side
'
,
payload
:
DeckCardMouseUpEvent
)
=>
{
const
handleMouseUp
=
(
type
:
"
main
"
|
"
extra
"
|
"
side
"
,
payload
:
DeckCardMouseUpEvent
,
)
=>
{
const
{
event
,
card
}
=
payload
;
const
{
event
,
card
}
=
payload
;
switch
(
event
.
button
)
{
switch
(
event
.
button
)
{
// 左键
// 左键
...
@@ -200,7 +206,7 @@ export const DeckEditor: React.FC<{
...
@@ -200,7 +206,7 @@ export const DeckEditor: React.FC<{
break
;
break
;
}
}
event
.
preventDefault
();
event
.
preventDefault
();
}
}
;
return
(
return
(
<
div
className=
{
styles
.
container
}
>
<
div
className=
{
styles
.
container
}
>
...
@@ -467,7 +473,6 @@ const SearchResults: React.FC<{
...
@@ -467,7 +473,6 @@ const SearchResults: React.FC<{
selectedCard
.
open
=
true
;
selectedCard
.
open
=
true
;
};
};
const
handleAddCardToMain
=
(
card
:
CardMeta
)
=>
{
const
handleAddCardToMain
=
(
card
:
CardMeta
)
=>
{
const
cardType
=
card
.
data
.
type
??
0
;
const
cardType
=
card
.
data
.
type
??
0
;
const
isExtraCard
=
isExtraDeckCard
(
cardType
);
const
isExtraCard
=
isExtraDeckCard
(
cardType
);
...
@@ -478,7 +483,7 @@ const SearchResults: React.FC<{
...
@@ -478,7 +483,7 @@ const SearchResults: React.FC<{
}
else
{
}
else
{
message
.
error
(
reason
);
message
.
error
(
reason
);
}
}
}
}
;
const
handleAddCardToSide
=
(
card
:
CardMeta
)
=>
{
const
handleAddCardToSide
=
(
card
:
CardMeta
)
=>
{
const
{
result
,
reason
}
=
editDeckStore
.
canAdd
(
card
,
"
side
"
,
"
search
"
);
const
{
result
,
reason
}
=
editDeckStore
.
canAdd
(
card
,
"
side
"
,
"
search
"
);
...
@@ -487,7 +492,7 @@ const SearchResults: React.FC<{
...
@@ -487,7 +492,7 @@ const SearchResults: React.FC<{
}
else
{
}
else
{
message
.
error
(
reason
);
message
.
error
(
reason
);
}
}
}
}
;
/** safari 不支持 onAuxClick,所以使用 mousedown 模拟 */
/** safari 不支持 onAuxClick,所以使用 mousedown 模拟 */
const
handleMouseUp
=
(
payload
:
DeckCardMouseUpEvent
)
=>
{
const
handleMouseUp
=
(
payload
:
DeckCardMouseUpEvent
)
=>
{
...
@@ -508,7 +513,7 @@ const SearchResults: React.FC<{
...
@@ -508,7 +513,7 @@ const SearchResults: React.FC<{
default
:
default
:
break
;
break
;
}
}
}
}
;
return
(
return
(
<>
<>
...
...
src/ui/Shared/DeckCard/index.tsx
View file @
1cce4706
...
@@ -38,12 +38,14 @@ export const DeckCard: React.FC<{
...
@@ -38,12 +38,14 @@ export const DeckCard: React.FC<{
className=
{
styles
.
card
}
className=
{
styles
.
card
}
ref=
{
ref
}
ref=
{
ref
}
style=
{
{
opacity
:
isDragging
&&
source
!==
"
search
"
?
0
:
1
}
}
style=
{
{
opacity
:
isDragging
&&
source
!==
"
search
"
?
0
:
1
}
}
onMouseUp=
{
event
=>
onMouseUp
?.({
onMouseUp=
{
(
event
)
=>
onMouseUp
?.({
event
,
event
,
card
:
value
,
card
:
value
,
})
}
})
}
onMouseEnter=
{
onMouseEnter
}
onMouseEnter=
{
onMouseEnter
}
onContextMenu=
{
e
=>
{
onContextMenu=
{
(
e
)
=>
{
e
.
preventDefault
();
e
.
preventDefault
();
}
}
}
}
>
>
...
...
src/ui/Shared/DeckZone/index.tsx
View file @
1cce4706
...
@@ -79,4 +79,4 @@ export const DeckZone: React.FC<{
...
@@ -79,4 +79,4 @@ export const DeckZone: React.FC<{
</
div
>
</
div
>
</
div
>
</
div
>
);
);
};
};
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