diff --git a/frontend/manage/src/api/controlsConfig.js b/frontend/manage/src/api/controlsConfig.js index e13866b..76a3c50 100644 --- a/frontend/manage/src/api/controlsConfig.js +++ b/frontend/manage/src/api/controlsConfig.js @@ -1198,6 +1198,38 @@ export const advanceComponents = [ } }, { + ctrlType: 'tianditu', + name: '', + desc: '天地图', + icon: 'icon-gaodeditu', + options: { + width: '100%', + defaultValue: '', + dataType: 'varchar', + noBindModel: false, + placeholder: '', + heightMap: '350px', + widthMap: '100%', + showEffect: 'dialog', + isAddPosition: true, + locationPath: '', + locationName: '', + labelAlign: '', + longitudeName: '', + longitudePath: '', + latitudeName: '', + latitudePath: '', + provinceName: '', + provincePath: '', + cityName: '', + cityPath: '', + districtName: '', + districtPath: '', + streetName: '', + streetPath: '', + } + }, + { ctrlType: 'customChart', tableName: '', boDefAlias: '', diff --git a/frontend/manage/src/components/form/BasicsProperty.vue b/frontend/manage/src/components/form/BasicsProperty.vue index 1270d4b..d95728b 100644 --- a/frontend/manage/src/components/form/BasicsProperty.vue +++ b/frontend/manage/src/components/form/BasicsProperty.vue @@ -4475,7 +4475,7 @@ export default { customQuerys: [], customQueryUrl: '', fields: [], - filterListType: ['number', 'currency', 'date', 'amap'], + filterListType: ['number', 'currency', 'date', 'amap','tianditu'], dialogLinkageVisible: false, //联动设置对话框 linkage: [ { diff --git a/frontend/manage/src/components/form/FormNavigator.vue b/frontend/manage/src/components/form/FormNavigator.vue index 249e7fc..e750c9e 100644 --- a/frontend/manage/src/components/form/FormNavigator.vue +++ b/frontend/manage/src/components/form/FormNavigator.vue @@ -703,6 +703,7 @@ export default { 'image', 'iframe', 'amap', + 'tianditu', 'dataView', 'formTable', 'table', @@ -818,6 +819,7 @@ export default { 'image', 'iframe', 'amap', + 'tianditu', 'dataView', 'formTable', 'table', @@ -826,7 +828,7 @@ export default { ] let amap = 0 for (let i = 0; i < this.widgetForm.list.length; i++) { - if (this.widgetForm.list[i].ctrlType == 'amap') { + if (['amap','tianditu'].includes(this.widgetForm.list[i].ctrlType)) { amap++ if (amap > 1) { this.$message({ @@ -857,14 +859,14 @@ export default { k++ ) { if ( - this.widgetForm.list[i].columns[j].list[k].ctrlType == 'amap' + ['amap','tianditu'].includes(this.widgetForm.list[i].columns[j].list[k].ctrlType) ) { amap++ if (amap > 1) { this.widgetForm.list[i].columns[j].list.splice(k, 1) this.$message({ type: 'error', - message: '已存在高德地图控件!' + message: '已存在地图控件!' }) return } diff --git a/frontend/manage/src/components/form/PropertyPanel.vue b/frontend/manage/src/components/form/PropertyPanel.vue index 41b7cba..6a70068 100644 --- a/frontend/manage/src/components/form/PropertyPanel.vue +++ b/frontend/manage/src/components/form/PropertyPanel.vue @@ -265,7 +265,7 @@ -