fix(资源池): bugFix

This commit is contained in:
baiqi 2024-10-24 15:33:19 +08:00 committed by 刘瑞斌
parent 6d5d5217e7
commit f3646a4e67
4 changed files with 19 additions and 6 deletions

View File

@ -4,6 +4,7 @@
:width="680" :width="680"
:title="t('system.resourcePool.customJobTemplate')" :title="t('system.resourcePool.customJobTemplate')"
:footer="!props.readOnly" :footer="!props.readOnly"
show-full-screen
@close="handleClose" @close="handleClose"
> >
<MsCodeEditor <MsCodeEditor
@ -13,6 +14,7 @@
height="calc(100vh - 205px)" height="calc(100vh - 205px)"
theme="MS-text" theme="MS-text"
:read-only="props.readOnly" :read-only="props.readOnly"
:show-full-screen="false"
/> />
<template v-if="!props.readOnly" #footer> <template v-if="!props.readOnly" #footer>
<a-button type="secondary" @click="resetTemplate">{{ t('system.resourcePool.jobTemplateReset') }}</a-button> <a-button type="secondary" @click="resetTemplate">{{ t('system.resourcePool.jobTemplateReset') }}</a-button>
@ -21,8 +23,6 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, watch } from 'vue';
import MsCodeEditor from '@/components/pure/ms-code-editor/index.vue'; import MsCodeEditor from '@/components/pure/ms-code-editor/index.vue';
import MsDrawer from '@/components/pure/ms-drawer/index.vue'; import MsDrawer from '@/components/pure/ms-drawer/index.vue';

View File

@ -322,9 +322,14 @@
</span> </span>
</a-tooltip> </a-tooltip>
</a-form-item> </a-form-item>
<a-form-item field="testResourceDTO.concurrentNumber" class="form-item"> <a-form-item
field="testResourceDTO.concurrentNumber"
:rules="[{ required: true, message: t('system.resourcePool.concurrentNumberRequired') }]"
class="form-item"
asterisk-position="end"
>
<template #label> <template #label>
<div class="flex items-center gap-[4px]"> <div class="inline-flex max-w-[calc(100%-12px)] items-center gap-[4px]">
<div>{{ t('system.resourcePool.testResourceDTO.concurrentNumber') }}</div> <div>{{ t('system.resourcePool.testResourceDTO.concurrentNumber') }}</div>
<a-tooltip v-if="!isXpack" :content="t('system.resourcePool.concurrentNumberTip')" position="tl" mini> <a-tooltip v-if="!isXpack" :content="t('system.resourcePool.concurrentNumberTip')" position="tl" mini>
<icon-question-circle class="ml-[4px] text-[var(--color-text-4)] hover:text-[rgb(var(--primary-6))]" /> <icon-question-circle class="ml-[4px] text-[var(--color-text-4)] hover:text-[rgb(var(--primary-6))]" />
@ -342,9 +347,14 @@
@change="() => setIsSave(false)" @change="() => setIsSave(false)"
></a-input-number> ></a-input-number>
</a-form-item> </a-form-item>
<a-form-item field="testResourceDTO.podThreads" class="form-item"> <a-form-item
field="testResourceDTO.podThreads"
:rules="[{ required: true, message: t('system.resourcePool.testResourceDTO.podThreadsRequired') }]"
class="form-item"
asterisk-position="end"
>
<template #label> <template #label>
<div class="flex items-center gap-[4px]"> <div class="inline-flex max-w-[calc(100%-12px)] items-center gap-[4px]">
<div>{{ t('system.resourcePool.testResourceDTO.podThreads') }}</div> <div>{{ t('system.resourcePool.testResourceDTO.podThreads') }}</div>
<a-tooltip <a-tooltip
v-if="!isXpack" v-if="!isXpack"

View File

@ -111,6 +111,8 @@ export default {
'system.resourcePool.testResourceDTO.apiTestImagePlaceholder': 'Please fill in the API image', 'system.resourcePool.testResourceDTO.apiTestImagePlaceholder': 'Please fill in the API image',
'system.resourcePool.testResourceDTO.concurrentNumber': 'Maximum concurrency', 'system.resourcePool.testResourceDTO.concurrentNumber': 'Maximum concurrency',
'system.resourcePool.testResourceDTO.podThreads': 'Maximum number of concurrent tasks per task', 'system.resourcePool.testResourceDTO.podThreads': 'Maximum number of concurrent tasks per task',
'system.resourcePool.testResourceDTO.podThreadsRequired':
'Maximum number of concurrent tasks per task cannot be empty',
'system.resourcePool.testResourceDTO.podThreadsTip': 'system.resourcePool.testResourceDTO.podThreadsTip':
'The maximum number of concurrent tasks for the community version is 3. If you need a higher number of concurrent tasks, you can apply for a trial of the enterprise version.', 'The maximum number of concurrent tasks for the community version is 3. If you need a higher number of concurrent tasks, you can apply for a trial of the enterprise version.',
'system.resourcePool.testResourceDTO.downloadRoleYaml': 'Download YAML files', 'system.resourcePool.testResourceDTO.downloadRoleYaml': 'Download YAML files',

View File

@ -105,6 +105,7 @@ export default {
'system.resourcePool.testResourceDTO.apiTestImagePlaceholder': '请输入 API 镜像', 'system.resourcePool.testResourceDTO.apiTestImagePlaceholder': '请输入 API 镜像',
'system.resourcePool.testResourceDTO.concurrentNumber': '最大并发数', 'system.resourcePool.testResourceDTO.concurrentNumber': '最大并发数',
'system.resourcePool.testResourceDTO.podThreads': '单个任务最大并发数', 'system.resourcePool.testResourceDTO.podThreads': '单个任务最大并发数',
'system.resourcePool.testResourceDTO.podThreadsRequired': '单个任务最大并发数不能为空',
'system.resourcePool.testResourceDTO.podThreadsTip': '社区版单个任务最大并发数为 3如需更大并发数 可申请企业版试用', 'system.resourcePool.testResourceDTO.podThreadsTip': '社区版单个任务最大并发数为 3如需更大并发数 可申请企业版试用',
'system.resourcePool.testResourceDTO.downloadRoleYaml': '下载 YAML 文件', 'system.resourcePool.testResourceDTO.downloadRoleYaml': '下载 YAML 文件',
'system.resourcePool.testResourceDTO.downloadRoleYamlTip': '请先填写命名空间再下载YAML文件', 'system.resourcePool.testResourceDTO.downloadRoleYamlTip': '请先填写命名空间再下载YAML文件',