From 024a8b459618d38b553feeaf0810ea866f9b4b00 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Sun, 24 Sep 2023 23:28:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E4=BB=A3=E7=A0=81.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../orion-vue-views-components-table.vue.vm        |  4 ++--
 orion-ops-ui/src/api/user/auth.ts                  |  1 -
 .../asset/host-identity/host-identity-selector.vue |  4 ++--
 .../asset/host-key/host-key-selector.vue           |  4 ++--
 .../src/components/global-setting/form-wrapper.vue |  2 +-
 orion-ops-ui/src/components/message-box/index.vue  |  3 ++-
 orion-ops-ui/src/components/tab-bar/tab-item.vue   |  6 +++---
 .../src/components/tag/tag-multi-selector.vue      | 14 +++++++-------
 orion-ops-ui/src/hooks/copy.ts                     | 10 +++++-----
 .../components/host-identity-table.vue             |  6 +++---
 .../host-key/components/host-key-form-drawer.vue   |  2 ++
 .../asset/host-key/components/host-key-table.vue   |  4 ++--
 .../asset/host/components/host-config-drawer.vue   |  5 ++++-
 .../asset/host/components/host-config-ssh-form.vue |  1 +
 .../src/views/asset/host/components/host-table.vue |  2 +-
 .../views/asset/host/types/host-config.types.ts    |  2 ++
 .../dashboard/workplace/components/banner.vue      |  2 +-
 .../system/menu/components/menu-form-modal.vue     |  2 +-
 .../user/role/components/role-menu-grant-modal.vue |  4 +++-
 .../src/views/user/role/components/role-table.vue  |  4 ++--
 .../src/views/user/user/components/user-table.vue  |  4 ++--
 21 files changed, 48 insertions(+), 38 deletions(-)

diff --git 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
index 33d68ab8..52c7f827 100644
--- 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';
diff --git a/orion-ops-ui/src/api/user/auth.ts b/orion-ops-ui/src/api/user/auth.ts
index b7402ee7..c546f369 100644
--- 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';
 
 /**
  * 登陆请求
diff --git 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
index 6b9a9273..0f71760f 100644
--- 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) {
diff --git 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
index 683949b9..e7863b37 100644
--- 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) {
diff --git a/orion-ops-ui/src/components/global-setting/form-wrapper.vue b/orion-ops-ui/src/components/global-setting/form-wrapper.vue
index 0ca14e03..c3360d17 100644
--- 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
diff --git a/orion-ops-ui/src/components/message-box/index.vue b/orion-ops-ui/src/components/message-box/index.vue
index 7c80f930..5c62cc85 100644
--- 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,6 +101,7 @@
   };
   const formatUnreadLength = (type: string) => {
     const list = getUnreadList(type);
+    // FIXME
     return list.length ? `(${list.length})` : ``;
   };
   const handleItemClick = (items: MessageListType) => {
diff --git a/orion-ops-ui/src/components/tab-bar/tab-item.vue b/orion-ops-ui/src/components/tab-bar/tab-item.vue
index be798434..1cff4b83 100644
--- 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>
diff --git a/orion-ops-ui/src/components/tag/tag-multi-selector.vue b/orion-ops-ui/src/components/tag/tag-multi-selector.vue
index c300a2d2..7a44ea99 100644
--- 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>
diff --git a/orion-ops-ui/src/hooks/copy.ts b/orion-ops-ui/src/hooks/copy.ts
index 468af897..d8572c8f 100644
--- 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,
diff --git 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
index 26ebcb7f..17f8f2bf 100644
--- 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';
@@ -135,7 +135,7 @@
 
   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());
diff --git 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
index 688eaf0c..ff9374e2 100644
--- 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
@@ -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');
   };
diff --git 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
index f00c00e8..43469909 100644
--- 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,7 +45,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">
@@ -93,7 +93,7 @@
 <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';
diff --git 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
index a2e0946f..46272a5e 100644
--- 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) => {
@@ -58,6 +60,7 @@
         config.value[s.type] = s;
       });
     } catch ({ message }) {
+      // FIXME
       Message.error(`配置加载失败 ${message}`);
       setVisible(false);
     } finally {
diff --git 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
index 056c9898..c6ffedf8 100644
--- 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
@@ -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="主机密码" />
diff --git a/orion-ops-ui/src/views/asset/host/components/host-table.vue b/orion-ops-ui/src/views/asset/host/components/host-table.vue
index 47f289bc..eb56dfb7 100644
--- 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">
diff --git 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
index 9f43f8a1..5b7d384a 100644
--- 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;
 }
diff --git a/orion-ops-ui/src/views/dashboard/workplace/components/banner.vue b/orion-ops-ui/src/views/dashboard/workplace/components/banner.vue
index 00b5534c..55941725 100644
--- 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>
diff --git 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
index 14240041..0d8011ee 100644
--- 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>
diff --git 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
index 4049682a..ada0433f 100644
--- 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
@@ -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];
+      }
     });
   };
 
diff --git a/orion-ops-ui/src/views/user/role/components/role-table.vue b/orion-ops-ui/src/views/user/role/components/role-table.vue
index 75e5860f..86ea0c2e 100644
--- 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,7 +52,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">
@@ -125,7 +125,7 @@
 <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';
diff --git a/orion-ops-ui/src/views/user/user/components/user-table.vue b/orion-ops-ui/src/views/user/user/components/user-table.vue
index f0440757..dd474cb5 100644
--- 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,7 +66,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">
@@ -146,7 +146,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';