fix:修复 chartDiagram 选择图片时 会回退到编辑页面的问题
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
export const Tools = [
|
export const Tools = [
|
||||||
{
|
{
|
||||||
group: 'General',
|
group: 'General',
|
||||||
|
show: false,
|
||||||
children: [
|
children: [
|
||||||
{
|
{
|
||||||
name: 'rectangle',
|
name: 'rectangle',
|
||||||
@@ -11,21 +12,21 @@ export const Tools = [
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'rectangle',
|
name: 'rectangle',
|
||||||
icon: '\ue730;',
|
icon: '\ue730',
|
||||||
id: 'e730;',
|
id: 'e730;',
|
||||||
nzClassName: 'nz-icon-rectangle1',
|
nzClassName: 'nz-icon-rectangle1',
|
||||||
unit: 'General'
|
unit: 'General'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'rectangle',
|
name: 'rectangle',
|
||||||
icon: '\ue731;',
|
icon: '\ue731',
|
||||||
id: '731',
|
id: '731',
|
||||||
nzClassName: 'nz-icon-EMAC1',
|
nzClassName: 'nz-icon-EMAC1',
|
||||||
unit: 'General'
|
unit: 'General'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'rectangle',
|
name: 'rectangle',
|
||||||
icon: '\ue67f;',
|
icon: '\ue67f',
|
||||||
id: 'e67f',
|
id: 'e67f',
|
||||||
nzClassName: 'nz-icon-module5',
|
nzClassName: 'nz-icon-module5',
|
||||||
unit: 'General'
|
unit: 'General'
|
||||||
@@ -64,7 +65,7 @@ export const Tools = [
|
|||||||
id: 'e680',
|
id: 'e680',
|
||||||
nzClassName: 'nz-icon-module6',
|
nzClassName: 'nz-icon-module6',
|
||||||
unit: 'General'
|
unit: 'General'
|
||||||
},
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -295,11 +295,11 @@ export default {
|
|||||||
pen.autoPlay = false
|
pen.autoPlay = false
|
||||||
},
|
},
|
||||||
pensActive (pens, e) { // 选中节点
|
pensActive (pens, e) { // 选中节点
|
||||||
|
setTimeout(() => {
|
||||||
this.selectPens = pens
|
this.selectPens = pens
|
||||||
this.modulesDiff(pens[0])
|
this.modulesDiff(pens[0])
|
||||||
setTimeout(() => {
|
|
||||||
this.$refs.meta2dProps && (this.$refs.meta2dProps.isUpdate = true)
|
this.$refs.meta2dProps && (this.$refs.meta2dProps.isUpdate = true)
|
||||||
})
|
}, 600)
|
||||||
},
|
},
|
||||||
topoClick (params, e) { // 点击节点
|
topoClick (params, e) { // 点击节点
|
||||||
if (!params.pen && this.$refs.meta2dProps) {
|
if (!params.pen && this.$refs.meta2dProps) {
|
||||||
|
|||||||
@@ -28,7 +28,7 @@
|
|||||||
@change="change('nzName')"></el-input>
|
@change="change('nzName')"></el-input>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-row-item form-row-item-full" v-if="!pen.type">
|
<div class="form-row-item form-row-item-full" v-if="!pen.type && !isChart">
|
||||||
<div class="form-row-key">
|
<div class="form-row-key">
|
||||||
{{$t('overall.module')}}
|
{{$t('overall.module')}}
|
||||||
</div>
|
</div>
|
||||||
@@ -1087,7 +1087,8 @@ export default {
|
|||||||
props: {
|
props: {
|
||||||
selectPens: {},
|
selectPens: {},
|
||||||
elements: {},
|
elements: {},
|
||||||
modules: {}
|
modules: {},
|
||||||
|
isChart: {}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
selectPens: {
|
selectPens: {
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
<div class="props-box props" @keypress.stop="" @keydown.stop="" @keyup.stop="">
|
<div class="props-box props" @keypress.stop="" @keydown.stop="" @keyup.stop="">
|
||||||
<el-tabs v-model="activeName" type="card" :before-leave="beforeLeave">
|
<el-tabs v-model="activeName" type="card" :before-leave="beforeLeave">
|
||||||
<el-tab-pane :label="$t('project.topology.element')" name="elements" v-if="selectPens.length === 1">
|
<el-tab-pane :label="$t('project.topology.element')" name="elements" v-if="selectPens.length === 1">
|
||||||
<meta2dElement :modules="modules" :selectPens.sync="selectPens" @change="change" :elements="elements"/>
|
<meta2dElement :modules="modules" :selectPens.sync="selectPens" @change="change" :elements="elements" :isChart="isChart"/>
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
<el-tab-pane :label="$t('project.topology.canvas')" name="canvas">
|
<el-tab-pane :label="$t('project.topology.canvas')" name="canvas">
|
||||||
<meta2dCanvas :canvasProps="canvasProps" :params.sync="params" :meta2dId='meta2dId' @changeActiveName="changeActiveName" ref ='meta2dCanvas'/>
|
<meta2dCanvas :canvasProps="canvasProps" :params.sync="params" :meta2dId='meta2dId' @changeActiveName="changeActiveName" ref ='meta2dCanvas'/>
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
custom-class="nz-select-img-dialog nz-new-dialog prevent-clickoutside"
|
custom-class="nz-select-img-dialog nz-new-dialog prevent-clickoutside"
|
||||||
:visible.sync="selectBoxShow"
|
:visible.sync="selectBoxShow"
|
||||||
width="auto"
|
width="auto"
|
||||||
:append-to-body="true"
|
:append-to-body="false"
|
||||||
:modal-append-to-body="false"
|
:modal-append-to-body="false"
|
||||||
@close="changeSelectBoxShow(false)"
|
@close="changeSelectBoxShow(false)"
|
||||||
destroy-on-close
|
destroy-on-close
|
||||||
@@ -37,7 +37,7 @@
|
|||||||
<div v-show="item.show" class="nz-collapse-body">
|
<div v-show="item.show" class="nz-collapse-body">
|
||||||
<div v-for="(btn, i) in item.children" :key="'info2'+'-'+index+'-'+i" class="buttons image-box-item" :class="btn.id == selectImgId ? 'is-select':''">
|
<div v-for="(btn, i) in item.children" :key="'info2'+'-'+index+'-'+i" class="buttons image-box-item" :class="btn.id == selectImgId ? 'is-select':''">
|
||||||
<img :src="btn.image" v-if="btn.image" class="image-src" @click.stop="selectImageChange(btn)">
|
<img :src="btn.image" v-if="btn.image" class="image-src" @click.stop="selectImageChange(btn)">
|
||||||
<i v-if="btn.nzClassName" class="nz-icon image-src" :class="btn.nzClassName" style="font-size: 40px" @click.stop="selectImageChange(btn)"/>
|
<i v-if="btn.nzClassName" class="nz-icon image-src" :class="btn.nzClassName" style="font-size: 36px" @click.stop="selectImageChange(btn)"/>
|
||||||
<div class="img-text text-ellipsis" :title="btn.imageName">{{btn.imageName}}</div>
|
<div class="img-text text-ellipsis" :title="btn.imageName">{{btn.imageName}}</div>
|
||||||
<i v-if="item.group!=='General'" class="delIcon nz-icon nz-icon-delete" @click.stop="tooltipDelete(btn)"></i>
|
<i v-if="item.group!=='General'" class="delIcon nz-icon nz-icon-delete" @click.stop="tooltipDelete(btn)"></i>
|
||||||
</div>
|
</div>
|
||||||
@@ -144,7 +144,7 @@ export default {
|
|||||||
imgId: {},
|
imgId: {},
|
||||||
showDefault: {
|
showDefault: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: false
|
default: true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
data () {
|
data () {
|
||||||
|
|||||||
Reference in New Issue
Block a user