mirror of
https://github.com/dataease/dataease.git
synced 2025-02-24 11:32:57 +08:00
Merge pull request #6054 from dataease/pr@dev@perf_map_setting
perf(地图设置): 地球村和中国区域只能增加不能删除提示#5979
This commit is contained in:
commit
056777b854
@ -2855,7 +2855,8 @@ export default {
|
||||
geo_json: 'Geo Json',
|
||||
fileplaceholder: 'Please upload the JSON format coordinate file',
|
||||
delete_confirm: 'And child nodes will be deleted. Confirm to execute ?',
|
||||
cur_node: 'Current node'
|
||||
cur_node: 'Current node',
|
||||
prohibit_prompts: '000 and 156 are the global village and China area code prefixes respectively. Removal is prohibited. Please use other code prefixes!'
|
||||
},
|
||||
map_mapping: {
|
||||
map: 'Map',
|
||||
|
@ -2849,7 +2849,8 @@ export default {
|
||||
geo_json: '坐標文件',
|
||||
fileplaceholder: '請上傳json格式坐標文件',
|
||||
delete_confirm: '及子節點都會被刪除,確認執行?',
|
||||
cur_node: '當前節點'
|
||||
cur_node: '當前節點',
|
||||
prohibit_prompts: '000、156分別是地球村和中華人民共和國區域代碼前綴,禁止移除,請使用其他代碼前綴!'
|
||||
},
|
||||
map_mapping: {
|
||||
map: '圖形',
|
||||
|
@ -2849,7 +2849,8 @@ export default {
|
||||
geo_json: '坐标文件',
|
||||
fileplaceholder: '请上传json格式坐标文件',
|
||||
delete_confirm: '及子节点都会被删除,确认执行?',
|
||||
cur_node: '当前节点'
|
||||
cur_node: '当前节点',
|
||||
prohibit_prompts: '000、156分别是地球村和中华人民共和国区域代码前缀,禁止移除,请使用其他代码前缀!'
|
||||
},
|
||||
map_mapping: {
|
||||
map: '图形',
|
||||
|
@ -100,7 +100,7 @@ export default {
|
||||
label: 'name',
|
||||
value: 'id'
|
||||
},
|
||||
expandedKeys: []
|
||||
expandedKeys: ['000000000']
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
|
@ -2,12 +2,20 @@
|
||||
<de-container
|
||||
v-loading="$store.getters.loadingMap[$store.getters.currentPath]"
|
||||
class="de-earth"
|
||||
style="height: calc(100vh - 150px);"
|
||||
style="height: calc(100vh - 200px);"
|
||||
>
|
||||
|
||||
<div class="de-map-tips">
|
||||
<el-alert
|
||||
:title="$t('map_setting.prohibit_prompts')"
|
||||
type="warning"
|
||||
description=""
|
||||
:closable="false"
|
||||
show-icon
|
||||
/>
|
||||
</div>
|
||||
<de-aside-container
|
||||
type="mapset"
|
||||
style="height: 100%;"
|
||||
class="map-setting-aside"
|
||||
>
|
||||
<map-setting-left
|
||||
ref="map_setting_tree"
|
||||
@ -18,7 +26,9 @@
|
||||
/>
|
||||
</de-aside-container>
|
||||
|
||||
<de-main-container style="height: 100%;">
|
||||
<de-main-container
|
||||
class="map-setting-main"
|
||||
>
|
||||
<map-setting-right
|
||||
ref="map_setting_form"
|
||||
:tree-data="treeData"
|
||||
@ -83,5 +93,17 @@ export default {
|
||||
padding: 24px;
|
||||
width: 100%;
|
||||
overflow: auto;
|
||||
.de-map-tips {
|
||||
position: absolute;
|
||||
width: calc(100% - 135px);
|
||||
}
|
||||
.map-setting-aside {
|
||||
top: 50px;
|
||||
height: calc(100% - 40px) !important;
|
||||
}
|
||||
.map-setting-main {
|
||||
margin-top: 50px;
|
||||
height: calc(100% - 50px);
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
@ -50,16 +50,14 @@
|
||||
class="tabs-container"
|
||||
:class="[activeName !== 'eight' ? 'is-center' : 'pad-center']"
|
||||
>
|
||||
<div class="min-w600">
|
||||
<div :class="activeName === 'ten' ? 'max-w600' : 'min-w600'">
|
||||
<basic-setting
|
||||
v-if="activeName === 'zero'"
|
||||
:is-plugin-loaded="isPluginLoaded"
|
||||
/>
|
||||
<email-setting v-if="activeName === 'first'" />
|
||||
<map-setting
|
||||
v-if="activeName === 'ten'"
|
||||
ref="mapSetting"
|
||||
/>
|
||||
<map-setting v-if="activeName === 'ten'" />
|
||||
|
||||
<simple-mode v-if="activeName === 'six'" />
|
||||
<cluster-mode v-if="activeName === 'seven'" />
|
||||
<kettle-setting v-if="activeName === 'eight'" />
|
||||
@ -123,6 +121,14 @@ export default {
|
||||
padding-bottom: 20px;
|
||||
}
|
||||
}
|
||||
.max-w600 {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
& > :nth-child(1) {
|
||||
box-sizing: border-box;
|
||||
padding-bottom: 20px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.is-center {
|
||||
|
Loading…
Reference in New Issue
Block a user