manager/orion-visor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

重构代码.

Browse Source
This commit is contained in:
lijiahangmax
2023-09-24 23:28:02 +08:00
parent 6fa57c616c
commit 024a8b4596
21 changed files with 48 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
orion-ops-ui/src/views/asset/host-identity/components/host-identity-table.vue
View File

@@ -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());

2
orion-ops-ui/src/views/asset/host-key/components/host-key-form-drawer.vue
View File

@@ -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');
};

4
orion-ops-ui/src/views/asset/host-key/components/host-key-table.vue
View File

@@ -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';

5
orion-ops-ui/src/views/asset/host/components/host-config-drawer.vue
View File

@@ -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 {

1
orion-ops-ui/src/views/asset/host/components/host-config-ssh-form.vue
View File

@@ -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="主机密码" />

2
orion-ops-ui/src/views/asset/host/components/host-table.vue
View File

@@ -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">

2
orion-ops-ui/src/views/asset/host/types/host-config.types.ts
View File

@@ -30,4 +30,6 @@ export interface HostSshConfig {
charset?: string;
fileNameCharset?: string;
fileContentCharset?: string;
useNewPassword?: boolean;
hasPassword?: boolean;
}

2
orion-ops-ui/src/views/dashboard/workplace/components/banner.vue
View File

@@ -16,7 +16,7 @@
const userStore = useUserStore();
const userInfo = computed(() => {
return {
name: userStore.name,
name: userStore.nickname,
};
});
</script>

2
orion-ops-ui/src/views/system/menu/components/menu-form-modal.vue
View File

@@ -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>

4
orion-ops-ui/src/views/user/role/components/role-menu-grant-modal.vue
View File

@@ -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];
}
});
};

4
orion-ops-ui/src/views/user/role/components/role-table.vue
View File

@@ -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';

4
orion-ops-ui/src/views/user/user/components/user-table.vue
View File

@@ -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';