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
4e84451e
Commit
4e84451e
authored
Dec 04, 2023
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
FiledTypeStr 改成 contentStr 纯文本内容
parent
7d7a65bd
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
20 deletions
+19
-20
slides.ts
src/types/slides.ts
+2
-2
text.ts
src/utils/psdParser/text.ts
+1
-1
index.vue
src/views/Editor/DataaSource/index.vue
+3
-4
index.vue
src/views/Editor/Thumbnails/index.vue
+4
-4
ElementTemplateData.vue
src/views/Editor/Toolbar/ElementTemplateData.vue
+9
-9
No files found.
src/types/slides.ts
View file @
4e84451e
...
...
@@ -154,7 +154,7 @@ export interface DataSourceType {
*
* vertical?: 竖向文本
*
*
FiledType
Str?: 纯文本内容
*
content
Str?: 纯文本内容
*/
export
interface
PPTTextElement
extends
PPTBaseElement
{
type
:
'text'
...
...
@@ -169,7 +169,7 @@ export interface PPTTextElement extends PPTBaseElement {
shadow
?:
PPTElementShadow
paragraphSpace
?:
number
vertical
?:
boolean
,
FiledType
Str
?:
string
,
content
Str
?:
string
,
TemplateList
?:
unknown
,
TemplateDataSource
?:
DataSourceType
,
}
...
...
src/utils/psdParser/text.ts
View file @
4e84451e
...
...
@@ -90,7 +90,7 @@ export const ResolveText = (item: any, index: number,offsetLeft:number,offsetTop
lineHeight
:
leading
,
wordSpace
:
tracking
,
vertical
:
isVertical
,
FiledType
Str
:
content
content
Str
:
content
}
if
(
textShadow
)
element
.
shadow
=
textShadow
...
...
src/views/Editor/DataaSource/index.vue
View file @
4e84451e
...
...
@@ -19,11 +19,11 @@
<template
#
default=
"scope"
>
<div
class=
"DataaSourceL"
>
<div
v-if=
"scope.row.type=='text'"
>
{{
scope
.
row
.
FiledType
Str
}}
{{
scope
.
row
.
content
Str
}}
</div>
<div
v-if=
"scope.row.type=='image'"
>
<img
style=
"width: 20px; height: 20px"
:src=
"scope.row.
FiledType
Str"
/>
:src=
"scope.row.
content
Str"
/>
</div>
</div>
</
template
>
...
...
@@ -56,7 +56,6 @@
clearable
class=
"m-2"
placeholder=
"请绑定数据源"
@
change=
"setTemplateDataSource(scope.row.TemplateDataSource.Id,scope.$index)"
>
<!-- :disabled="scope.row.type=='image'&&item.Name.indexOf('图')==-1" -->
<el-option
v-for=
"item in setType(scope.row)"
:key=
"item.Id"
...
...
@@ -128,7 +127,7 @@
x
.
TemplateDataSource
.
index
=
null
}
// if(x.type=="text"){
// x.
FiledType
Str = obj.Name
// x.
content
Str = obj.Name
// x.content = x.content.replace(getHtmlPlainText(x.content),obj.Name)
// }
}
...
...
src/views/Editor/Thumbnails/index.vue
View file @
4e84451e
...
...
@@ -351,13 +351,13 @@ const changeSlideIndex = (index: number) => {
datas
.
DataSource
.
DataSourceList
=
[]
newElements
&&
newElements
.
elements
&&
newElements
.
elements
.
forEach
(
slide
=>
{
if
(
slide
.
type
==
"text"
||
slide
.
type
==
"image"
)
{
let
FiledType
Str
if
(
slide
.
type
==
"text"
)
FiledType
Str
=
getHtmlPlainText
(
slide
.
content
)
if
(
slide
.
type
==
"image"
)
FiledType
Str
=
slide
.
src
let
content
Str
if
(
slide
.
type
==
"text"
)
content
Str
=
getHtmlPlainText
(
slide
.
content
)
if
(
slide
.
type
==
"image"
)
content
Str
=
slide
.
src
let
Obj
=
{}
Obj
=
{
...
slide
,
FiledTypeStr
:
FiledType
Str
,
contentStr
:
content
Str
,
TemplateList
:
TemplateList
,
TemplateDataSource
:
{
Content
:
slide
.
TemplateDataSource
&&
slide
.
TemplateDataSource
.
Content
?
slide
.
TemplateDataSource
.
Content
:
''
,
...
...
src/views/Editor/Toolbar/ElementTemplateData.vue
View file @
4e84451e
...
...
@@ -217,14 +217,14 @@
let
index
=
item
.
TemplateDataSource
&&
item
.
TemplateDataSource
.
index
>=
0
?
item
.
TemplateDataSource
.
index
:
null
as
Number
Reflect
.
set
(
item
.
TemplateDataSource
,
'index'
,
index
)
}
let
FiledType
Str
if
(
item
.
type
==
"text"
)
FiledType
Str
=
getHtmlPlainText
(
item
.
content
)
if
(
item
.
type
==
"image"
)
FiledType
Str
=
item
.
src
let
content
Str
if
(
item
.
type
==
"text"
)
content
Str
=
getHtmlPlainText
(
item
.
content
)
if
(
item
.
type
==
"image"
)
content
Str
=
item
.
src
let
Obj
=
{}
Obj
=
{
...
item
,
FiledTypeStr
:
FiledType
Str
,
contentStr
:
content
Str
,
TemplateList
:
TemplateList
,
TemplateDataSource
:
{
Content
:
item
.
TemplateDataSource
&&
item
.
TemplateDataSource
.
Content
?
item
.
TemplateDataSource
.
Content
:
''
,
...
...
@@ -241,7 +241,6 @@
})
slidesStore
.
setSlides
(
JSON
.
parse
(
JSON
.
stringify
(
newSlides
)))
}
getPageType
()
const
showInput
=
()
=>
{
inputVisible
.
value
=
true
nextTick
(()
=>
{
...
...
@@ -285,6 +284,7 @@
// 所有数据源
const
AllDataSource
=
()
=>
{
getPageType
()
datas
.
DataSource
.
DataSourceOverlay
=
!
datas
.
DataSource
.
DataSourceOverlay
return
if
(
slides
.
value
.
elements
&&
slides
.
value
.
elements
.
length
==
0
){
...
...
@@ -305,13 +305,13 @@
datas
.
DataSource
.
DataSourceList
=
[]
newElements
.
elements
.
forEach
(
slide
=>
{
if
(
slide
.
type
==
"text"
||
slide
.
type
==
"image"
)
{
let
FiledType
Str
if
(
slide
.
type
==
"text"
)
FiledType
Str
=
getHtmlPlainText
(
slide
.
content
)
if
(
slide
.
type
==
"image"
)
FiledType
Str
=
slide
.
src
let
content
Str
if
(
slide
.
type
==
"text"
)
content
Str
=
getHtmlPlainText
(
slide
.
content
)
if
(
slide
.
type
==
"image"
)
content
Str
=
slide
.
src
let
Obj
=
{}
Obj
=
{
...
slide
,
FiledTypeStr
:
FiledType
Str
,
contentStr
:
content
Str
,
TemplateList
:
TemplateList
,
TemplateDataSource
:
{
Content
:
slide
.
TemplateDataSource
&&
slide
.
TemplateDataSource
.
Content
?
slide
.
TemplateDataSource
.
Content
:
''
,
...
...
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