Skip to content

Commit

Permalink
bugfix: Agent 安装表单无法选择操作系统 (closed #865)
Browse files Browse the repository at this point in the history
  • Loading branch information
GONGONGONG authored and ZhuoZhuoCrayon committed Jun 27, 2022
1 parent b093e13 commit fefdf10
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
3 changes: 3 additions & 0 deletions dev_log/2.2.18/daoqing_202206231858.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
bugfix:
- "Agent 安装表单无法选择操作系统 (closed #865)"
14 changes: 7 additions & 7 deletions frontend/src/router/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const router = new VueRouter({
routes,
});

const loadOsRoute = ['agentSetup', 'agentImport', 'agentEdit'];
// const loadOsRoute = ['agentSetup', 'agentImport', 'agentEdit'];
const cancelRequest = async () => {
const allRequest = http.queue.get() as any[];
const requestQueue = allRequest.filter(request => request.cancelWhenRouteChange);
Expand Down Expand Up @@ -75,12 +75,12 @@ const beforeRouterMethod = async (to: Route, next: any) => {
MainStore.updateBizAction(authority ? authority.page : '');
await cancelRequest();
if (!MainStore.osList) {
if (loadOsRoute.includes(to.name)) {
const list = await MainStore.getOsList();
MainStore.updateOsList(list);
} else {
MainStore.getOsList().then(list => MainStore.updateOsList(list));
}
// if (loadOsRoute.includes(to.name)) {
// const list = await MainStore.getOsList();
// MainStore.updateOsList(list);
// } else {
MainStore.getOsList().then(list => MainStore.updateOsList(list));
// }
}

if (!defaultConfigLoaded) {
Expand Down

0 comments on commit fefdf10

Please sign in to comment.