fix(项目管理): 成员列表展示有误

This commit is contained in:
song-cc-rock 2024-04-01 16:59:06 +08:00 committed by Craftsman
parent f22b303187
commit bd7e858a0e
12 changed files with 35 additions and 15 deletions

View File

@ -56,7 +56,7 @@
v-if="item.status === UploadStatus.init" v-if="item.status === UploadStatus.init"
class="text-[12px] leading-[16px] text-[var(--color-text-4)]" class="text-[12px] leading-[16px] text-[var(--color-text-4)]"
> >
{{ t('ms.upload.waiting') }} {{ t('ms.upload.waiting_save') }}
</div> </div>
<div <div
v-else-if="item.status === UploadStatus.done" v-else-if="item.status === UploadStatus.done"

View File

@ -4,6 +4,7 @@ export default {
'ms.upload.importModalDragText': 'Drag or click this area to select a file', 'ms.upload.importModalDragText': 'Drag or click this area to select a file',
'ms.upload.importModalFileTip': 'Only {type} format files are supported, and the file size does not exceed {size} MB', 'ms.upload.importModalFileTip': 'Only {type} format files are supported, and the file size does not exceed {size} MB',
'ms.upload.waiting': 'Waiting', 'ms.upload.waiting': 'Waiting',
'ms.upload.waiting_save': 'Waiting save',
'ms.upload.reUpload': 'Reupload', 'ms.upload.reUpload': 'Reupload',
'ms.upload.preview': 'Preview', 'ms.upload.preview': 'Preview',
'ms.upload.uploadAt': 'Uploaded at', 'ms.upload.uploadAt': 'Uploaded at',

View File

@ -4,6 +4,7 @@ export default {
'ms.upload.importModalDragText': '拖拽或点击此区域选择文件', 'ms.upload.importModalDragText': '拖拽或点击此区域选择文件',
'ms.upload.importModalFileTip': '只支持 {type} 格式文件,文件大小不超过 {size} MB', 'ms.upload.importModalFileTip': '只支持 {type} 格式文件,文件大小不超过 {size} MB',
'ms.upload.waiting': '等待上传', 'ms.upload.waiting': '等待上传',
'ms.upload.waiting_save': '等待保存',
'ms.upload.reUpload': '重新上传', 'ms.upload.reUpload': '重新上传',
'ms.upload.preview': '预览', 'ms.upload.preview': '预览',
'ms.upload.uploadAt': '上传于', 'ms.upload.uploadAt': '上传于',

View File

@ -21,7 +21,7 @@ export default {
'menu.workbench': '工作台', 'menu.workbench': '工作台',
'menu.testPlan': '测试计划', 'menu.testPlan': '测试计划',
'menu.bugManagement': '缺陷管理', 'menu.bugManagement': '缺陷管理',
'menu.bugManagement.bugDetail': '缺陷管理', 'menu.bugManagement.bugDetail': '缺陷',
'menu.bugManagement.bugRecycle': '回收站', 'menu.bugManagement.bugRecycle': '回收站',
'menu.caseManagement': '用例管理', 'menu.caseManagement': '用例管理',
'menu.apiTest': '接口测试', 'menu.apiTest': '接口测试',

View File

@ -307,7 +307,7 @@
v-model:model-value="condition.variableNames" v-model:model-value="condition.variableNames"
:max-length="255" :max-length="255"
:disabled="props.disabled" :disabled="props.disabled"
:placeholder="t('apiTestDebug.storageByResultPlaceholder', { a: 'id,username' })" :placeholder="t('apiTestDebug.storageByColPlaceholder', { a: 'id', b: 'email', c: '{id_1}', d: '{email_1}' })"
@input="() => emit('change')" @input="() => emit('change')"
/> />
</div> </div>
@ -336,7 +336,7 @@
v-model:model-value="condition.resultVariable" v-model:model-value="condition.resultVariable"
:disabled="props.disabled" :disabled="props.disabled"
:max-length="255" :max-length="255"
:placeholder="t('apiTestDebug.storageByResultPlaceholder', { a: '${result}' })" :placeholder="t('apiTestDebug.storageByResultPlaceholder', { a: 'result', b: '${result}' })"
@input="() => emit('change')" @input="() => emit('change')"
/> />
</div> </div>
@ -683,7 +683,8 @@ if (!result){
slotName: 'key', slotName: 'key',
}, },
{ {
title: 'apiTestDebug.paramValue', title: 'apiTestDebug.extractValueByColumn',
titleSlotName: 'extractValueTitle',
dataIndex: 'value', dataIndex: 'value',
slotName: 'value', slotName: 'value',
isNormal: true, isNormal: true,

View File

@ -56,6 +56,17 @@
<div class="ml-[4px] text-[var(--color-text-3)]">{{ t('ms.assertion.typeChecking') }}</div> <div class="ml-[4px] text-[var(--color-text-3)]">{{ t('ms.assertion.typeChecking') }}</div>
</div> </div>
</template> </template>
<template #extractValueTitle>
<div class="flex items-center text-[var(--color-text-3)]">
{{ t('apiTestDebug.extractValueByColumn') }}
<a-tooltip :content="t('caseManagement.caseReview.passRateTip')" position="right">
<icon-question-circle
class="ml-[4px] text-[var(--color-text-4)] hover:text-[rgb(var(--primary-5))]"
size="16"
/>
</a-tooltip>
</div>
</template>
<!-- 表格列 slot --> <!-- 表格列 slot -->
<!-- 参数名 or 请求/响应头联想输入 --> <!-- 参数名 or 请求/响应头联想输入 -->
<template #key="{ record, columnConfig, rowIndex }"> <template #key="{ record, columnConfig, rowIndex }">

View File

@ -22,6 +22,7 @@ export default {
'apiTestDebug.paramNamePlaceholder': 'Please enter parameter name', 'apiTestDebug.paramNamePlaceholder': 'Please enter parameter name',
'apiTestDebug.paramValue': 'Parameter value', 'apiTestDebug.paramValue': 'Parameter value',
'apiTestDebug.paramValuePlaceholder': 'Starting with {at}, double-click to quickly enter', 'apiTestDebug.paramValuePlaceholder': 'Starting with {at}, double-click to quickly enter',
'apiTestDebug.extractValueByColumn': 'Extract value by column',
'apiTestDebug.paramValuePreview': 'Parameter preview', 'apiTestDebug.paramValuePreview': 'Parameter preview',
'apiTestDebug.desc': 'Description', 'apiTestDebug.desc': 'Description',
'apiTestDebug.paramRequired': 'Required', 'apiTestDebug.paramRequired': 'Required',
@ -94,9 +95,9 @@ export default {
'apiTestDebug.storageResultTip': 'apiTestDebug.storageResultTip':
'Save the entire result set as a variable instead of saving each column value as a separate variable', 'Save the entire result set as a variable instead of saving each column value as a separate variable',
'apiTestDebug.storageByCol': 'Store by columns', 'apiTestDebug.storageByCol': 'Store by columns',
'apiTestDebug.storageByColPlaceholder': 'For example, {a} is changed to {b}', 'apiTestDebug.storageByColPlaceholder': 'E.g. {a}, {b}; Subsequent uses such as {c} and {d}',
'apiTestDebug.storageByResult': 'Store by result', 'apiTestDebug.storageByResult': 'Store by result',
'apiTestDebug.storageByResultPlaceholder': 'Such as {a}', 'apiTestDebug.storageByResultPlaceholder': 'E.g. {a}; Subsequent use such as {b}',
'apiTestDebug.extractParameter': 'Extract', 'apiTestDebug.extractParameter': 'Extract',
'apiTestDebug.searchTip': 'Please enter a group name', 'apiTestDebug.searchTip': 'Please enter a group name',
'apiTestDebug.allRequest': 'All requests', 'apiTestDebug.allRequest': 'All requests',

View File

@ -25,6 +25,7 @@ export default {
'apiTestDebug.paramType': '类型', 'apiTestDebug.paramType': '类型',
'apiTestDebug.paramValue': '参数值', 'apiTestDebug.paramValue': '参数值',
'apiTestDebug.paramValuePlaceholder': '以{at}开始,双击可快速输入', 'apiTestDebug.paramValuePlaceholder': '以{at}开始,双击可快速输入',
'apiTestDebug.extractValueByColumn': '按列提取值',
'apiTestDebug.paramLengthRange': '长度区间', 'apiTestDebug.paramLengthRange': '长度区间',
'apiTestDebug.paramMin': '最小值', 'apiTestDebug.paramMin': '最小值',
'apiTestDebug.paramMax': '最大值', 'apiTestDebug.paramMax': '最大值',
@ -88,9 +89,9 @@ export default {
'apiTestDebug.storageColTip': '指定从数据库结果集中提取的列的名称;多个列可以使用“,”分隔', 'apiTestDebug.storageColTip': '指定从数据库结果集中提取的列的名称;多个列可以使用“,”分隔',
'apiTestDebug.storageResultTip': '把整个结果集保存为一个变量,而不是将每个列的值保存为单独的变量', 'apiTestDebug.storageResultTip': '把整个结果集保存为一个变量,而不是将每个列的值保存为单独的变量',
'apiTestDebug.storageByCol': '按列存储', 'apiTestDebug.storageByCol': '按列存储',
'apiTestDebug.storageByColPlaceholder': '如 {a} 改成 {b}', 'apiTestDebug.storageByColPlaceholder': '如 {a}, {b}; 后续使用如{c}和{d}',
'apiTestDebug.storageByResult': '按结果存储', 'apiTestDebug.storageByResult': '按结果存储',
'apiTestDebug.storageByResultPlaceholder': '如 {a}', 'apiTestDebug.storageByResultPlaceholder': '如 {a}; 后续使用如{b}',
'apiTestDebug.extractParameter': '提取参数', 'apiTestDebug.extractParameter': '提取参数',
'apiTestDebug.searchTip': '请输入模块/请求名称', 'apiTestDebug.searchTip': '请输入模块/请求名称',
'apiTestDebug.allRequest': '全部请求', 'apiTestDebug.allRequest': '全部请求',

View File

@ -305,7 +305,12 @@
let initValue = valueObj[item.fieldId]; let initValue = valueObj[item.fieldId];
const initOptions = item.options ? item.options : JSON.parse(item.platformOptionJson); const initOptions = item.options ? item.options : JSON.parse(item.platformOptionJson);
if (memberType.includes(item.type)) { if (memberType.includes(item.type)) {
if (item.defaultValue === 'CREATE_USER' || item.defaultValue.includes('CREATE_USER')) { // ,
if (
initValue == null &&
initValue === '' &&
(item.defaultValue === 'CREATE_USER' || item.defaultValue.includes('CREATE_USER'))
) {
initValue = item.type === 'MEMBER' ? userStore.id : [userStore.id]; initValue = item.type === 'MEMBER' ? userStore.id : [userStore.id];
} }
} }

View File

@ -423,7 +423,7 @@
title: 'bugManagement.tag', title: 'bugManagement.tag',
showDrag: true, showDrag: true,
isStringTag: true, isStringTag: true,
width: 200, width: 456,
dataIndex: 'tags', dataIndex: 'tags',
showInTable: true, showInTable: true,
}, },

View File

@ -228,7 +228,7 @@
const roleIds = ref<string>(''); const roleIds = ref<string>('');
const initData = async () => { const initData = async () => {
setLoadListParams({ ...searchParams.value }); setLoadListParams({ ...searchParams.value });
loadList(); await loadList();
}; };
const searchHandler = () => { const searchHandler = () => {
@ -397,8 +397,6 @@
onBeforeMount(() => { onBeforeMount(() => {
initData(); initData();
}); });
await tableStore.initColumn(TableKeyEnum.PROJECT_MEMBER, columns, 'drawer');
</script> </script>
<style scoped></style> <style scoped></style>

View File

@ -71,7 +71,7 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { FormInstance, Message } from '@arco-design/web-vue'; import { FormInstance } from '@arco-design/web-vue';
import MsDrawer from '@/components/pure/ms-drawer/index.vue'; import MsDrawer from '@/components/pure/ms-drawer/index.vue';
import MsFormCreate from '@/components/pure/ms-form-create/ms-form-create.vue'; import MsFormCreate from '@/components/pure/ms-form-create/ms-form-create.vue';
@ -134,6 +134,7 @@
fApi.value.clearValidateState(); fApi.value.clearValidateState();
}; };
const handlePlatformChange = async (value: SelectValue) => { const handlePlatformChange = async (value: SelectValue) => {
platformRules.value = [];
try { try {
if (value) { if (value) {
const res = await getPlatformInfo(value as string, MenuEnum.caseManagement); const res = await getPlatformInfo(value as string, MenuEnum.caseManagement);