Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme
This commit is contained in:
@@ -83,7 +83,7 @@
|
||||
</div>
|
||||
</template>
|
||||
<template v-else>
|
||||
<div class='legend-container' ref="legendArea" v-show="firstShow">
|
||||
<div class='legend-container' ref="legendArea" v-show="firstShow&&legendListMore.length">
|
||||
<table style="width: 100%" border="0" cellpadding="0" cellspacing="0">
|
||||
<th style="width: 100%"></th>
|
||||
<template v-for="(legendOption, index) in legendOptions">
|
||||
@@ -146,7 +146,7 @@
|
||||
</el-popover>
|
||||
</span>
|
||||
<div slot="title" >
|
||||
<span class="nz-dialog-title" v-show="!isExplore">{{data.title}}</span>
|
||||
<span class="nz-dialog-title" v-show="!isExplore">{{data.name}}</span>
|
||||
<span class="nz-dialog-title" v-show="isExplore"> </span>
|
||||
<div class="float-right panel-calendar dialog-tool">
|
||||
|
||||
|
||||
Reference in New Issue
Block a user