kyfx
/
LuckyFrameWeb
mirror of https://gitee.com/seagull1985/LuckyFrameWeb.git
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修复用例参数控制参数同名的相关逻辑Bug

This commit is contained in:
seagull 2019-10-09 11:13:02 +08:00
parent b8feaefe86
commit 2b4480d526
5 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mysqldb/initialization(create table)/V3.1 初始化.sql
View File

@ -889,11 +889,12 @@ insert into sys_dict_data values(69, 12, '网络异常', '12', 'qa_accident_ty
insert into sys_dict_data values(70, 13, '服务器硬件异常', '13', 'qa_accident_type', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '生产事故类型');
insert into sys_dict_data values(71, 14, '外部原因异常', '14', 'qa_accident_type', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '生产事故类型');
insert into sys_dict_data values(72, 15, '未知原因异常', '15', 'qa_accident_type', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '生产事故类型');
insert into sys_dict_data values(73, 1, '计划中', '1', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态');
insert into sys_dict_data values(74, 2, '开发中', '2', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态');
insert into sys_dict_data values(75, 3, '测试中', '3', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态');
insert into sys_dict_data values(76, 4, '待上线', '4', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态');
insert into sys_dict_data values(77, 5, '已完成', '0', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态');
insert into sys_dict_data values(73, 16, '其他异常', '16', 'qa_accident_type', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '生产事故类型');
insert into sys_dict_data values(74, 1, '计划中', '1', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态');
insert into sys_dict_data values(75, 2, '开发中', '2', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态');
insert into sys_dict_data values(76, 3, '测试中', '3', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态');
insert into sys_dict_data values(77, 4, '待上线', '4', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态');
insert into sys_dict_data values(78, 5, '已完成', '0', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态');
/*HTTP请求方法*/
insert into sys_dict_data values(1000, 1, 'HttpClientPost发送Post请求', 'HttpClientPost', 'testmanagmt_casestep_httpoperation', '', 'info', 'Y', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '使用HttpClient发送post请求');

11
mysqldb/upgrade(alter table)/V3.0 upgrade V3.1/V3.1升级.sql
View File

@ -97,6 +97,7 @@ insert into sys_dict_data values(69, 12, '网络异常', '12', 'qa_accident_ty
insert into sys_dict_data values(70, 13, '服务器硬件异常', '13', 'qa_accident_type', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '生产事故类型');
insert into sys_dict_data values(71, 14, '外部原因异常', '14', 'qa_accident_type', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '生产事故类型');
insert into sys_dict_data values(72, 15, '未知原因异常', '15', 'qa_accident_type', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '生产事故类型');
insert into sys_dict_data values(73, 16, '其他异常', '16', 'qa_accident_type', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '生产事故类型');
-- ----------------------------
-- 45、质量管理-版本管理
@ -156,11 +157,11 @@ values('1104','版本管理删除', '127', '4', '#', 'F', '0', 'qualitymanagmt
-- ----------------------------
-- 增加版本管理状态字典
-- ----------------------------
insert into sys_dict_data values(73, 1, '计划中', '1', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态');
insert into sys_dict_data values(74, 2, '开发中', '2', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态');
insert into sys_dict_data values(75, 3, '测试中', '3', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态');
insert into sys_dict_data values(76, 4, '待上线', '4', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态');
insert into sys_dict_data values(77, 5, '已完成', '0', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态');
insert into sys_dict_data values(74, 1, '计划中', '1', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态');
insert into sys_dict_data values(75, 2, '开发中', '2', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态');
insert into sys_dict_data values(76, 3, '测试中', '3', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态');
insert into sys_dict_data values(77, 4, '待上线', '4', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态');
insert into sys_dict_data values(78, 5, '已完成', '0', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态');
-- ----------------------------
-- 增加字典类型定义数据

2
src/main/resources/mybatis/testmanagmt/ProjectCaseParamsMapper.xml
View File

@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectProjectCaseParamsVo"/>
<where>
<if test="paramsName != null and paramsName != '' "> and pcp.params_name = #{paramsName}</if>
<if test="projectId != null "> and pcp.project_id = #{projectId}</if>
<if test="projectId != null and projectId!=0"> and (pcp.project_id = #{projectId} or pcp.project_id=0)</if>
</where>
</select>

8
src/main/resources/templates/testmanagmt/projectCaseParams/add.html
View File

@ -8,7 +8,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">项目名称：</label>
<div class="col-sm-8">
<select id="projectId" name="projectId" class="form-control m-b" th:with="type=${projects}">
<select id="projectId" name="projectId" class="form-control m-b" th:with="type=${projects}" onchange="resetValidateForm()">
<option value="0">所有项目</option>
<option th:each="projects : ${type}" th:text="${projects.projectName}" th:value="${projects.projectId}" th:selected="${projects.projectId == defaultProjectId}"></option>
</select>
@ -85,6 +85,12 @@
}
});
/*重新初始化表单验证*/
function resetValidateForm() {
$.validate.resetForm();
$.validate.form();
}
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-projectCaseParams-add').serialize());

8
src/main/resources/templates/testmanagmt/projectCaseParams/edit.html
View File

@ -9,7 +9,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">项目名称：</label>
<div class="col-sm-8">
<select id="projectId" name="projectId" th:field="*{projectId}" class="form-control m-b" th:with="type=${projects}">
<select id="projectId" name="projectId" th:field="*{projectId}" class="form-control m-b" th:with="type=${projects}" onchange="resetValidateForm()">
<option value="0">所有项目</option>
<option th:each="projects : ${type}" th:text="${projects.projectName}" th:value="${projects.projectId}" th:selected="${projects.projectId == projectCaseParams.projectId}"></option>
</select>
@ -86,6 +86,12 @@
}
});
/*重新初始化表单验证*/
function resetValidateForm() {
$.validate.resetForm();
$.validate.form();
}
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-projectCaseParams-edit').serialize());