diff --git a/services/service-pages/main/default/routes/page_design.router.js b/services/service-pages/main/default/routes/page_design.router.js index 428eea426b..0b9f6f21e7 100644 --- a/services/service-pages/main/default/routes/page_design.router.js +++ b/services/service-pages/main/default/routes/page_design.router.js @@ -43,7 +43,7 @@ router.get('/api/pageDesign', core.requireAuthentication, async function (req, r locale = "zh-CN"; } const page = await objectql.broker.call(`page.getLatestPageVersion`, {pageId: req.query.pageId}); - const retUrl = __meteor_runtime_config__.ROOT_URL + '/app/admin/pages/view/' + req.query.pageId + const retUrl = req.query.retUrl || __meteor_runtime_config__.ROOT_URL + '/app/admin/pages/view/' + req.query.pageId const steedosBuilderUrl = process.env.STEEDOS_BUILDER_URL || 'https://builder.steedos.cn'; const builderHost = `${steedosBuilderUrl}/amis?${assetUrl}retUrl=${retUrl}&locale=${locale}&pageType=${page.type}`; diff --git a/services/standard-object-database/main/default/routes/object_fields_design.router.js b/services/standard-object-database/main/default/routes/object_fields_design.router.js index 0ffc884072..f7a4c72310 100644 --- a/services/standard-object-database/main/default/routes/object_fields_design.router.js +++ b/services/standard-object-database/main/default/routes/object_fields_design.router.js @@ -42,7 +42,7 @@ router.get('/api/amisObjectFieldsDesign', core.requireAuthentication, async func } else if (req.query.locale == "zh-cn") { locale = "zh-CN"; } - const retUrl = __meteor_runtime_config__.ROOT_URL + '/app/admin/objects/view/' + req.query.oid + const retUrl = req.query.retUrl || __meteor_runtime_config__.ROOT_URL + '/app/admin/objects/view/' + req.query.oid const steedosBuilderUrl = process.env.STEEDOS_BUILDER_URL || 'https://builder.steedos.cn'; const builderHost = `${steedosBuilderUrl}/object?${assetUrl}retUrl=${retUrl}&locale=${locale}&isObjectDesign=1&pType=objectDesign`;