diff --git a/orion-visor-ui/src/views/exec/exec-command-log/components/exec-command-log-table.vue b/orion-visor-ui/src/views/exec/exec-command-log/components/exec-command-log-table.vue
index a476f99c..d7fcf2a0 100644
--- a/orion-visor-ui/src/views/exec/exec-command-log/components/exec-command-log-table.vue
+++ b/orion-visor-ui/src/views/exec/exec-command-log/components/exec-command-log-table.vue
@@ -94,6 +94,11 @@
+
+
@@ -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([]);
- const tableRenderData = ref([]);
+ const selectedKeys = ref>([]);
+ const tableRenderData = ref>([]);
const formModel = reactive({
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;
diff --git a/orion-visor-ui/src/views/exec/exec-command-log/types/const.ts b/orion-visor-ui/src/views/exec/exec-command-log/types/const.ts
index 20d8b031..8165c8b3 100644
--- a/orion-visor-ui/src/views/exec/exec-command-log/types/const.ts
+++ b/orion-visor-ui/src/views/exec/exec-command-log/types/const.ts
@@ -1,2 +1,5 @@
+// 表名称
+export const TableName = 'exec-cmd-log';
+
// 最大清理数量
export const maxClearLimit = 1000;
diff --git a/orion-visor-ui/src/views/exec/exec-command-log/types/table.columns.ts b/orion-visor-ui/src/views/exec/exec-command-log/types/table.columns.ts
index 12db79ca..d55a2ac6 100644
--- a/orion-visor-ui/src/views/exec/exec-command-log/types/table.columns.ts
+++ b/orion-visor-ui/src/views/exec/exec-command-log/types/table.columns.ts
@@ -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',
diff --git a/orion-visor-ui/src/views/exec/exec-job-log/components/exec-job-log-table.vue b/orion-visor-ui/src/views/exec/exec-job-log/components/exec-job-log-table.vue
index c8621988..07146f33 100644
--- a/orion-visor-ui/src/views/exec/exec-job-log/components/exec-job-log-table.vue
+++ b/orion-visor-ui/src/views/exec/exec-job-log/components/exec-job-log-table.vue
@@ -85,6 +85,11 @@
+
+
@@ -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 @@
-
- #{{ record.execSeq }}
-
-
- {{ record.description }}
+
+
+ #{{ record.execSeq }}
+
+
+ {{ record.description }}
+
@@ -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;
diff --git a/orion-visor-ui/src/views/exec/exec-job-log/types/const.ts b/orion-visor-ui/src/views/exec/exec-job-log/types/const.ts
index 20d8b031..1a92c847 100644
--- a/orion-visor-ui/src/views/exec/exec-job-log/types/const.ts
+++ b/orion-visor-ui/src/views/exec/exec-job-log/types/const.ts
@@ -1,2 +1,5 @@
+// 表名称
+export const TableName = 'exec-job-log';
+
// 最大清理数量
export const maxClearLimit = 1000;
diff --git a/orion-visor-ui/src/views/exec/exec-job-log/types/table.columns.ts b/orion-visor-ui/src/views/exec/exec-job-log/types/table.columns.ts
index dba56b84..3b875cf1 100644
--- a/orion-visor-ui/src/views/exec/exec-job-log/types/table.columns.ts
+++ b/orion-visor-ui/src/views/exec/exec-job-log/types/table.columns.ts
@@ -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[];
diff --git a/orion-visor-ui/src/views/exec/exec-job/components/exec-job-table.vue b/orion-visor-ui/src/views/exec/exec-job/components/exec-job-table.vue
index 9f7d745a..fb48afe9 100644
--- a/orion-visor-ui/src/views/exec/exec-job/components/exec-job-table.vue
+++ b/orion-visor-ui/src/views/exec/exec-job/components/exec-job-table.vue
@@ -77,6 +77,11 @@
+
+
@@ -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;
diff --git a/orion-visor-ui/src/views/exec/exec-job/types/const.ts b/orion-visor-ui/src/views/exec/exec-job/types/const.ts
index 4d8d058d..59df8ce9 100644
--- a/orion-visor-ui/src/views/exec/exec-job/types/const.ts
+++ b/orion-visor-ui/src/views/exec/exec-job/types/const.ts
@@ -1,5 +1,8 @@
import type { TemplateParam } from '@/components/view/exec-editor/const';
+// 表名称
+export const TableName = 'exec-job';
+
// cron 下次执行次数
export const CronNextTimes = 5;
diff --git a/orion-visor-ui/src/views/exec/exec-job/types/table.columns.ts b/orion-visor-ui/src/views/exec/exec-job/types/table.columns.ts
index d8d71e25..a5d7c7e7 100644
--- a/orion-visor-ui/src/views/exec/exec-job/types/table.columns.ts
+++ b/orion-visor-ui/src/views/exec/exec-job/types/table.columns.ts
@@ -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[];
diff --git a/orion-visor-ui/src/views/exec/exec-template/components/exec-template-table.vue b/orion-visor-ui/src/views/exec/exec-template/components/exec-template-table.vue
index 60c1920c..93e71f1c 100644
--- a/orion-visor-ui/src/views/exec/exec-template/components/exec-template-table.vue
+++ b/orion-visor-ui/src/views/exec/exec-template/components/exec-template-table.vue
@@ -64,6 +64,11 @@
+
+
@@ -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([]);
@@ -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;
diff --git a/orion-visor-ui/src/views/exec/exec-template/types/const.ts b/orion-visor-ui/src/views/exec/exec-template/types/const.ts
new file mode 100644
index 00000000..a15802c1
--- /dev/null
+++ b/orion-visor-ui/src/views/exec/exec-template/types/const.ts
@@ -0,0 +1,2 @@
+// 表名称
+export const TableName = 'exec-tpl';
diff --git a/orion-visor-ui/src/views/exec/exec-template/types/table.columns.ts b/orion-visor-ui/src/views/exec/exec-template/types/table.columns.ts
index 6bc8273c..839406a8 100644
--- a/orion-visor-ui/src/views/exec/exec-template/types/table.columns.ts
+++ b/orion-visor-ui/src/views/exec/exec-template/types/table.columns.ts
@@ -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[];
diff --git a/orion-visor-ui/src/views/exec/upload-task/components/upload-task-table.vue b/orion-visor-ui/src/views/exec/upload-task/components/upload-task-table.vue
index 7ad66962..07b51163 100644
--- a/orion-visor-ui/src/views/exec/upload-task/components/upload-task-table.vue
+++ b/orion-visor-ui/src/views/exec/upload-task/components/upload-task-table.vue
@@ -94,6 +94,11 @@
+
+
@@ -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;
diff --git a/orion-visor-ui/src/views/exec/upload-task/types/const.ts b/orion-visor-ui/src/views/exec/upload-task/types/const.ts
index 59bce11c..77242678 100644
--- a/orion-visor-ui/src/views/exec/upload-task/types/const.ts
+++ b/orion-visor-ui/src/views/exec/upload-task/types/const.ts
@@ -1,3 +1,6 @@
+// 表名称
+export const TableName = 'upload-task';
+
// 上传任务状态
export const UploadTaskStatus = {
// 等待中
diff --git a/orion-visor-ui/src/views/exec/upload-task/types/table.columns.ts b/orion-visor-ui/src/views/exec/upload-task/types/table.columns.ts
index 1aa0c4a0..3abda259 100644
--- a/orion-visor-ui/src/views/exec/upload-task/types/table.columns.ts
+++ b/orion-visor-ui/src/views/exec/upload-task/types/table.columns.ts
@@ -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[];
diff --git a/orion-visor-ui/src/views/system/dict-key/components/dict-key-table.vue b/orion-visor-ui/src/views/system/dict-key/components/dict-key-table.vue
index f873af76..c1a843bb 100644
--- a/orion-visor-ui/src/views/system/dict-key/components/dict-key-table.vue
+++ b/orion-visor-ui/src/views/system/dict-key/components/dict-key-table.vue
@@ -78,6 +78,11 @@
+
+
@@ -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([]);
- const tableRenderData = ref([]);
+ const selectedKeys = ref>([]);
+ const tableRenderData = ref>([]);
const formModel = reactive({
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;
diff --git a/orion-visor-ui/src/views/system/dict-key/types/const.ts b/orion-visor-ui/src/views/system/dict-key/types/const.ts
index b0369483..4d92638a 100644
--- a/orion-visor-ui/src/views/system/dict-key/types/const.ts
+++ b/orion-visor-ui/src/views/system/dict-key/types/const.ts
@@ -1,3 +1,6 @@
+// 表名称
+export const TableName = 'dict-key';
+
// 配置值类型定义
export const ValueType = {
// 字符串
diff --git a/orion-visor-ui/src/views/system/dict-key/types/table.columns.ts b/orion-visor-ui/src/views/system/dict-key/types/table.columns.ts
index 2a101e1d..6781d995 100644
--- a/orion-visor-ui/src/views/system/dict-key/types/table.columns.ts
+++ b/orion-visor-ui/src/views/system/dict-key/types/table.columns.ts
@@ -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[];
diff --git a/orion-visor-ui/src/views/system/dict-value/components/dict-value-table.vue b/orion-visor-ui/src/views/system/dict-value/components/dict-value-table.vue
index 60da0fc5..b27938b1 100644
--- a/orion-visor-ui/src/views/system/dict-value/components/dict-value-table.vue
+++ b/orion-visor-ui/src/views/system/dict-value/components/dict-value-table.vue
@@ -64,6 +64,11 @@
+
+
@@ -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>([]);
@@ -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;
diff --git a/orion-visor-ui/src/views/system/dict-value/types/const.ts b/orion-visor-ui/src/views/system/dict-value/types/const.ts
index 325c0499..4cabd37f 100644
--- a/orion-visor-ui/src/views/system/dict-value/types/const.ts
+++ b/orion-visor-ui/src/views/system/dict-value/types/const.ts
@@ -1,2 +1,5 @@
+// 表名称
+export const TableName = 'dict-value';
+
// 历史值类型
export const historyType = 'DICT';
diff --git a/orion-visor-ui/src/views/system/dict-value/types/table.columns.ts b/orion-visor-ui/src/views/system/dict-value/types/table.columns.ts
index d5f18358..e8675e35 100644
--- a/orion-visor-ui/src/views/system/dict-value/types/table.columns.ts
+++ b/orion-visor-ui/src/views/system/dict-value/types/table.columns.ts
@@ -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[];
diff --git a/orion-visor-ui/src/views/user/operator-log/components/operator-log-query-header.vue b/orion-visor-ui/src/views/user/operator-log/components/operator-log-query-header.vue
index f08ae743..e72e3843 100644
--- a/orion-visor-ui/src/views/user/operator-log/components/operator-log-query-header.vue
+++ b/orion-visor-ui/src/views/user/operator-log/components/operator-log-query-header.vue
@@ -62,8 +62,8 @@