Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Sharkey-thenautilus
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
dakkar
Sharkey-thenautilus
Commits
16b50fc6
Commit
16b50fc6
authored
1 year ago
by
tamaina
Browse files
Options
Downloads
Patches
Plain Diff
fix(frontend): デッキモードかつ直接/以外を表示したときにデッキが表示されない問題を修正
Fix #10905
parent
fb54c58a
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
packages/frontend/src/boot/main-boot.ts
+1
-1
1 addition, 1 deletion
packages/frontend/src/boot/main-boot.ts
packages/frontend/src/ui/deck.vue
+8
-0
8 additions, 0 deletions
packages/frontend/src/ui/deck.vue
with
9 additions
and
1 deletion
packages/frontend/src/boot/main-boot.ts
+
1
−
1
View file @
16b50fc6
...
...
@@ -16,7 +16,7 @@ import { initializeSw } from '@/scripts/initialize-sw';
export
async
function
mainBoot
()
{
const
{
isClientUpdated
}
=
await
common
(()
=>
createApp
(
new
URLSearchParams
(
window
.
location
.
search
).
has
(
'
zen
'
)
||
(
ui
===
'
deck
'
&&
location
.
pathname
!==
'
/
'
)
?
defineAsyncComponent
(()
=>
import
(
'
@/ui/zen.vue
'
))
:
new
URLSearchParams
(
window
.
location
.
search
).
has
(
'
zen
'
)
?
defineAsyncComponent
(()
=>
import
(
'
@/ui/zen.vue
'
))
:
!
$i
?
defineAsyncComponent
(()
=>
import
(
'
@/ui/visitor.vue
'
))
:
ui
===
'
deck
'
?
defineAsyncComponent
(()
=>
import
(
'
@/ui/deck.vue
'
))
:
ui
===
'
classic
'
?
defineAsyncComponent
(()
=>
import
(
'
@/ui/classic.vue
'
))
:
...
...
This diff is collapsed.
Click to expand it.
packages/frontend/src/ui/deck.vue
+
8
−
0
View file @
16b50fc6
...
...
@@ -130,6 +130,14 @@ mainRouter.navHook = (path, flag): boolean => {
return
false
;
};
if
(
mainRouter
.
currentRoute
.
value
.
path
!==
'
/
'
)
{
const
noMainColumn
=
!
deckStore
.
state
.
columns
.
some
(
x
=>
x
.
type
===
'
main
'
);
if
(
deckStore
.
state
.
navWindow
||
noMainColumn
)
{
os
.
pageWindow
(
mainRouter
.
currentRoute
.
value
.
path
);
mainRouter
.
replace
(
'
/
'
);
}
}
const
isMobile
=
ref
(
window
.
innerWidth
<=
500
);
window
.
addEventListener
(
'
resize
'
,
()
=>
{
isMobile
.
value
=
window
.
innerWidth
<=
500
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment