diff --git a/src/forge/Main/Diff.jsx b/src/forge/Main/Diff.jsx
index 985b03a8c..51eca8816 100644
--- a/src/forge/Main/Diff.jsx
+++ b/src/forge/Main/Diff.jsx
@@ -36,8 +36,9 @@ const Infos = styled.div`
}
& > .f-wrap-between {
padding: 14px 20px 14px 16px;
- border-radius: 3px 3px 0px 0px;
+ border-radius: 0px 0px 3px 3px;
border: 1px solid #D0D0D0;
+ border-top: none;
.df{
align-items: center;
& .underline:hover{
diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js
index 17cee7051..ef100805b 100644
--- a/src/forge/Order/order.js
+++ b/src/forge/Order/order.js
@@ -6,7 +6,7 @@ import moment from 'moment';
import NoneData from "../Nodata";
import OrderItem from "./OrderItem";
-import CheckProfile from '../Component/ProfileModal/Profile';
+import cookie from 'react-cookies';
import axios from "axios";
@@ -76,6 +76,14 @@ class order extends Component {
}
componentDidMount = () => {
+ // const selectParams = cookie.load('selectParams');
+ // let states = selectParams.select_params;
+ // this.setState({
+ // ...states
+ // },()=>{
+ // this.getSelectList();
+ // this.getIssueList('1');
+ // })
this.getSelectList();
this.getIssueList('1');
};
@@ -102,11 +110,11 @@ class order extends Component {
// 获取列表数据
getIssueList = (status_type, begin, end) => {
+ cookie.remove('selectParams');
this.setState({
isSpin: true
})
const { select_params } = this.state;
- console.log(select_params);
const { projectsId, owner } = this.props.match.params;
const url = `/${owner }/${projectsId}/issues.json`;
axios
@@ -120,7 +128,9 @@ class order extends Component {
})
.then((result) => {
if (result) {
- const issues = result.data.issues
+ const issues = result.data.issues;
+ // let inFifteenMinutes = new Date(new Date().getTime() + 24 * 3600 * 1000);
+ // cookie.save('selectParams', {states:this.state},{ expires: inFifteenMinutes,path:`/${owner}/${projectsId}/issues` });
this.setState({
data: result.data,
issues: issues,
@@ -193,11 +203,12 @@ class order extends Component {
select_params,
author_id,
assigned_to_id
+ },()=>{
+ if (!toGet) {
+ const { status_type } = this.state;
+ this.getIssueList(status_type);
+ }
});
- if (!toGet) {
- const { status_type } = this.state;
- this.getIssueList(status_type);
- }
};
renderMenu = (array, name, id, toGet) => {
diff --git a/src/forge/Settings/Webhooks/Index.jsx b/src/forge/Settings/Webhooks/Index.jsx
index 3af71ee1e..1cc171c47 100644
--- a/src/forge/Settings/Webhooks/Index.jsx
+++ b/src/forge/Settings/Webhooks/Index.jsx
@@ -76,10 +76,8 @@ function Index(props) {
subTitle={`删除后未来事件将不会推送至此Webhook地址:${url}`}
/>
每当特定事件(如push代码,合并请求被编辑)发生时,我们将通过webhook给您提供的远程URL发送post请求。您可以在我们的webhooks指南中了解更多信息
diff --git a/src/forge/Settings/Webhooks/New.jsx b/src/forge/Settings/Webhooks/New.jsx index 22b3899d7..d05a261ec 100644 --- a/src/forge/Settings/Webhooks/New.jsx +++ b/src/forge/Settings/Webhooks/New.jsx @@ -287,10 +287,10 @@ function New({ form , match , showNotification , history }) {