center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

feat: 地图json，区域

Browse Source
This commit is contained in:
junjie 2021-08-16 09:56:19 +08:00
parent bb7516ac39
commit 7905c85110
3 changed files with 3066 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/io/dataease/map/utils/MapUtils.java
View File

@ -34,7 +34,8 @@ public class MapUtils {
public static String formatCode(String code) {
return code.substring(3);
// return code.substring(3);
return code;
}
/*public static List<Map<String, Object>> readCodeList( ) {

3062
backend/src/main/resources/db/migration/V19__area_mapping.sql
View File

File diff suppressed because it is too large Load Diff

3
frontend/src/views/chart/view/ChartEdit.vue
View File

@ -572,7 +572,7 @@
<p style="margin-top: 10px;color:#F56C6C;font-size: 12px;">{{ $t('chart.change_ds_tip') }}</p>
<div slot="footer" class="dialog-footer">
<el-button size="mini" @click="closeChangeChart">{{ $t('chart.cancel') }}</el-button>
<el-button type="primary" size="mini" :disabled="!table || !table.id || !changeTable || !changeTable.id" @click="changeChart">{{ $t('chart.confirm') }}</el-button>
<el-button type="primary" size="mini" :disabled="!changeTable || !changeTable.id" @click="changeChart">{{ $t('chart.confirm') }}</el-button>
</div>
</el-dialog>
@ -1254,6 +1254,7 @@ export default {
this.view.customFilter = []
this.view.extStack = []
this.view.extBubble = []
this.view.drillFields = []
}
this.save(true, 'chart', false)
},