test/Jpom
1
0
Fork 0
mirror of https://gitee.com/dromara/Jpom.git synced 2024-11-30 02:48:17 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

fix 0px -> 0

Browse Source
This commit is contained in:
bwcx_jzy 2023-06-12 09:56:30 +08:00
parent dbbc879f04
commit 9e95cc849b
No known key found for this signature in database
GPG Key ID: E187D6E9DDDE8C53
42 changed files with 69 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PLANS.md
View File

@ -20,7 +20,7 @@
9. 执行审计
10. 执行部分命令耗时和直接执行相差太大
11. 监控通知模块优化支持更多（飞书）
12. 非 root 用户提升权限写入 root 用户文件
12. **非 root 用户提升权限写入 root 用户文件**
13. 部分数据迁移工作空间（项目，构建，仓库、节点分发）
14. 前端表格用户自定义列显示
15. 前端升级 vue3
@ -32,6 +32,7 @@
21. 隧道节点
22. 批量删除镜像 (sh)
23. docker 容器编辑重建(zx)
24. 仓库引用环境变量支持使用下拉框
### DONE
1. ~~使用服务端的 git 插件~~

2
web-vue/src/components/logView/index.vue
View File

@ -60,7 +60,7 @@ export default {
},
marginTop: {
String,
default: "0px",
default: "0",
},
extendBar: {
Boolean,

4
web-vue/src/components/logView/view-pre.vue
View File

@ -244,12 +244,12 @@ export default {
position: unset;
}
.item {
padding: 0px 6px;
padding: 0 6px;
}
.linenumber {
color: #e6e6e6;
padding: 0px 4px;
padding: 0 4px;
opacity: 0.6;
/* overflow: auto; */
/* white-space: nowrap; */

6
web-vue/src/pages/build/edit.vue
View File

@ -86,7 +86,7 @@
<a-collapse :activeKey="['0', '1', '2']" expandIconPosition="right">
<a-collapse-panel key="0">
<template slot="header">
<a-form-model-item prop="buildMode" style="margin-bottom: 0px">
<a-form-model-item prop="buildMode" style="margin-bottom: 0">
<template slot="label">
<a-tooltip>
方式
@ -214,7 +214,7 @@
</a-collapse-panel>
<a-collapse-panel key="1">
<template slot="header">
<a-form-model-item prop="releaseMethod" style="margin-bottom: 0px">
<a-form-model-item prop="releaseMethod" style="margin-bottom: 0">
<template slot="label">
<a-tooltip>
发布操作
@ -522,7 +522,7 @@
</a-collapse-panel>
<a-collapse-panel key="2">
<template slot="header">
<a-form-model-item label="其他配置" style="margin-bottom: 0px"></a-form-model-item>
<a-form-model-item label="其他配置" style="margin-bottom: 0"></a-form-model-item>
</template>
<a-form-model-item prop="cacheBuild">
<template slot="label">

6
web-vue/src/pages/build/list-info.vue
View File

@ -50,13 +50,13 @@
<template slot="title">
<a-row :gutter="[4, 0]">
<a-col :span="17" style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap">
<a-button type="link" style="padding: 0px" size="small" @click="handleDetails(item)">
<a-button type="link" style="padding: 0" size="small" @click="handleDetails(item)">
<span> {{ item.name }}</span>
</a-button>
</a-col>
<a-col :span="7" style="text-align: right" class="text-overflow-hidden">
<a-tooltip :title="`当前状态：${statusMap[item.status]} ${item.statusMsg ? '状态消息：' + item.statusMsg : ''} `">
<a-tag :color="statusColor[item.status]" style="margin-right: 0px"> {{ statusMap[item.status] || "未知状态" }}</a-tag>
<a-tag :color="statusColor[item.status]" style="margin-right: 0"> {{ statusMap[item.status] || "未知状态" }}</a-tag>
</a-tooltip>
</a-col>
</a-row>
@ -194,7 +194,7 @@
:row-selection="rowSelection"
>
<a-tooltip slot="name" slot-scope="text, record" placement="topLeft" @click="handleDetails(record)" :title="`名称：${text} 点击查看详情`">
<a-button type="link" style="padding: 0px" size="small"> <a-icon type="fullscreen" />{{ text }}</a-button>
<a-button type="link" style="padding: 0" size="small"> <a-icon type="fullscreen" />{{ text }}</a-button>
</a-tooltip>
<a-tooltip slot="branchName" slot-scope="text, record" placement="topLeft">
<template slot="title">

2
web-vue/src/pages/certificate/list.vue
View File

@ -36,7 +36,7 @@
<p>描述：{{ item.description }}</p>
</template>
<!-- {{ text }} -->
<a-button type="link" style="padding: 0px" @click="handleEdit(item)" size="small">{{ text }}</a-button>
<a-button type="link" style="padding: 0" @click="handleEdit(item)" size="small">{{ text }}</a-button>
</a-popover>
<template slot="fileExists" slot-scope="text">
<a-tag v-if="text" color="green">存在</a-tag>

4
web-vue/src/pages/dispatch/list.vue
View File

@ -54,7 +54,7 @@
</a-tooltip>
<template slot="name" slot-scope="text, record">
<a-tooltip placement="topLeft" :title="text">
<a-button size="small" style="padding: 0px" type="link" icon="fullscreen" @click="handleViewStatus(record)">{{ text }}</a-button>
<a-button size="small" style="padding: 0" type="link" icon="fullscreen" @click="handleViewStatus(record)">{{ text }}</a-button>
</a-tooltip>
</template>
@ -1627,7 +1627,7 @@ export default {
}
.box-shadow {
box-shadow: 0px 0px 10px 5px rgba(223, 222, 222, 0.5);
box-shadow: 0 0 10px 5px rgba(223, 222, 222, 0.5);
border-radius: 5px;
}

2
web-vue/src/pages/dispatch/status.vue
View File

@ -18,7 +18,7 @@
</a-space>
</template>
<a-tooltip slot="nodeId" slot-scope="text" placement="topLeft" :title="text">
<a-button type="link" style="padding: 0px" size="small" @click="toNode(text)">
<a-button type="link" style="padding: 0" size="small" @click="toNode(text)">
<span>{{ nodeNameMap[text] || text }}</span>
<a-icon type="fullscreen" />
</a-button>

2
web-vue/src/pages/docker/container.vue
View File

@ -409,7 +409,7 @@
v-model="terminalVisible"
width="80vw"
:bodyStyle="{
padding: '0px 10px',
padding: '0 10px',
paddingTop: '10px',
marginRight: '10px',
height: `70vh`,

2
web-vue/src/pages/file-manager/fileStorage/list.vue
View File

@ -46,7 +46,7 @@
<p v-if="item.progressDesc">状态描述：{{ item.progressDesc }}</p>
</template>
<!-- {{ text }} -->
<a-button type="link" style="padding: 0px" @click="handleEdit(item)" size="small">{{ text }}</a-button>
<a-button type="link" style="padding: 0" @click="handleEdit(item)" size="small">{{ text }}</a-button>
</a-popover>
<a-tooltip slot="renderSize" slot-scope="text" placement="topLeft" :title="renderSize(text)">

2
web-vue/src/pages/file-manager/release-task/list.vue
View File

@ -33,7 +33,7 @@
</a-tooltip>
<template slot="fileId" slot-scope="text, item">
<a-button type="link" style="padding: 0px" @click="handleViewFile(item)" size="small">{{ text }}</a-button>
<a-button type="link" style="padding: 0" @click="handleViewFile(item)" size="small">{{ text }}</a-button>
</template>
<template slot="status" slot-scope="text">

2
web-vue/src/pages/layout/my-workspace.vue
View File

@ -109,7 +109,7 @@ export default {
</script>
<style scoped>
.box-shadow {
box-shadow: 0px 0px 10px 5px rgba(223, 222, 222, 0.5);
box-shadow: 0 0 10px 5px rgba(223, 222, 222, 0.5);
border-radius: 5px;
}

10
web-vue/src/pages/node/list.vue
View File

@ -97,7 +97,7 @@
</template>
<template v-else>
<a-tooltip :title="`${text} 点击进入节点管理`" @click="handleNode(record)">
<a-button type="link" style="padding: 0px" size="small">
<a-button type="link" style="padding: 0" size="small">
<a-icon type="fullscreen" /><span>{{ text }}</span>
</a-button>
</a-tooltip>
@ -110,7 +110,7 @@
:title="`${statusMap[item.machineNodeData && item.machineNodeData.status] || '未知'} ${item.machineNodeData && item.machineNodeData.statusMsg}`"
>
<template v-if="item.openStatus === 1">
<a-tag :color="item.machineNodeData && item.machineNodeData.status === 1 ? 'green' : 'pink'" style="margin-right: 0px">
<a-tag :color="item.machineNodeData && item.machineNodeData.status === 1 ? 'green' : 'pink'" style="margin-right: 0">
{{ statusMap[item.machineNodeData && item.machineNodeData.status] || "未知" }}
</a-tag>
</template>
@ -219,7 +219,7 @@
<div>节点地址：{{ item.url }}</div>
</template>
<a-button type="link" style="padding: 0px" size="small" @click="handleNode(item)">
<a-button type="link" style="padding: 0" size="small" @click="handleNode(item)">
<span> {{ item.name }}</span>
</a-button>
</a-tooltip>
@ -230,7 +230,7 @@
<div>当前状态：{{ statusMap[item.machineNodeData && item.machineNodeData.status] }}</div>
<div>状态描述：{{ (item.machineNodeData && item.machineNodeData.statusMsg) || "" }}</div>
</template>
<a-tag :color="item.machineNodeData && item.machineNodeData.status === 1 ? 'green' : 'pink'" style="margin-right: 0px">
<a-tag :color="item.machineNodeData && item.machineNodeData.status === 1 ? 'green' : 'pink'" style="margin-right: 0">
{{ statusMap[item.machineNodeData && item.machineNodeData.status] }}
</a-tag>
</a-tooltip>
@ -413,7 +413,7 @@
<a-modal
v-model="terminalVisible"
:bodyStyle="{
padding: '0px 10px',
padding: '0 10px',
paddingTop: '10px',
marginRight: '10px',
height: `70vh`,

2
web-vue/src/pages/node/node-layout/project/project-list.vue
View File

@ -80,7 +80,7 @@
</template>
</template>
<a-tooltip slot="name" slot-scope="text, record" placement="topLeft" :title="`名称：${text}`" @click="handleEdit(record)">
<a-button type="link" style="padding: 0px" size="small"><a-icon v-if="record.outGivingProject" type="apartment" />{{ text }} </a-button>
<a-button type="link" style="padding: 0" size="small"><a-icon v-if="record.outGivingProject" type="apartment" />{{ text }} </a-button>
</a-tooltip>
<a-tooltip slot="path" slot-scope="text, item" placement="topLeft" :title="item.whitelistDirectory + item.lib">

2
web-vue/src/pages/node/script-list.vue
View File

@ -39,7 +39,7 @@
<a-tooltip slot="name" @click="handleEdit(record)" slot-scope="text, record" placement="topLeft" :title="text">
<!-- <span>{{ text }}</span> -->
<a-button type="link" style="padding: 0px" size="small">{{ text }}</a-button>
<a-button type="link" style="padding: 0" size="small">{{ text }}</a-button>
</a-tooltip>
<template slot="global" slot-scope="text">
<a-tag v-if="text === 'GLOBAL'">全局</a-tag>

2
web-vue/src/pages/node/search.vue
View File

@ -60,7 +60,7 @@
<span>{{ text }}</span>
</a-tooltip>
<a-tooltip slot="nodeId" slot-scope="text" placement="topLeft" :title="text">
<a-button type="link" style="padding: 0px" size="small" @click="toNode(text)">
<a-button type="link" style="padding: 0" size="small" @click="toNode(text)">
<span>{{ nodeMap[text] }}</span>
<a-icon type="fullscreen" />
</a-button>

2
web-vue/src/pages/ssh/ssh.vue
View File

@ -182,7 +182,7 @@
}"
:width="this.terminalFullscreen ? '100vw' : '80vw'"
:bodyStyle="{
padding: '0px 10px',
padding: '0 10px',
paddingTop: '10px',
marginRight: '10px',
height: `${this.terminalFullscreen ? 'calc(100vh - 56px)' : '70vh'}`,

2
web-vue/src/pages/system/assets/machine/machine-info.vue
View File

@ -12,7 +12,7 @@
{{ machineInfo && machineInfo.name }}
</template>
<template slot="extra">
<a-tag v-if="machineInfo" :color="machineInfo && machineInfo.status === 1 ? 'green' : 'pink'" style="margin-right: 0px">
<a-tag v-if="machineInfo" :color="machineInfo && machineInfo.status === 1 ? 'green' : 'pink'" style="margin-right: 0">
{{ statusMap[machineInfo && machineInfo.status] || "未知" }}
</a-tag>
</template>

12
web-vue/src/pages/system/assets/machine/machine-list.vue
View File

@ -67,7 +67,7 @@
</a-col>
<a-col :span="7" style="text-align: right" class="text-overflow-hidden">
<a-tooltip :title="`当前状态：${statusMap[item.status]} ${item.statusMsg ? '状态消息：' + item.statusMsg : ''} `">
<a-tag :color="item.status === 1 ? 'green' : 'pink'" style="margin-right: 0px"> {{ statusMap[item.status] }}</a-tag>
<a-tag :color="item.status === 1 ? 'green' : 'pink'" style="margin-right: 0"> {{ statusMap[item.status] }}</a-tag>
</a-tooltip>
</a-col>
</a-row>
@ -77,9 +77,9 @@
<a-row class="item-info">
<a-col :span="6" class="title text-overflow-hidden">系统名称:</a-col>
<a-col :span="18" class="content text-overflow-hidden">
<span style="color: #40a9ff; cursor: pointer" @click="showMachineInfo(item)">
<a-button style="padding: 0; height: auto" type="link" size="small" @click="showMachineInfo(item)">
{{ item.osName }}
</span>
</a-button>
</a-col>
</a-row>
</a-tooltip>
@ -103,9 +103,7 @@
<a-row class="item-info">
<a-col :span="6" class="title text-overflow-hidden">插件版本:</a-col>
<a-col :span="18" class="content text-overflow-hidden">
<span v-if="item.jpomVersion" type="link" size="small" @click="showMachineUpgrade(item)" style="color: #40a9ff; cursor: pointer">
{{ item.jpomVersion || "-" }}
</span>
<a-button v-if="item.jpomVersion" style="padding: 0; height: auto" type="link" size="small" @click="showMachineUpgrade(item)"> {{ item.jpomVersion || "-" }} </a-button>
</a-col>
</a-row>
</a-tooltip>
@ -164,7 +162,7 @@
<span>{{ text }}</span>
</a-tooltip>
<a-tooltip slot="status" slot-scope="text, item" :title="`当前状态：${statusMap[item.status]} ${item.statusMsg ? '状态消息：' + item.statusMsg : ''} `">
<a-tag :color="item.status === 1 ? 'green' : 'pink'" style="margin-right: 0px"> {{ statusMap[item.status] }}</a-tag>
<a-tag :color="item.status === 1 ? 'green' : 'pink'" style="margin-right: 0"> {{ statusMap[item.status] }}</a-tag>
</a-tooltip>
<a-tooltip slot="duration" slot-scope="text" placement="topLeft" :title="formatDuration(text)">
<span>{{ formatDuration(text, "", 2) }}</span>

2
web-vue/src/pages/system/assets/ssh/ssh-list.vue
View File

@ -262,7 +262,7 @@
}"
:width="this.terminalFullscreen ? '100vw' : '80vw'"
:bodyStyle="{
padding: '0px 10px',
padding: '0 10px',
paddingTop: '10px',
marginRight: '10px',
height: `${this.terminalFullscreen ? 'calc(100vh - 56px)' : '70vh'}`,

2
web-vue/src/pages/system/taskStat.vue
View File

@ -12,7 +12,7 @@
</a-tooltip>
<a-tooltip slot="cron" slot-scope="text" placement="topLeft" :title="text">
<!-- <a-icon type="unordered-list" /> -->
<a-button type="link" style="padding: 0px" size="small" @click="toCronTaskList(text)"> {{ text }} <a-icon type="unordered-list" /> </a-button>
<a-button type="link" style="padding: 0" size="small" @click="toCronTaskList(text)"> {{ text }} <a-icon type="unordered-list" /> </a-button>
</a-tooltip>
</a-table>
</div>

2
web-vue/src/pages/system/upgrade.vue
View File

@ -46,7 +46,7 @@
<span>{{ formatDuration(text, "", 2) }}</span>
</a-tooltip>
<template slot="status" slot-scope="text">
<a-tag :color="text === 1 ? 'green' : 'pink'" style="margin-right: 0px">
<a-tag :color="text === 1 ? 'green' : 'pink'" style="margin-right: 0">
{{ statusMap[text] || "未知" }}
</a-tag>
</template>

2
web-vue3/src/components/logView/index.vue
View File

@ -74,7 +74,7 @@ export default {
},
marginTop: {
String,
default: '0px'
default: '0'
},
extendBar: {
Boolean,

6
web-vue3/src/pages/build/edit.vue
View File

@ -89,7 +89,7 @@
<a-collapse :activeKey="['0', '1', '2']" expandIconPosition="right">
<a-collapse-panel key="0">
<template #header>
<a-form-item prop="buildMode" style="margin-bottom: 0px">
<a-form-item prop="buildMode" style="margin-bottom: 0">
<template #label>
<a-tooltip>
方式
@ -251,7 +251,7 @@
</a-collapse-panel>
<a-collapse-panel key="1">
<template #header>
<a-form-item prop="releaseMethod" style="margin-bottom: 0px">
<a-form-item prop="releaseMethod" style="margin-bottom: 0">
<template #label>
<a-tooltip>
发布操作
@ -642,7 +642,7 @@
</a-collapse-panel>
<a-collapse-panel key="2">
<template #header>
<a-form-item label="其他配置" style="margin-bottom: 0px"></a-form-item>
<a-form-item label="其他配置" style="margin-bottom: 0"></a-form-item>
</template>
<a-form-item prop="cacheBuild">
<template #label>

6
web-vue3/src/pages/build/list-info.vue
View File

@ -91,7 +91,7 @@
<template #title>
<a-row :gutter="[4, 0]">
<a-col :span="17" style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap">
<a-button type="link" style="padding: 0px" size="small" @click="handleDetails(item)">
<a-button type="link" style="padding: 0" size="small" @click="handleDetails(item)">
<span> {{ item.name }}</span>
</a-button>
</a-col>
@ -101,7 +101,7 @@
item.statusMsg ? '状态消息：' + item.statusMsg : ''
} `"
>
<a-tag :color="statusColor[item.status]" style="margin-right: 0px">
<a-tag :color="statusColor[item.status]" style="margin-right: 0">
{{ statusMap[item.status] || '未知' }}</a-tag
>
</a-tooltip>
@ -265,7 +265,7 @@
@click="handleDetails(record)"
:title="`名称：${text} 点击查看详情`"
>
<a-button type="link" style="padding: 0px" size="small"> <a-icon type="fullscreen" />{{ text }}</a-button>
<a-button type="link" style="padding: 0" size="small"> <a-icon type="fullscreen" />{{ text }}</a-button>
</a-tooltip>
<a-tooltip #branchName slot-scope="text, record" placement="topLeft">
<template #title>

2
web-vue3/src/pages/certificate/list.vue
View File

@ -48,7 +48,7 @@
<p>描述：{{ item.description }}</p>
</template>
<!-- {{ text }} -->
<a-button type="link" style="padding: 0px" @click="handleEdit(item)" size="small">{{ text }}</a-button>
<a-button type="link" style="padding: 0" @click="handleEdit(item)" size="small">{{ text }}</a-button>
</a-popover>
<template #fileExists slot-scope="text">
<a-tag v-if="text" color="green">存在</a-tag>

4
web-vue3/src/pages/dispatch/list.vue
View File

@ -64,7 +64,7 @@
</a-tooltip>
<template #name slot-scope="text, record">
<a-tooltip placement="topLeft" :title="text">
<a-button size="small" style="padding: 0px" type="link" icon="fullscreen" @click="handleViewStatus(record)">{{
<a-button size="small" style="padding: 0" type="link" icon="fullscreen" @click="handleViewStatus(record)">{{
text
}}</a-button>
</a-tooltip>
@ -1854,7 +1854,7 @@ export default {
}
.box-shadow {
box-shadow: 0px 0px 10px 5px rgba(223, 222, 222, 0.5);
box-shadow: 0 0 10px 5px rgba(223, 222, 222, 0.5);
border-radius: 5px;
}

2
web-vue3/src/pages/dispatch/status.vue
View File

@ -30,7 +30,7 @@
</a-space>
</template>
<a-tooltip #nodeId slot-scope="text" placement="topLeft" :title="text">
<a-button type="link" style="padding: 0px" size="small" @click="toNode(text)">
<a-button type="link" style="padding: 0" size="small" @click="toNode(text)">
<span>{{ nodeNameMap[text] || text }}</span>
<a-icon type="fullscreen" />
</a-button>

2
web-vue3/src/pages/docker/container.vue
View File

@ -483,7 +483,7 @@
v-model="terminalVisible"
width="80vw"
:bodyStyle="{
padding: '0px 10px',
padding: '0 10px',
paddingTop: '10px',
marginRight: '10px',
height: `70vh`

2
web-vue3/src/pages/file-manager/fileStorage/list.vue
View File

@ -72,7 +72,7 @@
<p v-if="item.progressDesc">状态描述：{{ item.progressDesc }}</p>
</template>
<!-- {{ text }} -->
<a-button type="link" style="padding: 0px" @click="handleEdit(item)" size="small">{{ text }}</a-button>
<a-button type="link" style="padding: 0" @click="handleEdit(item)" size="small">{{ text }}</a-button>
</a-popover>
<a-tooltip #renderSize slot-scope="text" placement="topLeft" :title="renderSize(text)">

2
web-vue3/src/pages/file-manager/release-task/list.vue
View File

@ -52,7 +52,7 @@
</a-tooltip>
<template #fileId slot-scope="text, item">
<a-button type="link" style="padding: 0px" @click="handleViewFile(item)" size="small">{{ text }}</a-button>
<a-button type="link" style="padding: 0" @click="handleViewFile(item)" size="small">{{ text }}</a-button>
</template>
<template #status slot-scope="text">

2
web-vue3/src/pages/layout/my-workspace.vue
View File

@ -123,7 +123,7 @@ export default {
</script>
<style scoped>
.box-shadow {
box-shadow: 0px 0px 10px 5px rgba(223, 222, 222, 0.5);
box-shadow: 0 0 10px 5px rgba(223, 222, 222, 0.5);
border-radius: 5px;
}

10
web-vue3/src/pages/node/list.vue
View File

@ -98,7 +98,7 @@
</template>
<template v-else>
<a-tooltip :title="`${text} 点击进入节点管理`" @click="handleNode(record)">
<a-button type="link" style="padding: 0px" size="small">
<a-button type="link" style="padding: 0" size="small">
<a-icon type="fullscreen" /><span>{{ text }}</span>
</a-button>
</a-tooltip>
@ -108,7 +108,7 @@
}`">
<template v-if="item.openStatus === 1">
<a-tag :color="item.machineNodeData && item.machineNodeData.status === 1 ? 'green' : 'pink'"
style="margin-right: 0px">
style="margin-right: 0">
{{ statusMap[item.machineNodeData && item.machineNodeData.status] || '未知' }}
</a-tag>
</template>
@ -227,7 +227,7 @@
<div>节点地址：{{ item.url }}</div>
</template>
<a-button type="link" style="padding: 0px" size="small" @click="handleNode(item)">
<a-button type="link" style="padding: 0" size="small" @click="handleNode(item)">
<span> {{ item.name }}</span>
</a-button>
</a-tooltip>
@ -243,7 +243,7 @@
</div>
</template>
<a-tag :color="item.machineNodeData && item.machineNodeData.status === 1 ? 'green' : 'pink'"
style="margin-right: 0px">
style="margin-right: 0">
{{ statusMap[item.machineNodeData && item.machineNodeData.status] }}
</a-tag>
</a-tooltip>
@ -400,7 +400,7 @@
</a-drawer>
<!-- Terminal -->
<a-modal v-model="terminalVisible" :bodyStyle="{
padding: '0px 10px',
padding: '0 10px',
paddingTop: '10px',
marginRight: '10px',
height: `70vh`

2
web-vue3/src/pages/node/node-layout/project/project-list.vue
View File

@ -112,7 +112,7 @@
:title="`名称：${text}`"
@click="handleEdit(record)"
>
<a-button type="link" style="padding: 0px" size="small"
<a-button type="link" style="padding: 0" size="small"
><a-icon v-if="record.outGivingProject" type="apartment" />{{ text }}
</a-button>
</a-tooltip>

2
web-vue3/src/pages/node/script-list.vue
View File

@ -58,7 +58,7 @@
<a-tooltip #name @click="handleEdit(record)" slot-scope="text, record" placement="topLeft" :title="text">
<!-- <span>{{ text }}</span> -->
<a-button type="link" style="padding: 0px" size="small">{{ text }}</a-button>
<a-button type="link" style="padding: 0" size="small">{{ text }}</a-button>
</a-tooltip>
<template #global slot-scope="text">
<a-tag v-if="text === 'GLOBAL'">全局</a-tag>

2
web-vue3/src/pages/node/search.vue
View File

@ -86,7 +86,7 @@
<span>{{ text }}</span>
</a-tooltip>
<a-tooltip #nodeId slot-scope="text" placement="topLeft" :title="text">
<a-button type="link" style="padding: 0px" size="small" @click="toNode(text)">
<a-button type="link" style="padding: 0" size="small" @click="toNode(text)">
<span>{{ nodeMap[text] }}</span>
<a-icon type="fullscreen" />
</a-button>

2
web-vue3/src/pages/ssh/ssh.vue
View File

@ -253,7 +253,7 @@
}"
:width="terminalFullscreen ? '100vw' : '80vw'"
:bodyStyle="{
padding: '0px 10px',
padding: '0 10px',
paddingTop: '10px',
marginRight: '10px',
height: `${this.terminalFullscreen ? 'calc(100vh - 56px)' : '70vh'}`

2
web-vue3/src/pages/system/assets/machine/machine-info.vue
View File

@ -15,7 +15,7 @@
<a-tag
v-if="machineInfo"
:color="machineInfo && machineInfo.status === 1 ? 'green' : 'pink'"
style="margin-right: 0px"
style="margin-right: 0"
>
{{ statusMap[machineInfo && machineInfo.status] || '未知' }}
</a-tag>

9
web-vue3/src/pages/system/assets/machine/machine-list.vue
View File

@ -109,7 +109,7 @@
item.statusMsg ? '状态消息：' + item.statusMsg : ''
} `"
>
<a-tag :color="item.status === 1 ? 'green' : 'pink'" style="margin-right: 0px">
<a-tag :color="item.status === 1 ? 'green' : 'pink'" style="margin-right: 0">
{{ statusMap[item.status] }}</a-tag
>
</a-tooltip>
@ -147,15 +147,14 @@
<a-row class="item-info">
<a-col :span="6" class="title text-overflow-hidden">插件版本:</a-col>
<a-col :span="18" class="content text-overflow-hidden">
<span
<a-button
v-if="item.jpomVersion"
type="link"
size="small"
@click="showMachineUpgrade(item)"
style="color: #40a9ff; cursor: pointer"
>
{{ item.jpomVersion || '-' }}
</span>
</a-button>
</a-col>
</a-row>
</a-tooltip>
@ -228,7 +227,7 @@
slot-scope="text, item"
:title="`当前状态：${statusMap[item.status]} ${item.statusMsg ? '状态消息：' + item.statusMsg : ''} `"
>
<a-tag :color="item.status === 1 ? 'green' : 'pink'" style="margin-right: 0px">
<a-tag :color="item.status === 1 ? 'green' : 'pink'" style="margin-right: 0">
{{ statusMap[item.status] }}</a-tag
>
</a-tooltip>

2
web-vue3/src/pages/system/assets/ssh/ssh-list.vue
View File

@ -338,7 +338,7 @@
}"
:width="terminalFullscreen ? '100vw' : '80vw'"
:bodyStyle="{
padding: '0px 10px',
padding: '0 10px',
paddingTop: '10px',
marginRight: '10px',
height: `${this.terminalFullscreen ? 'calc(100vh - 56px)' : '70vh'}`

2
web-vue3/src/pages/system/taskStat.vue
View File

@ -12,7 +12,7 @@
</a-tooltip>
<a-tooltip #cron slot-scope="text" placement="topLeft" :title="text">
<!-- <a-icon type="unordered-list" /> -->
<a-button type="link" style="padding: 0px" size="small" @click="toCronTaskList(text)">
<a-button type="link" style="padding: 0" size="small" @click="toCronTaskList(text)">
{{ text }} <a-icon type="unordered-list" />
</a-button>
</a-tooltip>

2
web-vue3/src/pages/system/upgrade.vue
View File

@ -88,7 +88,7 @@
<span>{{ formatDuration(text, '', 2) }}</span>
</a-tooltip>
<template #status slot-scope="text">
<a-tag :color="text === 1 ? 'green' : 'pink'" style="margin-right: 0px">
<a-tag :color="text === 1 ? 'green' : 'pink'" style="margin-right: 0">
{{ statusMap[text] || '未知' }}
</a-tag>
</template>