mirror of
https://gitee.com/dromara/Jpom.git
synced 2024-11-30 02:48:17 +08:00
optim page
This commit is contained in:
parent
aae97b716d
commit
147b2553de
@ -10,7 +10,7 @@
|
||||
### 🐞 解决BUG、优化功能
|
||||
|
||||
1. 【server】修复编辑构建 svn 类型仓库无法提交问题(感谢@杰 )
|
||||
|
||||
2. 【server】修复无法使用 git ssh 问题
|
||||
|
||||
------
|
||||
|
||||
|
14
PLANS.md
14
PLANS.md
@ -7,13 +7,13 @@
|
||||
3. 支持 mysql 数据库
|
||||
4. h2 数据库升级 2.0
|
||||
5. 文件管理支持备份
|
||||
6. 文件管理备份
|
||||
7. 节点工作空间变量
|
||||
8. 升级 JDK 11 或者 17
|
||||
9. 端口监控
|
||||
10. 操作监控优化
|
||||
11. 执行审计
|
||||
12. 节点日志文件搜索
|
||||
6. 节点工作空间变量
|
||||
7. 升级 JDK 11 或者 17
|
||||
8. 端口监控
|
||||
9. 操作监控优化
|
||||
10. 执行审计
|
||||
11. 节点日志文件搜索
|
||||
12. 监控 webhook
|
||||
|
||||
# 2.8.x
|
||||
--
|
||||
|
@ -155,7 +155,7 @@ export default {
|
||||
},
|
||||
{ title: "发布方式", dataIndex: "releaseMethod", width: 100, ellipsis: true, scopedSlots: { customRender: "releaseMethod" } },
|
||||
{ title: "构建人", dataIndex: "modifyUser", width: 130, ellipsis: true, scopedSlots: { customRender: "modifyUser" } },
|
||||
{ title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" }, width: 150, fixed: "right" },
|
||||
{ title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" }, width: 150, align: "center" },
|
||||
],
|
||||
};
|
||||
},
|
||||
|
@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<div class="full-content">
|
||||
<!-- <div ref="filter" class="filter"> -->
|
||||
<!-- <a-button type="primary" @click="handleFilter">刷新</a-button> -->
|
||||
<!-- <a-button type="primary" @click="handleFilter">刷新</a-button> -->
|
||||
<!-- </div> -->
|
||||
<!-- 数据表格 -->
|
||||
<a-table
|
||||
@ -101,7 +101,7 @@ export default {
|
||||
},
|
||||
{ title: "操作人", dataIndex: "modifyUser", ellipsis: true, scopedSlots: { customRender: "modifyUser" }, width: 120 },
|
||||
{ title: "状态", dataIndex: "status", width: 100, ellipsis: true, scopedSlots: { customRender: "status" } },
|
||||
{ title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" }, width: 100 },
|
||||
{ title: "操作", dataIndex: "operation", align: "center", scopedSlots: { customRender: "operation" }, width: 100 },
|
||||
],
|
||||
};
|
||||
},
|
||||
@ -181,5 +181,4 @@ export default {
|
||||
},
|
||||
};
|
||||
</script>
|
||||
<style scoped>
|
||||
</style>
|
||||
<style scoped></style>
|
||||
|
@ -147,7 +147,7 @@ export default {
|
||||
{ title: "开启状态", dataIndex: "status", ellipsis: true, scopedSlots: { customRender: "status" }, width: 120 },
|
||||
{ title: "自动重启", dataIndex: "autoRestart", ellipsis: true, scopedSlots: { customRender: "autoRestart" }, width: 120 },
|
||||
{ title: "报警状态", dataIndex: "alarm", ellipsis: true, scopedSlots: { customRender: "alarm" }, width: 120 },
|
||||
{ title: "修改人", dataIndex: "modifyUser", ellipsis: true, scopedSlots: { customRender: "modifyUser" }, width: 120 },
|
||||
{ title: "修改人", dataIndex: "modifyUser", ellipsis: true, align: "center", scopedSlots: { customRender: "modifyUser" }, width: 120 },
|
||||
{
|
||||
title: "修改时间",
|
||||
dataIndex: "modifyTimeMillis",
|
||||
|
@ -90,7 +90,7 @@ export default {
|
||||
width: 170,
|
||||
},
|
||||
{ title: "通知状态", dataIndex: "notifyStatus", width: 100, ellipsis: true, scopedSlots: { customRender: "notifyStatus" } },
|
||||
{ title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" }, width: 80 },
|
||||
{ title: "操作", dataIndex: "operation", align: "center", scopedSlots: { customRender: "operation" }, width: 80 },
|
||||
],
|
||||
};
|
||||
},
|
||||
|
@ -133,7 +133,7 @@ export default {
|
||||
},
|
||||
width: 180,
|
||||
},
|
||||
{ title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" }, width: 120 },
|
||||
{ title: "操作", dataIndex: "operation", align: "center", scopedSlots: { customRender: "operation" }, width: 120 },
|
||||
],
|
||||
rules: {
|
||||
name: [{ required: true, message: "Please input monitor name", trigger: "blur" }],
|
||||
|
@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<div class="node-full-content">
|
||||
<!-- 数据表格 -->
|
||||
<a-table :data-source="list" :loading="loading" :columns="columns" :pagination="false" bordered :rowKey="(record, index) => index">
|
||||
<a-table :data-source="list" size="middle" :loading="loading" :columns="columns" :pagination="false" bordered :rowKey="(record, index) => index">
|
||||
<template slot="title">
|
||||
<a-space>
|
||||
<a-button type="primary" @click="handleAdd">导入证书</a-button>
|
||||
@ -19,10 +19,10 @@
|
||||
</a-tooltip>
|
||||
<template slot="operation" slot-scope="text, record">
|
||||
<a-space>
|
||||
<a-button type="primary" @click="handleEdit(record)">编辑</a-button>
|
||||
<a-button type="primary" @click="handleDownload(record)">导出</a-button>
|
||||
<a-button type="primary" @click="handleTemplate(record)">模板</a-button>
|
||||
<a-button type="danger" @click="handleDelete(record)">删除</a-button>
|
||||
<a-button size="small" type="primary" @click="handleEdit(record)">编辑</a-button>
|
||||
<a-button size="small" type="primary" @click="handleDownload(record)">导出</a-button>
|
||||
<a-button size="small" type="primary" @click="handleTemplate(record)">模板</a-button>
|
||||
<a-button size="small" type="danger" @click="handleDelete(record)">删除</a-button>
|
||||
</a-space>
|
||||
</template>
|
||||
</a-table>
|
||||
@ -84,9 +84,9 @@ export default {
|
||||
editCertVisible: false,
|
||||
templateVisible: false,
|
||||
columns: [
|
||||
{ title: "ID", dataIndex: "id", width: 150, ellipsis: true, scopedSlots: { customRender: "id" } },
|
||||
{ title: "名称", dataIndex: "name", width: 150, ellipsis: true, scopedSlots: { customRender: "name" } },
|
||||
{ title: "域名", dataIndex: "domain", width: 170, ellipsis: true, scopedSlots: { customRender: "domain" } },
|
||||
{ title: "ID", dataIndex: "id", ellipsis: true, scopedSlots: { customRender: "id" } },
|
||||
{ title: "名称", dataIndex: "name", ellipsis: true, scopedSlots: { customRender: "name" } },
|
||||
{ title: "域名", dataIndex: "domain", ellipsis: true, scopedSlots: { customRender: "domain" } },
|
||||
{
|
||||
title: "生效时间",
|
||||
dataIndex: "effectiveTime",
|
||||
@ -109,7 +109,7 @@ export default {
|
||||
},
|
||||
width: 180,
|
||||
},
|
||||
{ title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" }, width: 360 },
|
||||
{ title: "操作", dataIndex: "operation", align: "center", scopedSlots: { customRender: "operation" }, width: 220 },
|
||||
],
|
||||
rules: {
|
||||
id: [{ required: true, message: "Please input ID", trigger: "blur" }],
|
||||
|
@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<div class="node-full-content">
|
||||
<!-- 数据表格 -->
|
||||
<a-table :data-source="list" :columns="columns" @change="changePage" :pagination="this.listQuery.total / this.listQuery.limit > 1 ? (this, pagination) : false" bordered rowKey="id">
|
||||
<a-table :data-source="list" size="middle" :columns="columns" @change="changePage" :pagination="this.listQuery.total / this.listQuery.limit > 1 ? (this, pagination) : false" bordered rowKey="id">
|
||||
<template slot="title">
|
||||
<a-space>
|
||||
<a-input v-model="listQuery['%name%']" placeholder="名称" allowClear class="search-input-item" />
|
||||
@ -48,9 +48,9 @@
|
||||
</a-tooltip>
|
||||
<template slot="operation" slot-scope="text, record">
|
||||
<a-space>
|
||||
<a-button type="primary" @click="viewLog(record)">查看日志</a-button>
|
||||
<a-button size="small" type="primary" @click="viewLog(record)">查看日志</a-button>
|
||||
|
||||
<a-button type="danger" @click="handleDelete(record)">删除</a-button>
|
||||
<a-button size="small" type="danger" @click="handleDelete(record)">删除</a-button>
|
||||
</a-space>
|
||||
</template>
|
||||
</a-table>
|
||||
@ -97,7 +97,7 @@ export default {
|
||||
{ title: "执行时间", dataIndex: "createTimeMillis", ellipsis: true, scopedSlots: { customRender: "createTimeMillis" } },
|
||||
{ title: "触发类型", dataIndex: "triggerExecType", width: 100, ellipsis: true, scopedSlots: { customRender: "triggerExecTypeMap" } },
|
||||
{ title: "执行人", dataIndex: "modifyUser", ellipsis: true, scopedSlots: { customRender: "modifyUser" } },
|
||||
{ title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" }, width: 220 },
|
||||
{ title: "操作", dataIndex: "operation", align: "center", scopedSlots: { customRender: "operation" }, width: 140 },
|
||||
],
|
||||
};
|
||||
},
|
||||
|
@ -422,7 +422,7 @@ export default {
|
||||
},
|
||||
{ title: "运行状态", dataIndex: "status", width: 80, ellipsis: true, align: "center", scopedSlots: { customRender: "status" } },
|
||||
{ title: "端口/PID", dataIndex: "port", width: 100, ellipsis: true, scopedSlots: { customRender: "port" } },
|
||||
{ title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" }, width: 180 },
|
||||
{ title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" }, align: "center", width: 180 },
|
||||
],
|
||||
rules: {
|
||||
id: [{ required: true, message: "请输入项目ID", trigger: "blur" }],
|
||||
|
@ -32,13 +32,13 @@
|
||||
</a-space>
|
||||
</div>
|
||||
<a-table size="middle" :locale="tableLocale" :loading="loading" :columns="columns" :data-source="processList" bordered rowKey="pid" class="node-table" :pagination="false">
|
||||
<a-tooltip slot="port" slot-scope="text" placement="topLeft" :title="text">
|
||||
<!-- <a-tooltip slot="port" slot-scope="text" placement="topLeft" :title="text">
|
||||
<span>{{ text }}</span>
|
||||
</a-tooltip>
|
||||
<a-tooltip slot="user" slot-scope="text" placement="topLeft" :title="text">
|
||||
<span>{{ text }}</span>
|
||||
</a-tooltip>
|
||||
<a-tooltip slot="jpomName" slot-scope="text" placement="topLeft" :title="text">
|
||||
</a-tooltip> -->
|
||||
<a-tooltip slot="tooltip" slot-scope="text" placement="topLeft" :title="text">
|
||||
<span>{{ text }}</span>
|
||||
</a-tooltip>
|
||||
<template slot="operation" slot-scope="text, record">
|
||||
@ -83,18 +83,18 @@ export default {
|
||||
historyData: [],
|
||||
processName: "java",
|
||||
columns: [
|
||||
{ title: "进程 ID", dataIndex: "pid", width: 100, ellipsis: true, scopedSlots: { customRender: "pid" } },
|
||||
{ title: "进程名称", dataIndex: "command", width: 150, ellipsis: true, scopedSlots: { customRender: "command" } },
|
||||
{ title: "端口", dataIndex: "port", width: 100, ellipsis: true, scopedSlots: { customRender: "port" } },
|
||||
{ title: "所有者", dataIndex: "user", width: 100, ellipsis: true, scopedSlots: { customRender: "user" } },
|
||||
{ title: "项目名称", dataIndex: "jpomName", width: 150, ellipsis: true, scopedSlots: { customRender: "jpomName" } },
|
||||
{ title: "物理内存", dataIndex: "res", width: 100, ellipsis: true },
|
||||
{ title: "进程状态", dataIndex: "status", width: 100, ellipsis: true },
|
||||
{ title: "占用CPU", dataIndex: "cpu", width: 100, ellipsis: true },
|
||||
{ title: "物理内存百分比", dataIndex: "mem", width: 140, ellipsis: true },
|
||||
{ title: "虚拟内存", dataIndex: "virt", width: 100, ellipsis: true },
|
||||
{ title: "共享内存", dataIndex: "shr", width: 100, ellipsis: true },
|
||||
{ title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" }, width: 100, fixed: "right" },
|
||||
{ title: "进程 ID", dataIndex: "pid", width: 80, ellipsis: true, scopedSlots: { customRender: "tooltip" } },
|
||||
{ title: "进程名称", dataIndex: "command", width: 150, ellipsis: true, scopedSlots: { customRender: "tooltip" } },
|
||||
{ title: "端口", dataIndex: "port", width: 100, ellipsis: true, scopedSlots: { customRender: "tooltip" } },
|
||||
{ title: "所有者", dataIndex: "user", width: 100, ellipsis: true, scopedSlots: { customRender: "tooltip" } },
|
||||
{ title: "项目名称", dataIndex: "jpomName", width: 150, ellipsis: true, scopedSlots: { customRender: "tooltip" } },
|
||||
{ title: "物理内存", dataIndex: "res", width: 100, ellipsis: true, scopedSlots: { customRender: "tooltip" } },
|
||||
{ title: "进程状态", dataIndex: "status", width: 100, ellipsis: true, scopedSlots: { customRender: "tooltip" } },
|
||||
{ title: "占用CPU", dataIndex: "cpu", width: 100, ellipsis: true, scopedSlots: { customRender: "tooltip" } },
|
||||
{ title: "物理内存百分比", dataIndex: "mem", width: 140, ellipsis: true, scopedSlots: { customRender: "tooltip" } },
|
||||
{ title: "虚拟内存", dataIndex: "virt", width: 100, ellipsis: true, scopedSlots: { customRender: "tooltip" } },
|
||||
{ title: "共享内存", dataIndex: "shr", width: 100, ellipsis: true, scopedSlots: { customRender: "tooltip" } },
|
||||
{ title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" }, align: "center", width: 80, fixed: "right" },
|
||||
],
|
||||
};
|
||||
},
|
||||
|
@ -174,7 +174,7 @@ export default {
|
||||
},
|
||||
{ title: "运行状态", dataIndex: "status", width: 100, ellipsis: true, scopedSlots: { customRender: "status" } },
|
||||
{ title: "端口/PID", dataIndex: "port", width: 100, ellipsis: true, scopedSlots: { customRender: "port" } },
|
||||
{ title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" }, width: 140 },
|
||||
{ title: "操作", dataIndex: "operation", align: "center", scopedSlots: { customRender: "operation" }, width: 140 },
|
||||
],
|
||||
};
|
||||
},
|
||||
|
@ -199,11 +199,11 @@ export default {
|
||||
username: null,
|
||||
importTypePlaceholder: "",
|
||||
columns: [
|
||||
{ title: "仓库名称", dataIndex: "name", sorter: true, width: 150, ellipsis: true, scopedSlots: { customRender: "name" } },
|
||||
{ title: "仓库名称", dataIndex: "name", sorter: true, ellipsis: true, scopedSlots: { customRender: "name" } },
|
||||
{
|
||||
title: "仓库地址",
|
||||
dataIndex: "gitUrl",
|
||||
width: 300,
|
||||
|
||||
sorter: true,
|
||||
ellipsis: true,
|
||||
scopedSlots: { customRender: "gitUrl" },
|
||||
@ -239,9 +239,9 @@ export default {
|
||||
{
|
||||
title: "操作",
|
||||
dataIndex: "operation",
|
||||
width: 160,
|
||||
align: "center",
|
||||
width: 120,
|
||||
scopedSlots: { customRender: "operation" },
|
||||
align: "left",
|
||||
},
|
||||
],
|
||||
reposColumns: [
|
||||
|
@ -137,7 +137,7 @@ export default {
|
||||
{ title: "修改时间", dataIndex: "modifyTimeMillis", sorter: true, width: 170, ellipsis: true, scopedSlots: { customRender: "modifyTimeMillis" } },
|
||||
{ title: "修改人", dataIndex: "modifyUser", ellipsis: true, scopedSlots: { customRender: "modifyUser" }, width: 120 },
|
||||
{ title: "最后操作人", dataIndex: "lastRunUser", ellipsis: true, scopedSlots: { customRender: "lastRunUser" } },
|
||||
{ title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" }, width: 180 },
|
||||
{ title: "操作", dataIndex: "operation", align: "center", scopedSlots: { customRender: "operation" }, width: 180 },
|
||||
],
|
||||
rules: {
|
||||
name: [{ required: true, message: "Please input Script name", trigger: "blur" }],
|
||||
|
@ -77,7 +77,7 @@ export default {
|
||||
{ title: "执行时间", dataIndex: "createTimeMillis", sorter: true, ellipsis: true, scopedSlots: { customRender: "createTimeMillis" } },
|
||||
{ title: "触发类型", dataIndex: "triggerExecType", width: 100, ellipsis: true, scopedSlots: { customRender: "triggerExecTypeMap" } },
|
||||
{ title: "执行人", dataIndex: "modifyUser", ellipsis: true, scopedSlots: { customRender: "modifyUser" } },
|
||||
{ title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" }, width: 150 },
|
||||
{ title: "操作", dataIndex: "operation", align: "center", scopedSlots: { customRender: "operation" }, width: 150 },
|
||||
],
|
||||
};
|
||||
},
|
||||
|
@ -103,7 +103,7 @@ export default {
|
||||
ellipsis: true,
|
||||
scopedSlots: { customRender: "modifyUser" },
|
||||
},
|
||||
{ title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" }, width: 200 },
|
||||
{ title: "操作", dataIndex: "operation", align: "center", scopedSlots: { customRender: "operation" }, width: 200 },
|
||||
],
|
||||
};
|
||||
},
|
||||
|
@ -205,7 +205,7 @@ export default {
|
||||
ellipsis: true,
|
||||
scopedSlots: { customRender: "modifyUser" },
|
||||
},
|
||||
{ title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" }, width: 180 },
|
||||
{ title: "操作", dataIndex: "operation", align: "center", scopedSlots: { customRender: "operation" }, width: 180 },
|
||||
],
|
||||
};
|
||||
},
|
||||
|
@ -95,11 +95,11 @@ export default {
|
||||
// { title: "节点 ID", dataIndex: "id", ellipsis: true, scopedSlots: { customRender: "id" } },
|
||||
{ title: "节点名称", dataIndex: "name", ellipsis: true, scopedSlots: { customRender: "name" } },
|
||||
{ title: "节点地址", dataIndex: "url", sorter: true, key: "url", ellipsis: true, scopedSlots: { customRender: "url" } },
|
||||
{ title: "Agent版本号", dataIndex: "version", width: "100", ellipsis: true, scopedSlots: { customRender: "version" } },
|
||||
{ title: "打包时间", dataIndex: "timeStamp", ellipsis: true, scopedSlots: { customRender: "timeStamp" } },
|
||||
{ title: "版本号", dataIndex: "version", width: 100, ellipsis: true, scopedSlots: { customRender: "version" } },
|
||||
{ title: "打包时间", dataIndex: "timeStamp", width: 180, ellipsis: true, scopedSlots: { customRender: "timeStamp" } },
|
||||
{ title: "状态", dataIndex: "status", ellipsis: true, scopedSlots: { customRender: "status" } },
|
||||
// {title: '自动更新', dataIndex: 'autoUpdate', ellipsis: true, scopedSlots: {customRender: 'autoUpdate'}},
|
||||
{ title: "操作", dataIndex: "operation", width: 90, scopedSlots: { customRender: "operation" }, align: "center" },
|
||||
{ title: "操作", dataIndex: "operation", width: 80, scopedSlots: { customRender: "operation" }, align: "center" },
|
||||
],
|
||||
nodeVersion: {},
|
||||
nodeStatus: {},
|
||||
|
Loading…
Reference in New Issue
Block a user