Merge remote-tracking branch 'origin/main'

2023-09-25 09:39:43 +08:00
parent 1e453e4312 f8cc8c4233
commit e1fafbe135
37 changed files with 2579 additions and 1353 deletions
--- a/orion-ops-launch/src/main/resources/templates/orion-vue-api.ts.vm
+++ b/orion-ops-launch/src/main/resources/templates/orion-vue-api.ts.vm
@@ -1,6 +1,7 @@
 import axios from 'axios';
 import qs from 'query-string';
 import { DataGrid, Pagination } from '@/types/global';
+import { TableData } from '@arco-design/web-vue/es/table/interface';

 /**
 * ${table.comment}创建请求
@@ -48,7 +49,7 @@ export interface ${vue.featureEntity}QueryRequest extends Pagination {
 /**
 * ${table.comment}查询响应
 */
-export interface ${vue.featureEntity}QueryResponse {
+export interface ${vue.featureEntity}QueryResponse extends TableData {
  #foreach($field in ${table.fields})
  #if("$field.propertyType" == "String")
  ${field.propertyName}?: string;
--- a/orion-ops-launch/src/main/resources/templates/orion-vue-views-components-table.vue.vm
+++ b/orion-ops-launch/src/main/resources/templates/orion-vue-views-components-table.vue.vm
@@ -70,7 +70,7 @@
             v-model:selectedKeys="selectedKeys"
             :row-selection="rowSelection"
             :data="tableRenderData"
-             :pagination="pagination"
+             :pagination="pagination as PaginationProps"
             @page-change="(page) => fetchTableData(page, pagination.pageSize)"
             @page-size-change="(size) => fetchTableData(pagination.current, size)"
             :bordered="false">
@@ -111,7 +111,7 @@
 <script lang="ts" setup>
  import { reactive, ref } from 'vue';
  import { batchDelete${vue.featureEntity}, delete${vue.featureEntity}, get${vue.featureEntity}Page, ${vue.featureEntity}QueryRequest, ${vue.featureEntity}QueryResponse } from '@/api/${vue.module}/${vue.feature}';
-  import { Message } from '@arco-design/web-vue';
+  import { Message, PaginationProps } from '@arco-design/web-vue';
  import useLoading from '@/hooks/loading';
  import columns from '../types/table.columns';
  import { defaultPagination, defaultRowSelection } from '@/types/table';
@@ -119,7 +119,7 @@
  import {} from '../types/const';
  import { toOptions } from '@/utils/enum';

-  const tableRenderData = ref<${vue.featureEntity}QueryResponse[]>();
+  const tableRenderData = ref<${vue.featureEntity}QueryResponse[]>([]);
  const { loading, setLoading } = useLoading();
  const emits = defineEmits(['openAdd', 'openUpdate']);

--- a/orion-ops-ui/pnpm-lock.yaml
+++ b/orion-ops-ui/pnpm-lock.yaml
--- a/orion-ops-ui/src/api/asset/host-identity.ts
+++ b/orion-ops-ui/src/api/asset/host-identity.ts
@@ -1,5 +1,6 @@
 import axios from 'axios';
 import { DataGrid, Pagination } from '@/types/global';
+import { TableData } from '@arco-design/web-vue/es/table/interface';

 /**
 * 主机身份创建请求
@@ -33,7 +34,7 @@ export interface HostIdentityQueryRequest extends Pagination {
 /**
 * 主机身份查询响应
 */
-export interface HostIdentityQueryResponse {
+export interface HostIdentityQueryResponse extends TableData {
  id?: number;
  name?: string;
  username?: string;
--- a/orion-ops-ui/src/api/asset/host-key.ts
+++ b/orion-ops-ui/src/api/asset/host-key.ts
@@ -1,5 +1,6 @@
 import axios from 'axios';
 import { DataGrid, Pagination } from '@/types/global';
+import { TableData } from '@arco-design/web-vue/es/table/interface';

 /**
 * 主机秘钥创建请求
@@ -32,7 +33,7 @@ export interface HostKeyQueryRequest extends Pagination {
 /**
 * 主机秘钥查询响应
 */
-export interface HostKeyQueryResponse {
+export interface HostKeyQueryResponse extends TableData {
  id?: number;
  name?: string;
  publicKey?: string;
--- a/orion-ops-ui/src/api/asset/host.ts
+++ b/orion-ops-ui/src/api/asset/host.ts
@@ -1,5 +1,6 @@
 import axios from 'axios';
 import { DataGrid, Pagination } from '@/types/global';
+import { TableData } from '@arco-design/web-vue/es/table/interface';

 /**
 * 主机创建请求
@@ -35,7 +36,7 @@ export interface HostQueryRequest extends Pagination {
 /**
 * 主机查询响应
 */
-export interface HostQueryResponse {
+export interface HostQueryResponse extends TableData {
  id?: number;
  name?: string;
  code?: string;
--- a/orion-ops-ui/src/api/system/menu.ts
+++ b/orion-ops-ui/src/api/system/menu.ts
@@ -1,4 +1,5 @@
 import axios from 'axios';
+import { TableData } from '@arco-design/web-vue/es/table/interface';

 /**
 * 菜单创建请求
@@ -35,7 +36,7 @@ export interface MenuQueryRequest {
 /**
 * 菜单查询响应
 */
-export interface MenuQueryResponse {
+export interface MenuQueryResponse extends TableData {
  id?: number;
  parentId?: number;
  name?: string;
--- a/orion-ops-ui/src/api/user/auth.ts
+++ b/orion-ops-ui/src/api/user/auth.ts
@@ -1,5 +1,4 @@
 import axios from 'axios';
-import { UserState } from '@/store/modules/user/types';

 /**
 * 登陆请求
--- a/orion-ops-ui/src/api/user/role.ts
+++ b/orion-ops-ui/src/api/user/role.ts
@@ -1,5 +1,6 @@
 import axios from 'axios';
 import { DataGrid, Pagination } from '@/types/global';
+import { TableData } from '@arco-design/web-vue/es/table/interface';

 /**
 * 角色创建请求
@@ -38,7 +39,7 @@ export interface RoleQueryRequest extends Pagination {
 /**
 * 角色查询响应
 */
-export interface RoleQueryResponse {
+export interface RoleQueryResponse extends TableData {
  id?: number;
  name?: string;
  code?: string;
--- a/orion-ops-ui/src/api/user/user.ts
+++ b/orion-ops-ui/src/api/user/user.ts
@@ -1,5 +1,6 @@
 import axios from 'axios';
 import { DataGrid, Pagination } from '@/types/global';
+import { TableData } from '@arco-design/web-vue/es/table/interface';

 /**
 * 用户创建请求
@@ -42,7 +43,7 @@ export interface UserQueryRequest extends Pagination {
 /**
 * 用户查询响应
 */
-export interface UserQueryResponse {
+export interface UserQueryResponse extends TableData {
  id?: number;
  username?: string;
  nickname?: string;
--- a/orion-ops-ui/src/components/asset/host-identity/host-identity-selector.vue
+++ b/orion-ops-ui/src/components/asset/host-identity/host-identity-selector.vue
@@ -22,9 +22,9 @@

  const emits = defineEmits(['update:modelValue']);

-  const value = computed({
+  const value = computed<number>({
    get() {
-      return props.modelValue;
+      return props.modelValue as number;
    },
    set(e) {
      if (e) {
--- a/orion-ops-ui/src/components/asset/host-key/host-key-selector.vue
+++ b/orion-ops-ui/src/components/asset/host-key/host-key-selector.vue
@@ -22,9 +22,9 @@

  const emits = defineEmits(['update:modelValue']);

-  const value = computed({
+  const value = computed<number>({
    get() {
-      return props.modelValue;
+      return props.modelValue as number;
    },
    set(e) {
      if (e) {
--- a/orion-ops-ui/src/components/global-setting/form-wrapper.vue
+++ b/orion-ops-ui/src/components/global-setting/form-wrapper.vue
@@ -3,7 +3,7 @@
    v-if="type === 'number'"
    :style="{ width: '80px' }"
    size="small"
-    :default-value="defaultValue"
+    :default-value="defaultValue as number"
    @change="handleChange"
  />
  <a-switch
--- a/orion-ops-ui/src/components/message-box/index.vue
+++ b/orion-ops-ui/src/components/message-box/index.vue
@@ -82,7 +82,7 @@
  async function readMessage(data: MessageListType) {
    const ids = data.map((item) => item.id);
    await setMessageStatus({ ids });
-    fetchSourceData();
+    await fetchSourceData();
  }

  const renderList = computed(() => {
@@ -101,7 +101,7 @@
  };
  const formatUnreadLength = (type: string) => {
    const list = getUnreadList(type);
-    return list.length ? `(${list.length})` : ``;
+    return list.length ? `(${list.length})` : '';
  };
  const handleItemClick = (items: MessageListType) => {
    if (renderList.value.length) readMessage([...items]);
--- a/orion-ops-ui/src/components/tab-bar/tab-item.vue
+++ b/orion-ops-ui/src/components/tab-bar/tab-item.vue
@@ -5,14 +5,14 @@
    @select="actionSelect">
    <span
      class="arco-tag arco-tag-size-medium arco-tag-checked"
-      :class="{ 'link-activated': itemData.fullPath === $route.fullPath }"
-      @click="goto(itemData)">
+      :class="{ 'link-activated': itemData?.fullPath === $route.fullPath }"
+      @click="goto(itemData as TagProps)">
      <span class="tag-link">
        {{ itemData.title }}
      </span>
      <span
        class="arco-icon-hover arco-tag-icon-hover arco-icon-hover-size-medium arco-tag-close-btn"
-        @click.stop="tagClose(itemData, index)">
+        @click.stop="tagClose(itemData as TagProps, index)">
        <icon-close />
      </span>
    </span>
--- a/orion-ops-ui/src/components/tag/tag-multi-selector.vue
+++ b/orion-ops-ui/src/components/tag/tag-multi-selector.vue
@@ -2,7 +2,7 @@
  <a-select v-model:model-value="value"
            :placeholder="placeholder"
            :options="optionData"
-            :limit=limit
+            :limit="limit as number"
            @exceed-limit="onLimited"
            multiple
            :allow-create="allowCreate"
@@ -17,13 +17,13 @@
 </script>

 <script lang="ts" setup>
-  import { ref, computed } from 'vue';
+  import { ref, computed, PropType } from 'vue';
  import { useCacheStore } from '@/store';
  import { Message, SelectOptionData } from '@arco-design/web-vue';
-  import { createTag, TagCreateRequest, TagType } from '@/api/meta/tag';
+  import { createTag, TagCreateRequest } from '@/api/meta/tag';

  const props = defineProps({
-    modelValue: Array,
+    modelValue: Array as PropType<Array<number>>,
    placeholder: String,
    limit: Number,
    type: String,
@@ -32,9 +32,9 @@

  const emits = defineEmits(['update:modelValue']);

-  const value = computed({
+  const value = computed<Array<number>>({
    get() {
-      return props.modelValue;
+      return props.modelValue as Array<number>;
    },
    async set(e) {
      await checkCreateTag(e as Array<any>);
@@ -103,7 +103,7 @@

  // 超出限制
  const onLimited = () => {
-    Message.warning(`最多选择${props.limit}个tag`);
+    Message.warning(`最多选择${ props.limit }个tag`);
  };

 </script>
--- a/orion-ops-ui/src/hooks/copy.ts
+++ b/orion-ops-ui/src/hooks/copy.ts
@@ -3,15 +3,15 @@ import { Message } from '@arco-design/web-vue';

 export default function useCopy() {
  const { isSupported, copy: c, text, copied } = useClipboard();
-  const copy = (value: string, tips = `${value} 已复制`) => {
-    return c(value)
-    .then(() => {
+  const copy = async (value: string, tips = `${ value } 已复制`) => {
+    try {
+      await c(value);
      if (tips) {
        Message.success(tips);
      }
-    }).catch(() => {
+    } catch {
      Message.error('复制失败');
-    });
+    }
  };
  return {
    isSupported,
--- a/orion-ops-ui/src/views/asset/host-identity/components/host-identity-form-modal.vue
+++ b/orion-ops-ui/src/views/asset/host-identity/components/host-identity-form-modal.vue
@@ -85,7 +85,7 @@
    };
  };

-  const formRef = ref<any>();
+  const formRef = ref();
  const formModel = reactive<HostIdentityUpdateRequest & Record<string, any>>(defaultForm());

  const emits = defineEmits(['added', 'updated']);
--- a/orion-ops-ui/src/views/asset/host-identity/components/host-identity-table.vue
+++ b/orion-ops-ui/src/views/asset/host-identity/components/host-identity-table.vue
@@ -53,7 +53,7 @@
             :loading="loading"
             :columns="columns"
             :data="tableRenderData"
-             :pagination="pagination"
+             :pagination="pagination as PaginationProps"
             @page-change="(page) => fetchTableData(page, pagination.pageSize)"
             @page-size-change="(size) => fetchTableData(pagination.current, size)"
             :bordered="false">
@@ -120,7 +120,7 @@
 <script lang="ts" setup>
  import { reactive, ref } from 'vue';
  import { deleteHostIdentity, getHostIdentityPage, HostIdentityQueryRequest, HostIdentityQueryResponse } from '@/api/asset/host-identity';
-  import { Message } from '@arco-design/web-vue';
+  import { Message, PaginationProps } from '@arco-design/web-vue';
  import useLoading from '@/hooks/loading';
  import columns from '../types/table.columns';
  import { defaultPagination } from '@/types/table';
@@ -133,9 +133,9 @@
  const { copy } = useCopy();
  const { hasAnyPermission } = usePermission();

-  const tableRenderData = ref<HostIdentityQueryResponse[]>();
+  const tableRenderData = ref<HostIdentityQueryResponse[]>([]);
  const { loading, setLoading } = useLoading();
-  const emits = defineEmits(['openAdd', 'openUpdate', 'openViewKey']);
+  const emits = defineEmits(['openAdd', 'openUpdate', 'openKeyView']);

  const cacheStore = useCacheStore();
  const pagination = reactive(defaultPagination());
--- a/orion-ops-ui/src/views/asset/host-key/components/host-key-form-drawer.vue
+++ b/orion-ops-ui/src/views/asset/host-key/components/host-key-form-drawer.vue
@@ -116,7 +116,7 @@
    };
  };

-  const formRef = ref<any>();
+  const formRef = ref();
  const formModel = reactive<HostKeyUpdateRequest & Record<string, any>>(defaultForm());

  const emits = defineEmits(['added', 'updated']);
@@ -173,12 +173,14 @@

  // 选择公钥文件
  const selectPublicFile = async (fileList: FileItem[]) => {
+    // FIXME
    formModel.publicKey = await readFileText(fileList[0].file as File);
    formRef.value.clearValidate('publicKey');
  };

  // 选择私钥文件
  const selectPrivateFile = async (fileList: FileItem[]) => {
+    // FIXME
    formModel.privateKey = await readFileText(fileList[0].file as File);
    formRef.value.clearValidate('privateKey');
  };
--- a/orion-ops-ui/src/views/asset/host-key/components/host-key-table.vue
+++ b/orion-ops-ui/src/views/asset/host-key/components/host-key-table.vue
@@ -45,14 +45,10 @@
             :loading="loading"
             :columns="columns"
             :data="tableRenderData"
-             :pagination="pagination"
+             :pagination="pagination as PaginationProps"
             @page-change="(page) => fetchTableData(page, pagination.pageSize)"
             @page-size-change="(size) => fetchTableData(pagination.current, size)"
             :bordered="false">
-      <!-- 名称 -->
-      <template #name="{ record }">
-        <span class="span-blue">{{ record.name }}</span>
-      </template>
      <!-- 操作 -->
      <template #handle="{ record }">
        <div class="table-handle-wrapper">
@@ -97,12 +93,12 @@
 <script lang="ts" setup>
  import { reactive, ref } from 'vue';
  import { deleteHostKey, getHostKeyPage, HostKeyQueryRequest, HostKeyQueryResponse } from '@/api/asset/host-key';
-  import { Message } from '@arco-design/web-vue';
+  import { Message, PaginationProps } from '@arco-design/web-vue';
  import useLoading from '@/hooks/loading';
  import columns from '../types/table.columns';
  import { defaultPagination } from '@/types/table';

-  const tableRenderData = ref<HostKeyQueryResponse[]>();
+  const tableRenderData = ref<HostKeyQueryResponse[]>([]);
  const { loading, setLoading } = useLoading();
  const emits = defineEmits(['openAdd', 'openUpdate', 'openView']);

--- a/orion-ops-ui/src/views/asset/host/components/host-config-drawer.vue
+++ b/orion-ops-ui/src/views/asset/host/components/host-config-drawer.vue
@@ -44,7 +44,9 @@
  const cacheStore = useCacheStore();

  const record = ref();
-  const config = ref<Record<string, any>>({});
+  const config = ref<Record<string, any>>({
+    SSH: undefined
+  });

  // 打开
  const open = async (e: any) => {
--- a/orion-ops-ui/src/views/asset/host/components/host-config-ssh-form.vue
+++ b/orion-ops-ui/src/views/asset/host/components/host-config-ssh-form.vue
@@ -26,7 +26,7 @@
                     label="用户名"
                     :rules="usernameRules"
                     label-col-flex="60px"
-                     :help="AuthTypeEnum.IDENTITY.value === formModel.authType ? '将使用主机身份的用户名' : null">
+                     :help="AuthTypeEnum.IDENTITY.value === formModel.authType ? '将使用主机身份的用户名' : undefined">
          <a-input v-model="formModel.username"
                   :disabled="AuthTypeEnum.IDENTITY.value === formModel.authType"
                   placeholder="请输入用户名" />
@@ -54,6 +54,7 @@
                     label="主机密码"
                     :rules="passwordRules"
                     label-col-flex="60px">
+          <!-- FIXME -->
          <a-input-password v-model="formModel.password"
                            :disabled="!formModel.useNewPassword && formModel.hasPassword"
                            placeholder="主机密码" />
@@ -157,7 +158,7 @@
    version: undefined,
  });

-  const formRef = ref<any>();
+  const formRef = ref();
  const formModel = reactive<HostSshConfig & Record<string, any>>({
    username: undefined,
    port: undefined,
--- a/orion-ops-ui/src/views/asset/host/components/host-form-modal.vue
+++ b/orion-ops-ui/src/views/asset/host/components/host-form-modal.vue
@@ -76,7 +76,7 @@
    };
  };

-  const formRef = ref<any>();
+  const formRef = ref();
  const formModel = reactive<HostUpdateRequest & Record<string, any>>(defaultForm());

  const emits = defineEmits(['added', 'updated']);
--- a/orion-ops-ui/src/views/asset/host/components/host-table.vue
+++ b/orion-ops-ui/src/views/asset/host/components/host-table.vue
@@ -74,7 +74,7 @@
             :loading="loading"
             :columns="columns"
             :data="tableRenderData"
-             :pagination="pagination"
+             :pagination="pagination as PaginationProps"
             @page-change="(page) => fetchTableData(page, pagination.pageSize)"
             @page-size-change="(size) => fetchTableData(pagination.current, size)"
             :bordered="false">
@@ -157,7 +157,7 @@
 <script lang="ts" setup>
  import { reactive, ref } from 'vue';
  import { deleteHost, getHostPage, HostQueryRequest, HostQueryResponse } from '@/api/asset/host';
-  import { Message } from '@arco-design/web-vue';
+  import { Message, PaginationProps } from '@arco-design/web-vue';
  import useLoading from '@/hooks/loading';
  import columns from '../types/table.columns';
  import { tagColor } from '../types/const';
@@ -170,11 +170,11 @@
  import { useCacheStore } from '@/store';

  const tagSelector = ref();
-  const tableRenderData = ref<HostQueryResponse[]>();
+  const tableRenderData = ref<HostQueryResponse[]>([]);
  const { loading, setLoading } = useLoading();
  const emits = defineEmits(['openAdd', 'openUpdate', 'openUpdateConfig']);

-  const pagination = reactive(defaultPagination());
+  const pagination = reactive<PaginationProps>(defaultPagination());
  const { copy } = useCopy();
  const { toggle: toggleFavorite } = useFavorite('HOST');

--- a/orion-ops-ui/src/views/asset/host/types/host-config.types.ts
+++ b/orion-ops-ui/src/views/asset/host/types/host-config.types.ts
@@ -30,4 +30,6 @@ export interface HostSshConfig {
  charset?: string;
  fileNameCharset?: string;
  fileContentCharset?: string;
+  useNewPassword?: boolean;
+  hasPassword?: boolean;
 }
--- a/orion-ops-ui/src/views/dashboard/workplace/components/banner.vue
+++ b/orion-ops-ui/src/views/dashboard/workplace/components/banner.vue
@@ -16,7 +16,7 @@
  const userStore = useUserStore();
  const userInfo = computed(() => {
    return {
-      name: userStore.name,
+      name: userStore.nickname,
    };
  });
 </script>
--- a/orion-ops-ui/src/views/system/menu/components/menu-form-modal.vue
+++ b/orion-ops-ui/src/views/system/menu/components/menu-form-modal.vue
@@ -41,7 +41,7 @@
        <a-form-item v-if="formModel.type !== MenuTypeEnum.FUNCTION.value"
                     field="icon"
                     label="菜单图标">
-          <icon-picker v-model:icon="formModel.icon">
+          <icon-picker v-model:icon="formModel.icon as string">
            <template #iconSelect>
              <a-input v-model="formModel.icon" placeholder="请选择菜单图标" />
            </template>
@@ -151,7 +151,7 @@
    };
  };

-  const formRef = ref<any>();
+  const formRef = ref();
  const formModel = reactive<MenuUpdateRequest & Record<string, any>>(defaultForm());

  const emits = defineEmits(['added', 'updated']);
--- a/orion-ops-ui/src/views/system/menu/components/menu-table.vue
+++ b/orion-ops-ui/src/views/system/menu/components/menu-table.vue
@@ -181,13 +181,13 @@

  const cacheStore = useCacheStore();

-  const formRef = ref<any>();
+  const formRef = ref();
  const formModel = reactive<MenuQueryRequest>({
    name: undefined,
    status: undefined
  });

-  const tableRef = ref<any>();
+  const tableRef = ref();
  const expandStatus = ref<boolean>(false);

  const tableRenderData = ref<MenuQueryResponse[]>([]);
--- a/orion-ops-ui/src/views/system/menu/index.vue
+++ b/orion-ops-ui/src/views/system/menu/index.vue
@@ -24,8 +24,8 @@
  import { onUnmounted, ref } from 'vue';
  import { useCacheStore } from '@/store';

-  const table = ref<any>();
-  const modal = ref<any>();
+  const table = ref();
+  const modal = ref();

  // 卸载时清除 menu cache
  onUnmounted(() => {
--- a/orion-ops-ui/src/views/user/role/components/role-form-modal.vue
+++ b/orion-ops-ui/src/views/user/role/components/role-form-modal.vue
@@ -61,7 +61,7 @@
    };
  };

-  const formRef = ref<any>();
+  const formRef = ref();
  const formModel = reactive<RoleUpdateRequest & Record<string, any>>(defaultForm());

  const emits = defineEmits(['added', 'updated']);
--- a/orion-ops-ui/src/views/user/role/components/role-menu-grant-modal.vue
+++ b/orion-ops-ui/src/views/user/role/components/role-menu-grant-modal.vue
@@ -56,7 +56,7 @@
  const { visible, setVisible } = useVisible();
  const { loading, setLoading } = useLoading();

-  const tree = ref<any>();
+  const tree = ref();
  const roleRecord = reactive<Record<string, any>>({
    id: undefined,
    name: undefined,
@@ -88,7 +88,9 @@
  // 渲染对象
  const renderRecord = (record: any) => {
    Object.keys(roleRecord).forEach(k => {
-      roleRecord[k] = record[k];
+      if (record.hasOwnProperty(k)) {
+        roleRecord[k] = record[k];
+      }
    });
  };

--- a/orion-ops-ui/src/views/user/role/components/role-table.vue
+++ b/orion-ops-ui/src/views/user/role/components/role-table.vue
@@ -52,20 +52,18 @@
             :loading="loading"
             :columns="columns"
             :data="tableRenderData"
-             :pagination="pagination"
+             :pagination="pagination as PaginationProps"
             @page-change="(page) => fetchTableData(page, pagination.pageSize)"
             @page-size-change="(size) => fetchTableData(pagination.current, size)"
             :bordered="false">
-      <!-- 名称 -->
-      <template #name="{ record }">
-        <span class="span-blue">{{ record.name }}</span>
-      </template>
      <!-- 编码 -->
      <template #code="{ record }">
        <a-tag>{{ record.code }}</a-tag>
      </template>
      <!-- 状态 -->
      <template #status="{ record }">
+        <!-- FIXME -->
+        <span class="circle"></span>
        <a-tag :color="getEnumValue(record.status, RoleStatusEnum,'color')">
          {{ getEnumValue(record.status, RoleStatusEnum) }}
        </a-tag>
@@ -129,14 +127,14 @@
 <script lang="ts" setup>
  import { reactive, ref } from 'vue';
  import { deleteRole, getRolePage, updateRoleStatus, RoleQueryRequest, RoleQueryResponse } from '@/api/user/role';
-  import { Message } from '@arco-design/web-vue';
+  import { Message, PaginationProps } from '@arco-design/web-vue';
  import useLoading from '@/hooks/loading';
  import columns from '../types/table.columns';
  import { RoleStatusEnum } from '../types/enum.types';
  import { toOptions, getEnumValue, toggleEnumValue, toggleEnum } from '@/utils/enum';
  import { defaultPagination } from '@/types/table';

-  const tableRenderData = ref<RoleQueryResponse[]>();
+  const tableRenderData = ref<RoleQueryResponse[]>([]);
  const { loading, setLoading } = useLoading();
  const emits = defineEmits(['openAdd', 'openUpdate', 'openGrant']);

--- a/orion-ops-ui/src/views/user/user/components/user-form-modal.vue
+++ b/orion-ops-ui/src/views/user/user/components/user-form-modal.vue
@@ -79,7 +79,7 @@
    };
  };

-  const formRef = ref<any>();
+  const formRef = ref();
  const formModel = reactive<UserUpdateRequest & Record<string, any>>(defaultForm());

  const emits = defineEmits(['added', 'updated']);
--- a/orion-ops-ui/src/views/user/user/components/user-grant-roles-form-modal.vue
+++ b/orion-ops-ui/src/views/user/user/components/user-grant-roles-form-modal.vue
@@ -67,7 +67,7 @@
    };
  };

-  const formRef = ref<any>();
+  const formRef = ref();
  const formModel = reactive<Record<string, any>>(defaultForm());
  const cacheStore = useCacheStore();

--- a/orion-ops-ui/src/views/user/user/components/user-reset-password-form-modal.vue
+++ b/orion-ops-ui/src/views/user/user/components/user-reset-password-form-modal.vue
@@ -63,7 +63,7 @@
    };
  };

-  const formRef = ref<any>();
+  const formRef = ref();
  const formModel = reactive<Record<string, any>>(defaultForm());

  // 打开
--- a/orion-ops-ui/src/views/user/user/components/user-table.vue
+++ b/orion-ops-ui/src/views/user/user/components/user-table.vue
@@ -66,16 +66,13 @@
             :loading="loading"
             :columns="columns"
             :data="tableRenderData"
-             :pagination="pagination"
+             :pagination="pagination as PaginationProps"
             @page-change="(page) => fetchTableData(page, pagination.pageSize)"
             @page-size-change="(size) => fetchTableData(pagination.current, size)"
             :bordered="false">
-      <!-- 用户名 -->
-      <template #username="{ record }">
-        <span class="span-blue">{{ record.username }}</span>
-      </template>
      <!-- 状态 -->
      <template #status="{ record }">
+        <!-- FIXME -->
        <a-tag :color="getEnumValue(record.status, UserStatusEnum,'color')">
          {{ getEnumValue(record.status, UserStatusEnum) }}
        </a-tag>
@@ -150,7 +147,7 @@
 <script lang="ts" setup>
  import { reactive, ref } from 'vue';
  import { deleteUser, getUserPage, updateUserStatus, UserQueryRequest, UserQueryResponse } from '@/api/user/user';
-  import { Message } from '@arco-design/web-vue';
+  import { Message, PaginationProps } from '@arco-design/web-vue';
  import useLoading from '@/hooks/loading';
  import columns from '../types/table.columns';
  import { UserStatusEnum } from '../types/enum.types';
@@ -158,7 +155,7 @@
  import { toOptions, getEnumValue } from '@/utils/enum';
  import { useUserStore } from '@/store';

-  const tableRenderData = ref<UserQueryResponse[]>();
+  const tableRenderData = ref<UserQueryResponse[]>([]);
  const { loading, setLoading } = useLoading();
  const emits = defineEmits(['openAdd', 'openUpdate', 'openResetPassword', 'openGrantRole']);