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
2025-03-22 00:58:15 +08:00
parent 4efd2b5ec2
commit 94ed071897
33 changed files with 458 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
orion-visor-ui/src/views/exec/exec-command-log/components/exec-command-log-table.vue
View File

@@ -94,6 +94,11 @@
</template>
</a-button>
</a-popconfirm>
<!-- 调整 -->
<table-adjust :columns="logColumns"
:columns-hook="columnsHook"
:query-order="queryOrder"
@query="fetchTableData" />
</a-space>
</div>
</template>
@@ -102,7 +107,7 @@
row-key="id"
ref="tableRef"
:loading="loading"
:columns="logColumns"
:columns="tableColumns"
:row-selection="rowSelection"
:expandable="expandable"
:data="tableRenderData"
@@ -221,28 +226,33 @@
import useLoading from '@/hooks/loading';
import { logColumns } from '../types/table.columns';
import { ExecStatus, execStatusKey } from '@/components/exec/log/const';
import { useExpandable, useTablePagination, useRowSelection } from '@/hooks/table';
import { useExpandable, useTablePagination, useRowSelection, useTableColumns } from '@/hooks/table';
import { TableName } from '../types/const';
import { useDictStore, useUserStore } from '@/store';
import { dateFormat, formatDuration } from '@/utils';
import { reExecCommand } from '@/api/exec/exec-command';
import { interruptExecCommand } from '@/api/exec/exec-command-log';
import { useQueryOrder, DESC } from '@/hooks/query-order';
import UserSelector from '@/components/user/user/selector/index.vue';
import ExecCommandHostLogTable from './exec-command-host-log-table.vue';
import TableAdjust from '@/components/app/table-adjust/index.vue';
const emits = defineEmits(['viewCommand', 'viewParams', 'viewLog', 'openClear']);
const route = useRoute();
const router = useRouter();
const pagination = useTablePagination();
const rowSelection = useRowSelection();
const expandable = useExpandable();
const rowSelection = useRowSelection();
const pagination = useTablePagination();
const queryOrder = useQueryOrder(TableName, DESC);
const { tableColumns, columnsHook } = useTableColumns(TableName, logColumns);
const { loading, setLoading } = useLoading();
const { toOptions, getDictValue } = useDictStore();
const pullIntervalId = ref();
const tableRef = ref();
const selectedKeys = ref<number[]>([]);
const tableRenderData = ref<ExecLogQueryResponse[]>([]);
const selectedKeys = ref<Array<number>>([]);
const tableRenderData = ref<Array<ExecLogQueryResponse>>([]);
const formModel = reactive<ExecLogQueryRequest>({
id: undefined,
userId: undefined,
@@ -392,7 +402,7 @@
const doFetchTableData = async (request: ExecLogQueryRequest) => {
try {
setLoading(true);
const { data } = await getExecCommandLogPage(request);
const { data } = await getExecCommandLogPage(queryOrder.markOrderly(request));
tableRenderData.value = data.rows;
pagination.total = data.total;
pagination.current = request.page;

3
orion-visor-ui/src/views/exec/exec-command-log/types/const.ts
View File

@@ -1,2 +1,5 @@
// 表名称
export const TableName = 'exec-cmd-log';
// 最大清理数量
export const maxClearLimit = 1000;

9
orion-visor-ui/src/views/exec/exec-command-log/types/table.columns.ts
View File

@@ -10,6 +10,7 @@ export const logColumns = [
width: 100,
align: 'left',
fixed: 'left',
default: true,
}, {
title: '执行描述',
dataIndex: 'description',
@@ -18,6 +19,7 @@ export const logColumns = [
width: 168,
ellipsis: true,
tooltip: true,
default: true,
}, {
title: '执行命令',
dataIndex: 'command',
@@ -25,6 +27,7 @@ export const logColumns = [
align: 'left',
ellipsis: true,
minWidth: 238,
default: true,
}, {
title: '执行用户',
dataIndex: 'username',
@@ -32,28 +35,32 @@ export const logColumns = [
align: 'left',
width: 118,
ellipsis: true,
default: true,
}, {
title: '执行状态',
dataIndex: 'status',
slotName: 'status',
align: 'left',
width: 118,
default: true,
}, {
title: '执行时间',
dataIndex: 'startTime',
slotName: 'startTime',
align: 'left',
width: 190,
default: true,
}, {
title: '操作',
slotName: 'handle',
width: 288,
align: 'center',
fixed: 'right',
default: true,
},
] as TableColumnData[];
// 主机列
// 主机表格列
export const hostColumns = [
{
title: 'id',

30
orion-visor-ui/src/views/exec/exec-job-log/components/exec-job-log-table.vue
View File

@@ -85,6 +85,11 @@
</template>
</a-button>
</a-popconfirm>
<!-- 调整 -->
<table-adjust :columns="columns"
:columns-hook="columnsHook"
:query-order="queryOrder"
@query="fetchTableData" />
</a-space>
</div>
</template>
@@ -93,7 +98,7 @@
row-key="id"
ref="tableRef"
:loading="loading"
:columns="columns"
:columns="tableColumns"
:row-selection="rowSelection"
:expandable="expandable"
:data="tableRenderData"
@@ -111,11 +116,13 @@
</template>
<!-- 任务名称 -->
<template #description="{ record }">
<span class="span-blue mr4 usn">
#{{ record.execSeq }}
</span>
<span :title="record.description">
{{ record.description }}
<span>
<span class="span-blue mr4 usn">
#{{ record.execSeq }}
</span>
<span :title="record.description">
{{ record.description }}
</span>
</span>
</template>
<!-- 执行命令 -->
@@ -231,18 +238,23 @@
import { Message } from '@arco-design/web-vue';
import useLoading from '@/hooks/loading';
import columns from '../types/table.columns';
import { DESC, useQueryOrder } from '@/hooks/query-order';
import { ExecStatus, execStatusKey, ExecMode } from '@/components/exec/log/const';
import { useExpandable, useTablePagination, useRowSelection } from '@/hooks/table';
import { useExpandable, useTablePagination, useRowSelection, useTableColumns } from '@/hooks/table';
import { TableName } from '../types/const';
import { useDictStore } from '@/store';
import { dateFormat, formatDuration } from '@/utils';
import ExecJobHostLogTable from './exec-job-host-log-table.vue';
import UserSelector from '@/components/user/user/selector/index.vue';
import TableAdjust from '@/components/app/table-adjust/index.vue';
const emits = defineEmits(['viewCommand', 'viewParams', 'viewLog', 'openClear']);
const pagination = useTablePagination();
const rowSelection = useRowSelection();
const expandable = useExpandable();
const pagination = useTablePagination();
const queryOrder = useQueryOrder(TableName, DESC);
const { tableColumns, columnsHook } = useTableColumns(TableName, columns);
const { loading, setLoading } = useLoading();
const { toOptions, getDictValue } = useDictStore();
@@ -383,7 +395,7 @@
const doFetchTableData = async (request: ExecLogQueryRequest) => {
try {
setLoading(true);
const { data } = await getExecJobLogPage(request);
const { data } = await getExecJobLogPage(queryOrder.markOrderly(request));
tableRenderData.value = data.rows;
pagination.total = data.total;
pagination.current = request.page;

3
orion-visor-ui/src/views/exec/exec-job-log/types/const.ts
View File

@@ -1,2 +1,5 @@
// 表名称
export const TableName = 'exec-job-log';
// 最大清理数量
export const maxClearLimit = 1000;

9
orion-visor-ui/src/views/exec/exec-job-log/types/table.columns.ts
View File

@@ -8,6 +8,7 @@ const columns = [
width: 100,
align: 'left',
fixed: 'left',
default: true,
}, {
title: '任务名称',
dataIndex: 'description',
@@ -15,13 +16,15 @@ const columns = [
align: 'left',
width: 188,
ellipsis: true,
default: true,
}, {
title: '执行命令',
dataIndex: 'command',
slotName: 'command',
align: 'left',
minWidth: 238,
ellipsis: true,
minWidth: 238,
default: true,
}, {
title: '执行用户',
dataIndex: 'username',
@@ -29,24 +32,28 @@ const columns = [
align: 'left',
width: 128,
ellipsis: true,
default: true,
}, {
title: '执行状态',
dataIndex: 'status',
slotName: 'status',
align: 'left',
width: 118,
default: true,
}, {
title: '执行时间',
dataIndex: 'startTime',
slotName: 'startTime',
align: 'left',
width: 190,
default: true,
}, {
title: '操作',
slotName: 'handle',
width: 218,
align: 'center',
fixed: 'right',
default: true,
},
] as TableColumnData[];

19
orion-visor-ui/src/views/exec/exec-job/components/exec-job-table.vue
View File

@@ -77,6 +77,11 @@
</template>
</a-button>
</a-popconfirm>
<!-- 调整 -->
<table-adjust :columns="columns"
:columns-hook="columnsHook"
:query-order="queryOrder"
@query="fetchTableData" />
</a-space>
</div>
</template>
@@ -85,7 +90,7 @@
row-key="id"
ref="tableRef"
:loading="loading"
:columns="columns"
:columns="tableColumns"
:row-selection="rowSelection"
:data="tableRenderData"
:pagination="pagination"
@@ -215,20 +220,24 @@
import usePermission from '@/hooks/permission';
import useLoading from '@/hooks/loading';
import columns from '../types/table.columns';
import { ExecJobStatus, execJobStatusKey, execStatusKey } from '../types/const';
import { useTablePagination, useRowSelection } from '@/hooks/table';
import { TableName, ExecJobStatus, execJobStatusKey, execStatusKey } from '../types/const';
import { useTablePagination, useRowSelection, useTableColumns } from '@/hooks/table';
import { useCacheStore, useDictStore, useUserStore } from '@/store';
import { useRoute } from 'vue-router';
import { copy } from '@/hooks/copy';
import { dateFormat } from '@/utils';
import { DESC, useQueryOrder } from '@/hooks/query-order';
import UserSelector from '@/components/user/user/selector/index.vue';
import TableAdjust from '@/components/app/table-adjust/index.vue';
const emits = defineEmits(['openAdd', 'openUpdate', 'openDetail', 'updateExecUser', 'testCron']);
const route = useRoute();
const cacheStore = useCacheStore();
const pagination = useTablePagination();
const rowSelection = useRowSelection();
const pagination = useTablePagination();
const queryOrder = useQueryOrder(TableName, DESC);
const { tableColumns, columnsHook } = useTableColumns(TableName, columns);
const { loading, setLoading } = useLoading();
const { hasPermission } = usePermission();
const { toOptions, getDictValue } = useDictStore();
@@ -313,7 +322,7 @@
const doFetchTableData = async (request: ExecJobQueryRequest) => {
try {
setLoading(true);
const { data } = await getExecJobPage(request);
const { data } = await getExecJobPage(queryOrder.markOrderly(request));
tableRenderData.value = data.rows;
pagination.total = data.total;
pagination.current = request.page;

3
orion-visor-ui/src/views/exec/exec-job/types/const.ts
View File

@@ -1,5 +1,8 @@
import type { TemplateParam } from '@/components/view/exec-editor/const';
// 表名称
export const TableName = 'exec-job';
// cron 下次执行次数
export const CronNextTimes = 5;

35
orion-visor-ui/src/views/exec/exec-job/types/table.columns.ts
View File

@@ -9,6 +9,7 @@ const columns = [
width: 100,
align: 'left',
fixed: 'left',
default: true,
}, {
title: '任务名称',
dataIndex: 'name',
@@ -16,6 +17,7 @@ const columns = [
align: 'left',
width: 180,
ellipsis: true,
default: true,
}, {
title: 'cron',
dataIndex: 'expression',
@@ -24,6 +26,7 @@ const columns = [
width: 168,
ellipsis: true,
tooltip: true,
default: true,
}, {
title: '执行命令',
dataIndex: 'command',
@@ -31,6 +34,7 @@ const columns = [
align: 'left',
minWidth: 238,
ellipsis: true,
default: true,
}, {
title: '执行用户',
dataIndex: 'execUsername',
@@ -39,12 +43,14 @@ const columns = [
ellipsis: true,
tooltip: true,
width: 124,
default: true,
}, {
title: '任务状态',
dataIndex: 'status',
slotName: 'status',
align: 'center',
width: 112,
default: true,
}, {
title: '最近执行',
dataIndex: 'recentLog',
@@ -55,6 +61,17 @@ const columns = [
justifyContent: 'center'
},
width: 200,
default: true,
}, {
title: '创建时间',
dataIndex: 'createTime',
slotName: 'createTime',
align: 'center',
width: 180,
render: ({ record }) => {
return dateFormat(new Date(record.createTime));
},
default: false,
}, {
title: '修改时间',
dataIndex: 'updateTime',
@@ -64,12 +81,30 @@ const columns = [
render: ({ record }) => {
return dateFormat(new Date(record.updateTime));
},
default: true,
}, {
title: '创建人',
dataIndex: 'creator',
slotName: 'creator',
width: 148,
ellipsis: true,
tooltip: true,
default: false,
}, {
title: '修改人',
dataIndex: 'updater',
slotName: 'updater',
width: 148,
ellipsis: true,
tooltip: true,
default: false,
}, {
title: '操作',
slotName: 'handle',
width: 228,
align: 'center',
fixed: 'right',
default: true,
},
] as TableColumnData[];

18
orion-visor-ui/src/views/exec/exec-template/components/exec-template-table.vue
View File

@@ -64,6 +64,11 @@
</template>
</a-button>
</a-popconfirm>
<!-- 调整 -->
<table-adjust :columns="columns"
:columns-hook="columnsHook"
:query-order="queryOrder"
@query="fetchTableData" />
</a-space>
</div>
</template>
@@ -72,7 +77,7 @@
row-key="id"
ref="tableRef"
:loading="loading"
:columns="columns"
:columns="tableColumns"
:row-selection="rowSelection"
:data="tableRenderData"
:pagination="pagination"
@@ -135,13 +140,18 @@
import { Message } from '@arco-design/web-vue';
import useLoading from '@/hooks/loading';
import columns from '../types/table.columns';
import { useTablePagination, useRowSelection } from '@/hooks/table';
import { TableName } from '../types/const';
import { useTablePagination, useRowSelection, useTableColumns } from '@/hooks/table';
import { copy } from '@/hooks/copy';
import { DESC, useQueryOrder } from '@/hooks/query-order';
import TableAdjust from '@/components/app/table-adjust/index.vue';
const emits = defineEmits(['openAdd', 'openUpdate', 'openExec']);
const pagination = useTablePagination();
const rowSelection = useRowSelection();
const pagination = useTablePagination();
const queryOrder = useQueryOrder(TableName, DESC);
const { tableColumns, columnsHook } = useTableColumns(TableName, columns);
const { loading, setLoading } = useLoading();
const selectedKeys = ref<number[]>([]);
@@ -195,7 +205,7 @@
const doFetchTableData = async (request: ExecTemplateQueryRequest) => {
try {
setLoading(true);
const { data } = await getExecTemplatePage(request);
const { data } = await getExecTemplatePage(queryOrder.markOrderly(request));
tableRenderData.value = data.rows;
pagination.total = data.total;
pagination.current = request.page;

2
orion-visor-ui/src/views/exec/exec-template/types/const.ts Normal file
View File

@@ -0,0 +1,2 @@
// 表名称
export const TableName = 'exec-tpl';

31
orion-visor-ui/src/views/exec/exec-template/types/table.columns.ts
View File

@@ -9,6 +9,7 @@ const columns = [
width: 100,
align: 'left',
fixed: 'left',
default: true,
}, {
title: '模板名称',
dataIndex: 'name',
@@ -16,12 +17,24 @@ const columns = [
align: 'left',
width: 200,
ellipsis: true,
default: true,
}, {
title: '模板命令',
dataIndex: 'command',
slotName: 'command',
align: 'left',
ellipsis: true,
default: true,
}, {
title: '创建时间',
dataIndex: 'createTime',
slotName: 'createTime',
align: 'center',
width: 180,
render: ({ record }) => {
return dateFormat(new Date(record.createTime));
},
default: true,
}, {
title: '修改时间',
dataIndex: 'updateTime',
@@ -31,12 +44,30 @@ const columns = [
render: ({ record }) => {
return dateFormat(new Date(record.updateTime));
},
default: true,
}, {
title: '创建人',
dataIndex: 'creator',
slotName: 'creator',
width: 148,
ellipsis: true,
tooltip: true,
default: false,
}, {
title: '修改人',
dataIndex: 'updater',
slotName: 'updater',
width: 148,
ellipsis: true,
tooltip: true,
default: false,
}, {
title: '操作',
slotName: 'handle',
width: 180,
align: 'center',
fixed: 'right',
default: true,
},
] as TableColumnData[];

19
orion-visor-ui/src/views/exec/upload-task/components/upload-task-table.vue
View File

@@ -94,6 +94,11 @@
</template>
</a-button>
</a-popconfirm>
<!-- 调整 -->
<table-adjust :columns="columns"
:columns-hook="columnsHook"
:query-order="queryOrder"
@query="fetchTableData" />
</a-space>
</div>
</template>
@@ -102,7 +107,7 @@
row-key="id"
ref="tableRef"
:loading="loading"
:columns="columns"
:columns="tableColumns"
:row-selection="rowSelection"
:data="tableRenderData"
:pagination="pagination"
@@ -186,18 +191,22 @@
import { Message } from '@arco-design/web-vue';
import useLoading from '@/hooks/loading';
import columns from '../types/table.columns';
import { UploadTaskStatus, uploadTaskStatusKey } from '../types/const';
import { useTablePagination, useRowSelection } from '@/hooks/table';
import { TableName, UploadTaskStatus, uploadTaskStatusKey } from '../types/const';
import { useTablePagination, useRowSelection, useTableColumns } from '@/hooks/table';
import { useDictStore } from '@/store';
import { copy } from '@/hooks/copy';
import { useRouter } from 'vue-router';
import { DESC, useQueryOrder } from '@/hooks/query-order';
import UserSelector from '@/components/user/user/selector/index.vue';
import TableAdjust from '@/components/app/table-adjust/index.vue';
const emits = defineEmits(['openClear']);
const router = useRouter();
const pagination = useTablePagination();
const rowSelection = useRowSelection();
const pagination = useTablePagination();
const queryOrder = useQueryOrder(TableName, DESC);
const { tableColumns, columnsHook } = useTableColumns(TableName, columns);
const { loading, setLoading } = useLoading();
const { toOptions, getDictValue } = useDictStore();
@@ -292,7 +301,7 @@
const doFetchTableData = async (request: UploadTaskQueryRequest) => {
try {
setLoading(true);
const { data } = await getUploadTaskPage(request);
const { data } = await getUploadTaskPage(queryOrder.markOrderly(request));
tableRenderData.value = data.rows;
pagination.total = data.total;
pagination.current = request.page;

3
orion-visor-ui/src/views/exec/upload-task/types/const.ts
View File

@@ -1,3 +1,6 @@
// 表名称
export const TableName = 'upload-task';
// 上传任务状态
export const UploadTaskStatus = {
// 等待中

9
orion-visor-ui/src/views/exec/upload-task/types/table.columns.ts
View File

@@ -9,6 +9,7 @@ const columns = [
width: 100,
align: 'left',
fixed: 'left',
default: true,
}, {
title: '上传用户',
dataIndex: 'username',
@@ -17,6 +18,7 @@ const columns = [
width: 118,
ellipsis: true,
tooltip: true,
default: true,
}, {
title: '上传描述',
dataIndex: 'description',
@@ -24,6 +26,7 @@ const columns = [
align: 'left',
ellipsis: true,
tooltip: true,
default: true,
}, {
title: '远程路径',
dataIndex: 'remotePath',
@@ -32,24 +35,28 @@ const columns = [
ellipsis: true,
tooltip: true,
minWidth: 238,
default: true,
}, {
title: '上传状态',
dataIndex: 'status',
slotName: 'status',
align: 'center',
width: 138,
default: true,
}, {
title: '文件数量',
dataIndex: 'fileCount',
slotName: 'fileCount',
width: 98,
align: 'center',
default: true,
}, {
title: '主机数量',
dataIndex: 'hostCount',
slotName: 'hostCount',
width: 98,
align: 'center',
default: true,
}, {
title: '上传时间',
dataIndex: 'createTime',
@@ -59,12 +66,14 @@ const columns = [
render: ({ record }) => {
return dateFormat(new Date(record.createTime));
},
default: true,
}, {
title: '操作',
slotName: 'handle',
width: 180,
align: 'center',
fixed: 'right',
default: true,
},
] as TableColumnData[];

23
orion-visor-ui/src/views/system/dict-key/components/dict-key-table.vue
View File

@@ -78,6 +78,11 @@
</template>
</a-button>
</a-popconfirm>
<!-- 调整 -->
<table-adjust :columns="columns"
:columns-hook="columnsHook"
:query-order="queryOrder"
@query="fetchTableData" />
</a-space>
</div>
</template>
@@ -86,7 +91,7 @@
row-key="id"
ref="tableRef"
:loading="loading"
:columns="columns"
:columns="tableColumns"
:row-selection="rowSelection"
:data="tableRenderData"
:pagination="pagination"
@@ -165,22 +170,26 @@
import { Message } from '@arco-design/web-vue';
import useLoading from '@/hooks/loading';
import columns from '../types/table.columns';
import { useTablePagination, useRowSelection } from '@/hooks/table';
import { dictValueTypeKey } from '../types/const';
import { useTablePagination, useRowSelection, useTableColumns } from '@/hooks/table';
import { TableName, dictValueTypeKey } from '../types/const';
import { copy } from '@/hooks/copy';
import { useCacheStore, useDictStore } from '@/store';
import { getDictValueList } from '@/api/system/dict-value';
import { useQueryOrder, DESC } from '@/hooks/query-order';
import TableAdjust from '@/components/app/table-adjust/index.vue';
const emits = defineEmits(['openAdd', 'openUpdate', 'openView']);
const cacheStore = useCacheStore();
const pagination = useTablePagination();
const rowSelection = useRowSelection();
const pagination = useTablePagination();
const queryOrder = useQueryOrder(TableName, DESC);
const { tableColumns, columnsHook } = useTableColumns(TableName, columns);
const { loading, setLoading } = useLoading();
const { toOptions, getDictValue } = useDictStore();
const selectedKeys = ref<number[]>([]);
const tableRenderData = ref<DictKeyQueryResponse[]>([]);
const selectedKeys = ref<Array<number>>([]);
const tableRenderData = ref<Array<DictKeyQueryResponse>>([]);
const formModel = reactive<DictKeyQueryRequest>({
id: undefined,
keyName: undefined,
@@ -259,7 +268,7 @@
const doFetchTableData = async (request: DictKeyQueryRequest) => {
try {
setLoading(true);
const { data } = await getDictKeyPage(request);
const { data } = await getDictKeyPage(queryOrder.markOrderly(request));
tableRenderData.value = data.rows;
pagination.total = data.total;
pagination.current = request.page;

3
orion-visor-ui/src/views/system/dict-key/types/const.ts
View File

@@ -1,3 +1,6 @@
// 表名称
export const TableName = 'dict-key';
// 配置值类型定义
export const ValueType = {
// 字符串

45
orion-visor-ui/src/views/system/dict-key/types/table.columns.ts
View File

@@ -1,4 +1,5 @@
import type { TableColumnData } from '@arco-design/web-vue';
import { dateFormat } from '@/utils';
const columns = [
{
@@ -8,6 +9,7 @@ const columns = [
width: 100,
align: 'left',
fixed: 'left',
default: true,
}, {
title: '配置项',
dataIndex: 'keyName',
@@ -15,6 +17,7 @@ const columns = [
align: 'left',
ellipsis: true,
tooltip: true,
default: true,
}, {
title: '配置描述',
dataIndex: 'description',
@@ -22,23 +25,63 @@ const columns = [
align: 'left',
ellipsis: true,
tooltip: true,
default: true,
}, {
title: '类型',
dataIndex: 'valueType',
slotName: 'valueType',
align: 'left',
width: 150
width: 150,
default: true,
}, {
title: '额外配置',
dataIndex: 'extraSchema',
slotName: 'extraSchema',
align: 'left',
default: true,
}, {
title: '创建时间',
dataIndex: 'createTime',
slotName: 'createTime',
align: 'center',
width: 180,
render: ({ record }) => {
return dateFormat(new Date(record.createTime));
},
default: false,
}, {
title: '修改时间',
dataIndex: 'updateTime',
slotName: 'updateTime',
align: 'center',
width: 180,
render: ({ record }) => {
return dateFormat(new Date(record.updateTime));
},
default: true,
}, {
title: '创建人',
dataIndex: 'creator',
slotName: 'creator',
width: 148,
ellipsis: true,
tooltip: true,
default: false,
}, {
title: '修改人',
dataIndex: 'updater',
slotName: 'updater',
width: 148,
ellipsis: true,
tooltip: true,
default: false,
}, {
title: '操作',
slotName: 'handle',
width: 170,
align: 'center',
fixed: 'right',
default: true,
},
] as TableColumnData[];

18
orion-visor-ui/src/views/system/dict-value/components/dict-value-table.vue
View File

@@ -64,6 +64,11 @@
</template>
</a-button>
</a-popconfirm>
<!-- 调整 -->
<table-adjust :columns="columns"
:columns-hook="columnsHook"
:query-order="queryOrder"
@query="fetchTableData" />
</a-space>
</div>
</template>
@@ -72,7 +77,7 @@
row-key="id"
ref="tableRef"
:loading="loading"
:columns="columns"
:columns="tableColumns"
:row-selection="rowSelection"
:data="tableRenderData"
:pagination="pagination"
@@ -146,14 +151,19 @@
import { Message } from '@arco-design/web-vue';
import useLoading from '@/hooks/loading';
import columns from '../types/table.columns';
import { useTablePagination, useRowSelection } from '@/hooks/table';
import { useTablePagination, useRowSelection, useTableColumns } from '@/hooks/table';
import { copy } from '@/hooks/copy';
import { TableName } from '../types/const';
import { useQueryOrder, DESC } from '@/hooks/query-order';
import DictKeySelector from '@/components/system/dict-key/selector/index.vue';
import TableAdjust from '@/components/app/table-adjust/index.vue';
const emits = defineEmits(['openAdd', 'openUpdate', 'openHistory']);
const pagination = useTablePagination();
const rowSelection = useRowSelection();
const pagination = useTablePagination();
const queryOrder = useQueryOrder(TableName, DESC);
const { tableColumns, columnsHook } = useTableColumns(TableName, columns);
const { loading, setLoading } = useLoading();
const selectedKeys = ref<Array<number>>([]);
@@ -225,7 +235,7 @@
const doFetchTableData = async (request: DictValueQueryRequest) => {
try {
setLoading(true);
const { data } = await getDictValuePage(request);
const { data } = await getDictValuePage(queryOrder.markOrderly(request));
tableRenderData.value = data.rows;
pagination.total = data.total;
pagination.current = request.page;

3
orion-visor-ui/src/views/system/dict-value/types/const.ts
View File

@@ -1,2 +1,5 @@
// 表名称
export const TableName = 'dict-value';
// 历史值类型
export const historyType = 'DICT';

36
orion-visor-ui/src/views/system/dict-value/types/table.columns.ts
View File

@@ -9,13 +9,15 @@ const columns = [
width: 100,
align: 'left',
fixed: 'left',
default: true,
}, {
title: '配置项',
dataIndex: 'keyName',
slotName: 'keyName',
align: 'left',
ellipsis: true,
tooltip: true
tooltip: true,
default: true,
}, {
title: '配置描述',
dataIndex: 'label',
@@ -23,12 +25,14 @@ const columns = [
align: 'left',
ellipsis: true,
tooltip: true,
default: true,
}, {
title: '配置值',
dataIndex: 'value',
slotName: 'value',
align: 'left',
ellipsis: true,
default: true,
}, {
title: '额外参数',
dataIndex: 'extra',
@@ -36,12 +40,24 @@ const columns = [
align: 'left',
ellipsis: true,
tooltip: true,
default: true,
}, {
title: '排序',
dataIndex: 'sort',
slotName: 'sort',
align: 'left',
width: 70,
default: true,
}, {
title: '创建时间',
dataIndex: 'createTime',
slotName: 'createTime',
align: 'center',
width: 180,
render: ({ record }) => {
return dateFormat(new Date(record.createTime));
},
default: false,
}, {
title: '修改时间',
dataIndex: 'updateTime',
@@ -51,12 +67,30 @@ const columns = [
render: ({ record }) => {
return dateFormat(new Date(record.updateTime));
},
default: true,
}, {
title: '创建人',
dataIndex: 'creator',
slotName: 'creator',
width: 148,
ellipsis: true,
tooltip: true,
default: false,
}, {
title: '修改人',
dataIndex: 'updater',
slotName: 'updater',
width: 148,
ellipsis: true,
tooltip: true,
default: false,
}, {
title: '操作',
slotName: 'handle',
width: 170,
align: 'center',
fixed: 'right',
default: true,
},
] as TableColumnData[];

2
orion-visor-ui/src/views/user/operator-log/components/operator-log-query-header.vue
View File

@@ -62,8 +62,8 @@
</script>
<script lang="ts" setup>
import type { SelectOptionData } from '@arco-design/web-vue';
import type { OperatorLogQueryRequest } from '@/api/user/operator-log';
import type { SelectOptionData } from '@arco-design/web-vue';
import { ref, watch } from 'vue';
import useLoading from '@/hooks/loading';
import { useDictStore } from '@/store';

19
orion-visor-ui/src/views/user/operator-log/components/operator-log-simple-table.vue
View File

@@ -3,7 +3,7 @@
<a-table row-key="id"
ref="tableRef"
:loading="loading"
:columns="logColumns"
:columns="tableColumns"
:data="tableRenderData"
:pagination="pagination"
:bordered="false"
@@ -83,7 +83,7 @@
import { ref, onMounted } from 'vue';
import { operatorLogModuleKey, operatorLogTypeKey, operatorRiskLevelKey, operatorLogResultKey, dictKeys } from '../types/const';
import columns from '../types/table.columns';
import { getLogDetail } from '../types/const';
import { TableName, getLogDetail } from '../types/const';
import { copy } from '@/hooks/copy';
import useLoading from '@/hooks/loading';
import { useTablePagination } from '@/hooks/table';
@@ -91,6 +91,7 @@
import { getOperatorLogPage } from '@/api/user/operator-log';
import { getCurrentUserOperatorLog } from '@/api/user/mine';
import { replaceHtmlTag, clearHtmlTag } from '@/utils';
import { useQueryOrder, DESC } from '@/hooks/query-order';
import JsonEditorModal from '@/components/view/json-editor/modal/index.vue';
const props = withDefaults(defineProps<Partial<{
@@ -108,11 +109,12 @@
});
const pagination = useTablePagination();
const { markOrderly } = useQueryOrder(TableName, DESC);
const { loading, setLoading } = useLoading();
const { getDictValue } = useDictStore();
const { getDictValue, loadKeys } = useDictStore();
const jsonView = ref();
const logColumns = ref();
const tableColumns = ref();
const tableRenderData = ref<OperatorLogQueryResponse[]>([]);
// 查看详情
@@ -135,11 +137,11 @@
let rows;
if (props.current) {
// 查询当前用户
const { data } = await getCurrentUserOperatorLog(request);
const { data } = await getCurrentUserOperatorLog(markOrderly(request));
rows = data;
} else {
// 查询所有
const { data } = await getOperatorLogPage({ ...request, ...props.baseParams });
const { data } = await getOperatorLogPage(markOrderly({ ...request, ...props.baseParams }));
rows = data;
}
tableRenderData.value = rows.rows.map(s => {
@@ -162,8 +164,7 @@
// 初始化
onMounted(async () => {
// 加载字典值
const dictStore = useDictStore();
await dictStore.loadKeys(dictKeys);
await loadKeys(dictKeys);
// 设置表格列
let cols = columns.map(s => {
return { ...s };
@@ -178,7 +179,7 @@
// 不显示操作
cols = cols.filter(s => s.dataIndex !== 'handle');
}
logColumns.value = cols;
tableColumns.value = cols;
// 加载数据
fetchTableData();
});

27
orion-visor-ui/src/views/user/operator-log/components/operator-log-table.vue
View File

@@ -42,6 +42,11 @@
</template>
</a-button>
</a-popconfirm>
<!-- 调整 -->
<table-adjust :columns="columns"
:columns-hook="columnsHook"
:query-order="queryOrder"
@query="fetchTableData" />
</a-space>
</div>
</template>
@@ -51,7 +56,7 @@
ref="tableRef"
:loading="loading"
:row-selection="rowSelection"
:columns="columns"
:columns="tableColumns"
:data="tableRenderData"
:pagination="pagination"
:bordered="false"
@@ -140,21 +145,26 @@
<script lang="ts" setup>
import type { OperatorLogQueryRequest, OperatorLogQueryResponse } from '@/api/user/operator-log';
import { ref, reactive, onMounted } from 'vue';
import { operatorLogModuleKey, operatorLogTypeKey, operatorRiskLevelKey, operatorLogResultKey } from '../types/const';
import { TableName, operatorLogModuleKey, operatorLogTypeKey, operatorRiskLevelKey, operatorLogResultKey } from '../types/const';
import columns from '../types/table.columns';
import { copy } from '@/hooks/copy';
import useLoading from '@/hooks/loading';
import { useTablePagination, useRowSelection } from '@/hooks/table';
import { useRoute } from 'vue-router';
import { useDictStore } from '@/store';
import { useTablePagination, useRowSelection, useTableColumns } from '@/hooks/table';
import { getOperatorLogPage, deleteOperatorLog } from '@/api/user/operator-log';
import { replaceHtmlTag, clearHtmlTag } from '@/utils';
import { Message } from '@arco-design/web-vue';
import { useQueryOrder, DESC } from '@/hooks/query-order';
import OperatorLogQueryHeader from './operator-log-query-header.vue';
import TableAdjust from '@/components/app/table-adjust/index.vue';
const emits = defineEmits(['openClear', 'openDetail']);
const pagination = useTablePagination();
const rowSelection = useRowSelection();
const pagination = useTablePagination();
const queryOrder = useQueryOrder(TableName, DESC);
const { tableColumns, columnsHook } = useTableColumns(TableName, columns);
const { loading, setLoading } = useLoading();
const { getDictValue } = useDictStore();
@@ -211,11 +221,13 @@
fetchTableData();
};
defineExpose({ reload });
// 加载数据
const doFetchTableData = async (request: OperatorLogQueryRequest) => {
try {
setLoading(true);
const { data } = await getOperatorLogPage(request);
const { data } = await getOperatorLogPage(queryOrder.markOrderly(request));
tableRenderData.value = data.rows.map(s => {
return { ...s, originLogInfo: clearHtmlTag(s.logInfo) };
});
@@ -236,6 +248,11 @@
// 初始化
onMounted(() => {
const operatorType = useRoute().query.operatorType as string;
if (operatorType) {
formModel.type = operatorType;
}
// 查询数据
fetchTableData();
});

3
orion-visor-ui/src/views/user/operator-log/types/const.ts
View File

@@ -2,6 +2,9 @@ import type { OperatorLogQueryResponse } from '@/api/user/operator-log';
import { pick } from 'lodash';
import { dateFormat } from '@/utils';
// 表名称
export const TableName = 'opt-log';
// 结果状态
export const ResultStatus = {
// 失败

8
orion-visor-ui/src/views/user/operator-log/types/table.columns.ts
View File

@@ -9,23 +9,27 @@ const columns = [
width: 120,
ellipsis: true,
tooltip: true,
default: true,
}, {
title: '操作模块',
dataIndex: 'module',
slotName: 'module',
width: 234,
default: true,
}, {
title: '风险等级',
dataIndex: 'riskLevel',
slotName: 'riskLevel',
width: 90,
align: 'center',
default: true,
}, {
title: '执行结果',
dataIndex: 'result',
slotName: 'result',
width: 90,
align: 'center',
default: true,
}, {
title: '操作日志',
dataIndex: 'originLogInfo',
@@ -33,6 +37,7 @@ const columns = [
minWidth: 238,
align: 'left',
ellipsis: true,
default: true,
}, {
title: '留痕地址',
dataIndex: 'address',
@@ -40,6 +45,7 @@ const columns = [
width: 156,
align: 'left',
ellipsis: true,
default: true,
}, {
title: '操作时间',
dataIndex: 'createTime',
@@ -49,6 +55,7 @@ const columns = [
render: ({ record }) => {
return dateFormat(new Date(record.createTime));
},
default: true,
}, {
title: '操作',
dataIndex: 'handle',
@@ -56,6 +63,7 @@ const columns = [
width: 128,
align: 'center',
fixed: 'right',
default: true,
},
] as TableColumnData[];

1
orion-visor-ui/src/views/user/role/components/role-form-modal.vue
View File

@@ -68,6 +68,7 @@
id: undefined,
name: undefined,
code: undefined,
description: undefined,
};
};

17
orion-visor-ui/src/views/user/role/components/role-table.vue
View File

@@ -55,6 +55,11 @@
<icon-plus />
</template>
</a-button>
<!-- 调整 -->
<table-adjust :columns="columns"
:columns-hook="columnsHook"
:query-order="queryOrder"
@query="fetchTableData" />
</a-space>
</div>
</template>
@@ -62,7 +67,7 @@
<a-table row-key="id"
ref="tableRef"
:loading="loading"
:columns="columns"
:columns="tableColumns"
:data="tableRenderData"
:pagination="pagination"
:bordered="false"
@@ -142,16 +147,20 @@
import { Message } from '@arco-design/web-vue';
import useLoading from '@/hooks/loading';
import columns from '../types/table.columns';
import { RoleStatus, roleStatusKey } from '../types/const';
import { useTablePagination } from '@/hooks/table';
import { TableName, RoleStatus, roleStatusKey } from '../types/const';
import { useTablePagination, useTableColumns } from '@/hooks/table';
import usePermission from '@/hooks/permission';
import { useCacheStore, useDictStore } from '@/store';
import { AdminRoleCode } from '@/types/const';
import { useQueryOrder, ASC } from '@/hooks/query-order';
import TableAdjust from '@/components/app/table-adjust/index.vue';
const emits = defineEmits(['openAdd', 'openUpdate', 'openGrant']);
const cacheStore = useCacheStore();
const pagination = useTablePagination();
const queryOrder = useQueryOrder(TableName, ASC);
const { tableColumns, columnsHook } = useTableColumns(TableName, columns);
const { hasPermission } = usePermission();
const { loading, setLoading } = useLoading();
const { toOptions, getDictValue } = useDictStore();
@@ -203,7 +212,7 @@
const doFetchTableData = async (request: RoleQueryRequest) => {
try {
setLoading(true);
const { data } = await getRolePage(request);
const { data } = await getRolePage(queryOrder.markOrderly(request));
tableRenderData.value = data.rows;
pagination.total = data.total;
pagination.current = request.page;

3
orion-visor-ui/src/views/user/role/types/const.ts
View File

@@ -1,3 +1,6 @@
// 表名称
export const TableName = 'role';
// 角色状态
export const RoleStatus = {
// 停用

35
orion-visor-ui/src/views/user/role/types/table.columns.ts
View File

@@ -9,6 +9,7 @@ const columns = [
width: 100,
align: 'left',
fixed: 'left',
default: true,
}, {
title: '角色名称',
dataIndex: 'name',
@@ -16,11 +17,13 @@ const columns = [
minWidth: 118,
ellipsis: true,
tooltip: true,
default: true,
}, {
title: '角色编码',
dataIndex: 'code',
slotName: 'code',
minWidth: 118,
default: true,
}, {
title: '角色描述',
dataIndex: 'description',
@@ -28,27 +31,57 @@ const columns = [
minWidth: 128,
ellipsis: true,
tooltip: true,
default: true,
}, {
title: '角色状态',
dataIndex: 'status',
slotName: 'status',
align: 'center',
width: 128,
default: true,
}, {
title: '创建时间',
dataIndex: 'createTime',
slotName: 'createTime',
width: 180,
align: 'center',
width: 180,
render: ({ record }) => {
return dateFormat(new Date(record.createTime));
},
default: true,
}, {
title: '修改时间',
dataIndex: 'updateTime',
slotName: 'updateTime',
align: 'center',
width: 180,
render: ({ record }) => {
return dateFormat(new Date(record.updateTime));
},
default: true,
}, {
title: '创建人',
dataIndex: 'creator',
slotName: 'creator',
width: 148,
ellipsis: true,
tooltip: true,
default: false,
}, {
title: '修改人',
dataIndex: 'updater',
slotName: 'updater',
width: 148,
ellipsis: true,
tooltip: true,
default: false,
}, {
title: '操作',
slotName: 'handle',
width: 198,
align: 'center',
fixed: 'right',
default: true,
},
] as TableColumnData[];

22
orion-visor-ui/src/views/user/user/components/user-table.vue
View File

@@ -89,6 +89,11 @@
</template>
</a-button>
</a-popconfirm>
<!-- 调整 -->
<table-adjust :columns="columns"
:columns-hook="columnsHook"
:query-order="queryOrder"
@query="fetchTableData" />
</a-space>
</div>
</template>
@@ -97,7 +102,7 @@
row-key="id"
ref="tableRef"
:loading="loading"
:columns="columns"
:columns="tableColumns"
:row-selection="rowSelection"
:data="tableRenderData"
:pagination="pagination"
@@ -192,19 +197,23 @@
import { batchDeleteUser, deleteUser, getUserPage, updateUserStatus } from '@/api/user/user';
import { Message } from '@arco-design/web-vue';
import columns from '../types/table.columns';
import { userStatusKey, UserStatus } from '../types/const';
import { TableName, userStatusKey, UserStatus } from '../types/const';
import useLoading from '@/hooks/loading';
import { useTablePagination, useRowSelection } from '@/hooks/table';
import { useTablePagination, useRowSelection, useTableColumns } from '@/hooks/table';
import usePermission from '@/hooks/permission';
import { useRouter } from 'vue-router';
import { useCacheStore, useDictStore, useUserStore } from '@/store';
import { copy } from '@/hooks/copy';
import { useQueryOrder, ASC } from '@/hooks/query-order';
import TableAdjust from '@/components/app/table-adjust/index.vue';
const emits = defineEmits(['openAdd', 'openUpdate', 'openResetPassword', 'openGrantRole']);
const emits = defineEmits(['openAdd', 'openUpdate', 'openImport', 'openExport', 'openResetPassword', 'openGrantRole']);
const cacheStore = useCacheStore();
const pagination = useTablePagination();
const rowSelection = useRowSelection();
const pagination = useTablePagination();
const queryOrder = useQueryOrder(TableName, ASC);
const { tableColumns, columnsHook } = useTableColumns(TableName, columns);
const { hasPermission } = usePermission();
const { loading, setLoading } = useLoading();
const { toOptions, getDictValue } = useDictStore();
@@ -218,7 +227,6 @@
username: undefined,
password: undefined,
nickname: undefined,
avatar: undefined,
mobile: undefined,
email: undefined,
status: undefined,
@@ -287,7 +295,7 @@
const doFetchTableData = async (request: UserQueryRequest) => {
try {
setLoading(true);
const { data } = await getUserPage(request);
const { data } = await getUserPage(queryOrder.markOrderly(request));
tableRenderData.value = data.rows;
pagination.total = data.total;
pagination.current = request.page;

3
orion-visor-ui/src/views/user/user/types/const.ts
View File

@@ -1,3 +1,6 @@
// 表名称
export const TableName = 'user';
// 用户状态
export const UserStatus = {
// 禁用

45
orion-visor-ui/src/views/user/user/types/table.columns.ts
View File

@@ -9,6 +9,7 @@ const columns = [
width: 68,
align: 'left',
fixed: 'left',
default: true,
}, {
title: '用户名',
dataIndex: 'username',
@@ -16,6 +17,7 @@ const columns = [
minWidth: 138,
ellipsis: true,
tooltip: true,
default: true,
}, {
title: '花名',
dataIndex: 'nickname',
@@ -23,6 +25,7 @@ const columns = [
minWidth: 138,
ellipsis: true,
tooltip: true,
default: true,
}, {
title: '手机号',
dataIndex: 'mobile',
@@ -30,6 +33,7 @@ const columns = [
minWidth: 88,
ellipsis: true,
tooltip: true,
default: true,
}, {
title: '邮箱',
dataIndex: 'email',
@@ -37,6 +41,7 @@ const columns = [
minWidth: 88,
ellipsis: true,
tooltip: true,
default: true,
}, {
title: '用户描述',
dataIndex: 'description',
@@ -44,12 +49,14 @@ const columns = [
minWidth: 128,
ellipsis: true,
tooltip: true,
default: true,
}, {
title: '用户状态',
dataIndex: 'status',
slotName: 'status',
align: 'center',
width: 128,
default: true,
}, {
title: '最后登录时间',
dataIndex: 'lastLoginTime',
@@ -59,12 +66,50 @@ const columns = [
render: ({ record }) => {
return record.lastLoginTime && dateFormat(new Date(record.lastLoginTime));
},
default: true,
}, {
title: '创建时间',
dataIndex: 'createTime',
slotName: 'createTime',
align: 'center',
width: 180,
render: ({ record }) => {
return dateFormat(new Date(record.createTime));
},
default: true,
}, {
title: '修改时间',
dataIndex: 'updateTime',
slotName: 'updateTime',
align: 'center',
width: 180,
render: ({ record }) => {
return dateFormat(new Date(record.updateTime));
},
default: false,
}, {
title: '创建人',
dataIndex: 'creator',
slotName: 'creator',
width: 148,
ellipsis: true,
tooltip: true,
default: false,
}, {
title: '修改人',
dataIndex: 'updater',
slotName: 'updater',
width: 148,
ellipsis: true,
tooltip: true,
default: false,
}, {
title: '操作',
slotName: 'handle',
width: 298,
align: 'center',
fixed: 'right',
default: true,
},
] as TableColumnData[];