diff --git a/apps/web-antd/src/views/system/client/index.vue b/apps/web-antd/src/views/system/client/index.vue
index 90dcf3d1..7e3f0c52 100644
--- a/apps/web-antd/src/views/system/client/index.vue
+++ b/apps/web-antd/src/views/system/client/index.vue
@@ -6,6 +6,7 @@ import type { Client } from '#/api/system/client/model';
 
 import { useAccess } from '@vben/access';
 import { Page, useVbenDrawer } from '@vben/common-ui';
+import { DEFAULT_CLIENT_ID, EnableStatus } from '@vben/constants';
 
 import { Modal, Popconfirm, Space } from 'antdv-next';
 
@@ -16,7 +17,7 @@ import {
   clientList,
   clientRemove,
 } from '#/api/system/client';
-import { TableSwitch } from '#/components/table';
+import { ApiSwitch } from '#/components/global';
 import { commonDownloadExcel } from '#/utils/file/download';
 
 import clientDrawer from './client-drawer.vue';
@@ -108,6 +109,12 @@ function handleDownloadExcel() {
 }
 
 const { hasAccessByCodes } = useAccess();
+async function handleChangeStatus(checked: boolean, row: Client) {
+  await clientChangeStatus({
+    clientId: row.id,
+    status: checked ? EnableStatus.Enable : EnableStatus.Disable,
+  });
+}
 </script>
 
 <template>
@@ -142,10 +149,13 @@ const { hasAccessByCodes } = useAccess();
       <template #status="{ row }">
         <!-- pc不允许禁用 禁用了直接登录不了 应该设置disabled -->
         <!-- 登录提示: 认证权限类型已禁用 -->
-        <TableSwitch
-          v-model:value="row.status"
-          :api="() => clientChangeStatus(row)"
-          :disabled="row.id === 1 || !hasAccessByCodes(['system:client:edit'])"
+        <ApiSwitch
+          :value="row.status === EnableStatus.Enable"
+          :api="(checked) => handleChangeStatus(checked, row)"
+          :disabled="
+            row.id === DEFAULT_CLIENT_ID ||
+            !hasAccessByCodes(['system:client:edit'])
+          "
           @reload="tableApi.query()"
         />
       </template>
diff --git a/apps/web-antd/src/views/system/client/secret-input.vue b/apps/web-antd/src/views/system/client/secret-input.vue
index 5d317b2a..5b356123 100644
--- a/apps/web-antd/src/views/system/client/secret-input.vue
+++ b/apps/web-antd/src/views/system/client/secret-input.vue
@@ -2,7 +2,7 @@
 import { IconifyIcon } from '@vben/icons';
 import { buildUUID } from '@vben/utils';
 
-import { Input } from 'antdv-next';
+import { Input, SpaceCompact } from 'antdv-next';
 
 defineOptions({ name: 'SecretInput' });
 
@@ -27,16 +27,19 @@ defineExpose({ refreshSecret });
 </script>
 
 <template>
-  <Input v-model:value="value" :disabled="disabled" :placeholder="placeholder">
-    <template v-if="!disabled" #addonAfter>
-      <a-button type="primary" @click="refreshSecret">
-        <div class="flex items-center gap-[4px]">
-          <IconifyIcon icon="charm:refresh" />
-          <span>随机生成</span>
-        </div>
-      </a-button>
-    </template>
-  </Input>
+  <SpaceCompact>
+    <Input
+      v-model:value="value"
+      :disabled="disabled"
+      :placeholder="placeholder"
+    />
+    <a-button v-if="!disabled" type="primary" @click="refreshSecret">
+      <div class="flex items-center gap-[4px]">
+        <IconifyIcon icon="charm:refresh" />
+        <span>随机生成</span>
+      </div>
+    </a-button>
+  </SpaceCompact>
 </template>
 
 <style lang="scss" scoped>
diff --git a/packages/constants/src/core.ts b/packages/constants/src/core.ts
index cb92856f..8ebad9c2 100644
--- a/packages/constants/src/core.ts
+++ b/packages/constants/src/core.ts
@@ -52,6 +52,11 @@ export const SUPERADMIN_ROLE_KEY = 'superadmin';
  */
 export const ADMIN_ROLE_KEY = 'admin';
 
+/**
+ * 默认客户端ID
+ */
+export const DEFAULT_CLIENT_ID = 1;
+
 /**
  * 对应 字典-S系统开关的状态
  */