fix(测试跟踪): 用例评审页面列表报错

This commit is contained in:
song-cc-rock 2023-02-09 15:29:33 +08:00 committed by jianxing
parent 4357374353
commit c372c58e71
4 changed files with 17 additions and 28 deletions

View File

@ -30,10 +30,11 @@ import io.metersphere.utils.ListUtil;
import io.metersphere.xpack.version.service.ProjectVersionService; import io.metersphere.xpack.version.service.ProjectVersionService;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import jakarta.annotation.Resource;
import java.util.*; import java.util.*;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -54,6 +55,7 @@ public class TestReviewTestCaseService {
@Resource @Resource
TestCaseReviewMapper testCaseReviewMapper; TestCaseReviewMapper testCaseReviewMapper;
@Resource @Resource
@Lazy
TestCaseReviewService testCaseReviewService; TestCaseReviewService testCaseReviewService;
@Resource @Resource
TestCaseMapper testCaseMapper; TestCaseMapper testCaseMapper;

View File

@ -30,7 +30,7 @@
<ms-select-tree <ms-select-tree
:disabled="readOnly" :disabled="readOnly"
:data="treeNodes" :data="treeNodes"
:defaultKey="form.module" :defaultKey="defaultModuleKey"
:obj="moduleObj" :obj="moduleObj"
@getValue="(id, data) => setModule(id, data)" @getValue="(id, data) => setModule(id, data)"
clearable clearable
@ -460,18 +460,19 @@ export default {
isCustomNum() { isCustomNum() {
return useStore().currentProjectIsCustomNum; return useStore().currentProjectIsCustomNum;
}, },
// this.customFieldForm[""] = this.form.priority; defaultModuleKey() {
// this.customFieldForm[""] = this.form.maintainer; if (this.editable) {
// this.customFieldForm[""] = this.form.status; let defaultNodeKey = '';
// priority() { this.treeNodes.forEach(node => {
// return this.customFieldForm[""] || this.form.priority; if (node.label === '未规划用例') {
// }, defaultNodeKey = node.id;
// maintainer() { }
// return this.customFieldForm[""] || this.form.maintainer; })
// }, return defaultNodeKey;
// status() { } else {
// return this.customFieldForm[""] || this.form.status; return this.form.module
// }, }
}
}, },
mounted() { mounted() {
this.getDemandOptions(); this.getDemandOptions();

View File

@ -95,15 +95,6 @@
prop="description" prop="description"
/> />
</div> </div>
<div class="remark-wrap">
<form-rich-text-item
v-if="!enableThirdPartTemplate"
:title="$t('commons.remark')"
:data="form"
:default-open="richTextDefaultOpen"
prop="remark"
/>
</div>
<el-form-item :label="$t('test_track.case.attachment')"></el-form-item> <el-form-item :label="$t('test_track.case.attachment')"></el-form-item>
</el-form> </el-form>

View File

@ -261,11 +261,6 @@
{{ $t("case.empty_file") }} {{ $t("case.empty_file") }}
</div> </div>
</div> </div>
<div class="upload-file" style="margin-top: 16px">
<el-button type="primary" size="small" icon="el-icon-upload2">{{
$t("case.upload_file")
}}</el-button>
</div>
</div> </div>
</div> </div>
</el-drawer> </el-drawer>