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
939a239e
Unverified
Commit
939a239e
authored
3 years ago
by
王嘉豪
Committed by
GitHub
3 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #2219 from dataease/fix_mobile-design
fix: 移动端设计时,等待区可能出现空白问题
parents
2d0dd593
7dad0503
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
frontend/src/components/canvas/components/Editor/index.vue
+5
-1
frontend/src/components/canvas/components/Editor/index.vue
frontend/src/components/canvas/custom-component/DeStreamMedia.vue
+1
-1
.../src/components/canvas/custom-component/DeStreamMedia.vue
frontend/src/views/chart/chart/gauge/gauge_antv.js
+1
-1
frontend/src/views/chart/chart/gauge/gauge_antv.js
frontend/src/views/panel/edit/ComponentWait.vue
+1
-1
frontend/src/views/panel/edit/ComponentWait.vue
frontend/src/views/panel/edit/ComponentWaitItem.vue
+5
-9
frontend/src/views/panel/edit/ComponentWaitItem.vue
with
13 additions
and
13 deletions
+13
-13
frontend/src/components/canvas/components/Editor/index.vue
+
5
-
1
View file @
939a239e
...
...
@@ -1368,7 +1368,11 @@ export default {
resizeView
(
index
,
item
)
{
if
(
item
.
type
===
'
view
'
||
item
.
type
===
'
de-show-date
'
)
{
this
.
$refs
.
wrapperChild
[
index
].
chartResize
()
try
{
this
.
$refs
.
wrapperChild
[
index
].
chartResize
()
}
catch
(
e
)
{
// ignore error
}
}
},
editComponent
(
index
,
item
)
{
...
...
This diff is collapsed.
Click to expand it.
frontend/src/components/canvas/custom-component/DeStreamMedia.vue
+
1
-
1
View file @
939a239e
...
...
@@ -115,7 +115,7 @@ export default {
this
.
flvPlayer
.
load
()
this
.
flvPlayer
.
play
()
}
catch
(
error
)
{
console
.
log
(
error
)
console
.
log
(
'
flvjs err ignore
'
)
}
}
}
...
...
This diff is collapsed.
Click to expand it.
frontend/src/views/chart/chart/gauge/gauge_antv.js
+
1
-
1
View file @
939a239e
...
...
@@ -128,7 +128,7 @@ export function baseGaugeOptionAntV(plot, container, chart, action, scale = 1) {
}
}
}
console
.
log
(
options
.
indicator
.
pin
)
//
console.log(options.indicator.pin)
// 开始渲染
if
(
plot
)
{
...
...
This diff is collapsed.
Click to expand it.
frontend/src/views/panel/edit/ComponentWait.vue
+
1
-
1
View file @
939a239e
...
...
@@ -9,7 +9,7 @@
v-for=
"(config, index) in pcComponentData"
v-if=
"!config.mobileSelected"
:id=
"'wait' + config.id"
:key=
"
index
"
:key=
"
config.id
"
>
<component-wait-item
:config=
"config"
...
...
This diff is collapsed.
Click to expand it.
frontend/src/views/panel/edit/ComponentWaitItem.vue
+
5
-
9
View file @
939a239e
<
template
>
<div
v-proportion=
"0.8"
:style=
"componentItemStyle"
>
<div
class=
"component-item"
>
<mobile-check-bar
v-if=
"mobileCheckBarShow"
:element=
"config"
/>
<de-out-widget
v-if=
"config.type==='custom'"
...
...
@@ -70,11 +67,6 @@ export default {
})
return
result
},
componentItemStyle
()
{
return
{
padding
:
'
5px
'
}
},
...
mapState
([
'
mobileLayoutStatus
'
,
'
componentData
'
,
...
...
@@ -96,4 +88,8 @@ export default {
width
:
100%
!important
;
height
:
100%
;
}
.component-item
{
padding
:
5px
;
height
:
200px
!important
;
}
</
style
>
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