Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add test case p3 priority & .gitignore file #157

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions case-server/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
dist/
.idea
logs
target
temp
26 changes: 20 additions & 6 deletions case-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.8.RELEASE</version>
<version>2.2.0.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.xiaoju.framework</groupId>
Expand Down Expand Up @@ -103,6 +103,12 @@
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>${page.helper.version}</version>
<exclusions>
<exclusion>
<artifactId>mybatis-spring-boot-starter</artifactId>
<groupId>org.mybatis.spring.boot</groupId>
</exclusion>
</exclusions>
</dependency>

<!-- springboot自带的web-socket相关包 -->
Expand Down Expand Up @@ -156,6 +162,12 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.16.0</version>
<exclusions>
<exclusion>
<artifactId>log4j-api</artifactId>
<groupId>org.apache.logging.log4j</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.lmax</groupId>
Expand All @@ -166,6 +178,7 @@
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>1.6.1</version>
</dependency>

<!-- IOUtils -->
Expand All @@ -191,13 +204,14 @@
<groupId>com.flipkart.zjsonpatch</groupId>
<artifactId>zjsonpatch</artifactId>
<version>0.4.11</version>
<exclusions>
<exclusion>
<artifactId>commons-collections4</artifactId>
<groupId>org.apache.commons</groupId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>5.1.6.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ public enum PriorityEnum {
// 枚举
Priority0(1,"P0用例"),
Priority1(2,"P1用例"),
Priority2(3,"P2用例");
Priority2(3,"P2用例"),
Priority3(4,"P3用例");

private Integer value;
private String name;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,8 @@ public Long importExcelFile(FileImportReq req, HttpServletRequest request) throw
data.put("id", UUID.randomUUID().toString());
data.put("created", System.currentTimeMillis());
String priority = row.getCell(row.getFirstCellNum()+1) == null ? "" : row.getCell(row.getFirstCellNum()+1).getStringCellValue().trim();
if (priority.equals("P0") || priority.equals("P1") || priority.equals("P2")) {
data.put("priority", Integer.valueOf(priority.split("P")[1])+1);
if (priority.equals("P0") || priority.equals("P1") || priority.equals("P2") || priority.equals("P3")) {
data.put("priority", Integer.parseInt(priority.split("P")[1])+1);
} // 非法字符的或者其他级别,则不添加priority字段
data.put("resource", row.getCell(row.getFirstCellNum()+8) == null ? "" : row.getCell(row.getFirstCellNum()+8).getStringCellValue().trim().split(","));
String note = "";
Expand Down
1 change: 0 additions & 1 deletion case-server/src/main/resources/web/dist/index.html

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
1 change: 0 additions & 1 deletion case-server/src/main/resources/web/dist/umi.5091cf5c.js

This file was deleted.

1 change: 0 additions & 1 deletion case-server/src/main/resources/web/dist/umi.ab611d83.js

This file was deleted.

48 changes: 0 additions & 48 deletions case-server/src/main/resources/web/dist/vendors.17b41549.chunk.css

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ class TaskModal extends React.Component {
marginTop: '10px',
fontSize: '14px',
};
const grade = ['P0', 'P1', 'P2'];
const grade = ['P0', 'P1', 'P2', 'P3'];
return (
<Modal
visible={this.props.visible}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import React, { Component } from 'react';
import { Icon, Button, Tooltip } from 'antd';
import './PriorityGroup.scss';
import React, { Component } from 'react'
import { Icon, Button, Tooltip } from 'antd'
import './PriorityGroup.scss'

class PriorityGroup extends Component {
handleAction = (priority) => {
const { minder } = this.props;
minder.execCommand('Priority', priority);
};
handleAction = priority => {
const { minder } = this.props
minder.execCommand('Priority', priority)
}
render() {
const { minder, priority = [1, 2, 3], isLock } = this.props;
let disabled = minder.getSelectedNodes().length === 0;
if (isLock) disabled = true;
const { minder, priority = [1, 2, 3, 4], isLock } = this.props
let disabled = minder.getSelectedNodes().length === 0
if (isLock) disabled = true
return (
<div className="nodes-actions" style={{ width: 120 }}>
<Tooltip title="移除优先级" getPopupContainer={(triggerNode) => triggerNode.parentNode}>
<Tooltip title="移除优先级" getPopupContainer={triggerNode => triggerNode.parentNode}>
<Button
type="link"
size="small"
Expand All @@ -29,7 +29,7 @@ class PriorityGroup extends Component {
</Button>
</Tooltip>
{priority &&
priority.map((item) => {
priority.map(item => {
return (
<Button
key={item}
Expand All @@ -41,10 +41,10 @@ class PriorityGroup extends Component {
>
P{item - 1}
</Button>
);
)
})}
</div>
);
)
}
}
export default PriorityGroup;
export default PriorityGroup