diff --git a/src/views/demo/onlineform/formModule/modalDesign.vue b/src/views/demo/onlineform/formModule/modalDesign.vue index 1e163dd1..ae057b01 100644 --- a/src/views/demo/onlineform/formModule/modalDesign.vue +++ b/src/views/demo/onlineform/formModule/modalDesign.vue @@ -285,8 +285,11 @@ config.value.table.querys = editDataScheme.table.querys; // 常用按钮-表 config.value.table.btns = editDataScheme.table.btns; - // 地图设置-表 - config.value.table.maps = editDataScheme.table.maps || cloneDeep(config_backups).table.maps; + // 地图设置-表(顺序:表单发布的值、表单设定的值、表单发布默认值) + config.value.table.maps = + editDataScheme.table.maps || + getDesignMapsGeom(formScheme.value.formInfo.schemas) || + cloneDeep(config_backups).table.maps; setCheckedKeys(); } else { @@ -315,7 +318,8 @@ // 常用按钮-表 config.value.table.btns = btnsTree.value; // 地图设置 - config.value.table.maps = cloneDeep(config_backups).table.maps; + config.value.table.maps = + getDesignMapsGeom(formScheme.value.formInfo.schemas) || cloneDeep(config_backups).table.maps; } function setCheckedKeys() { @@ -336,9 +340,25 @@ }); } - provide('formConfig', config.value); + // 获取设计的MapGeom的设定值 + function getDesignMapsGeom(schemas) { + let mapData = null; + schemas.forEach((e) => { + if (mapData) { + return mapData; + } + if (e.component == 'MapGeom') { + mapData = e.mapSetData; + } else if (e.component == 'Grid') { + e.columns.forEach((item) => { + mapData = getDesignMapsGeom(item.children); + }); + } + }); + return mapData; + } - console.log(config.value); + provide('formConfig', config.value); defineExpose({ config,