Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
pptist
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
viitto
pptist
Commits
a6a686d3
Commit
a6a686d3
authored
Nov 24, 2023
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
a52baaa1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
9 deletions
+36
-9
index.vue
src/views/Editor/EditorHeader/index.vue
+16
-1
index.vue
src/views/Editor/Toolbar/index.vue
+20
-8
No files found.
src/views/Editor/EditorHeader/index.vue
View file @
a6a686d3
...
@@ -132,7 +132,22 @@ const marketStore = useScreenStore()
...
@@ -132,7 +132,22 @@ const marketStore = useScreenStore()
const
{
market
,
model
,
ConfigId
}
=
storeToRefs
(
useScreenStore
())
const
{
market
,
model
,
ConfigId
}
=
storeToRefs
(
useScreenStore
())
const
goBack
=
()
=>
{
const
goBack
=
()
=>
{
marketStore
.
setMarket
(
true
)
ElMessageBox
.
confirm
(
'退出此页面将清空当前数据,请谨慎操作?'
,
'提示'
,
{
confirmButtonText
:
'确定'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
,
}
)
.
then
(()
=>
{
marketStore
.
setMarket
(
true
)
})
.
catch
(()
=>
{
})
}
}
// 导入PSD
// 导入PSD
const
UploadPsd
=
()
=>
{
const
UploadPsd
=
()
=>
{
...
...
src/views/Editor/Toolbar/index.vue
View file @
a6a686d3
...
@@ -13,9 +13,10 @@
...
@@ -13,9 +13,10 @@
</
template
>
</
template
>
<
script
lang=
"ts"
setup
>
<
script
lang=
"ts"
setup
>
import
{
computed
,
watch
}
from
'vue'
import
{
ref
,
computed
,
watch
}
from
'vue'
import
{
storeToRefs
}
from
'pinia'
import
{
storeToRefs
}
from
'pinia'
import
{
useMainStore
}
from
'@/store'
import
{
useMainStore
}
from
'@/store'
import
{
useScreenStore
}
from
'@/store'
import
{
ToolbarStates
}
from
'@/types/toolbar'
import
{
ToolbarStates
}
from
'@/types/toolbar'
import
ElementStylePanel
from
'./ElementStylePanel/index.vue'
import
ElementStylePanel
from
'./ElementStylePanel/index.vue'
...
@@ -35,6 +36,7 @@ interface ElementTabs {
...
@@ -35,6 +36,7 @@ interface ElementTabs {
const
mainStore
=
useMainStore
()
const
mainStore
=
useMainStore
()
const
{
activeElementIdList
,
handleElement
,
toolbarState
}
=
storeToRefs
(
mainStore
)
const
{
activeElementIdList
,
handleElement
,
toolbarState
}
=
storeToRefs
(
mainStore
)
const
{
model
}
=
storeToRefs
(
useScreenStore
())
const
elementTabs
=
computed
<
ElementTabs
[]
>
(()
=>
{
const
elementTabs
=
computed
<
ElementTabs
[]
>
(()
=>
{
if
(
handleElement
.
value
?.
type
===
'text'
)
{
if
(
handleElement
.
value
?.
type
===
'text'
)
{
...
@@ -51,12 +53,22 @@ const elementTabs = computed<ElementTabs[]>(() => {
...
@@ -51,12 +53,22 @@ const elementTabs = computed<ElementTabs[]>(() => {
{
label
:
'动画'
,
key
:
ToolbarStates
.
EL_ANIMATION
},
{
label
:
'动画'
,
key
:
ToolbarStates
.
EL_ANIMATION
},
]
]
})
})
const
slideTabs
=
[
const
slideTabs
=
ref
([]
as
any
)
{
label
:
'设计'
,
key
:
ToolbarStates
.
SLIDE_DESIGN
},
if
(
model
.
value
){
{
label
:
'切换'
,
key
:
ToolbarStates
.
SLIDE_ANIMATION
},
slideTabs
.
value
=
[
{
label
:
'动画'
,
key
:
ToolbarStates
.
EL_ANIMATION
},
{
label
:
'设计'
,
key
:
ToolbarStates
.
SLIDE_DESIGN
},
{
label
:
'模版数据'
,
key
:
ToolbarStates
.
EL_TEMPLATEDATA
},
{
label
:
'切换'
,
key
:
ToolbarStates
.
SLIDE_ANIMATION
},
]
{
label
:
'动画'
,
key
:
ToolbarStates
.
EL_ANIMATION
},
{
label
:
'模版数据'
,
key
:
ToolbarStates
.
EL_TEMPLATEDATA
},
]
}
else
{
slideTabs
.
value
=
[
{
label
:
'设计'
,
key
:
ToolbarStates
.
SLIDE_DESIGN
},
{
label
:
'切换'
,
key
:
ToolbarStates
.
SLIDE_ANIMATION
},
{
label
:
'动画'
,
key
:
ToolbarStates
.
EL_ANIMATION
},
]
}
const
multiSelectTabs
=
[
const
multiSelectTabs
=
[
{
label
:
'样式'
,
key
:
ToolbarStates
.
EL_STYLE
},
{
label
:
'样式'
,
key
:
ToolbarStates
.
EL_STYLE
},
{
label
:
'位置'
,
key
:
ToolbarStates
.
MULTI_POSITION
},
{
label
:
'位置'
,
key
:
ToolbarStates
.
MULTI_POSITION
},
...
@@ -67,7 +79,7 @@ const setToolbarState = (value: ToolbarStates) => {
...
@@ -67,7 +79,7 @@ const setToolbarState = (value: ToolbarStates) => {
}
}
const
currentTabs
=
computed
(()
=>
{
const
currentTabs
=
computed
(()
=>
{
if
(
!
activeElementIdList
.
value
.
length
)
return
slideTabs
if
(
!
activeElementIdList
.
value
.
length
)
return
slideTabs
.
value
else
if
(
activeElementIdList
.
value
.
length
>
1
)
return
multiSelectTabs
else
if
(
activeElementIdList
.
value
.
length
>
1
)
return
multiSelectTabs
return
elementTabs
.
value
return
elementTabs
.
value
})
})
...
...
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