test/Jpom
1
0
Fork 0
mirror of https://gitee.com/dromara/Jpom.git synced 2024-12-02 03:48:05 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

fix 前端 i18n 遗漏key

Browse Source
This commit is contained in:
小吾立 2024-06-18 16:17:12 +08:00
parent 0c1b18e269
commit 2e7964190e
28 changed files with 186 additions and 625 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/common/src/test/java/i8n/DiffWebI18nTest.java
View File

@ -35,7 +35,7 @@ public class DiffWebI18nTest {
String rootPath = file.getAbsolutePath();
File rootFile = new File(rootPath).getParentFile().getParentFile();
rootFile = FileUtil.file(rootFile, "web-vue");
JSONObject zhCn = this.loadJson(rootFile, "zh_cn");
JSONObject zhCn = this.loadJson(rootFile, "zh_cn2");
Map<String, String> cacheKey = new HashMap<>();
this.generateWaitMap(zhCn, "", cacheKey);
Collection<String> values = cacheKey.values();

12
web-vue/src/pages/build/history.vue
View File

@ -70,9 +70,7 @@
</a-select>
<a-range-picker :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss" @change="onchangeTime" />
<a-tooltip :title="$t('i18n.4838a3bd20')">
<a-button type="primary" :loading="loading" @click="loadData">{{
$t('i18n.e5f71fc31e')
}}</a-button>
<a-button type="primary" :loading="loading" @click="loadData">{{ $t('i18n.e5f71fc31e') }}</a-button>
</a-tooltip>
<a-button
type="primary"
@ -109,9 +107,7 @@
</template>
<template v-else-if="column.dataIndex === 'status'">
<a-tooltip :title="record.statusMsg || statusMap[text] || $t('i18n.1622dc9b6b')">
<a-tag :color="statusColor[record.status]">{{
statusMap[text] || $t('i18n.1622dc9b6b')
}}</a-tag>
<a-tag :color="statusColor[record.status]">{{ statusMap[text] || $t('i18n.1622dc9b6b') }}</a-tag>
</a-tooltip>
</template>
<template v-else-if="column.dataIndex === 'releaseMethod'">
@ -127,9 +123,7 @@
<template v-else-if="column.dataIndex === 'resultFileSize'">
<a-tooltip
:title="`${$t('i18n.16646e46b1')}${renderSize(record.resultFileSize)}， ${$t(
'pages.build.history.6919d16e'
)} ${renderSize(record.buildLogFileSize)}`"
:title="`${$t('i18n.16646e46b1')}${renderSize(record.resultFileSize)}， ${$t('i18n.77e501b44b')} ${renderSize(record.buildLogFileSize)}`"
>
<span v-if="record.resultFileSize">{{ renderSize(record.resultFileSize) }}</span>
<span v-else-if="record.buildLogFileSize">{{ renderSize(record.buildLogFileSize) }}</span>

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

@ -344,9 +344,7 @@ export default {
console.error(err)
$notification.error({
key: 'log-read-error',
message: `web socket ${this.$t('i18n.7030ff6470')},${this.$t(
'pages.dispatch.logReadView.763330b'
)}`
message: `web socket ${this.$t('i18n.7030ff6470')},${this.$t('i18n.226a6f9cdd')}`
})
clearInterval(this.socketCache[id].heart)
}

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

@ -78,9 +78,7 @@
</a-tooltip>
</template>
<template v-else-if="column.dataIndex === 'outGivingStatus'">
<a-tag v-if="text === 2" color="green">{{
dispatchStatusMap[text] || $t('i18n.1622dc9b6b')
}}</a-tag>
<a-tag v-if="text === 2" color="green">{{ dispatchStatusMap[text] || $t('i18n.1622dc9b6b') }}</a-tag>
<a-tag v-else-if="text === 1 || text === 0 || text === 5" color="orange">{{
dispatchStatusMap[text] || $t('i18n.1622dc9b6b')
}}</a-tag>
@ -134,9 +132,7 @@
<template v-else-if="column.dataIndex === 'projectPid'">
<a-tooltip
placement="topLeft"
:title="`${$t('i18n.2b04210d33')}${record.projectPid || '-'} / ${$t(
'pages.dispatch.status.284af1b3'
)}${record.projectPort || '-'}`"
:title="`${$t('i18n.2b04210d33')}${record.projectPid || '-'} / ${$t('i18n.4c096c51a3')}${record.projectPort || '-'}`"
>
<span>{{ record.projectPid || '-' }}/{{ record.projectPort || '-' }}</span>
</a-tooltip>

31
web-vue/src/pages/docker/swarm/node.vue
View File

@ -45,15 +45,8 @@
<a-select-option key="manager">{{ $t('i18n.a6269ede6c') }}</a-select-option>
</a-select>
<a-button type="primary" :loading="loading" @click="loadData">{{
$t('i18n.e5f71fc31e')
}}</a-button>
<a-statistic-countdown
format="s"
:title="$t('i18n.0f8403d07e')"
:value="countdownTime"
@finish="loadData"
>
<a-button type="primary" :loading="loading" @click="loadData">{{ $t('i18n.e5f71fc31e') }}</a-button>
<a-statistic-countdown format="s" :title="$t('i18n.0f8403d07e')" :value="countdownTime" @finish="loadData">
<template #suffix>
<div style="font-size: 12px">{{ $t('i18n.ee6ce96abb') }}</div>
</template>
@ -101,9 +94,7 @@
<template v-else-if="column.dataIndex === 'state'">
<a-tooltip
placement="topLeft"
:title="`${$t('i18n.9b3e947cc9')}${record.status && record.status.state} ${$t(
'pages.docker.swarm.node.147fba6c'
)}${record.spec ? record.spec.availability || '' : ''}`"
:title="`${$t('i18n.9b3e947cc9')}${record.status && record.status.state} ${$t('i18n.fb91527ce5')}${record.spec ? record.spec.availability || '' : ''}`"
>
<a-tag
:color="
@ -156,9 +147,7 @@
<template v-else-if="column.dataIndex === 'updatedAt'">
<a-tooltip
placement="topLeft"
:title="`${$t('i18n.bf94b97d1a')}${text} ${$t('i18n.312f45014a')}${
record.createdAt
}`"
:title="`${$t('i18n.bf94b97d1a')}${text} ${$t('i18n.312f45014a')}${record.createdAt}`"
>
<span>
{{ text }}
@ -169,19 +158,13 @@
<template v-else-if="column.dataIndex === 'operation'">
<a-space>
<template v-if="record.managerStatus && record.managerStatus.leader">
<a-button size="small" type="primary" @click="handleEdit(record)">{{
$t('i18n.8347a927c0')
}}</a-button>
<a-button size="small" type="primary" @click="handleEdit(record)">{{ $t('i18n.8347a927c0') }}</a-button>
<a-tooltip :title="$t('i18n.28c1c35cd9')">
<a-button size="small" type="primary" danger :disabled="true">{{
$t('i18n.b3b1f709d4')
}}</a-button>
<a-button size="small" type="primary" danger :disabled="true">{{ $t('i18n.b3b1f709d4') }}</a-button>
</a-tooltip>
</template>
<template v-else>
<a-button size="small" type="primary" @click="handleEdit(record)">{{
$t('i18n.8347a927c0')
}}</a-button>
<a-button size="small" type="primary" @click="handleEdit(record)">{{ $t('i18n.8347a927c0') }}</a-button>
<a-button size="small" type="primary" danger @click="handleLeava(record)">{{
$t('i18n.b3b1f709d4')
}}</a-button>

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

@ -47,16 +47,10 @@
@press-enter="loadData"
/>
<a-tooltip :title="$t('i18n.4838a3bd20')">
<a-button type="primary" :loading="loading" @click="loadData">{{
$t('i18n.e5f71fc31e')
}}</a-button>
<a-button type="primary" :loading="loading" @click="loadData">{{ $t('i18n.e5f71fc31e') }}</a-button>
</a-tooltip>
<a-button type="primary" @click="handleUpload">{{
$t('i18n.a6fc9e3ae6')
}}</a-button>
<a-button type="primary" @click="handleRemoteDownload">{{
$t('i18n.bd7043cae3')
}}</a-button>
<a-button type="primary" @click="handleUpload">{{ $t('i18n.a6fc9e3ae6') }}</a-button>
<a-button type="primary" @click="handleRemoteDownload">{{ $t('i18n.bd7043cae3') }}</a-button>
<a-button
type="primary"
danger
@ -85,12 +79,9 @@
<p>{{ $t('i18n.b9c52d9a85') }}{{ text }}</p>
<p>{{ $t('i18n.46a04cdc9c') }}{{ record.description }}</p>
<p v-if="record.status !== undefined">
{{ $t('i18n.53365c29c8')
}}{{ statusMap[record.status] || $t('i18n.1622dc9b6b') }}
</p>
<p v-if="record.progressDesc">
{{ $t('i18n.fb3a2241bb') }}{{ record.progressDesc }}
{{ $t('i18n.53365c29c8') }}{{ statusMap[record.status] || $t('i18n.1622dc9b6b') }}
</p>
<p v-if="record.progressDesc">{{ $t('i18n.fb3a2241bb') }}{{ record.progressDesc }}</p>
</template>
<!-- {{ text }} -->
<a-button type="link" style="padding: 0" size="small" @click="handleEdit(record)">{{ text }}</a-button>
@ -103,10 +94,7 @@
</a-tooltip>
</template>
<template v-else-if="column.dataIndex === 'source'">
<a-tooltip
placement="topLeft"
:title="sourceMap[text] || $t('i18n.1622dc9b6b')"
>
<a-tooltip placement="topLeft" :title="sourceMap[text] || $t('i18n.1622dc9b6b')">
<span>{{ sourceMap[text] || $t('i18n.1622dc9b6b') }}</span>
</a-tooltip>
</template>
@ -178,9 +166,7 @@
"
>
<LoadingOutlined v-if="percentage" />
<a-button v-else type="primary"
><UploadOutlined />{{ $t('i18n.fd7e0c997d') }}</a-button
>
<a-button v-else type="primary"><UploadOutlined />{{ $t('i18n.fd7e0c997d') }}</a-button>
</a-upload>
</a-form-item>
<a-form-item :label="$t('i18n.824607be6b')" name="keepDay">
@ -197,11 +183,7 @@
<a-radio :value="false"> {{ $t('i18n.691b11e443') }} </a-radio>
</a-radio-group>
</a-form-item>
<a-form-item
:label="$t('i18n.2f5e828ecd')"
name="aliasCode"
:help="$t('i18n.41638b0a48')"
>
<a-form-item :label="$t('i18n.2f5e828ecd')" name="aliasCode" :help="$t('i18n.41638b0a48')">
<a-input-search
v-model:value="temp.aliasCode"
:max-length="50"
@ -218,10 +200,7 @@
</a-input-search>
</a-form-item>
<a-form-item :label="$t('i18n.8d6f38b4b1')" name="description">
<a-textarea
v-model:value="temp.description"
:placeholder="$t('i18n.411672c954')"
/>
<a-textarea v-model:value="temp.description" :placeholder="$t('i18n.411672c954')" />
</a-form-item>
</a-form>
</CustomModal>
@ -253,11 +232,7 @@
<a-radio :value="false"> {{ $t('i18n.691b11e443') }} </a-radio>
</a-radio-group>
</a-form-item>
<a-form-item
:label="$t('i18n.2f5e828ecd')"
name="aliasCode"
:help="$t('i18n.41638b0a48')"
>
<a-form-item :label="$t('i18n.2f5e828ecd')" name="aliasCode" :help="$t('i18n.41638b0a48')">
<a-input-search
v-model:value="temp.aliasCode"
:max-length="50"
@ -274,10 +249,7 @@
</a-input-search>
</a-form-item>
<a-form-item :label="$t('i18n.8d6f38b4b1')" name="description">
<a-textarea
v-model:value="temp.description"
:placeholder="$t('i18n.411672c954')"
/>
<a-textarea v-model:value="temp.description" :placeholder="$t('i18n.411672c954')" />
</a-form-item>
</a-form>
</CustomModal>
@ -309,11 +281,7 @@
<a-radio :value="false"> {{ $t('i18n.691b11e443') }} </a-radio>
</a-radio-group>
</a-form-item>
<a-form-item
:label="$t('i18n.2f5e828ecd')"
name="aliasCode"
:help="$t('i18n.41638b0a48')"
>
<a-form-item :label="$t('i18n.2f5e828ecd')" name="aliasCode" :help="$t('i18n.41638b0a48')">
<a-input-search
v-model:value="temp.aliasCode"
:max-length="50"
@ -330,10 +298,7 @@
</a-input-search>
</a-form-item>
<a-form-item :label="$t('i18n.8d6f38b4b1')" name="description">
<a-textarea
v-model:value="temp.description"
:placeholder="$t('i18n.411672c954')"
/>
<a-textarea v-model:value="temp.description" :placeholder="$t('i18n.411672c954')" />
</a-form-item>
</a-form>
</CustomModal>
@ -351,18 +316,14 @@
<a-tabs default-active-key="1">
<template #rightExtra>
<a-tooltip :title="$t('i18n.84415a6bb1')">
<a-button type="primary" size="small" @click="resetTrigger">{{
$t('i18n.4b9c3271dc')
}}</a-button>
<a-button type="primary" size="small" @click="resetTrigger">{{ $t('i18n.4b9c3271dc') }}</a-button>
</a-tooltip>
</template>
<a-tab-pane key="1" :tab="$t('i18n.0b58866c3e')">
<a-space direction="vertical" style="width: 100%">
<a-alert
type="info"
:message="`${$t('i18n.d911cffcd5')}(${$t(
'pages.file-manager.fileStorage.list.a5873c3e'
)})`"
:message="`${$t('i18n.d911cffcd5')}(${$t('i18n.00a070c696')})`"
>
<template #description>
<a-typography-paragraph :copyable="{ tooltip: false, text: temp.triggerDownloadUrl }">
@ -372,9 +333,7 @@
</template>
</a-alert>
<a :href="temp.triggerDownloadUrl" target="_blank">
<a-button size="small" type="primary"
><DownloadOutlined />{{ $t('i18n.2a813bc3eb') }}</a-button
>
<a-button size="small" type="primary"><DownloadOutlined />{{ $t('i18n.2a813bc3eb') }}</a-button>
</a>
</a-space>
</a-tab-pane>
@ -395,9 +354,7 @@
</a-alert>
<a-alert
type="info"
:message="`${$t('i18n.d911cffcd5')}(${$t(
'pages.file-manager.fileStorage.list.a5873c3e'
)})`"
:message="`${$t('i18n.d911cffcd5')}(${$t('i18n.00a070c696')})`"
>
<template #description>
<a-typography-paragraph :copyable="{ tooltip: false, text: temp.triggerAliasDownloadUrl }">
@ -407,9 +364,7 @@
</template>
</a-alert>
<a :href="temp.triggerAliasDownloadUrl" target="_blank">
<a-button size="small" type="primary"
><DownloadOutlined />{{ $t('i18n.2a813bc3eb') }}</a-button
>
<a-button size="small" type="primary"><DownloadOutlined />{{ $t('i18n.2a813bc3eb') }}</a-button>
</a>
</a-space>
</a-tab-pane>
@ -714,12 +669,8 @@ export default {
if (res.data) {
//
$notification.warning({
message: `${this.$t('i18n.a17b5ab021')},${this.$t(
'pages.file-manager.fileStorage.list.6a721706'
)}${res.data.name} ,${this.$t('i18n.ee992d9744')}${
res.data.workspaceId === 'GLOBAL'
? this.$t('i18n.0a60ac8f02')
: this.$t('i18n.c9744f45e7')
message: `${this.$t('i18n.a17b5ab021')},${this.$t('i18n.b9c52d9a85')}${res.data.name} ,${this.$t('i18n.ee992d9744')}${
res.data.workspaceId === 'GLOBAL' ? this.$t('i18n.0a60ac8f02') : this.$t('i18n.c9744f45e7')
}`
})
//

61
web-vue/src/pages/file-manager/staticFileStorage/list.vue
View File

@ -42,14 +42,10 @@
@press-enter="loadData"
/>
<a-tooltip :title="$t('i18n.4838a3bd20')">
<a-button type="primary" :loading="loading" @click="loadData">{{
$t('i18n.e5f71fc31e')
}}</a-button>
<a-button type="primary" :loading="loading" @click="loadData">{{ $t('i18n.e5f71fc31e') }}</a-button>
</a-tooltip>
<!-- <a-button type="primary" @click="handleUpload">上传文件</a-button> -->
<a-button type="primary" @click="reScanner">{{
$t('i18n.56525d62ac')
}}</a-button>
<a-button type="primary" @click="reScanner">{{ $t('i18n.56525d62ac') }}</a-button>
<a-button
type="primary"
@ -102,18 +98,13 @@
</a-tooltip>
</template>
<template v-else-if="column.dataIndex === 'source'">
<a-tooltip
placement="topLeft"
:title="`${sourceMap[text] || $t('i18n.1622dc9b6b')}`"
>
<a-tooltip placement="topLeft" :title="`${sourceMap[text] || $t('i18n.1622dc9b6b')}`">
<span>{{ sourceMap[text] || $t('i18n.1622dc9b6b') }}</span>
</a-tooltip>
</template>
<template v-else-if="column.dataIndex === 'status'">
<a-tag v-if="text === 1" color="green">{{
$t('i18n.df9497ea98')
}}</a-tag>
<a-tag v-if="text === 1" color="green">{{ $t('i18n.df9497ea98') }}</a-tag>
<a-tag v-else color="red">{{ $t('i18n.162e219f6d') }}</a-tag>
</template>
@ -160,18 +151,11 @@
>
<a-form ref="editForm" :rules="rules" :model="temp" :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
<a-form-item :label="$t('i18n.29139c2a1a')" name="name">
<a-input
v-model:value="temp.name"
:placeholder="$t('i18n.29139c2a1a')"
:disabled="true"
/>
<a-input v-model:value="temp.name" :placeholder="$t('i18n.29139c2a1a')" :disabled="true" />
</a-form-item>
<a-form-item :label="$t('i18n.8d6f38b4b1')" name="description">
<a-textarea
v-model:value="temp.description"
:placeholder="$t('i18n.411672c954')"
/>
<a-textarea v-model:value="temp.description" :placeholder="$t('i18n.411672c954')" />
</a-form-item>
</a-form>
</CustomModal>
@ -190,18 +174,14 @@
<a-tabs default-active-key="1">
<template #rightExtra>
<a-tooltip :title="$t('i18n.84415a6bb1')">
<a-button type="primary" size="small" @click="resetTrigger">{{
$t('i18n.4b9c3271dc')
}}</a-button>
<a-button type="primary" size="small" @click="resetTrigger">{{ $t('i18n.4b9c3271dc') }}</a-button>
</a-tooltip>
</template>
<a-tab-pane key="1" :tab="$t('i18n.0b58866c3e')">
<a-space direction="vertical" style="width: 100%">
<a-alert
type="info"
:message="`${$t('i18n.d911cffcd5')}(${$t(
'pages.file-manager.staticFileStorage.list.4c8d1a3b'
)})`"
:message="`${$t('i18n.d911cffcd5')}(${$t('i18n.00a070c696')})`"
>
<template #description>
<a-typography-paragraph :copyable="{ text: temp.triggerDownloadUrl }">
@ -211,16 +191,11 @@
</template>
</a-alert>
<a :href="temp.triggerDownloadUrl" target="_blank">
<a-button size="small" type="primary"
><DownloadOutlined />{{ $t('i18n.2a813bc3eb') }}</a-button
>
<a-button size="small" type="primary"><DownloadOutlined />{{ $t('i18n.2a813bc3eb') }}</a-button>
</a>
</a-space>
</a-tab-pane>
<a-tab-pane
v-if="temp.triggerAliasDownloadUrl"
:tab="$t('i18n.d61af4e686')"
>
<a-tab-pane v-if="temp.triggerAliasDownloadUrl" :tab="$t('i18n.d61af4e686')">
<a-space direction="vertical" style="width: 100%">
<a-alert :message="$t('i18n.947d983961')" type="warning">
<template #description>
@ -237,9 +212,7 @@
</a-alert>
<a-alert
type="info"
:message="`${$t('i18n.d911cffcd5')}(${$t(
'pages.file-manager.staticFileStorage.list.4c8d1a3b'
)})`"
:message="`${$t('i18n.d911cffcd5')}(${$t('i18n.00a070c696')})`"
>
<template #description>
<a-typography-paragraph :copyable="{ text: temp.triggerAliasDownloadUrl }">
@ -249,9 +222,7 @@
</template>
</a-alert>
<a :href="temp.triggerAliasDownloadUrl" target="_blank">
<a-button size="small" type="primary"
><DownloadOutlined />{{ $t('i18n.2a813bc3eb') }}</a-button
>
<a-button size="small" type="primary"><DownloadOutlined />{{ $t('i18n.2a813bc3eb') }}</a-button>
</a>
</a-space>
</a-tab-pane>
@ -406,13 +377,9 @@ export default {
],
rules: {
name: [
{ required: true, message: this.$t('i18n.7aa81d1573'), trigger: 'blur' }
],
name: [{ required: true, message: this.$t('i18n.7aa81d1573'), trigger: 'blur' }],
url: [
{ required: true, message: this.$t('i18n.f4dd45fca9'), trigger: 'blur' }
]
url: [{ required: true, message: this.$t('i18n.f4dd45fca9'), trigger: 'blur' }]
},
temp: {},

57
web-vue/src/pages/layout/user-header.vue
View File

@ -5,11 +5,7 @@
<a-button v-if="mode === 'normal'" type="dashed" class="workspace jpom-workspace btn-group-item">
<div class="workspace-name">
<a-tooltip
:title="`${$t('i18n.8f36f2ede7')}${selectWorkspace.name} ${$t(
'pages.layout.user-header.12d0e469'
)}${selectWorkspace.group || $t('i18n.71dc8feb59')}${$t(
'pages.layout.user-header.26e6628f'
)}`"
:title="`${$t('i18n.8f36f2ede7')}${selectWorkspace.name} ${$t('i18n.d7ec97aecd')}${selectWorkspace.group || $t('i18n.71dc8feb59')}${$t('i18n.5942e7ebd0')}`"
placement="bottom"
>
<SwitcherOutlined />
@ -33,10 +29,7 @@
</a-button>
<a-button v-if="mode === 'management'" type="dashed">
<div class="workspace-name">
<a-tooltip
:title="`${$t('i18n.f668c8c881')}${selectCluster && selectCluster.name}`"
placement="bottom"
>
<a-tooltip :title="`${$t('i18n.f668c8c881')}${selectCluster && selectCluster.name}`" placement="bottom">
<ClusterOutlined />
{{ selectCluster && selectCluster.name }}
</a-tooltip>
@ -203,10 +196,7 @@
<a-input-password v-model:value="temp.newPwd" :placeholder="$t('i18n.abdd7ea830')" />
</a-form-item>
<a-form-item :label="$t('i18n.3fbdde139c')" name="confirmPwd">
<a-input-password
v-model:value="temp.confirmPwd"
:placeholder="$t('i18n.a7a9a2156a')"
/>
<a-input-password v-model:value="temp.confirmPwd" :placeholder="$t('i18n.a7a9a2156a')" />
</a-form-item>
<a-form-item>
<a-row type="flex" justify="center">
@ -272,39 +262,23 @@
</template>
<!-- 不能使用 template 包裹 否则验证不能正常启用 -->
<a-form-item v-if="temp.needVerify" :label="$t('i18n.983f59c9d4')" name="twoCode">
<a-input
ref="twoCode"
v-model:value="temp.twoCode"
:placeholder="$t('i18n.3f18d14961')"
/>
<a-input ref="twoCode" v-model:value="temp.twoCode" :placeholder="$t('i18n.3f18d14961')" />
</a-form-item>
<a-form-item v-if="temp.needVerify">
<a-row type="flex" justify="center">
<a-col :span="2">
<a-button type="primary" html-type="submit">{{
$t('i18n.b7cfa07d78')
}}</a-button>
<a-button type="primary" html-type="submit">{{ $t('i18n.b7cfa07d78') }}</a-button>
</a-col>
</a-row>
</a-form-item>
<!-- 不能使用 template 包裹 否则验证不能正常启用 -->
<a-form-item
v-if="!temp.needVerify && temp.status"
:label="$t('i18n.983f59c9d4')"
name="twoCode"
>
<a-input
ref="twoCode"
v-model:value="temp.twoCode"
:placeholder="$t('i18n.3f18d14961')"
/>
<a-form-item v-if="!temp.needVerify && temp.status" :label="$t('i18n.983f59c9d4')" name="twoCode">
<a-input ref="twoCode" v-model:value="temp.twoCode" :placeholder="$t('i18n.3f18d14961')" />
</a-form-item>
<a-form-item v-if="!temp.needVerify && temp.status">
<a-row type="flex" justify="center">
<a-col :span="2">
<a-button type="primary" html-type="submit">{{
$t('i18n.e8e3bfbbfe')
}}</a-button>
<a-button type="primary" html-type="submit">{{ $t('i18n.e8e3bfbbfe') }}</a-button>
</a-col>
</a-row>
</a-form-item>
@ -312,9 +286,7 @@
<a-form-item v-if="!temp.needVerify && !temp.status">
<a-row type="flex" justify="center">
<a-col :span="2">
<a-button type="primary" @click="openMfaFn">{{
$t('i18n.1b8fff7308')
}}</a-button>
<a-button type="primary" @click="openMfaFn">{{ $t('i18n.1b8fff7308') }}</a-button>
</a-col>
</a-row>
</a-form-item>
@ -393,9 +365,7 @@
>
<a-form :model="temp" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }">
<a-alert banner>
<template #message>
{{ $t('i18n.bf93517805') }},{{ $t('i18n.52b526ab9e') }}
</template>
<template #message> {{ $t('i18n.bf93517805') }},{{ $t('i18n.52b526ab9e') }} </template>
</a-alert>
<!-- <a-form-item label="页面导航">
<a-space>
@ -503,12 +473,7 @@
:keyboard="false"
>
<a-space direction="vertical">
<a-alert
:message="$t('i18n.84777ebf8b')"
:description="$t('i18n.4af980516d')"
type="error"
:closable="false"
/>
<a-alert :message="$t('i18n.84777ebf8b')" :description="$t('i18n.4af980516d')" type="error" :closable="false" />
<a-row align="middle" type="flex" justify="center">
<a-button type="danger" @click="toBindMfa"> {{ $t('i18n.97a19328a8') }} </a-button>
</a-row>

14
web-vue/src/pages/layout/user-log.vue
View File

@ -97,9 +97,7 @@
<template v-else-if="column.dataIndex === 'optStatus'">
<a-tooltip
placement="topLeft"
:title="`${$t('i18n.be4b9241ec')},${$t('i18n.69056f4792')},${$t(
'pages.layout.user-log.819da0e0'
)}`"
:title="`${$t('i18n.be4b9241ec')},${$t('i18n.69056f4792')},${$t('i18n.27b36afd36')}`"
>
<span>{{ text }}</span>
</a-tooltip>
@ -162,19 +160,13 @@
</template>
<template #bodyCell="{ column, text }">
<template v-if="column.dataIndex === 'success'">
<a-tooltip
placement="topLeft"
:title="text ? $t('i18n.330363dfc5') : $t('i18n.acd5cb847a')"
>
<a-tooltip placement="topLeft" :title="text ? $t('i18n.330363dfc5') : $t('i18n.acd5cb847a')">
<a-tag v-if="text" color="green">{{ $t('i18n.330363dfc5') }}</a-tag>
<a-tag v-else color="pink">{{ $t('i18n.acd5cb847a') }}</a-tag>
</a-tooltip>
</template>
<template v-else-if="column.dataIndex === 'useMfa'">
<a-tooltip
placement="topLeft"
:title="text ? $t('i18n.ecff77a8d4') : $t('i18n.869ec83e33')"
>
<a-tooltip placement="topLeft" :title="text ? $t('i18n.ecff77a8d4') : $t('i18n.869ec83e33')">
<a-tag>{{ text ? $t('i18n.ecff77a8d4') : $t('i18n.869ec83e33') }}</a-tag>
</a-tooltip>
</template>

10
web-vue/src/pages/login/index.vue
View File

@ -7,11 +7,7 @@
<template v-if="action === 'login'">
<a-form :model="loginForm" :label-col="{ span: 0 }" :wrapper-col="{ span: 24 }" @finish="handleLogin">
<a-form-item name="loginName" :rules="[{ required: true, message: $t('i18n.08b1fa1304') }]">
<a-input
v-model:value="loginForm.loginName"
autocomplete="true"
:placeholder="$t('i18n.819767ada1')"
/>
<a-input v-model:value="loginForm.loginName" autocomplete="true" :placeholder="$t('i18n.819767ada1')" />
</a-form-item>
<a-form-item name="userPwd" :rules="[{ required: true, message: $t('i18n.e39ffe99e9') }]">
<a-input-password
@ -387,9 +383,7 @@ const checkHasLoginInfo = () => {
const p = h(
'p',
{
innerHTML: `${$t('i18n.cfbb3341d5')}<b>${useUserStore.userInfo.name || ''}</b> ${$t(
'pages.login.index.6dee1b92'
)}`
innerHTML: `${$t('i18n.cfbb3341d5')}<b>${useUserStore.userInfo.name || ''}</b> ${$t('i18n.17006d4d51')}`
},
[]
)

9
web-vue/src/pages/node/fast-install.vue
View File

@ -51,10 +51,7 @@
</a-tabs>
</a-collapse-panel>
<a-collapse-panel key="3" :header="$t('i18n.dab864ab72')">
<a-alert
type="info"
:message="`${$t('i18n.ccb91317c5')}(${$t('i18n.a8920fbfad')})`"
>
<a-alert type="info" :message="`${$t('i18n.ccb91317c5')}(${$t('i18n.a8920fbfad')})`">
<template #description>
<a-typography-paragraph :copyable="{ tooltip: false, text: fastInstallInfo.bindCommand }">
<span>{{ fastInstallInfo.bindCommand }} </span>
@ -69,9 +66,7 @@
<a-alert
v-for="(item, index) in pullFastInstallResultData"
:key="`${index}-${new Date().getTime()}`"
:message="`${$t('i18n.ac00774608')} ${index + 1} ${$t(
'pages.node.fast-install.d6f154c5'
)}`"
:message="`${$t('i18n.ac00774608')} ${index + 1} ${$t('i18n.dbc0b66ca4')}`"
:type="`${item.type === 'success' ? 'success' : item.type === 'exists' ? 'error' : 'warning'}`"
closable
@close="clearPullFastInstallResult(item.id)"

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

@ -60,11 +60,7 @@
>
<template #title>
<a-space>
<a-input
v-model:value="listQuery['%name%']"
:placeholder="$t('i18n.b1785ef01e')"
@press-enter="loadData"
/>
<a-input v-model:value="listQuery['%name%']" :placeholder="$t('i18n.b1785ef01e')" @press-enter="loadData" />
<a-select
v-model:value="listQuery.group"
@ -86,9 +82,7 @@
<a-select-option v-for="item in groupList" :key="item">{{ item }}</a-select-option>
</a-select>
<a-tooltip :title="$t('i18n.4838a3bd20')">
<a-button :loading="loading" type="primary" @click="loadData">{{
$t('i18n.e5f71fc31e')
}}</a-button>
<a-button :loading="loading" type="primary" @click="loadData">{{ $t('i18n.e5f71fc31e') }}</a-button>
</a-tooltip>
<a-button
type="primary"
@ -163,9 +157,7 @@
:color="record.machineNodeData && record.machineNodeData.status === 1 ? 'green' : 'pink'"
style="margin-right: 0"
>
{{
statusMap[record.machineNodeData && record.machineNodeData.status] || $t('i18n.1622dc9b6b')
}}
{{ statusMap[record.machineNodeData && record.machineNodeData.status] || $t('i18n.1622dc9b6b') }}
</a-tag>
</template>
<a-tag v-else>{{ $t('i18n.4637765b0a') }}</a-tag>
@ -335,12 +327,10 @@
<a-tooltip>
<template #title>
<div>
{{ $t('i18n.e703c7367c')
}}{{ statusMap[item.machineNodeData && item.machineNodeData.status] }}
{{ $t('i18n.e703c7367c') }}{{ statusMap[item.machineNodeData && item.machineNodeData.status] }}
</div>
<div>
{{ $t('i18n.fb3a2241bb')
}}{{ (item.machineNodeData && item.machineNodeData.statusMsg) || '' }}
{{ $t('i18n.fb3a2241bb') }}{{ (item.machineNodeData && item.machineNodeData.statusMsg) || '' }}
</div>
</template>
<a-tag
@ -1132,9 +1122,7 @@ export default {
}
let msg = msgData[method] || this.$t('i18n.49574eee58')
if (!record.sortValue) {
msg += `${this.$t('i18n.57c0a41ec6')},${this.$t('i18n.066f903d75')},${this.$t(
'pages.node.list.d9c5971d'
)}`
msg += `${this.$t('i18n.57c0a41ec6')},${this.$t('i18n.066f903d75')},${this.$t('i18n.c4e2cd2266')}`
}
// console.log(this.list, index, this.list[method === "top" ? index : method === "up" ? index - 1 : index + 1]);
const compareId = this.list[method === 'top' ? index : method === 'up' ? index - 1 : index + 1].id

17
web-vue/src/pages/node/node-layout/other/script-console.vue
View File

@ -30,21 +30,14 @@
@ok="startExecution"
>
<a-form ref="ruleForm" :model="temp" :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
<a-form-item
:label="$t('i18n.abba4775e1')"
:help="`${commandParams.length ? $t('i18n.916cde39c4') : ''}`"
>
<a-form-item :label="$t('i18n.abba4775e1')" :help="`${commandParams.length ? $t('i18n.916cde39c4') : ''}`">
<a-space direction="vertical" style="width: 100%">
<a-row v-for="(item, index) in commandParams" :key="item.key">
<a-col :span="22">
<a-input
v-model:value="item.value"
:addon-before="`${$t('i18n.3d0a2df9ec')}${index + 1}${$t(
'pages.node.node-layout.other.script-console.97f7c43a'
)}`"
:placeholder="`${$t('i18n.3d0a2df9ec')}${$t(
'pages.node.node-layout.other.script-console.97f7c43a'
)} ${item.desc ? ',' + item.desc : ''}`"
:addon-before="`${$t('i18n.3d0a2df9ec')}${index + 1}${$t('i18n.fe7509e0ed')}`"
:placeholder="`${$t('i18n.3d0a2df9ec')}${$t('i18n.fe7509e0ed')} ${item.desc ? ',' + item.desc : ''}`"
>
<template #suffix>
<a-tooltip v-if="item.desc" :title="item.desc">
@ -161,9 +154,7 @@ export default {
this.socket.onerror = (err) => {
console.error(err)
$notification.error({
message: `web socket ${this.$t('i18n.7030ff6470')},${this.$t(
'pages.node.node-layout.other.script-console.763330b'
)}`
message: `web socket ${this.$t('i18n.7030ff6470')},${this.$t('i18n.226a6f9cdd')}`
})
clearInterval(this.heart)
this.btnLoading = true

37
web-vue/src/pages/node/node-layout/project/project-console.vue
View File

@ -31,12 +31,8 @@
<template #content>
<template v-if="project.lastReloadResult">
<p>
<a-tag v-if="project.lastReloadResult.success" color="green">{{
$t('i18n.330363dfc5')
}}</a-tag>
<a-tag v-else color="green">{{
$t('i18n.330363dfc5')
}}</a-tag>
<a-tag v-if="project.lastReloadResult.success" color="green">{{ $t('i18n.330363dfc5') }}</a-tag>
<a-tag v-else color="green">{{ $t('i18n.330363dfc5') }}</a-tag>
</p>
<p v-for="(item, index) in project.lastReloadResult.msgs" :key="index">
{{ item }}
@ -55,9 +51,7 @@
}}</a-button>
</template>
</template>
<a-button size="small" type="primary" @click="goFile">{{
$t('i18n.8780e6b3d1')
}}</a-button>
<a-button size="small" type="primary" @click="goFile">{{ $t('i18n.8780e6b3d1') }}</a-button>
<a-dropdown v-if="project.dslProcessInfo">
<template #overlay>
<a-menu>
@ -66,9 +60,7 @@
<a-tag>
{{ item.process }}
</a-tag>
<template v-if="item.type === 'file'"
>{{ $t('i18n.4df483b9c7') }}{{ item.scriptId }}
</template>
<template v-if="item.type === 'file'">{{ $t('i18n.4df483b9c7') }}{{ item.scriptId }} </template>
<template v-else-if="item.type === 'script'">
<a-button
type="link"
@ -85,8 +77,7 @@
</template>
<template v-else-if="item.type === 'library'">
<a-button type="link" size="small" disabled=""
>{{ $t('i18n.91a10b8776')
}}{{ item.scriptId }}</a-button
>{{ $t('i18n.91a10b8776') }}{{ item.scriptId }}</a-button
>
</template>
</template>
@ -103,9 +94,7 @@
</a-menu-item>
</a-menu>
</template>
<a-button size="small" type="primary">
{{ $t('i18n.ce40cd6390') }} <DownOutlined />
</a-button>
<a-button size="small" type="primary"> {{ $t('i18n.ce40cd6390') }} <DownOutlined /> </a-button>
</a-dropdown>
<a-button
size="small"
@ -257,9 +246,7 @@ export default {
this.socket.onerror = (err) => {
console.error(err)
$notification.error({
message: `web socket ${this.$t('i18n.7030ff6470')},${this.$t(
'pages.node.node-layout.project.project-console.763330b'
)}`
message: `web socket ${this.$t('i18n.7030ff6470')},${this.$t('i18n.226a6f9cdd')}`
})
clearInterval(this.heart)
}
@ -307,14 +294,8 @@ export default {
this.$refs.logView.appendLine(element)
})
}
res.data.ports &&
this.$refs.logView.appendLine(
this.$t('i18n.b6c9619081') + res.data.ports
)
res.data.pids &&
this.$refs.logView.appendLine(
this.$t('i18n.2b04210d33') + res.data.pids.join(',')
)
res.data.ports && this.$refs.logView.appendLine(this.$t('i18n.b6c9619081') + res.data.ports)
res.data.pids && this.$refs.logView.appendLine(this.$t('i18n.2b04210d33') + res.data.pids.join(','))
}
this.$refs.logView.appendLine(res.op + ' ' + res.msg)
return

4
web-vue/src/pages/node/node-layout/project/project-edit.vue
View File

@ -292,9 +292,7 @@
<a-textarea
v-model:value="temp.args"
:auto-size="{ minRows: 3, maxRows: 3 }"
:placeholder="`Main ${$t('i18n.6a9231c3ba')}. ${$t(
'pages.node.node-layout.project.project-edit.18629de'
)}.port=8080`"
:placeholder="`Main ${$t('i18n.6a9231c3ba')}. ${$t('i18n.848e4e21da')}.port=8080`"
/>
</a-form-item>
<a-form-item

68
web-vue/src/pages/node/node-layout/project/project-file-backup.vue
View File

@ -12,9 +12,7 @@
x: 'max-content'
}"
>
<template v-if="backupListData.path" #title>
{{ $t('i18n.1b38c0bc86') }}{{ backupListData.path }}
</template>
<template v-if="backupListData.path" #title> {{ $t('i18n.1b38c0bc86') }}{{ backupListData.path }} </template>
<template #bodyCell="{ column, text, record }">
<template v-if="column.dataIndex === 'filename'">
@ -61,9 +59,7 @@
"
>{{ $t('i18n.adcd1dd701') }}
</a-button>
<a-button size="small" type="primary" @click="loadData">{{
$t('i18n.90b5a467c1')
}}</a-button>
<a-button size="small" type="primary" @click="loadData">{{ $t('i18n.90b5a467c1') }}</a-button>
</a-space>
</div>
@ -92,14 +88,8 @@
<template #title>
<a-popconfirm
:title="`${
uploadPath
? $t('i18n.bdd4cddd22') +
uploadPath +
$t('i18n.dadd4907c2')
: ''
} ${$t('i18n.aefd8f9f27')},${$t(
'pages.node.node-layout.project.project-file-backup.69fd8524'
)}`"
uploadPath ? $t('i18n.bdd4cddd22') + uploadPath + $t('i18n.dadd4907c2') : ''
} ${$t('i18n.aefd8f9f27')},${$t('i18n.500789168c')}`"
:ok-text="$t('i18n.587a63264b')"
:cancel-text="$t('i18n.b1a09cee8e')"
:ok-button-props="{
@ -112,15 +102,11 @@
<QuestionCircleOutlined style="color: red" />
</template>
<!-- @click="recoverPath(uploadPath)" -->
<a-button size="small" type="primary">{{
$t('i18n.69de8d7f40')
}}</a-button>
<a-button size="small" type="primary">{{ $t('i18n.69de8d7f40') }}</a-button>
</a-popconfirm>
<a-space>
<a-tag v-if="uploadPath" color="#2db7f5"
>{{ $t('i18n.2c8109fa0b') }}{{ uploadPath || '' }}</a-tag
>
<a-tag v-if="uploadPath" color="#2db7f5">{{ $t('i18n.2c8109fa0b') }}{{ uploadPath || '' }}</a-tag>
</a-space>
</template>
@ -133,11 +119,7 @@
</template>
<template v-else-if="column.dataIndex === 'isDirectory'">
<a-tooltip placement="topLeft" :title="text">
<span>{{
text
? $t('i18n.767fa455bb')
: $t('i18n.2a0c4740f1')
}}</span>
<span>{{ text ? $t('i18n.767fa455bb') : $t('i18n.2a0c4740f1') }}</span>
</a-tooltip>
</template>
<template v-else-if="column.dataIndex === 'fileSizeLong'">
@ -154,9 +136,7 @@
<a-space>
<template v-if="record.isDirectory">
<a-tooltip :title="$t('i18n.6c14188ba0')">
<a-button size="small" type="primary" :disabled="true">{{
$t('i18n.f26ef91424')
}}</a-button>
<a-button size="small" type="primary" :disabled="true">{{ $t('i18n.f26ef91424') }}</a-button>
</a-tooltip>
</template>
<template v-else>
@ -168,14 +148,8 @@
<!-- record.filename -->
<a-popconfirm
:title="`${
record.filename
? $t('i18n.bdd4cddd22') +
record.filename +
$t('i18n.dadd4907c2')
: ''
} ${$t('i18n.aefd8f9f27')},${$t(
'pages.node.node-layout.project.project-file-backup.69fd8524'
)}`"
record.filename ? $t('i18n.bdd4cddd22') + record.filename + $t('i18n.dadd4907c2') : ''
} ${$t('i18n.aefd8f9f27')},${$t('i18n.500789168c')}`"
:ok-text="$t('i18n.587a63264b')"
:cancel-text="$t('i18n.b1a09cee8e')"
:ok-button-props="{
@ -187,9 +161,7 @@
<template #icon>
<QuestionCircleOutlined style="color: red" />
</template>
<a-button size="small" type="primary">{{
$t('i18n.69de8d7f40')
}}</a-button>
<a-button size="small" type="primary">{{ $t('i18n.69de8d7f40') }}</a-button>
</a-popconfirm>
</template>
<template v-else>
@ -482,12 +454,8 @@ export default {
// 删除
handleDelete(record) {
const msg = record.isDirectory
? this.$t('i18n.3cc09369ad') +
record.filename +
this.$t('i18n.52a8df6678')
: this.$t('i18n.3cc09369ad') +
record.filename +
this.$t('i18n.48e79b3340')
? this.$t('i18n.3cc09369ad') + record.filename + this.$t('i18n.52a8df6678')
: this.$t('i18n.3cc09369ad') + record.filename + this.$t('i18n.48e79b3340')
$confirm({
title: this.$t('i18n.c4535759ee'),
zIndex: 1009,
@ -515,10 +483,7 @@ export default {
},
// 删除备份
handlBackupeDelete(record) {
const msg =
this.$t('i18n.3cc09369ad') +
record.filename +
this.$t('i18n.115cd58b5d')
const msg = this.$t('i18n.3cc09369ad') + record.filename + this.$t('i18n.115cd58b5d')
$confirm({
title: this.$t('i18n.c4535759ee'),
zIndex: 1009,
@ -556,10 +521,7 @@ export default {
$confirm({
title: this.$t('i18n.c4535759ee'),
zIndex: 1009,
content:
this.$t('i18n.d2cac1245d') +
record.filename +
this.$t('i18n.e039ffccc8'),
content: this.$t('i18n.d2cac1245d') + record.filename + this.$t('i18n.e039ffccc8'),
okText: this.$t('i18n.e83a256e4f'),
cancelText: this.$t('i18n.625fb26b4b'),
onOk() {

8
web-vue/src/pages/node/node-layout/project/project-file-read.vue
View File

@ -2,9 +2,7 @@
<div>
<log-view1 :ref="`logView`" height="calc(100vh - 140px)">
<template #before>
<a-button type="primary" size="small" @click="goFile">{{
$t('i18n.8780e6b3d1')
}}</a-button></template
<a-button type="primary" size="small" @click="goFile">{{ $t('i18n.8780e6b3d1') }}</a-button></template
>
</log-view1>
</div>
@ -97,9 +95,7 @@ export default {
this.socket.onerror = (err) => {
console.error(err)
$notification.error({
message: `web socket ${this.$t('i18n.7030ff6470')},${this.$t(
'pages.node.node-layout.project.project-file-read.763330b'
)}`
message: `web socket ${this.$t('i18n.7030ff6470')},${this.$t('i18n.226a6f9cdd')}`
})
clearInterval(this.heart)
}

10
web-vue/src/pages/node/node-layout/system/config-file.vue
View File

@ -9,11 +9,7 @@
:show-tool="true"
>
<template #tool_before>
<a-alert
v-if="temp.file"
show-icon
:message="`${$t('i18n.37c1eb9b23')}:${temp.file}`"
/>
<a-alert v-if="temp.file" show-icon :message="`${$t('i18n.37c1eb9b23')}:${temp.file}`" />
</template>
</code-editor>
</a-form-item>
@ -96,9 +92,7 @@ export default {
spinning: true,
tip:
(msg || this.$t('i18n.85da2e5bb1')) +
`,${this.$t('i18n.809b12d6a0')},${this.$t(
'pages.node.node-layout.system.config-file.536e5313'
)}`
`,${this.$t('i18n.809b12d6a0')},${this.$t('i18n.af013dd9dc')}`
})
setTimeout(() => {
//

8
web-vue/src/pages/node/node-layout/system/log.vue
View File

@ -11,9 +11,7 @@
<log-view2 :ref="`logView`" height="calc(100vh - 160px - 30px)">
<template #before>
<a-space>
<a-button type="primary" size="small" @click="loadData">{{
$t('i18n.694fc5efa9')
}}</a-button>
<a-button type="primary" size="small" @click="loadData">{{ $t('i18n.694fc5efa9') }}</a-button>
<a-button type="primary" danger size="small" :disabled="!temp.path" @click="deleteLog">{{
$t('i18n.2f4aaddde3')
}}</a-button>
@ -151,9 +149,7 @@ export default {
this.socket.onerror = (err) => {
console.error(err)
$notification.error({
message: `web socket ${this.$t('i18n.7030ff6470')},${this.$t(
'pages.node.node-layout.system.log.763330b'
)}`
message: `web socket ${this.$t('i18n.7030ff6470')},${this.$t('i18n.226a6f9cdd')}`
})
}
this.socket.onclose = (err) => {

15
web-vue/src/pages/node/script-edit.vue
View File

@ -44,9 +44,7 @@
<a-form-item-rest>
<code-editor v-model:content="temp.context" height="40vh" :show-tool="true" :options="{ mode: 'shell' }">
<template #tool_before>
<a-button type="link" @click="scriptLibraryVisible = true">{{
$t('i18n.f685377a22')
}}</a-button>
<a-button type="link" @click="scriptLibraryVisible = true">{{ $t('i18n.f685377a22') }}</a-button>
</template>
</code-editor>
</a-form-item-rest>
@ -60,9 +58,7 @@
<a-input
v-model:value="item.desc"
:addon-before="$t('i18n.417fa2c2be', { index: index + 1 })"
:placeholder="`${$t('i18n.55721d321c')},${$t(
'pages.node.script-edit.b01bb0b5'
)},${$t('i18n.72d4ade571')}`"
:placeholder="`${$t('i18n.55721d321c')},${$t('i18n.2b1015e902')},${$t('i18n.72d4ade571')}`"
/>
<a-input
v-model:value="item.value"
@ -79,9 +75,7 @@
</a-row>
</a-col>
</a-row>
<a-button type="primary" @click="() => commandParams.push({})">{{
$t('i18n.4c0eead6ff')
}}</a-button>
<a-button type="primary" @click="() => commandParams.push({})">{{ $t('i18n.4c0eead6ff') }}</a-button>
</a-space>
</a-form-item>
<a-form-item :label="$t('i18n.fffd3ce745')" name="global">
@ -265,8 +259,7 @@ export default {
for (let i = 0; i < this.commandParams.length; i++) {
if (!this.commandParams[i].desc) {
$notification.error({
message:
this.$t('i18n.8ae2b9915c') + (i + 1) + this.$t('i18n.c583b707ba')
message: this.$t('i18n.8ae2b9915c') + (i + 1) + this.$t('i18n.c583b707ba')
})
return false
}

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

@ -96,14 +96,10 @@
{{ $t('i18n.7f7c624a84') }} <DownOutlined />
</a-button>
<a-button type="primary" size="small" @click="openAdd"
><PlusOutlined />{{ $t('i18n.66ab5e9f24') }}</a-button
>
<a-button type="primary" size="small" @click="openAdd"><PlusOutlined />{{ $t('i18n.66ab5e9f24') }}</a-button>
<template v-if="!nodeId">
<a-dropdown v-if="nodeMap && Object.keys(nodeMap).length">
<a-button type="primary" size="small" danger>
{{ $t('i18n.6a620e3c07') }} <DownOutlined
/></a-button>
<a-button type="primary" size="small" danger> {{ $t('i18n.6a620e3c07') }} <DownOutlined /></a-button>
<template #overlay>
<a-menu>
<a-menu-item v-for="(nodeName, key) in nodeMap" :key="key" @click="reSyncProject(key)">
@ -271,9 +267,7 @@
</template>
<template v-else-if="column.dataIndex === 'operation'">
<a-space>
<a-button size="small" type="primary" @click="handleFile(record)">{{
$t('i18n.2a0c4740f1')
}}</a-button>
<a-button size="small" type="primary" @click="handleFile(record)">{{ $t('i18n.2a0c4740f1') }}</a-button>
<template v-if="noFileModes.includes(record.runMode)">
<a-button size="small" type="primary" @click="handleConsole(record)">{{
$t('i18n.b5c3770699')
@ -281,9 +275,7 @@
</template>
<template v-else>
<a-tooltip :title="$t('i18n.904615588b')">
<a-button size="small" type="primary" :disabled="true">{{
$t('i18n.b5c3770699')
}}</a-button></a-tooltip
<a-button size="small" type="primary" :disabled="true">{{ $t('i18n.b5c3770699') }}</a-button></a-tooltip
>
</template>
@ -464,9 +456,7 @@
<a-tabs default-active-key="1">
<template #rightExtra>
<a-tooltip :title="$t('i18n.01ad26f4a9')">
<a-button type="primary" size="small" @click="resetTrigger">{{
$t('i18n.4b9c3271dc')
}}</a-button>
<a-button type="primary" size="small" @click="resetTrigger">{{ $t('i18n.4b9c3271dc') }}</a-button>
</a-tooltip>
</template>
<a-tab-pane key="1" :tab="$t('i18n.1a6aa24e76')">
@ -497,10 +487,7 @@
</template>
</a-alert>
<a-alert
type="info"
:message="`${$t('i18n.8d202b890c')}(${$t('i18n.00a070c696')})`"
>
<a-alert type="info" :message="`${$t('i18n.8d202b890c')}(${$t('i18n.00a070c696')})`">
<template #description>
<a-typography-paragraph :copyable="{ tooltip: false, text: temp.batchTriggerUrl }">
<a-tag>POST</a-tag> <span>{{ temp.batchTriggerUrl }} </span>
@ -1204,9 +1191,7 @@ export default {
}
let msg = msgData[method] || this.$t('i18n.49574eee58')
if (!record.sortValue) {
msg += `${this.$t('i18n.57c0a41ec6')},${this.$t('i18n.066f903d75')},${this.$t(
'pages.node.search.dad3b017'
)}`
msg += `${this.$t('i18n.57c0a41ec6')},${this.$t('i18n.066f903d75')},${this.$t('i18n.c4e2cd2266')}`
}
// console.log(this.list, index, this.list[method === "top" ? index : method === "up" ? index - 1 : index + 1]);
const compareId = this.projList[method === 'top' ? index : method === 'up' ? index - 1 : index + 1].id

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

@ -995,9 +995,7 @@ export default {
}
let msg = msgData[method] || this.$t('i18n.49574eee58')
if (!record.sortValue) {
msg += ` ${this.$t('i18n.57c0a41ec6')},${this.$t(
'pages.repository.repository-list.616438fd'
)},${this.$t('i18n.c4e2cd2266')}`
msg += ` ${this.$t('i18n.57c0a41ec6')},${this.$t('i18n.066f903d75')},${this.$t('i18n.c4e2cd2266')}`
}
// console.log(this.list, index, this.list[method === "top" ? index : method === "up" ? index - 1 : index + 1]);
const compareId = this.list[method === 'top' ? index : method === 'up' ? index - 1 : index + 1].id

17
web-vue/src/pages/script/script-console.vue
View File

@ -29,21 +29,14 @@
<!-- <a-form-item label="执行参数" name="args">
<a-input v-model="temp.args" placeholder="执行参数,没有参数可以不填写" />
</a-form-item> -->
<a-form-item
:label="$t('i18n.abba4775e1')"
:help="`${commandParams.length ? $t('i18n.916cde39c4') : ''}`"
>
<a-form-item :label="$t('i18n.abba4775e1')" :help="`${commandParams.length ? $t('i18n.916cde39c4') : ''}`">
<a-space direction="vertical" style="width: 100%">
<a-row v-for="(item, index) in commandParams" :key="item.key">
<a-col :span="22">
<a-input
v-model:value="item.value"
:addon-before="`${$t('i18n.3d0a2df9ec')}${index + 1}${$t(
'pages.script.script-console.97f7c43a'
)}`"
:placeholder="`${$t('i18n.3d0a2df9ec')}${$t(
'pages.script.script-console.97f7c43a'
)} ${item.desc ? ',' + item.desc : ''}`"
:addon-before="`${$t('i18n.3d0a2df9ec')}${index + 1}${$t('i18n.fe7509e0ed')}`"
:placeholder="`${$t('i18n.3d0a2df9ec')}${$t('i18n.fe7509e0ed')} ${item.desc ? ',' + item.desc : ''}`"
>
<template #suffix>
<a-tooltip v-if="item.desc" :title="item.desc">
@ -152,9 +145,7 @@ export default {
this.socket.onerror = (err) => {
console.error(err)
$notification.error({
message: `web socket ${this.$t('i18n.7030ff6470')},${this.$t(
'pages.script.script-console.763330b'
)}`
message: `web socket ${this.$t('i18n.7030ff6470')},${this.$t('i18n.226a6f9cdd')}`
})
this.btnLoading = true
}

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

@ -79,29 +79,15 @@
:placeholder="$t('i18n.88f5c7ac4a')"
class="search-input-item"
>
<a-select-option value="networkDelay">{{
$t('i18n.204222d167')
}}</a-select-option>
<a-select-option value="networkDelay">{{ $t('i18n.204222d167') }}</a-select-option>
<a-select-option value="osOccupyCpu">cpu</a-select-option>
<a-select-option value="osOccupyDisk">{{
$t('i18n.1d650a60a5')
}}</a-select-option>
<a-select-option value="osOccupyMemory">{{
$t('i18n.9932551cd5')
}}</a-select-option>
<a-select-option value="modifyTimeMillis">{{
$t('i18n.a001a226fd')
}}</a-select-option>
<a-select-option value="createTimeMillis">{{
$t('i18n.eca37cb072')
}}</a-select-option>
<a-select-option value="osOccupyDisk">{{ $t('i18n.1d650a60a5') }}</a-select-option>
<a-select-option value="osOccupyMemory">{{ $t('i18n.9932551cd5') }}</a-select-option>
<a-select-option value="modifyTimeMillis">{{ $t('i18n.a001a226fd') }}</a-select-option>
<a-select-option value="createTimeMillis">{{ $t('i18n.eca37cb072') }}</a-select-option>
</a-select>
<a-button :loading="loading" type="primary" @click="getMachineList">{{
$t('i18n.e5f71fc31e')
}}</a-button>
<a-button type="primary" @click="addMachine">{{
$t('i18n.66ab5e9f24')
}}</a-button>
<a-button :loading="loading" type="primary" @click="getMachineList">{{ $t('i18n.e5f71fc31e') }}</a-button>
<a-button type="primary" @click="addMachine">{{ $t('i18n.66ab5e9f24') }}</a-button>
<a-dropdown v-if="tableSelections && tableSelections.length">
<template #overlay>
@ -117,14 +103,10 @@
</a-menu-item>
</a-menu>
</template>
<a-button type="primary">
{{ $t('i18n.7f7c624a84') }} <DownOutlined />
</a-button>
<a-button type="primary"> {{ $t('i18n.7f7c624a84') }} <DownOutlined /> </a-button>
</a-dropdown>
<a-tooltip v-else :title="$t('i18n.98cd2bdc03')">
<a-button :disabled="true" type="primary">
{{ $t('i18n.7f7c624a84') }}<DownOutlined
/></a-button>
<a-button :disabled="true" type="primary"> {{ $t('i18n.7f7c624a84') }}<DownOutlined /></a-button>
</a-tooltip>
</a-space>
</template>
@ -156,9 +138,7 @@
<template v-else-if="column.dataIndex === 'status'">
<a-tooltip
:title="`${$t('i18n.e703c7367c')}${statusMap[record.status]} ${
record.statusMsg
? $t('i18n.8d13037eb7') + record.statusMsg
: $t('i18n.77e100e462')
record.statusMsg ? $t('i18n.8d13037eb7') + record.statusMsg : $t('i18n.77e100e462')
} `"
>
<a-tag :color="record.status === 1 ? 'green' : 'pink'" style="margin-right: 0">
@ -184,9 +164,7 @@
<template v-else-if="column.dataIndex === 'operation'">
<a-space>
<a-button type="primary" size="small" @click="handleEdit(record)">{{
$t('i18n.95b351c862')
}}</a-button>
<a-button type="primary" size="small" @click="handleEdit(record)">{{ $t('i18n.95b351c862') }}</a-button>
<a-button type="primary" size="small" @click="syncToWorkspaceShow(record)">{{
$t('i18n.e39de3376e')
}}</a-button>
@ -215,9 +193,7 @@
<a-col :span="7" style="text-align: right" class="text-overflow-hidden">
<a-tooltip
:title="`${$t('i18n.e703c7367c')}${statusMap[item.status]} ${
item.statusMsg
? $t('i18n.8d13037eb7') + item.statusMsg
: $t('i18n.77e100e462')
item.statusMsg ? $t('i18n.8d13037eb7') + item.statusMsg : $t('i18n.77e100e462')
} `"
>
<a-tag :color="item.status === 1 ? 'green' : 'pink'" style="margin-right: 0">
@ -230,9 +206,7 @@
<a-tooltip :title="item.osName">
<a-row class="item-info">
<a-col :span="6" class="title text-overflow-hidden">{{
$t('i18n.2027743b8d')
}}</a-col>
<a-col :span="6" class="title text-overflow-hidden">{{ $t('i18n.2027743b8d') }}</a-col>
<a-col :span="18" class="content text-overflow-hidden">
<a-button
:disabled="!item.osName"
@ -248,9 +222,7 @@
</a-tooltip>
<a-tooltip :title="item.osVersion">
<a-row class="item-info">
<a-col :span="6" class="title text-overflow-hidden">{{
$t('i18n.3006a3da65')
}}</a-col>
<a-col :span="6" class="title text-overflow-hidden">{{ $t('i18n.3006a3da65') }}</a-col>
<a-col :span="18" class="content text-overflow-hidden">
{{ item.osVersion || '-' }}
</a-col>
@ -258,9 +230,7 @@
</a-tooltip>
<a-tooltip :title="item.osLoadAverage">
<a-row class="item-info">
<a-col :span="6" class="title text-overflow-hidden">{{
$t('i18n.9e96d9c8d3')
}}</a-col>
<a-col :span="6" class="title text-overflow-hidden">{{ $t('i18n.9e96d9c8d3') }}</a-col>
<a-col :span="18" class="content text-overflow-hidden">
{{ item.osLoadAverage || '-' }}
</a-col>
@ -268,9 +238,7 @@
</a-tooltip>
<a-tooltip :title="item.jpomVersion">
<a-row class="item-info">
<a-col :span="6" class="title text-overflow-hidden">{{
$t('i18n.4a346aae15')
}}</a-col>
<a-col :span="6" class="title text-overflow-hidden">{{ $t('i18n.4a346aae15') }}</a-col>
<a-col :span="18" class="content text-overflow-hidden">
<a-button
:disabled="!item.jpomVersion"
@ -298,9 +266,7 @@
<a-button type="primary" size="small" @click="viewMachineNode(item)">{{
$t('i18n.3bf3c0a8d6')
}}</a-button>
<a-button size="small" @click="deleteMachineInfo(item)">{{
$t('i18n.2f4aaddde3')
}}</a-button>
<a-button size="small" @click="deleteMachineInfo(item)">{{ $t('i18n.2f4aaddde3') }}</a-button>
</a-button-group>
</a-row>
</a-card>
@ -348,11 +314,7 @@
>
<a-form ref="editNodeForm" :rules="rules" :model="temp" :label-col="{ span: 4 }" :wrapper-col="{ span: 19 }">
<a-form-item :label="$t('i18n.e4013f8b81')" name="name">
<a-input
v-model:value="temp.name"
:max-length="50"
:placeholder="$t('i18n.e4013f8b81')"
/>
<a-input v-model:value="temp.name" :max-length="50" :placeholder="$t('i18n.e4013f8b81')" />
</a-form-item>
<a-form-item :label="$t('i18n.93e1df604a')" name="groupName">
<custom-select
@ -381,11 +343,7 @@
<template #help>{{ $t('i18n.6f8da7dcca') }}</template>
<a-input v-model:value="temp.jpomUrl" :placeholder="$t('i18n.1235b052ff')">
<template #addonBefore>
<a-select
v-model:value="temp.jpomProtocol"
:placeholder="$t('i18n.e825ec7800')"
style="width: 160px"
>
<a-select v-model:value="temp.jpomProtocol" :placeholder="$t('i18n.e825ec7800')" style="width: 160px">
<a-select-option value="Http"> Http:// </a-select-option>
<a-select-option value="Https"> Https:// </a-select-option>
</a-select>
@ -394,10 +352,7 @@
</a-form-item>
<a-form-item :label="$t('i18n.86fb7b5421')" name="loginName">
<a-input
v-model:value="temp.jpomUsername"
:placeholder="$t('i18n.f8460626f0')"
/>
<a-input v-model:value="temp.jpomUsername" :placeholder="$t('i18n.f8460626f0')" />
<template #help>{{ $t('i18n.eec342f34e') }}</template>
</a-form-item>
<a-form-item :name="`${temp.id ? 'loginPwd-update' : 'loginPwd'}`">
@ -411,10 +366,7 @@
<QuestionCircleOutlined v-show="!temp.id" />
</a-tooltip>
</template>
<a-input-password
v-model:value="temp.jpomPassword"
:placeholder="$t('i18n.e5a63852fd')"
/>
<a-input-password v-model:value="temp.jpomPassword" :placeholder="$t('i18n.e5a63852fd')" />
</a-form-item>
<a-collapse>
@ -426,9 +378,7 @@
:un-checked-children="$t('i18n.c9744f45e7')"
default-checked
/>
{{ $t('i18n.8e34aa1a59') }},{{
$t('i18n.715ec3b393')
}}
{{ $t('i18n.8e34aa1a59') }},{{ $t('i18n.715ec3b393') }}
</a-form-item>
<a-form-item :label="$t('i18n.67425c29a5')" name="timeOut">
@ -441,10 +391,7 @@
</a-form-item>
<a-form-item :label="$t('i18n.fc954d25ec')" name="jpomHttpProxy">
<a-input
v-model:value="temp.jpomHttpProxy"
:placeholder="$t('i18n.dcf14deb0e')"
>
<a-input v-model:value="temp.jpomHttpProxy" :placeholder="$t('i18n.dcf14deb0e')">
<template #addonBefore>
<a-select
v-model:value="temp.jpomHttpProxyType"
@ -467,9 +414,7 @@
default-value="0"
:placeholder="$t('i18n.3c8eada338')"
>
<a-select-option :value="0">{{
$t('i18n.8a3e316cd7')
}}</a-select-option>
<a-select-option :value="0">{{ $t('i18n.8a3e316cd7') }}</a-select-option>
<a-select-option :value="1">BASE64</a-select-option>
<a-select-option :value="2">AES</a-select-option>
</a-select>
@ -547,21 +492,13 @@
:mask-closable="false"
>
<a-space direction="vertical" style="width: 100%">
<a-alert
v-if="nodeList && nodeList.length"
:message="$t('i18n.566c67e764')"
type="info"
show-icon
/>
<a-alert v-if="nodeList && nodeList.length" :message="$t('i18n.566c67e764')" type="info" show-icon />
<a-list bordered :data-source="nodeList">
<template #renderItem="{ item }">
<a-list-item style="display: block">
<a-row>
<a-col :span="10">{{ $t('i18n.5d83794cfa') }}{{ item.name }}</a-col>
<a-col :span="10"
>{{ $t('i18n.2358e1ef49')
}}{{ item.workspace && item.workspace.name }}</a-col
>
<a-col :span="10">{{ $t('i18n.2358e1ef49') }}{{ item.workspace && item.workspace.name }}</a-col>
<a-col :span="4">
<a-button type="link" @click="toNode(item.id, item.name, item.workspace && item.workspace.id)">
<LoginOutlined /> </a-button
@ -584,9 +521,7 @@
@ok="onSubmitWhitelist"
>
<a-alert
:message="`${$t('i18n.6fa1229ea9')},${$t(
'pages.system.assets.machine.machine-list.d732193c'
)},${$t('i18n.332ba869d9')}`"
:message="`${$t('i18n.6fa1229ea9')},${$t('i18n.acf14aad3c')},${$t('i18n.332ba869d9')}`"
style="margin-top: 10px; margin-bottom: 20px"
banner
/>
@ -653,9 +588,7 @@
</a-space>
</template>
<a-alert
:message="`${$t('i18n.10c385b47e')},${$t(
'pages.system.assets.machine.machine-list.d732193c'
)},${$t('i18n.332ba869d9')}`"
:message="`${$t('i18n.10c385b47e')},${$t('i18n.acf14aad3c')},${$t('i18n.332ba869d9')}`"
style="margin-top: 10px; margin-bottom: 20px"
banner
/>
@ -747,9 +680,7 @@ export default {
syncToWorkspaceVisible: false,
temp: {},
rules: {
name: [
{ required: true, message: this.$t('i18n.cbdc4f58f6'), trigger: 'blur' }
]
name: [{ required: true, message: this.$t('i18n.cbdc4f58f6'), trigger: 'blur' }]
},
drawerVisible: false,
drawerUpgradeVisible: false,
@ -849,9 +780,7 @@ export default {
align: 'center',
ellipsis: true,
customRender: ({ text }) => {
return text
? this.$t('i18n.0a60ac8f02')
: this.$t('i18n.c9744f45e7')
return text ? this.$t('i18n.0a60ac8f02') : this.$t('i18n.c9744f45e7')
}
},
{
@ -1173,9 +1102,7 @@ export default {
onNodeSubmit(restart) {
$confirm({
title: this.$t('i18n.c4535759ee'),
content: restart
? this.$t('i18n.0cf4f0ba82')
: this.$t('i18n.863a95c914'),
content: restart ? this.$t('i18n.0cf4f0ba82') : this.$t('i18n.863a95c914'),
okText: this.$t('i18n.e83a256e4f'),
zIndex: 1009,
cancelText: this.$t('i18n.625fb26b4b'),

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

@ -58,14 +58,10 @@
</a-select>
<a-tooltip :title="$t('i18n.4838a3bd20')">
<a-button type="primary" :loading="loading" @click="loadData"
>{{ $t('i18n.e5f71fc31e') }}
</a-button>
<a-button type="primary" :loading="loading" @click="loadData">{{ $t('i18n.e5f71fc31e') }} </a-button>
</a-tooltip>
<a-button type="primary" @click="handleAdd">{{
$t('i18n.66ab5e9f24')
}}</a-button>
<a-button type="primary" @click="handleAdd">{{ $t('i18n.66ab5e9f24') }}</a-button>
<a-button :disabled="!tableSelections.length" type="primary" @click="syncToWorkspaceShow()">
{{ $t('i18n.82d2c66f47') }}</a-button
>
@ -76,9 +72,7 @@
<template #overlay>
<a-menu>
<a-menu-item key="1">
<a-button type="primary" @click="handlerImportTemplate()">{{
$t('i18n.2e505d23f7')
}}</a-button>
<a-button type="primary" @click="handlerImportTemplate()">{{ $t('i18n.2e505d23f7') }}</a-button>
</a-menu-item>
</a-menu>
</template>
@ -91,9 +85,7 @@
:multiple="false"
:before-upload="beforeUpload"
>
<a-button type="primary"
><UploadOutlined /> {{ $t('i18n.8d9a071ee2') }}<DownOutlined />
</a-button>
<a-button type="primary"><UploadOutlined /> {{ $t('i18n.8d9a071ee2') }}<DownOutlined /> </a-button>
</a-upload>
</a-dropdown>
</a-space>
@ -132,9 +124,7 @@
<p>{{ $t('i18n.f425f59044') }}{{ record.osVersion }}</p>
<p>CPU{{ $t('i18n.045cd62da3') }}{{ record.osCpuIdentifierName }}</p>
<p>{{ $t('i18n.07a0e44145') }}{{ record.hostName }}</p>
<p>
{{ $t('i18n.8a745296f4') }}{{ formatDuration(record.osSystemUptime) }}
</p>
<p>{{ $t('i18n.8a745296f4') }}{{ formatDuration(record.osSystemUptime) }}</p>
</template>
{{ text || $t('i18n.1622dc9b6b') }}
</a-popover>
@ -165,9 +155,7 @@
<a-popover v-if="record.dockerInfo" :title="$t('i18n.5a7ea53d18')">
<template #content>
<p>{{ $t('i18n.461ec75a5a') }}{{ JSON.parse(record.dockerInfo).path }}</p>
<p>
{{ $t('i18n.2684c4634d') }}{{ JSON.parse(record.dockerInfo).version }}
</p>
<p>{{ $t('i18n.2684c4634d') }}{{ JSON.parse(record.dockerInfo).version }}</p>
</template>
<a-tag color="green">{{ $t('i18n.df9497ea98') }}</a-tag>
</a-popover>
@ -179,8 +167,7 @@
<template v-else-if="column.dataIndex === 'status'">
<a-tooltip :title="`${record.statusMsg || $t('i18n.77e100e462')}`">
<a-tag :color="statusMap[record.status] && statusMap[record.status].color">{{
(statusMap[record.status] && statusMap[record.status].desc) ||
$t('i18n.1622dc9b6b')
(statusMap[record.status] && statusMap[record.status].desc) || $t('i18n.1622dc9b6b')
}}</a-tag>
</a-tooltip>
</template>
@ -192,9 +179,7 @@
<template v-else-if="column.dataIndex === 'osOccupyMemory'">
<a-tooltip
placement="topLeft"
:title="`${$t('i18n.ca32cdfd59')}${formatPercent(record.osOccupyMemory)},${$t(
'pages.system.assets.ssh.ssh-list.8b8cc8a1'
)}${renderSize(record.osMoneyTotal)}`"
:title="`${$t('i18n.ca32cdfd59')}${formatPercent(record.osOccupyMemory)},${$t('i18n.a0a3d583b9')}${renderSize(record.osMoneyTotal)}`"
>
<span>{{ formatPercent(record.osOccupyMemory) }}/{{ renderSize(record.osMoneyTotal) }}</span>
</a-tooltip>
@ -204,9 +189,7 @@
<a-popover :title="$t('i18n.a74b62f4bb')">
<template #content>
<p>{{ $t('i18n.7e359f4b71') }}{{ renderSize(record.osFileStoreTotal) }}</p>
<p>
{{ $t('i18n.de17fc0b78') }}{{ formatPercent(record.osMaxOccupyDisk) }}
</p>
<p>{{ $t('i18n.de17fc0b78') }}{{ formatPercent(record.osMaxOccupyDisk) }}</p>
<p>{{ $t('i18n.ba452d57f2') }}{{ record.osMaxOccupyDiskName }}</p>
</template>
<span>{{ formatPercent(record.osMaxOccupyDisk) }} / {{ renderSize(record.osFileStoreTotal) }}</span>
@ -243,9 +226,7 @@
<a-button size="small" type="primary" @click="syncToWorkspaceShow(record)">{{
$t('i18n.e39de3376e')
}}</a-button>
<a-button size="small" type="primary" @click="handleFile(record)">{{
$t('i18n.2a0c4740f1')
}}</a-button>
<a-button size="small" type="primary" @click="handleFile(record)">{{ $t('i18n.2a0c4740f1') }}</a-button>
<a-button size="small" type="primary" @click="handleViewWorkspaceSsh(record)">{{
$t('i18n.1c3cf7f5f0')
}}</a-button>
@ -292,11 +273,7 @@
>
<a-form ref="editSshForm" :rules="rules" :model="temp" :label-col="{ span: 4 }" :wrapper-col="{ span: 18 }">
<a-form-item :label="$t('i18n.10f6fc171a')" name="name">
<a-input
v-model:value="temp.name"
:max-length="50"
:placeholder="$t('i18n.10f6fc171a')"
/>
<a-input v-model:value="temp.name" :max-length="50" :placeholder="$t('i18n.10f6fc171a')" />
</a-form-item>
<a-form-item :label="$t('i18n.1014b33d22')" name="group">
<custom-select
@ -309,11 +286,7 @@
</a-form-item>
<a-form-item label="Host" name="host">
<a-input-group compact name="host">
<a-input
v-model:value="temp.host"
style="width: 70%"
:placeholder="$t('i18n.3d83a07747')"
/>
<a-input v-model:value="temp.host" style="width: 70%" :placeholder="$t('i18n.3d83a07747')" />
<a-form-item-rest>
<a-input-number
v-model:value="temp.port"
@ -332,8 +305,7 @@
<a-tooltip>
{{ $t('i18n.819767ada1') }}
<template #title>
{{ $t('i18n.f0a1428f65') }}<b>$ref.wEnv.xxxx</b> xxxx
{{ $t('i18n.c1b72e7ded') }}</template
{{ $t('i18n.f0a1428f65') }}<b>$ref.wEnv.xxxx</b> xxxx {{ $t('i18n.c1b72e7ded') }}</template
>
<QuestionCircleOutlined v-if="!temp.id" />
</a-tooltip>
@ -360,8 +332,7 @@
<a-tooltip>
{{ $t('i18n.a810520460') }}
<template #title>
{{ $t('i18n.63dd96a28a') }}<b>$ref.wEnv.xxxx</b> xxxx
{{ $t('i18n.c1b72e7ded') }}</template
{{ $t('i18n.63dd96a28a') }}<b>$ref.wEnv.xxxx</b> xxxx {{ $t('i18n.c1b72e7ded') }}</template
>
<QuestionCircleOutlined v-if="!temp.id" />
</a-tooltip>
@ -370,11 +341,7 @@
<custom-input
:input="temp.password"
:env-list="envVarList"
:placeholder="`${
temp.type === 'add'
? $t('i18n.a810520460')
: $t('i18n.6c08692a3a')
}`"
:placeholder="`${temp.type === 'add' ? $t('i18n.a810520460') : $t('i18n.6c08692a3a')}`"
@change="
(v) => {
temp = { ...temp, password: v }
@ -411,8 +378,7 @@
</a-form-item>
<a-form-item :label="$t('i18n.649231bdee')" name="suffix">
<template #help>
{{ $t('i18n.25cad97419') }},
{{ $t('i18n.c03fd7fda8')
{{ $t('i18n.25cad97419') }}, {{ $t('i18n.c03fd7fda8')
}}<span style="color: red">{{ $t('i18n.6adcbc6663') }}</span
>）{{ $t('i18n.81197c2d02') }}
</template>
@ -518,10 +484,7 @@
<a-list-item style="display: block">
<a-row>
<a-col :span="10">SSH{{ $t('i18n.5b47861521') }}{{ item.name }}</a-col>
<a-col :span="10"
>{{ $t('i18n.2358e1ef49')
}}{{ item.workspace && item.workspace.name }}</a-col
>
<a-col :span="10">{{ $t('i18n.2358e1ef49') }}{{ item.workspace && item.workspace.name }}</a-col>
<a-col :span="4">
<a-button v-if="item.workspace" size="small" type="primary" @click="configWorkspaceSsh(item)"
>{{ $t('i18n.224e2ccda8') }}
@ -656,9 +619,7 @@
</a-space>
</CustomModal>
</a-tab-pane>
<a-tab-pane key="2" :tab="$t('i18n.d7c077c6f6')">
<OperationLog type="machinessh"></OperationLog
></a-tab-pane>
<a-tab-pane key="2" :tab="$t('i18n.d7c077c6f6')"> <OperationLog type="machinessh"></OperationLog></a-tab-pane>
</a-tabs>
</div>
</template>

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

@ -59,9 +59,7 @@
@press-enter="loadData"
/>
<a-tooltip :title="$t('i18n.4838a3bd20')">
<a-button type="primary" :loading="loading" @click="loadData">{{
$t('i18n.e5f71fc31e')
}}</a-button>
<a-button type="primary" :loading="loading" @click="loadData">{{ $t('i18n.e5f71fc31e') }}</a-button>
</a-tooltip>
<a-tooltip>
@ -85,9 +83,7 @@
</template>
<template v-else-if="column.dataIndex === 'url'">
<a-tooltip
:title="`${$t('i18n.f668c8c881')}${record.name || ''}/${$t(
'pages.system.cluster-list.6a7417e0'
)}${record.url || ''}/${$t('i18n.8d13037eb7')}${record.statusMsg || ''}`"
:title="`${$t('i18n.f668c8c881')}${record.name || ''}/${$t('i18n.df3833270b')}${record.url || ''}/${$t('i18n.8d13037eb7')}${record.statusMsg || ''}`"
>
<a-button v-if="record.url" type="link" size="small" @click="openUrl(record.url)">
{{ text }}
@ -98,9 +94,7 @@
</template>
<template v-else-if="column.dataIndex === 'operation'">
<a-space>
<a-button size="small" type="primary" @click="handleEdit(record)">{{
$t('i18n.95b351c862')
}}</a-button>
<a-button size="small" type="primary" @click="handleEdit(record)">{{ $t('i18n.95b351c862') }}</a-button>
<a-button size="small" type="primary" danger @click="handleDelete(record)">{{
$t('i18n.2f4aaddde3')
}}</a-button>

12
web-vue/src/pages/user/operation-log.vue
View File

@ -99,9 +99,7 @@
</a-select>
<a-range-picker :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss" @change="onchangeTime" />
<a-tooltip :title="$t('i18n.4838a3bd20')">
<a-button type="primary" :loading="loading" @click="loadData">{{
$t('i18n.e5f71fc31e')
}}</a-button>
<a-button type="primary" :loading="loading" @click="loadData">{{ $t('i18n.e5f71fc31e') }}</a-button>
</a-tooltip>
</a-space>
</template>
@ -136,18 +134,14 @@
<template v-else-if="column.dataIndex === 'optStatus'">
<a-tooltip
placement="topLeft"
:title="`${$t('i18n.be4b9241ec')},${$t('i18n.69056f4792')},${$t(
'pages.user.operation-log.abc9fa2f'
)}`"
:title="`${$t('i18n.be4b9241ec')},${$t('i18n.69056f4792')},${$t('i18n.27b36afd36')}`"
>
<span>{{ text }}</span>
</a-tooltip>
</template>
<template v-else-if="column.dataIndex === 'operation'">
<a-button size="small" type="primary" @click="handleDetail(record)">{{
$t('i18n.f26225bde6')
}}</a-button>
<a-button size="small" type="primary" @click="handleDetail(record)">{{ $t('i18n.f26225bde6') }}</a-button>
</template>
</template>
</CustomTable>

39
web-vue/src/pages/user/permission-group.vue
View File

@ -22,9 +22,7 @@
@press-enter="loadData"
/>
<a-tooltip :title="$t('i18n.4838a3bd20')">
<a-button type="primary" :loading="loading" @click="loadData">{{
$t('i18n.e5f71fc31e')
}}</a-button>
<a-button type="primary" :loading="loading" @click="loadData">{{ $t('i18n.e5f71fc31e') }}</a-button>
</a-tooltip>
<a-button type="primary" @click="handleAdd">{{ $t('i18n.66ab5e9f24') }}</a-button>
</a-space>
@ -32,9 +30,7 @@
<template #bodyCell="{ column, record }">
<template v-if="column.dataIndex === 'operation'">
<a-space>
<a-button size="small" type="primary" @click="handleEdit(record)">{{
$t('i18n.95b351c862')
}}</a-button>
<a-button size="small" type="primary" @click="handleEdit(record)">{{ $t('i18n.95b351c862') }}</a-button>
<a-button type="primary" danger size="small" @click="handleDelete(record)">{{
$t('i18n.2f4aaddde3')
}}</a-button>
@ -55,21 +51,13 @@
>
<a-form ref="editForm" :rules="rules" :model="temp" :label-col="{ span: 4 }" :wrapper-col="{ span: 18 }">
<a-form-item :label="$t('i18n.d7ec2d3fea')" name="name">
<a-input
v-model:value="temp.name"
:max-length="50"
:placeholder="$t('i18n.d7ec2d3fea')"
/>
<a-input v-model:value="temp.name" :max-length="50" :placeholder="$t('i18n.d7ec2d3fea')" />
</a-form-item>
<a-form-item name="workspace">
<template #label>
<a-tooltip>
{{ $t('i18n.98d69f8b62') }}
<template #title>
{{ $t('i18n.9a8eb63daf') }},{{
$t('i18n.85f347f9d0')
}}</template
>
<template #title> {{ $t('i18n.9a8eb63daf') }},{{ $t('i18n.85f347f9d0') }}</template>
<QuestionCircleOutlined v-if="!temp.id" />
</a-tooltip>
</template>
@ -112,18 +100,11 @@
:show-time="{ format: 'HH:mm:ss' }"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
:placeholder="[
$t('i18n.592c595891'),
$t('i18n.f782779e8b')
]"
:placeholder="[$t('i18n.592c595891'), $t('i18n.f782779e8b')]"
/>
<div>
<a-input
v-model:value="item.reason"
:placeholder="$t('i18n.1eba2d93fc')"
allow-clear
/>
<a-input v-model:value="item.reason" :placeholder="$t('i18n.1eba2d93fc')" allow-clear />
</div>
</a-space>
@ -154,9 +135,7 @@
<template #label>
<a-tooltip>
{{ $t('i18n.ef7e3377a0') }}
<template #title>
{{ $t('i18n.21e4f10399') }},{{ $t('i18n.4c69102fe1') }}
</template>
<template #title> {{ $t('i18n.21e4f10399') }},{{ $t('i18n.4c69102fe1') }} </template>
<QuestionCircleOutlined v-if="!temp.id" />
</a-tooltip>
</template>
@ -494,9 +473,7 @@ export default {
$confirm({
title: this.$t('i18n.c4535759ee'),
zIndex: 1009,
content: `demo ${this.$t('i18n.a8f44c3188')},${this.$t(
'pages.user.permission-group.f382dae4'
)}`,
content: `demo ${this.$t('i18n.a8f44c3188')},${this.$t('i18n.c5f9a96133')}`,
okText: this.$t('i18n.e83a256e4f'),
cancelText: this.$t('i18n.625fb26b4b'),