diff --git a/docker-compose.yml b/docker-compose.yml index 976d043fc..69ee9365a 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -96,7 +96,7 @@ services: appstore: container_name: "dootask-appstore-${APP_ID}" privileged: true - image: "dootask/appstore:0.0.9" + image: "dootask/appstore:0.1.0" volumes: - shared_data:/usr/share/dootask - /var/run/docker.sock:/var/run/docker.sock diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js index 8153a0a2a..e63ba1745 100644 --- a/resources/assets/js/store/actions.js +++ b/resources/assets/js/store/actions.js @@ -4697,7 +4697,12 @@ export default { .replace(/\{user_token}/g, encodeURIComponent(state.userToken)) .replace(/\{system_theme}/g, state.systemConfig.themeName) .replace(/\{system_lang}/g, languageName) - .replace(/\{system_base_url}/g, $A.mainUrl('').replace(/\/$/, '')); + .replace(/\{system_base_url}/g, $A.mainUrl('').replace(/\/$/, '')) + .replace(/\{window_location_(\w+)}/g, (match, property) => { + if (property in window.location) { + return window.location[property]; + } + }); emitter.emit('observeMicroApp:open', config); },