feat(测试跟踪): 测试计划状态新增“已归档”
--id=1006588 --user=郭雨琦 【测试跟踪】测试计划状态新增“已归档” https://www.tapd.cn/55049933/prong/stories/view/1155049933001006588
This commit is contained in:
guoyuqi
xiaomeinvG
parent
bd8e5ce815
commit
18f91323f1
|
|
@ -111,19 +111,6 @@
|
|||
</if>
|
||||
</sql>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<select id="list" resultType="io.metersphere.track.dto.TestPlanDTOWithMetric"
|
||||
parameterType="io.metersphere.track.request.testcase.QueryTestPlanRequest">
|
||||
select DISTINCT test_plan.*, project.name as projectName,schedule.id as scheduleId,
|
||||
|
|
@ -164,6 +151,7 @@
|
|||
<foreach collection="values" item="value" separator="," open="(" close=")">
|
||||
#{value}
|
||||
</foreach>
|
||||
and test_plan.status != 'Archived'
|
||||
</when>
|
||||
<when test="key=='status'">
|
||||
<choose>
|
||||
|
|
@ -205,11 +193,18 @@
|
|||
schedule.id is null
|
||||
</if>
|
||||
</foreach>
|
||||
and test_plan.status != 'Archived'
|
||||
</when>
|
||||
</choose>
|
||||
</if>
|
||||
<if test="(values == null or values.size() == 0) and request.filters.get('status') == null">
|
||||
and test_plan.status != 'Archived'
|
||||
</if>
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="request.filters == null or request.filters.size() == 0">
|
||||
and test_plan.status != 'Archived'
|
||||
</if>
|
||||
<if test="request.byFilter == true">
|
||||
and test_plan.status in
|
||||
<foreach collection="request.filterStatus" item="value" separator="," open="(" close=")">
|
||||
|
|
|
|||
|
|
@ -109,4 +109,16 @@ VALUES ('metersphere.module.ui', 'ENABLE', 'text', 1);
|
|||
INSERT INTO system_parameter
|
||||
SELECT 'smtp.from', param_value, type, sort
|
||||
FROM system_parameter
|
||||
WHERE param_key = 'smtp.account';
|
||||
WHERE param_key = 'smtp.account';
|
||||
|
||||
DROP PROCEDURE IF EXISTS schema_change;
|
||||
DELIMITER //
|
||||
CREATE PROCEDURE schema_change() BEGIN
|
||||
DECLARE CurrentDatabase VARCHAR(100);
|
||||
SELECT DATABASE() INTO CurrentDatabase;
|
||||
IF NOT EXISTS (SELECT * FROM information_schema.statistics WHERE table_schema=CurrentDatabase AND table_name = 'test_plan' AND index_name = 'project_id_index') THEN
|
||||
ALTER TABLE `test_plan` ADD INDEX project_id_index ( `project_id` );
|
||||
END IF;
|
||||
END//
|
||||
DELIMITER ;
|
||||
CALL schema_change();
|
||||
|
|
@ -5,6 +5,7 @@
|
|||
<ms-tag v-if="value == 'Finished'" type="warning" :content="$t('test_track.plan.plan_status_finished')"/>
|
||||
<ms-tag v-if="value == 'Completed'" type="success" :content="$t('test_track.plan.plan_status_completed')"/>
|
||||
<ms-tag v-if="value === 'Trash'" type="danger" effect="plain" :content="$t('test_track.plan.plan_status_trash')"/>
|
||||
<ms-tag v-if="value == 'Archived'" type="danger" :content="$t('test_track.plan.plan_status_archived')"/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
|
|||
|
|
@ -20,6 +20,11 @@
|
|||
:icon="status == 'Finished' ? 'el-icon-check' : ''"
|
||||
@click="setStatus('Finished')"> {{$t('test_track.plan.plan_status_finished')}}</el-button>
|
||||
</el-col>
|
||||
<el-col>
|
||||
<el-button type="danger" round size="mini"
|
||||
:icon="status == 'Archived' ? 'el-icon-check' : ''"
|
||||
@click="setStatus('Archived')"> {{$t('test_track.plan.plan_status_archived')}}</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</template>
|
||||
|
||||
|
|
|
|||
|
|
@ -81,6 +81,10 @@
|
|||
:command="{item: scope.row, status: 'Completed'}">
|
||||
{{ $t('test_track.plan.plan_status_completed') }}
|
||||
</el-dropdown-item>
|
||||
<el-dropdown-item :disabled="!hasEditPermission"
|
||||
:command="{item: scope.row, status: 'Archived'}">
|
||||
{{ $t('test_track.plan.plan_status_archived') }}
|
||||
</el-dropdown-item>
|
||||
</el-dropdown-menu>
|
||||
</el-dropdown>
|
||||
</span>
|
||||
|
|
@ -397,7 +401,8 @@ export default {
|
|||
{text: this.$t('test_track.plan.plan_status_prepare'), value: 'Prepare'},
|
||||
{text: this.$t('test_track.plan.plan_status_running'), value: 'Underway'},
|
||||
{text: this.$t('test_track.plan.plan_status_finished'), value: 'Finished'},
|
||||
{text: this.$t('test_track.plan.plan_status_completed'), value: 'Completed'}
|
||||
{text: this.$t('test_track.plan.plan_status_completed'), value: 'Completed'},
|
||||
{text: this.$t('test_track.plan.plan_status_archived'), value: 'Archived'}
|
||||
],
|
||||
stageFilters: [
|
||||
{text: this.$t('test_track.plan.smoke_test'), value: 'smoke'},
|
||||
|
|
|
|||
|
|
@ -2138,6 +2138,7 @@ export default {
|
|||
plan_status_running: "Starting",
|
||||
plan_status_finished: "Finished",
|
||||
plan_status_completed: "Completed",
|
||||
plan_status_archived: "Archived",
|
||||
plan_status_trash: "Trashed",
|
||||
planned_start_time: "Start Time",
|
||||
planned_end_time: "End Time",
|
||||
|
|
|
|||
|
|
@ -2138,6 +2138,7 @@ export default {
|
|||
plan_status_running: "进行中",
|
||||
plan_status_finished: "已结束",
|
||||
plan_status_completed: "已完成",
|
||||
plan_status_archived: "已归档",
|
||||
plan_status_trash: "废弃",
|
||||
planned_start_time: "计划开始",
|
||||
planned_end_time: "计划结束",
|
||||
|
|
|
|||
|
|
@ -2137,6 +2137,7 @@ export default {
|
|||
plan_status_running: "進行中",
|
||||
plan_status_finished: "已結束",
|
||||
plan_status_completed: "已完成",
|
||||
plan_status_archived: "已歸檔",
|
||||
plan_status_trash: "廢棄",
|
||||
planned_start_time: "計劃開始",
|
||||
planned_end_time: "計劃結束",
|
||||
|
|
|
|||
Loading…
Reference in New Issue