From 8596bfafc940e843987e1b9a40cc28d12b11977f Mon Sep 17 00:00:00 2001
From: shimingxy <shimingxy@qq.com>
Date: Tue, 11 Mar 2025 10:31:40 +0800
Subject: [PATCH] remove query submitLoading

---
 .../access/sessions/sessions.component.html   |   2 +-
 .../audit-login-apps.component.html           |   2 +-
 .../audit-logins/audit-logins.component.html  |   2 +-
 .../audit-system-logs.component.html          |   2 +-
 .../socials-provider.component.html           |   2 +-
 .../access-editer.component.html              |   2 +-
 .../access/access/access.component.html       |   2 +-
 .../access/sessions/sessions.component.html   |   2 +-
 .../routes/accounts/accounts.component.html   |   2 +-
 .../src/app/routes/apps/apps.component.html   |   2 +-
 .../select-apps/select-apps.component.html    |   2 +-
 .../audit-connector.component.html            |   2 +-
 .../audit-login-apps.component.html           |   2 +-
 .../audit-logins/audit-logins.component.html  |   2 +-
 .../audit-synchronizer.component.html         |   2 +-
 .../audit-system-logs.component.html          |   2 +-
 .../accounts-strategy.component.html          |   2 +-
 .../select-accounts-strategy.component.html   |   2 +-
 .../config/adapters/adapters.component.html   |   2 +-
 .../select-adapters.component.html            |   2 +-
 .../connectors/connectors.component.html      |   2 +-
 .../socials-provider.component.html           |   2 +-
 .../synchronizers.component.html              |   2 +-
 .../group-members-editer.component.html       |   2 +-
 .../group-members.component.html              |   2 +-
 .../member-groups-editer.component.html       |   2 +-
 .../routes/idm/groups/groups.component.html   |   2 +-
 .../select-groups.component.html              |   2 +-
 .../organizations.component.html              |   2 +-
 .../select-user/select-user.component.html    |   2 +-
 .../app/routes/idm/users/users.component.html | 117 ++++++++++++------
 .../permissions/apps/apps.component.html      |   2 +-
 .../permission/permission.component.html      |   2 +-
 .../resources/resources.component.html        |   2 +-
 .../member-roles-editer.component.html        |   2 +-
 .../role-members-editer.component.html        |   2 +-
 .../role-members/role-members.component.html  |   2 +-
 .../permissions/roles/roles.component.html    |   2 +-
 .../select-roles/select-roles.component.html  |   2 +-
 39 files changed, 116 insertions(+), 77 deletions(-)

diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/routes/access/sessions/sessions.component.html b/maxkey-web-frontend/maxkey-web-app/src/app/routes/access/sessions/sessions.component.html
index cc22dc71f..356a6c6b9 100644
--- a/maxkey-web-frontend/maxkey-web-app/src/app/routes/access/sessions/sessions.component.html
+++ b/maxkey-web-frontend/maxkey-web-app/src/app/routes/access/sessions/sessions.component.html
@@ -35,7 +35,7 @@
       </div>
 
       <div nz-col [nzSpan]="query.expandForm ? 24 : 8" [class.text-right]="query.expandForm">
-        <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n }}</button>
+        <button nz-button type="submit" [nzType]="'primary'">{{ 'mxk.text.query' | i18n }}</button>
         <button nz-button type="reset" (click)="onReset()" class="mx-sm">{{ 'mxk.text.reset' | i18n }}</button>
         <button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm d-none">
           {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button
diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/routes/audit/audit-login-apps/audit-login-apps.component.html b/maxkey-web-frontend/maxkey-web-app/src/app/routes/audit/audit-login-apps/audit-login-apps.component.html
index 45e62274e..989e69854 100644
--- a/maxkey-web-frontend/maxkey-web-app/src/app/routes/audit/audit-login-apps/audit-login-apps.component.html
+++ b/maxkey-web-frontend/maxkey-web-app/src/app/routes/audit/audit-login-apps/audit-login-apps.component.html
@@ -33,7 +33,7 @@
       </div>
 
       <div nz-col [nzSpan]="query.expandForm ? 24 : 8" [class.text-right]="query.expandForm">
-        <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n }}</button>
+        <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query' | i18n }}</button>
         <button nz-button type="reset" (click)="onReset()" class="mx-sm">{{ 'mxk.text.reset' | i18n }}</button>
         <button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm d-none">
           {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button
diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/routes/audit/audit-logins/audit-logins.component.html b/maxkey-web-frontend/maxkey-web-app/src/app/routes/audit/audit-logins/audit-logins.component.html
index 3819c920f..fb99634aa 100644
--- a/maxkey-web-frontend/maxkey-web-app/src/app/routes/audit/audit-logins/audit-logins.component.html
+++ b/maxkey-web-frontend/maxkey-web-app/src/app/routes/audit/audit-logins/audit-logins.component.html
@@ -33,7 +33,7 @@
       </div>
 
       <div nz-col [nzSpan]="query.expandForm ? 24 : 8" [class.text-right]="query.expandForm">
-        <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n }}</button>
+        <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query' | i18n }}</button>
         <button nz-button type="reset" (click)="onReset()" class="mx-sm">{{ 'mxk.text.reset' | i18n }}</button>
         <button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm d-none">
           {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button
diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/routes/audit/audit-system-logs/audit-system-logs.component.html b/maxkey-web-frontend/maxkey-web-app/src/app/routes/audit/audit-system-logs/audit-system-logs.component.html
index eb1a01676..051876377 100644
--- a/maxkey-web-frontend/maxkey-web-app/src/app/routes/audit/audit-system-logs/audit-system-logs.component.html
+++ b/maxkey-web-frontend/maxkey-web-app/src/app/routes/audit/audit-system-logs/audit-system-logs.component.html
@@ -71,7 +71,7 @@
       </div>
 
       <div nz-col [nzSpan]="query.expandForm ? 24 : 8" [class.text-right]="query.expandForm">
-        <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n }}</button>
+        <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query' | i18n }}</button>
         <button nz-button type="reset" (click)="onReset()" class="mx-sm">{{ 'mxk.text.reset' | i18n }}</button>
         <button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm">
           {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button
diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/routes/config/socials-provider/socials-provider.component.html b/maxkey-web-frontend/maxkey-web-app/src/app/routes/config/socials-provider/socials-provider.component.html
index b0a9f6791..850a87dd4 100644
--- a/maxkey-web-frontend/maxkey-web-app/src/app/routes/config/socials-provider/socials-provider.component.html
+++ b/maxkey-web-frontend/maxkey-web-app/src/app/routes/config/socials-provider/socials-provider.component.html
@@ -20,7 +20,7 @@
       </div>
 
       <div nz-col [nzSpan]="query.expandForm ? 24 : 8" [class.text-right]="query.expandForm">
-        <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n }}</button>
+        <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query' | i18n }}</button>
         <button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' | i18n }}</button>
         <button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm" style="display: none">
           {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/access/access-editer/access-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/access/access-editer/access-editer.component.html
index b470bc226..7a04537fe 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/access/access-editer/access-editer.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/access/access-editer/access-editer.component.html
@@ -13,7 +13,7 @@
       </div>
 
       <div nz-col [nzSpan]="query.expandForm ? 24 : 10" [class.text-right]="query.expandForm">
-        <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' |
+        <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query' |
           i18n }}</button>
         <button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' |
           i18n }}</button>
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/access/access.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/access/access.component.html
index fe6cc1951..3a60f1548 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/access/access.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/access/access.component.html
@@ -69,7 +69,7 @@
               </nz-form-item>
             </div>
             <div nz-col [nzSpan]="query.expandForm ? 24 : 4" [class.text-right]="query.expandForm">
-              <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query'
+              <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query'
                 | i18n }}</button>
               <button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset'
                 | i18n }}</button>
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/sessions/sessions.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/sessions/sessions.component.html
index a5c8cc85d..b9283079f 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/sessions/sessions.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/sessions/sessions.component.html
@@ -71,7 +71,7 @@
       </div>
 
       <div nz-col [nzSpan]="query.expandForm ? 24 : 8" [class.text-right]="query.expandForm">
-        <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n }}</button>
+        <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query' | i18n }}</button>
         <button nz-button type="reset" (click)="onReset()" class="mx-sm">{{ 'mxk.text.reset' | i18n }}</button>
         <button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm">
           {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/accounts/accounts.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/accounts/accounts.component.html
index c9178d771..299ee2ddd 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/accounts/accounts.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/accounts/accounts.component.html
@@ -29,7 +29,7 @@
       </div>
 
       <div nz-col [nzSpan]="query.expandForm ? 24 : 8" [class.text-right]="query.expandForm">
-        <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' |
+        <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query' |
           i18n }}</button>
         <button nz-button type="reset" (click)="onReset()" class="mx-sm">{{ 'mxk.text.reset' | i18n }}</button>
         <button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm" style="display: none">
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/apps.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/apps.component.html
index b4a9867b1..dd96237f8 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/apps.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/apps.component.html
@@ -34,7 +34,7 @@
       </div>
       <div nz-col [nzSpan]="query.expandForm ? 24 : 4" [class.text-right]="query.expandForm">
         <nz-form-item>
-          <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' |
+          <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query' |
             i18n }}</button>
           <button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' |
             i18n }}</button>
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/select-apps/select-apps.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/select-apps/select-apps.component.html
index 8c7665350..95791e829 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/select-apps/select-apps.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/select-apps/select-apps.component.html
@@ -12,7 +12,7 @@
     </div>
 
     <div nz-col [nzSpan]="query.expandForm ? 24 : 10" [class.text-right]="query.expandForm">
-      <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n
+      <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query' | i18n
         }}</button>
       <button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' | i18n
         }}</button>
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-connector/audit-connector.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-connector/audit-connector.component.html
index 15a8c3d47..09786c3f6 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-connector/audit-connector.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-connector/audit-connector.component.html
@@ -73,7 +73,7 @@
       </div>
 
       <div nz-col [nzSpan]="query.expandForm ? 24 : 8" [class.text-right]="query.expandForm">
-        <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n }}</button>
+        <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query' | i18n }}</button>
         <button nz-button type="reset" (click)="onReset()" class="mx-sm">{{ 'mxk.text.reset' | i18n }}</button>
         <button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm">
           {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-login-apps/audit-login-apps.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-login-apps/audit-login-apps.component.html
index e6e57dc42..6d30f00cd 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-login-apps/audit-login-apps.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-login-apps/audit-login-apps.component.html
@@ -57,7 +57,7 @@
       </div>
 
       <div nz-col [nzSpan]="query.expandForm ? 24 : 8" [class.text-right]="query.expandForm">
-        <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n }}</button>
+        <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query' | i18n }}</button>
         <button nz-button type="reset" (click)="onReset()" class="mx-sm">{{ 'mxk.text.reset' | i18n }}</button>
         <button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm">
           {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-logins/audit-logins.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-logins/audit-logins.component.html
index a39752e42..e641dc102 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-logins/audit-logins.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-logins/audit-logins.component.html
@@ -73,7 +73,7 @@
       </div>
 
       <div nz-col [nzSpan]="query.expandForm ? 24 : 8" [class.text-right]="query.expandForm">
-        <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n }}</button>
+        <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query' | i18n }}</button>
         <button nz-button type="reset" (click)="onReset()" class="mx-sm">{{ 'mxk.text.reset' | i18n }}</button>
         <button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm">
           {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-synchronizer/audit-synchronizer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-synchronizer/audit-synchronizer.component.html
index ff26cb632..f5cd68627 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-synchronizer/audit-synchronizer.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-synchronizer/audit-synchronizer.component.html
@@ -73,7 +73,7 @@
       </div>
 
       <div nz-col [nzSpan]="query.expandForm ? 24 : 8" [class.text-right]="query.expandForm">
-        <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n }}</button>
+        <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query' | i18n }}</button>
         <button nz-button type="reset" (click)="onReset()" class="mx-sm">{{ 'mxk.text.reset' | i18n }}</button>
         <button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm">
           {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-system-logs/audit-system-logs.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-system-logs/audit-system-logs.component.html
index 803df8bc3..72f864cbe 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-system-logs/audit-system-logs.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-system-logs/audit-system-logs.component.html
@@ -73,7 +73,7 @@
       </div>
 
       <div nz-col [nzSpan]="query.expandForm ? 24 : 8" [class.text-right]="query.expandForm">
-        <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n }}</button>
+        <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query' | i18n }}</button>
         <button nz-button type="reset" (click)="onReset()" class="mx-sm">{{ 'mxk.text.reset' | i18n }}</button>
         <button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm">
           {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/accounts-strategy/accounts-strategy.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/accounts-strategy/accounts-strategy.component.html
index 4527d2ed9..4330df740 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/accounts-strategy/accounts-strategy.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/accounts-strategy/accounts-strategy.component.html
@@ -14,7 +14,7 @@
       </div>
 
       <div nz-col [nzSpan]="query.expandForm ? 24 : 8" [class.text-right]="query.expandForm">
-        <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' |
+        <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query' |
           i18n }}</button>
         <button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' |
           i18n }}</button>
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/accounts-strategy/select-accounts-strategy/select-accounts-strategy.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/accounts-strategy/select-accounts-strategy/select-accounts-strategy.component.html
index 7a16d3280..74150d3ad 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/accounts-strategy/select-accounts-strategy/select-accounts-strategy.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/accounts-strategy/select-accounts-strategy/select-accounts-strategy.component.html
@@ -13,7 +13,7 @@
       </div>
 
       <div nz-col [nzSpan]="query.expandForm ? 24 : 12" [class.text-right]="query.expandForm">
-        <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n }}</button>
+        <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query' | i18n }}</button>
         <button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' | i18n }}</button>
         <button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm" style="display: none">
           {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/adapters/adapters.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/adapters/adapters.component.html
index 828f2d3c5..9b53e66ac 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/adapters/adapters.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/adapters/adapters.component.html
@@ -14,7 +14,7 @@
       </div>
 
       <div nz-col [nzSpan]="query.expandForm ? 24 : 8" [class.text-right]="query.expandForm">
-        <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' |
+        <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query' |
           i18n }}</button>
         <button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' |
           i18n }}</button>
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/adapters/select-adapters/select-adapters.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/adapters/select-adapters/select-adapters.component.html
index 1d0ee498a..6a2e372b3 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/adapters/select-adapters/select-adapters.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/adapters/select-adapters/select-adapters.component.html
@@ -12,7 +12,7 @@
       </div>
 
       <div nz-col [nzSpan]="query.expandForm ? 24 : 10" [class.text-right]="query.expandForm">
-        <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n }}</button>
+        <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query' | i18n }}</button>
         <button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' | i18n }}</button>
         <button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm" style="display: none">
           {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/connectors/connectors.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/connectors/connectors.component.html
index d850d1d75..91da55057 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/connectors/connectors.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/connectors/connectors.component.html
@@ -14,7 +14,7 @@
       </div>
 
       <div nz-col [nzSpan]="query.expandForm ? 24 : 8" [class.text-right]="query.expandForm">
-        <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' |
+        <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query' |
           i18n }}</button>
         <button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' |
           i18n }}</button>
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider.component.html
index cb66e3aa1..d9e1c6f81 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider.component.html
@@ -14,7 +14,7 @@
       </div>
 
       <div nz-col [nzSpan]="query.expandForm ? 24 : 8" [class.text-right]="query.expandForm">
-        <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' |
+        <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query' |
           i18n }}</button>
         <button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' |
           i18n }}</button>
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/synchronizers/synchronizers.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/synchronizers/synchronizers.component.html
index d5ff1bcd4..dc265d379 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/synchronizers/synchronizers.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/synchronizers/synchronizers.component.html
@@ -14,7 +14,7 @@
       </div>
 
       <div nz-col [nzSpan]="query.expandForm ? 24 : 8" [class.text-right]="query.expandForm">
-        <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' |
+        <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query' |
           i18n }}</button>
         <button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' |
           i18n }}</button>
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/group-members-editer/group-members-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/group-members-editer/group-members-editer.component.html
index 5603a62cd..c67d16374 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/group-members-editer/group-members-editer.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/group-members-editer/group-members-editer.component.html
@@ -12,7 +12,7 @@
     </div>
 
     <div nz-col [nzSpan]="query.expandForm ? 24 : 10" [class.text-right]="query.expandForm">
-      <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' |
+      <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query' |
         i18n }}</button>
       <button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' |
         i18n }}</button>
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/group-members.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/group-members.component.html
index 126d4d9ff..3a95a95c5 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/group-members.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/group-members.component.html
@@ -69,7 +69,7 @@
               </nz-form-item>
             </div>
             <div nz-col [nzSpan]="query.expandForm ? 24 : 8" [class.text-right]="query.expandForm">
-              <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query'
+              <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query'
                 | i18n }}</button>
               <button nz-button type="reset" (click)="onReset()" class="mx-sm">{{ 'mxk.text.reset' | i18n }}</button>
               <button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm" style="display: none">
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/member-groups-editer/member-groups-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/member-groups-editer/member-groups-editer.component.html
index 0dfefdf45..86eb2f69b 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/member-groups-editer/member-groups-editer.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/member-groups-editer/member-groups-editer.component.html
@@ -18,7 +18,7 @@
     </div>
 
     <div nz-col [nzSpan]="query.expandForm ? 24 : 10" [class.text-right]="query.expandForm">
-      <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n }}</button>
+      <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query' | i18n }}</button>
       <button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' | i18n }}</button>
       <button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm" style="display: none">
         {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/groups.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/groups.component.html
index 51fd50b6f..bf62cfb10 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/groups.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/groups.component.html
@@ -14,7 +14,7 @@
       </div>
 
       <div nz-col [nzSpan]="query.expandForm ? 24 : 8" [class.text-right]="query.expandForm">
-        <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' |
+        <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query' |
           i18n }}</button>
         <button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' |
           i18n }}</button>
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/select-groups/select-groups.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/select-groups/select-groups.component.html
index c88288d31..0105b31e3 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/select-groups/select-groups.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/select-groups/select-groups.component.html
@@ -19,7 +19,7 @@
     </div>
 
     <div nz-col [nzSpan]="query.expandForm ? 24 : 10" [class.text-right]="query.expandForm">
-      <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n }}</button>
+      <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query' | i18n }}</button>
       <button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' | i18n }}</button>
       <button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm" style="display: none">
         {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/organizations/organizations.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/organizations/organizations.component.html
index e1bd8df72..0c5d90155 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/organizations/organizations.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/organizations/organizations.component.html
@@ -13,7 +13,7 @@
         </nz-form-item>
       </div>
       <div nz-col [nzSpan]="query.expandForm ? 24 : 8" [class.text-right]="query.expandForm">
-        <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' |
+        <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query' |
           i18n }}</button>
         <button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' |
           i18n }}</button>
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/users/select-user/select-user.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/users/select-user/select-user.component.html
index 3d71d351b..3b5fa75a1 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/users/select-user/select-user.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/users/select-user/select-user.component.html
@@ -12,7 +12,7 @@
       </nz-form-item>
     </div>
     <div nz-col [nzSpan]="query.expandForm ? 24 : 10" [class.text-right]="query.expandForm">
-      <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n
+      <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query' | i18n
         }}</button>
       <button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' | i18n
         }}</button>
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/users/users.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/users/users.component.html
index 7fa6cbafd..994b0308e 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/users/users.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/users/users.component.html
@@ -7,18 +7,23 @@
         <nz-form-item>
           <nz-form-label nzFor="name">{{ 'mxk.users.username' | i18n }}</nz-form-label>
           <nz-form-control>
-            <input nz-input [(ngModel)]="query.params.username" [ngModelOptions]="{ standalone: true }" name="username"
-              placeholder="" id="username" />
+            <input
+              nz-input
+              [(ngModel)]="query.params.username"
+              [ngModelOptions]="{ standalone: true }"
+              name="username"
+              placeholder=""
+              id="username"
+            />
           </nz-form-control>
         </nz-form-item>
       </div>
       <div nz-col [nzSpan]="query.expandForm ? 24 : 8" [class.text-right]="query.expandForm">
-        <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' |
-          i18n }}</button>
-        <button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' |
-          i18n }}</button>
+        <button nz-button type="submit" [nzType]="'primary'">{{ 'mxk.text.query' | i18n }}</button>
+        <button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' | i18n }}</button>
         <button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm" style="display: none">
-          {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button>
+          {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button
+        >
       </div>
     </div>
   </form>
@@ -32,16 +37,32 @@
       <button nz-button type="button" [nzType]="'primary'" (click)="changePassword($event)">
         {{ 'mxk.text.changepassword' | i18n }}
       </button>
-      <button nz-button type="button" nz-popconfirm nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
-        nzPopconfirmPlacement="left" [nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
-        [nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n" (nzOnConfirm)="onBatchDelete()" [nzType]="'primary'"
-        nzDanger class="mx-sm">
+      <button
+        nz-button
+        type="button"
+        nz-popconfirm
+        nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
+        nzPopconfirmPlacement="left"
+        [nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
+        [nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n"
+        (nzOnConfirm)="onBatchDelete()"
+        [nzType]="'primary'"
+        nzDanger
+        class="mx-sm"
+      >
         {{ 'mxk.text.batchDelete' | i18n }}
       </button>
     </div>
     <div nz-col [nzSpan]="6" class="grid-border">
-      <nz-tree nzShowLine="false" [nzCheckable]="treeNodes.checkable" nzBlockNode [nzData]="treeNodes.nodes"
-        (nzClick)="activeNode($event)" (nzDblClick)="openFolder($event)" [nzTreeTemplate]="nzTreeTemplate"></nz-tree>
+      <nz-tree
+        nzShowLine="false"
+        [nzCheckable]="treeNodes.checkable"
+        nzBlockNode
+        [nzData]="treeNodes.nodes"
+        (nzClick)="activeNode($event)"
+        (nzDblClick)="openFolder($event)"
+        [nzTreeTemplate]="nzTreeTemplate"
+      ></nz-tree>
       <ng-template #nzTreeTemplate let-node let-origin="origin">
         <span class="custom-node">
           <span *ngIf="!node.isLeaf" (contextmenu)="contextMenu($event, menu)">
@@ -62,15 +83,26 @@
       </nz-dropdown-menu>
     </div>
     <div nz-col nzMd="18" nzSm="24" class="grid-border">
-      <nz-table #dynamicTable nzTableLayout="auto" nzSize="small" nzBordered sizeChanger="true" nzShowSizeChanger
-        [nzData]="query.results.rows" [nzFrontPagination]="false" [nzTotal]="query.results.records"
-        [nzPageSizeOptions]="query.params.pageSizeOptions" [nzPageSize]="query.params.pageSize"
-        [nzPageIndex]="query.params.pageNumber" [nzLoading]="this.query.tableLoading"
-        (nzQueryParams)="onQueryParamsChange($event)" nzWidth="100%">
+      <nz-table
+        #dynamicTable
+        nzTableLayout="auto"
+        nzSize="small"
+        nzBordered
+        sizeChanger="true"
+        nzShowSizeChanger
+        [nzData]="query.results.rows"
+        [nzFrontPagination]="false"
+        [nzTotal]="query.results.records"
+        [nzPageSizeOptions]="query.params.pageSizeOptions"
+        [nzPageSize]="query.params.pageSize"
+        [nzPageIndex]="query.params.pageNumber"
+        [nzLoading]="this.query.tableLoading"
+        (nzQueryParams)="onQueryParamsChange($event)"
+        nzWidth="100%"
+      >
         <thead>
           <tr>
-            <th [nzChecked]="query.checked" [nzIndeterminate]="query.indeterminate"
-              (nzCheckedChange)="onTableAllChecked($event)"></th>
+            <th [nzChecked]="query.checked" [nzIndeterminate]="query.indeterminate" (nzCheckedChange)="onTableAllChecked($event)"></th>
             <th nzAlign="center" style="display: none">{{ 'mxk.text.id' | i18n }}</th>
             <th nzAlign="center">{{ 'mxk.users.username' | i18n }}</th>
             <th nzAlign="center">{{ 'mxk.users.displayName' | i18n }}</th>
@@ -84,8 +116,11 @@
         </thead>
         <tbody>
           <tr *ngFor="let data of query.results.rows">
-            <td [nzChecked]="query.tableCheckedId.has(data.id)" [nzDisabled]="data.disabled"
-              (nzCheckedChange)="onTableItemChecked(data.id, $event)"></td>
+            <td
+              [nzChecked]="query.tableCheckedId.has(data.id)"
+              [nzDisabled]="data.disabled"
+              (nzCheckedChange)="onTableItemChecked(data.id, $event)"
+            ></td>
             <td nzAlign="left" style="display: none">
               <span>{{ data.id }}</span>
             </td>
@@ -94,8 +129,7 @@
             <td nzAlign="left"> {{ data.employeeNumber }}</td>
             <td nzAlign="left"> {{ data.department }}</td>
             <td nzAlign="left"> {{ data.jobTitle }}</td>
-            <td nzAlign="center"> {{ data.gender == 1 ? ('mxk.users.gender.female' | i18n) : ('mxk.users.gender.male' |
-              i18n) }}</td>
+            <td nzAlign="center"> {{ data.gender == 1 ? ('mxk.users.gender.female' | i18n) : ('mxk.users.gender.male' | i18n) }}</td>
             <td nzAlign="center">
               <a title="{{ 'mxk.users.status.active' | i18n }}" *ngIf="data.status == 1">
                 <i nz-icon nzType="check-circle" nzTheme="fill" style="color: green"> </i>
@@ -128,31 +162,36 @@
                 </button>
                 <nz-dropdown-menu #menuMoreAction="nzDropdownMenu">
                   <ul nz-menu>
-                    <li nz-menu-item *ngIf="data.status == 1"
-                      (click)="onNavToUrl($event, data.id, data.username, 'groups')">{{
+                    <li nz-menu-item *ngIf="data.status == 1" (click)="onNavToUrl($event, data.id, data.username, 'groups')">{{
                       'mxk.text.groups' | i18n
-                      }}</li>
+                    }}</li>
                     <li nz-menu-item *ngIf="data.status == 1" (click)="changePasswordById($event, data.id)">{{
                       'mxk.text.changepassword' | i18n
-                      }}</li>
-                    <li nz-menu-item *ngIf="data.status == 1" (click)="onUpdateStatus($event, data.id, 5)">{{
-                      'mxk.text.lock' | i18n }}</li>
+                    }}</li>
+                    <li nz-menu-item *ngIf="data.status == 1" (click)="onUpdateStatus($event, data.id, 5)">{{ 'mxk.text.lock' | i18n }}</li>
                     <li nz-menu-item *ngIf="data.status == 1" (click)="onUpdateStatus($event, data.id, 4)">{{
                       'mxk.text.disable' | i18n
-                      }}</li>
+                    }}</li>
                     <li nz-menu-item *ngIf="data.status == 2" (click)="onUpdateStatus($event, data.id, 1)">{{
                       'mxk.text.enable' | i18n
-                      }}</li>
+                    }}</li>
                     <li nz-menu-item *ngIf="data.status == 4" (click)="onUpdateStatus($event, data.id, 1)">{{
                       'mxk.text.enable' | i18n
-                      }}</li>
+                    }}</li>
                     <li nz-menu-item *ngIf="data.status == 5" (click)="onUpdateStatus($event, data.id, 1)">{{
                       'mxk.text.unlock' | i18n
-                      }}</li>
-                    <li nz-menu-item nz-popconfirm nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
-                      nzPopconfirmPlacement="left" [nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
-                      [nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n" (nzOnConfirm)="onDelete(data.id)"
-                      nzDanger>{{ 'mxk.text.delete' | i18n }}</li>
+                    }}</li>
+                    <li
+                      nz-menu-item
+                      nz-popconfirm
+                      nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
+                      nzPopconfirmPlacement="left"
+                      [nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
+                      [nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n"
+                      (nzOnConfirm)="onDelete(data.id)"
+                      nzDanger
+                      >{{ 'mxk.text.delete' | i18n }}</li
+                    >
                   </ul>
                 </nz-dropdown-menu>
               </div>
@@ -162,4 +201,4 @@
       </nz-table>
     </div>
   </div>
-</nz-card>
\ No newline at end of file
+</nz-card>
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/apps/apps.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/apps/apps.component.html
index 2a42614ca..d1a6bdf71 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/apps/apps.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/apps/apps.component.html
@@ -34,7 +34,7 @@
             </div>
             <div nz-col [nzSpan]="query.expandForm ? 24 : 4" [class.text-right]="query.expandForm">
                 <nz-form-item>
-                    <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{
+                    <button nz-button type="submit" [nzType]="'primary'" >{{
                         'mxk.text.query' | i18n }}</button>
                     <button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{
                         'mxk.text.reset' | i18n }}</button>
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/permission/permission.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/permission/permission.component.html
index 64722a0ac..2a981c162 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/permission/permission.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/permission/permission.component.html
@@ -19,7 +19,7 @@
         </nz-form-item>
       </div>
       <div nz-col [nzSpan]="query.expandForm ? 24 : 4" [class.text-right]="query.expandForm">
-        <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' |
+        <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query' |
           i18n }}</button>
         <button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' |
           i18n }}</button>
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/resources/resources.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/resources/resources.component.html
index 94ed18955..446b9facc 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/resources/resources.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/resources/resources.component.html
@@ -20,7 +20,7 @@
         </nz-form-item>
       </div>
       <div nz-col [nzSpan]="query.expandForm ? 24 : 4" [class.text-right]="query.expandForm">
-        <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' |
+        <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query' |
           i18n }}</button>
         <button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' |
           i18n }}</button>
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/role-members/member-roles-editer/member-roles-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/role-members/member-roles-editer/member-roles-editer.component.html
index d7fdd1e2b..3065cd068 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/role-members/member-roles-editer/member-roles-editer.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/role-members/member-roles-editer/member-roles-editer.component.html
@@ -18,7 +18,7 @@
     </div>
 
     <div nz-col [nzSpan]="query.expandForm ? 24 : 10" [class.text-right]="query.expandForm">
-      <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n }}</button>
+      <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query' | i18n }}</button>
       <button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' | i18n }}</button>
       <button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm" style="display: none">
         {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/role-members/role-members-editer/role-members-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/role-members/role-members-editer/role-members-editer.component.html
index 6726d3c69..385919ded 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/role-members/role-members-editer/role-members-editer.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/role-members/role-members-editer/role-members-editer.component.html
@@ -18,7 +18,7 @@
     </div>
 
     <div nz-col [nzSpan]="query.expandForm ? 24 : 10" [class.text-right]="query.expandForm">
-      <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n }}</button>
+      <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query' | i18n }}</button>
       <button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' | i18n }}</button>
       <button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm" style="display: none">
         {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/role-members/role-members.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/role-members/role-members.component.html
index 97520c328..2535e132d 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/role-members/role-members.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/role-members/role-members.component.html
@@ -68,7 +68,7 @@
               </nz-form-item>
             </div>
             <div nz-col [nzSpan]="query.expandForm ? 24 : 8" [class.text-right]="query.expandForm">
-              <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query'
+              <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query'
                 | i18n }}</button>
               <button nz-button type="reset" (click)="onReset()" class="mx-sm">{{ 'mxk.text.reset' | i18n }}</button>
               <button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm" style="display: none">
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/roles/roles.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/roles/roles.component.html
index 32ba26b18..c5cafb844 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/roles/roles.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/roles/roles.component.html
@@ -14,7 +14,7 @@
       </div>
 
       <div nz-col [nzSpan]="query.expandForm ? 24 : 8" [class.text-right]="query.expandForm">
-        <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' |
+        <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query' |
           i18n }}</button>
         <button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' |
           i18n }}</button>
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/roles/select-roles/select-roles.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/roles/select-roles/select-roles.component.html
index f08c65162..93dc77d58 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/roles/select-roles/select-roles.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/roles/select-roles/select-roles.component.html
@@ -12,7 +12,7 @@
     </div>
 
     <div nz-col [nzSpan]="query.expandForm ? 24 : 10" [class.text-right]="query.expandForm">
-      <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n
+      <button nz-button type="submit" [nzType]="'primary'" >{{ 'mxk.text.query' | i18n
         }}</button>
       <button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' | i18n
         }}</button>