From acb22bc56a9ef40b5d3709be5c12c2438d750d09 Mon Sep 17 00:00:00 2001 From: chenwenchang <479999519@qq.com> Date: Mon, 2 Dec 2024 10:27:02 +0800 Subject: [PATCH] =?UTF-8?q?fix(frontend):=20=E4=B8=B4=E6=97=B6=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9=E8=B0=83=E6=95=B4=E5=8F=8A=E4=BC=98?= =?UTF-8?q?=E5=8C=96=20#8250=20#=20Reviewed,=20transaction=20id:=2025459?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/services/source/permission.ts | 15 +- .../temporary-paassword-modify/Index.vue | 225 +++++++++++- .../{index => }/components/UpdateResult.vue | 201 ++++++++--- .../components/form-item/InstanceList.vue | 0 .../components/form-item/PasswordInput.vue | 0 .../components/form-item/ValidDuration.vue | 0 .../render-passwrod-instance/Index.vue | 0 .../RenderInstance.vue | 0 .../index/Index.vue | 340 ------------------ .../temporary-paassword-modify/routes.ts | 13 - 10 files changed, 371 insertions(+), 423 deletions(-) rename dbm-ui/frontend/src/views/temporary-paassword-modify/{index => }/components/UpdateResult.vue (54%) rename dbm-ui/frontend/src/views/temporary-paassword-modify/{index => }/components/form-item/InstanceList.vue (100%) rename dbm-ui/frontend/src/views/temporary-paassword-modify/{index => }/components/form-item/PasswordInput.vue (100%) rename dbm-ui/frontend/src/views/temporary-paassword-modify/{index => }/components/form-item/ValidDuration.vue (100%) rename dbm-ui/frontend/src/views/temporary-paassword-modify/{index => }/components/render-passwrod-instance/Index.vue (100%) rename dbm-ui/frontend/src/views/temporary-paassword-modify/{index => }/components/render-passwrod-instance/RenderInstance.vue (100%) delete mode 100644 dbm-ui/frontend/src/views/temporary-paassword-modify/index/Index.vue diff --git a/dbm-ui/frontend/src/services/source/permission.ts b/dbm-ui/frontend/src/services/source/permission.ts index 51c285a659..33cab05fb6 100644 --- a/dbm-ui/frontend/src/services/source/permission.ts +++ b/dbm-ui/frontend/src/services/source/permission.ts @@ -88,14 +88,7 @@ export const modifyAdminPassword = (params: { }[]; // 是否异步 is_async?: boolean; -}) => - http.post< - | { - success: AdminPasswordResultItem[]; - fail: AdminPasswordResultItem[]; - } - | string // 异步修改时返回root_id - >(`${path}/modify_admin_password/`, params); +}) => http.post(`${path}/modify_admin_password/`, params); /** * 查询生效实例密码(admin) @@ -120,10 +113,8 @@ export const queryAsyncModifyResult = (params: { root_id: string }) => http.post<{ status: string; error?: string; - data: { - success: AdminPasswordResultItem[]; - fail: AdminPasswordResultItem[]; - }; + success?: AdminPasswordResultItem[]; + fail?: AdminPasswordResultItem[]; result?: boolean; }>(`${path}/query_async_modify_result/`, params); diff --git a/dbm-ui/frontend/src/views/temporary-paassword-modify/Index.vue b/dbm-ui/frontend/src/views/temporary-paassword-modify/Index.vue index 7c2aa3f3e1..a370ee34e6 100644 --- a/dbm-ui/frontend/src/views/temporary-paassword-modify/Index.vue +++ b/dbm-ui/frontend/src/views/temporary-paassword-modify/Index.vue @@ -1,3 +1,226 @@ + + + + + + diff --git a/dbm-ui/frontend/src/views/temporary-paassword-modify/index/components/UpdateResult.vue b/dbm-ui/frontend/src/views/temporary-paassword-modify/components/UpdateResult.vue similarity index 54% rename from dbm-ui/frontend/src/views/temporary-paassword-modify/index/components/UpdateResult.vue rename to dbm-ui/frontend/src/views/temporary-paassword-modify/components/UpdateResult.vue index be587e5291..bedb013240 100644 --- a/dbm-ui/frontend/src/views/temporary-paassword-modify/index/components/UpdateResult.vue +++ b/dbm-ui/frontend/src/views/temporary-paassword-modify/components/UpdateResult.vue @@ -12,18 +12,51 @@ -->