Unverified 提交 4cab403c authored 作者: fit2cloud-chenyw's avatar fit2cloud-chenyw 提交者: GitHub

Merge branch 'dev' into pr@dev@style_panel_filter

...@@ -75,6 +75,7 @@ export default { ...@@ -75,6 +75,7 @@ export default {
padding-left: 1px; padding-left: 1px;
padding-right: 1px; padding-right: 1px;
cursor:pointer!important; cursor:pointer!important;
text-align: center;
background-color: #0a7be0; background-color: #0a7be0;
} }
.bar-main i{ .bar-main i{
......
...@@ -156,7 +156,7 @@ export default { ...@@ -156,7 +156,7 @@ export default {
} }
}, },
editBarViewShowFlag() { editBarViewShowFlag() {
return this.active && this.inTab return this.active && this.inTab && !this.mobileLayoutStatus
}, },
charViewShowFlag() { charViewShowFlag() {
return this.httpRequest.status && this.chart.type && !this.chart.type.includes('table') && !this.chart.type.includes('text') && this.renderComponent() === 'echarts' return this.httpRequest.status && this.chart.type && !this.chart.type.includes('table') && !this.chart.type.includes('text') && this.renderComponent() === 'echarts'
......
<template> <template>
<div v-if="editMode == 'edit'" class="v-text" @keydown="handleKeydown" @keyup="handleKeyup"> <div v-if="editStatus" class="v-text" @keydown="handleKeydown" @keyup="handleKeyup">
<!-- tabindex >= 0 使得双击时聚集该元素 --> <!-- tabindex >= 0 使得双击时聚集该元素 -->
<div <div
v-if="canEdit" v-if="canEdit"
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
<script> <script>
import { keycodes } from '@/components/canvas/utils/shortcutKey.js' import { keycodes } from '@/components/canvas/utils/shortcutKey.js'
import { mapState } from 'vuex'
export default { export default {
props: { props: {
...@@ -65,13 +66,19 @@ export default { ...@@ -65,13 +66,19 @@ export default {
} }
}, },
computed: { computed: {
editStatus() {
return this.editMode === 'edit' && !this.mobileLayoutStatus
},
textInfo() { textInfo() {
if (this.element && this.element.hyperlinks && this.element.hyperlinks.enable) { if (this.element && this.element.hyperlinks && this.element.hyperlinks.enable) {
return "<a title='" + this.element.hyperlinks.content + "' target='" + this.element.hyperlinks.openMode + "' href='" + this.element.hyperlinks.content + "'>" + this.element.propValue + '</a>' return "<a title='" + this.element.hyperlinks.content + "' target='" + this.element.hyperlinks.openMode + "' href='" + this.element.hyperlinks.content + "'>" + this.element.propValue + '</a>'
} else { } else {
return this.element.propValue return this.element.propValue
} }
} },
...mapState([
'mobileLayoutStatus'
])
}, },
watch: { watch: {
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<span slot="label"> <span slot="label">
<span>{{ item.title }}</span> <span>{{ item.title }}</span>
<el-dropdown v-if="isEdit" slot="label" class="de-tab-drop" trigger="click" @command="handleCommand"> <el-dropdown v-if="dropdownShow" slot="label" class="de-tab-drop" trigger="click" @command="handleCommand">
<span class="el-dropdown-link"> <span class="el-dropdown-link">
<!-- <span>{{ item.title }}</span> --> <!-- <span>{{ item.title }}</span> -->
...@@ -135,8 +135,12 @@ export default { ...@@ -135,8 +135,12 @@ export default {
} }
}, },
computed: { computed: {
dropdownShow() {
return this.isEdit && !this.mobileLayoutStatus
},
...mapState([ ...mapState([
'curComponent' 'curComponent',
'mobileLayoutStatus'
]) ])
}, },
watch: { watch: {
......
<template> <template>
<div style="display: flex;"> <div style="display: flex;position:relative">
<view-track-bar <view-track-bar
ref="viewTrack" ref="viewTrack"
:track-menu="trackMenu" :track-menu="trackMenu"
...@@ -368,10 +368,10 @@ export default { ...@@ -368,10 +368,10 @@ export default {
position: absolute; position: absolute;
z-index: 999; z-index: 999;
left: 2%; left: 2%;
bottom: 3%; bottom: 30px;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
text-align: center; text-align: center;
padding: 5px; padding: 2px;
border-radius: 5px border-radius: 5px
} }
......
...@@ -81,6 +81,7 @@ export default { ...@@ -81,6 +81,7 @@ export default {
.component-wait-main { .component-wait-main {
width: 100%; width: 100%;
height: calc(100% - 30px); height: calc(100% - 30px);
text-align: left;
overflow-y: auto; overflow-y: auto;
} }
.component-custom { .component-custom {
......
...@@ -70,7 +70,7 @@ export default { ...@@ -70,7 +70,7 @@ export default {
componentItemStyle() { componentItemStyle() {
return { return {
padding: '5px', padding: '5px',
display: 'inline-block', float: 'left',
width: '33%' width: '33%'
} }
}, },
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论