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
6ac5f031
Commit
6ac5f031
authored
Jul 10, 2024
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
数据匹配
parent
99a88ca8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
11 deletions
+30
-11
index.vue
src/views/Editor/EditorHeader/index.vue
+1
-1
index.vue
src/views/Editor/Toolbar/index.vue
+22
-8
index.vue
src/views/components/element/TextElement/index.vue
+7
-2
No files found.
src/views/Editor/EditorHeader/index.vue
View file @
6ac5f031
...
@@ -258,7 +258,7 @@ const goBack = (type:any) =>{
...
@@ -258,7 +258,7 @@ const goBack = (type:any) =>{
if
(
searchData
.
value
.
sellId
)
{
if
(
searchData
.
value
.
sellId
)
{
clearInterval
(
intervalId
.
value
);
clearInterval
(
intervalId
.
value
);
intervalId
.
value
=
null
;
intervalId
.
value
=
null
;
setTemplate
(
0
)
//
setTemplate(0)
}
}
if
(
type
==
1
)
{
if
(
type
==
1
)
{
searchData
.
value
.
SalesEditor
=
router
.
currentRoute
.
value
.
params
searchData
.
value
.
SalesEditor
=
router
.
currentRoute
.
value
.
params
...
...
src/views/Editor/Toolbar/index.vue
View file @
6ac5f031
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
</
template
>
</
template
>
<
script
lang=
"ts"
setup
>
<
script
lang=
"ts"
setup
>
import
{
ref
,
computed
,
watch
}
from
'vue'
import
{
ref
,
computed
,
watch
,
inject
}
from
'vue'
import
{
storeToRefs
}
from
'pinia'
import
{
storeToRefs
}
from
'pinia'
import
{
useMainStore
}
from
'@/store'
import
{
useMainStore
}
from
'@/store'
import
{
useScreenStore
}
from
'@/store'
import
{
useScreenStore
}
from
'@/store'
...
@@ -29,6 +29,7 @@ import SlideAnimationPanel from './SlideAnimationPanel.vue'
...
@@ -29,6 +29,7 @@ import SlideAnimationPanel from './SlideAnimationPanel.vue'
import
MultiPositionPanel
from
'./MultiPositionPanel.vue'
import
MultiPositionPanel
from
'./MultiPositionPanel.vue'
import
SymbolPanel
from
'./SymbolPanel.vue'
import
SymbolPanel
from
'./SymbolPanel.vue'
import
Tabs
from
'@/components/Tabs.vue'
import
Tabs
from
'@/components/Tabs.vue'
import
{
injectKeyTemplate
}
from
'@/types/injectKey'
interface
ElementTabs
{
interface
ElementTabs
{
label
:
string
label
:
string
...
@@ -39,15 +40,28 @@ const mainStore = useMainStore()
...
@@ -39,15 +40,28 @@ const mainStore = useMainStore()
const
{
activeElementIdList
,
handleElement
,
toolbarState
}
=
storeToRefs
(
mainStore
)
const
{
activeElementIdList
,
handleElement
,
toolbarState
}
=
storeToRefs
(
mainStore
)
const
{
model
}
=
storeToRefs
(
useScreenStore
())
const
{
model
}
=
storeToRefs
(
useScreenStore
())
const
searchData
=
ref
({}
as
any
)
searchData
.
value
=
inject
(
injectKeyTemplate
)
const
elementTabs
=
computed
<
ElementTabs
[]
>
(()
=>
{
const
elementTabs
=
computed
<
ElementTabs
[]
>
(()
=>
{
if
(
handleElement
.
value
?.
type
===
'text'
)
{
if
(
handleElement
.
value
?.
type
===
'text'
)
{
return
[
if
(
!
searchData
.
value
.
isTeamManage
){
{
label
:
'样式'
,
key
:
ToolbarStates
.
EL_STYLE
},
return
[
{
label
:
'符号'
,
key
:
ToolbarStates
.
SYMBOL
},
{
label
:
'样式'
,
key
:
ToolbarStates
.
EL_STYLE
},
{
label
:
'位置'
,
key
:
ToolbarStates
.
EL_POSITION
},
{
label
:
'符号'
,
key
:
ToolbarStates
.
SYMBOL
},
// { label: '动画', key: ToolbarStates.EL_ANIMATION }
{
label
:
'位置'
,
key
:
ToolbarStates
.
EL_POSITION
},
{
label
:
'匹配数据'
,
key
:
ToolbarStates
.
EL_NORMALDATA
}
// { label: '动画', key: ToolbarStates.EL_ANIMATION }
]
{
label
:
'匹配数据'
,
key
:
ToolbarStates
.
EL_NORMALDATA
}
]
}
else
{
return
[
{
label
:
'样式'
,
key
:
ToolbarStates
.
EL_STYLE
},
{
label
:
'符号'
,
key
:
ToolbarStates
.
SYMBOL
},
{
label
:
'位置'
,
key
:
ToolbarStates
.
EL_POSITION
},
// { label: '动画', key: ToolbarStates.EL_ANIMATION }
]
}
}
}
return
[
return
[
{
label
:
'样式'
,
key
:
ToolbarStates
.
EL_STYLE
},
{
label
:
'样式'
,
key
:
ToolbarStates
.
EL_STYLE
},
...
...
src/views/components/element/TextElement/index.vue
View file @
6ac5f031
...
@@ -67,7 +67,7 @@
...
@@ -67,7 +67,7 @@
</template>
</template>
<
script
lang=
"ts"
setup
>
<
script
lang=
"ts"
setup
>
import
{
computed
,
onMounted
,
onUnmounted
,
ref
,
watch
}
from
'vue'
import
{
computed
,
onMounted
,
onUnmounted
,
ref
,
watch
,
inject
}
from
'vue'
import
{
storeToRefs
}
from
'pinia'
import
{
storeToRefs
}
from
'pinia'
import
{
debounce
}
from
'lodash'
import
{
debounce
}
from
'lodash'
import
{
useMainStore
,
useSlidesStore
}
from
'@/store'
import
{
useMainStore
,
useSlidesStore
}
from
'@/store'
...
@@ -79,6 +79,8 @@ import useHistorySnapshot from '@/hooks/useHistorySnapshot'
...
@@ -79,6 +79,8 @@ import useHistorySnapshot from '@/hooks/useHistorySnapshot'
import
ElementOutline
from
'@/views/components/element/ElementOutline.vue'
import
ElementOutline
from
'@/views/components/element/ElementOutline.vue'
import
ProsemirrorEditor
from
'@/views/components/element/ProsemirrorEditor.vue'
import
ProsemirrorEditor
from
'@/views/components/element/ProsemirrorEditor.vue'
import
{
ToolbarStates
}
from
'@/types/toolbar'
import
{
ToolbarStates
}
from
'@/types/toolbar'
import
{
injectKeyTemplate
}
from
'@/types/injectKey'
const
props
=
defineProps
<
{
const
props
=
defineProps
<
{
elementInfo
:
PPTTextElement
elementInfo
:
PPTTextElement
...
@@ -98,12 +100,15 @@ const editorRef = ref()
...
@@ -98,12 +100,15 @@ const editorRef = ref()
const
shadow
=
computed
(()
=>
props
.
elementInfo
.
shadow
)
const
shadow
=
computed
(()
=>
props
.
elementInfo
.
shadow
)
const
{
shadowStyle
}
=
useElementShadow
(
shadow
)
const
{
shadowStyle
}
=
useElementShadow
(
shadow
)
const
fullLockVisible
=
ref
(
0
)
const
fullLockVisible
=
ref
(
0
)
const
searchData
=
ref
({}
as
any
)
searchData
.
value
=
inject
(
injectKeyTemplate
)
const
handleSelectElement
=
(
e
:
MouseEvent
|
TouchEvent
,
canMove
=
true
)
=>
{
const
handleSelectElement
=
(
e
:
MouseEvent
|
TouchEvent
,
canMove
=
true
)
=>
{
if
(
e
.
button
&&
e
.
button
==
1
)
return
if
(
e
.
button
&&
e
.
button
==
1
)
return
if
(
props
.
elementInfo
.
lock
)
return
if
(
props
.
elementInfo
.
lock
)
return
e
.
stopPropagation
()
e
.
stopPropagation
()
mainStore
.
setToolbarState
(
ToolbarStates
.
EL_NORMALDATA
)
if
(
!
searchData
.
value
.
isTeamManage
)
mainStore
.
setToolbarState
(
ToolbarStates
.
EL_NORMALDATA
)
props
.
selectElement
(
e
,
props
.
elementInfo
,
canMove
)
props
.
selectElement
(
e
,
props
.
elementInfo
,
canMove
)
}
}
...
...
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