Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
loongten
dataease
Commits
96786551
Unverified
Commit
96786551
authored
3 years ago
by
王嘉豪
Committed by
GitHub
3 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #2193 from dataease/pr@dev@fix-pic-component
fix: 修复图片样式打不开问题
parents
60b3c855
44c8e50f
main
dev
v1.10
v1.10.0
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
frontend/src/views/background/index.vue
+2
-1
frontend/src/views/background/index.vue
frontend/src/views/panel/edit/index.vue
+1
-0
frontend/src/views/panel/edit/index.vue
with
3 additions
and
1 deletion
+3
-1
frontend/src/views/background/index.vue
+
2
-
1
View file @
96786551
...
...
@@ -110,6 +110,7 @@ import { mapState } from 'vuex'
import
{
deepCopy
}
from
'
@/components/canvas/utils/utils
'
import
{
COLOR_PANEL
}
from
'
@/views/chart/chart/chart
'
import
{
uploadFileResult
}
from
'
@/api/staticResource/staticResource
'
import
{
COMMON_BACKGROUND_NONE
}
from
'
@/components/canvas/custom-component/component-list
'
export
default
{
name
:
'
Background
'
,
...
...
@@ -144,7 +145,7 @@ export default {
if
(
this
.
curComponent
&&
this
.
curComponent
.
commonBackground
&&
this
.
curComponent
.
commonBackground
.
outerImage
&&
typeof
(
this
.
curComponent
.
commonBackground
.
outerImage
)
===
'
string
'
)
{
this
.
fileList
.
push
({
url
:
this
.
curComponent
.
commonBackground
.
outerImage
})
}
this
.
backgroundOrigin
=
deepCopy
(
this
.
curComponent
.
commonBackground
)
this
.
backgroundOrigin
=
deepCopy
(
this
.
curComponent
.
commonBackground
?
this
.
curComponent
.
commonBackground
:
COMMON_BACKGROUND_NONE
)
this
.
queryBackground
()
},
queryBackground
()
{
...
...
This diff is collapsed.
Click to expand it.
frontend/src/views/panel/edit/index.vue
+
1
-
0
View file @
96786551
...
...
@@ -949,6 +949,7 @@ export default {
hyperlinks
:
HYPERLINKS
,
mobileStyle
:
BASE_MOBILE_STYLE
,
propValue
:
fileResult
,
commonBackground
:
deepCopy
(
COMMON_BACKGROUND
),
style
:
{
...
commonStyle
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
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
Menu
Projects
Groups
Snippets
Help