test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(测试计划): 已归档的测试计划不能修改步骤执行结果

This commit is contained in:
teukkk 2024-05-28 14:05:47 +08:00 committed by Craftsman
parent 94bcdd9b08
commit dd2e1943da
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/views/case-management/caseManagementFeature/components/addStep.vue
View File

@ -28,7 +28,10 @@
@blur="blurHandler(record, 'expected')" @blur="blurHandler(record, 'expected')"
/> />
</template> </template>
<template #actualResult="{ record }"> <template
v-if="hasAnyPermission(['PROJECT_TEST_PLAN:READ+EXECUTE']) && !props.isDisabledTestPlan"
#actualResult="{ record }"
>
<a-textarea <a-textarea
v-model="record.actualResult" v-model="record.actualResult"
:max-length="1000" :max-length="1000"
@ -40,7 +43,7 @@
</template> </template>
<template #lastExecResult="{ record }"> <template #lastExecResult="{ record }">
<a-select <a-select
v-if="hasAnyPermission(['PROJECT_TEST_PLAN:READ+EXECUTE'])" v-if="hasAnyPermission(['PROJECT_TEST_PLAN:READ+EXECUTE']) && !props.isDisabledTestPlan"
v-model:model-value="record.executeResult" v-model:model-value="record.executeResult"
:placeholder="t('common.pleaseSelect')" :placeholder="t('common.pleaseSelect')"
class="param-input w-full" class="param-input w-full"
@ -101,6 +104,7 @@
isDisabled?: boolean; isDisabled?: boolean;
isScrollY?: boolean; isScrollY?: boolean;
isTestPlan?: boolean; isTestPlan?: boolean;
isDisabledTestPlan?: boolean;
}>(), }>(),
{ {
isDisabled: false, isDisabled: false,

2
frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDetail.vue
View File

@ -67,6 +67,7 @@
v-model:step-list="stepData" v-model:step-list="stepData"
:is-scroll-y="false" :is-scroll-y="false"
:is-test-plan="props.isTestPlan" :is-test-plan="props.isTestPlan"
:is-disabled-test-plan="props.isDisabledTestPlan"
:is-disabled="!isEditPreposition" :is-disabled="!isEditPreposition"
/> />
</div> </div>
@ -304,6 +305,7 @@
formRules?: FormRuleItem[]; // 编辑表单 formRules?: FormRuleItem[]; // 编辑表单
formApi?: any; formApi?: any;
isTestPlan?: boolean; // 测试计划页面的 isTestPlan?: boolean; // 测试计划页面的
isDisabledTestPlan?: boolean; // 测试计划页面-已归档
}>(), }>(),
{ {
allowEdit: true, // 是否允许编辑 allowEdit: true, // 是否允许编辑

2
frontend/src/views/test-plan/testPlan/detail/featureCase/detail/index.vue
View File

@ -101,7 +101,7 @@
</template> </template>
</MsDescription> </MsDescription>
<div v-else-if="activeTab === 'detail'" class="align-content-start flex h-full flex-col"> <div v-else-if="activeTab === 'detail'" class="align-content-start flex h-full flex-col">
<CaseTabDetail ref="caseTabDetailRef" is-test-plan :form="caseDetail" /> <CaseTabDetail ref="caseTabDetailRef" is-test-plan :form="caseDetail" :is-disabled-test-plan="!canEdit" />
<!-- 开始执行 --> <!-- 开始执行 -->
<div <div
v-if="canEdit && hasAnyPermission(['PROJECT_TEST_PLAN:READ+EXECUTE'])" v-if="canEdit && hasAnyPermission(['PROJECT_TEST_PLAN:READ+EXECUTE'])"