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

Merge pull request #2652 from dataease/pr@dev@fix_global_image

Browse Source 
fix(仪表板): 世界地图配置禁止删除中国地图文件
This commit is contained in:
fit2cloud-chenyw 2022-07-21 14:41:42 +08:00 committed by GitHub
commit 28b1724f6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -4,7 +4,9 @@ ARG IMAGE_TAG
RUN mkdir -p /opt/apps /opt/dataease/data/feature/full /opt/dataease/drivers RUN mkdir -p /opt/apps /opt/dataease/data/feature/full /opt/dataease/drivers
ADD mapFiles/* /opt/dataease/data/feature/full/ RUN cp -r -f mapFiles/* /opt/dataease/data/feature/full/
# ADD mapFiles/* /opt/dataease/data/feature/full/
ADD drivers/* /opt/dataease/drivers/ ADD drivers/* /opt/dataease/drivers/

10
frontend/src/views/system/SysParam/MapSetting/MapSettingLeft.vue
View File

@ -34,7 +34,7 @@
<span style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" :title="data.name">{{ node.data.name }}</span> <span style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" :title="data.name">{{ node.data.name }}</span>
</span> </span>
<span v-if="!data.code.startWith('156')" class="child"> <span v-if="!isChina(data.code)" class="child">
<span @click.stop> <span @click.stop>
<span class="el-dropdown-link"> <span class="el-dropdown-link">
<el-button <el-button
@ -45,7 +45,7 @@
/> />
</span> </span>
</span> </span>
<span v-if="!data.code.startWith('000')" style="margin-left: 12px;" @click.stop> <span v-if="!isGlobal(data.code)" style="margin-left: 12px;" @click.stop>
<span class="el-dropdown-link"> <span class="el-dropdown-link">
<el-button <el-button
icon="el-icon-delete" icon="el-icon-delete"
@ -164,6 +164,12 @@ export default {
}, },
showNewNode(code) { showNewNode(code) {
this.$refs.tree.setCurrentKey(code) this.$refs.tree.setCurrentKey(code)
},
isChina(code) {
return code && code.startsWith('156')
},
isGlobal(code) {
return code && code.startsWith('000')
} }
} }
} }