save
This commit is contained in:
commit
554e6741d7
|
|
@ -206,6 +206,12 @@ module.exports = {
|
|||
{
|
||||
loader: require.resolve("sass-loader"),
|
||||
},
|
||||
{
|
||||
loader: 'sass-resources-loader',
|
||||
options: {
|
||||
resources: ['src/global.scss']
|
||||
}
|
||||
}
|
||||
],
|
||||
},
|
||||
// "file" loader makes sure those assets get served by WebpackDevServer.
|
||||
|
|
|
|||
|
|
@ -208,6 +208,12 @@ module.exports = {
|
|||
{
|
||||
loader: require.resolve("sass-loader"),
|
||||
},
|
||||
{
|
||||
loader: 'sass-resources-loader',
|
||||
options: {
|
||||
resources: ['src/global.scss']
|
||||
}
|
||||
}
|
||||
],
|
||||
},
|
||||
// "file" loader makes sure assets end up in the `build` folder.
|
||||
|
|
|
|||
|
|
@ -14158,6 +14158,27 @@
|
|||
"object-assign": "^4.1.1"
|
||||
}
|
||||
},
|
||||
"react-copy-to-clipboard": {
|
||||
"version": "5.1.0",
|
||||
"resolved": "https://registry.npmmirror.com/react-copy-to-clipboard/-/react-copy-to-clipboard-5.1.0.tgz",
|
||||
"integrity": "sha512-k61RsNgAayIJNoy9yDsYzDe/yAZAzEbEgcz3DZMhF686LEyukcE1hzurxe85JandPUG+yTfGVFzuEw3xt8WP/A==",
|
||||
"requires": {
|
||||
"copy-to-clipboard": "^3.3.1",
|
||||
"prop-types": "^15.8.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"prop-types": {
|
||||
"version": "15.8.1",
|
||||
"resolved": "https://registry.npmmirror.com/prop-types/-/prop-types-15.8.1.tgz",
|
||||
"integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
|
||||
"requires": {
|
||||
"loose-envify": "^1.4.0",
|
||||
"object-assign": "^4.1.1",
|
||||
"react-is": "^16.13.1"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"react-countup": {
|
||||
"version": "6.1.0",
|
||||
"resolved": "https://registry.npmjs.org/react-countup/-/react-countup-6.1.0.tgz",
|
||||
|
|
@ -15874,7 +15895,7 @@
|
|||
},
|
||||
"sass-loader": {
|
||||
"version": "7.3.1",
|
||||
"resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.3.1.tgz",
|
||||
"resolved": "https://registry.npmmirror.com/sass-loader/-/sass-loader-7.3.1.tgz",
|
||||
"integrity": "sha512-tuU7+zm0pTCynKYHpdqaPpe+MMTQ76I9TPZ7i4/5dZsigE350shQWe5EZNl5dBidM49TPET75tNqRbcsUZWeNA==",
|
||||
"requires": {
|
||||
"clone-deep": "^4.0.1",
|
||||
|
|
@ -15890,9 +15911,85 @@
|
|||
"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
|
||||
},
|
||||
"semver": {
|
||||
"version": "6.3.0",
|
||||
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
|
||||
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
|
||||
"version": "6.3.1",
|
||||
"resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz",
|
||||
"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
|
||||
}
|
||||
}
|
||||
},
|
||||
"sass-resources-loader": {
|
||||
"version": "2.2.5",
|
||||
"resolved": "https://registry.npmmirror.com/sass-resources-loader/-/sass-resources-loader-2.2.5.tgz",
|
||||
"integrity": "sha512-po8rfETH9cOQACWxubT/1CCu77KjxwRtCDm6QAXZH99aUHBydwSoxdIjC40SGp/dcS/FkSNJl0j1VEojGZqlvQ==",
|
||||
"requires": {
|
||||
"async": "^3.2.3",
|
||||
"chalk": "^4.1.0",
|
||||
"glob": "^7.1.6",
|
||||
"loader-utils": "^2.0.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"ansi-styles": {
|
||||
"version": "4.3.0",
|
||||
"resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
|
||||
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
|
||||
"requires": {
|
||||
"color-convert": "^2.0.1"
|
||||
}
|
||||
},
|
||||
"async": {
|
||||
"version": "3.2.4",
|
||||
"resolved": "https://registry.npmmirror.com/async/-/async-3.2.4.tgz",
|
||||
"integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="
|
||||
},
|
||||
"chalk": {
|
||||
"version": "4.1.2",
|
||||
"resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
|
||||
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
|
||||
"requires": {
|
||||
"ansi-styles": "^4.1.0",
|
||||
"supports-color": "^7.1.0"
|
||||
}
|
||||
},
|
||||
"color-convert": {
|
||||
"version": "2.0.1",
|
||||
"resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
|
||||
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
|
||||
"requires": {
|
||||
"color-name": "~1.1.4"
|
||||
}
|
||||
},
|
||||
"color-name": {
|
||||
"version": "1.1.4",
|
||||
"resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
|
||||
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
|
||||
},
|
||||
"has-flag": {
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
|
||||
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
|
||||
},
|
||||
"json5": {
|
||||
"version": "2.2.3",
|
||||
"resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz",
|
||||
"integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
|
||||
},
|
||||
"loader-utils": {
|
||||
"version": "2.0.4",
|
||||
"resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
|
||||
"integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
|
||||
"requires": {
|
||||
"big.js": "^5.2.2",
|
||||
"emojis-list": "^3.0.0",
|
||||
"json5": "^2.1.2"
|
||||
}
|
||||
},
|
||||
"supports-color": {
|
||||
"version": "7.2.0",
|
||||
"resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
|
||||
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
|
||||
"requires": {
|
||||
"has-flag": "^4.0.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -84,6 +84,7 @@
|
|||
"react-color": "^2.18.0",
|
||||
"react-content-loader": "^3.1.1",
|
||||
"react-cookies": "^0.1.1",
|
||||
"react-copy-to-clipboard": "^5.1.0",
|
||||
"react-countup": "^6.1.0",
|
||||
"react-cropper": "^2.1.8",
|
||||
"react-datepicker": "^2.14.1",
|
||||
|
|
@ -105,7 +106,8 @@
|
|||
"redux": "^4.0.5",
|
||||
"redux-thunk": "2.3.0",
|
||||
"rsuite": "^4.3.4",
|
||||
"sass-loader": "7.3.1",
|
||||
"sass-loader": "^7.3.1",
|
||||
"sass-resources-loader": "^2.2.5",
|
||||
"save-dev": "0.0.1-security",
|
||||
"scroll-into-view": "^1.14.2",
|
||||
"showdown": "^1.9.1",
|
||||
|
|
|
|||
|
|
@ -2466,7 +2466,7 @@ a.hoverLine:hover{
|
|||
}
|
||||
|
||||
a:hover{
|
||||
color: #466AFF !important;
|
||||
color: #466AFF;
|
||||
}
|
||||
|
||||
.color-grey-98 {
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
@font-face {
|
||||
font-family: "iconfont"; /* Project id 2340181 */
|
||||
src: url('iconfont.woff2?t=1653550272457') format('woff2'),
|
||||
url('iconfont.woff?t=1653550272457') format('woff'),
|
||||
url('iconfont.ttf?t=1653550272457') format('truetype');
|
||||
src: url('iconfont.woff2?t=1693564942420') format('woff2'),
|
||||
url('iconfont.woff?t=1693564942420') format('woff'),
|
||||
url('iconfont.ttf?t=1693564942420') format('truetype');
|
||||
}
|
||||
|
||||
.iconfont {
|
||||
|
|
@ -13,6 +13,230 @@
|
|||
-moz-osx-font-smoothing: grayscale;
|
||||
}
|
||||
|
||||
.icon-liulan1:before {
|
||||
content: "\e96e";
|
||||
}
|
||||
|
||||
.icon-a-zu2044:before {
|
||||
content: "\e96d";
|
||||
}
|
||||
|
||||
.icon-cuo:before {
|
||||
content: "\e96c";
|
||||
}
|
||||
|
||||
.icon-dui:before {
|
||||
content: "\e96b";
|
||||
}
|
||||
|
||||
.icon-zanting:before {
|
||||
content: "\e96a";
|
||||
}
|
||||
|
||||
.icon-cangkuyuyanicon:before {
|
||||
content: "\e962";
|
||||
}
|
||||
|
||||
.icon-dongtaiicon1:before {
|
||||
content: "\e963";
|
||||
}
|
||||
|
||||
.icon-jingxuanxiangmu:before {
|
||||
content: "\e964";
|
||||
}
|
||||
|
||||
.icon-zuzhichengyuan1:before {
|
||||
content: "\e965";
|
||||
}
|
||||
|
||||
.icon-zuzhijieshao:before {
|
||||
content: "\e966";
|
||||
}
|
||||
|
||||
.icon-zuzhituandui:before {
|
||||
content: "\e967";
|
||||
}
|
||||
|
||||
.icon-shezhi6:before {
|
||||
content: "\e968";
|
||||
}
|
||||
|
||||
.icon-zidingyi:before {
|
||||
content: "\e969";
|
||||
}
|
||||
|
||||
.icon-a-zu37:before {
|
||||
content: "\e961";
|
||||
}
|
||||
|
||||
.icon-guanzhuicon:before {
|
||||
content: "\e95b";
|
||||
}
|
||||
|
||||
.icon-yidianzan_icon:before {
|
||||
content: "\e95c";
|
||||
}
|
||||
|
||||
.icon-morenfuke_icon1:before {
|
||||
content: "\e95d";
|
||||
}
|
||||
|
||||
.icon-yiguanzhuicon:before {
|
||||
content: "\e95e";
|
||||
}
|
||||
|
||||
.icon-yifuke_icon:before {
|
||||
content: "\e95f";
|
||||
}
|
||||
|
||||
.icon-xingzhuang:before {
|
||||
content: "\e960";
|
||||
}
|
||||
|
||||
.icon-kaiqi:before {
|
||||
content: "\e95a";
|
||||
}
|
||||
|
||||
.icon-a-31shijian:before {
|
||||
content: "\e944";
|
||||
}
|
||||
|
||||
.icon-chengyuan2:before {
|
||||
content: "\e945";
|
||||
}
|
||||
|
||||
.icon-a-bianji12:before {
|
||||
content: "\e946";
|
||||
}
|
||||
|
||||
.icon-fuzhi-shanchu:before {
|
||||
content: "\e947";
|
||||
}
|
||||
|
||||
.icon-chuangjianqianbao:before {
|
||||
content: "\e948";
|
||||
}
|
||||
|
||||
.icon-biaoji2:before {
|
||||
content: "\e949";
|
||||
}
|
||||
|
||||
.icon-lichengbeiicon1:before {
|
||||
content: "\e94a";
|
||||
}
|
||||
|
||||
.icon-biaoji:before {
|
||||
content: "\e94b";
|
||||
}
|
||||
|
||||
.icon-fenzhi3:before {
|
||||
content: "\e94c";
|
||||
}
|
||||
|
||||
.icon-riqi:before {
|
||||
content: "\e94d";
|
||||
}
|
||||
|
||||
.icon-ruliriqixiao:before {
|
||||
content: "\e94e";
|
||||
}
|
||||
|
||||
.icon-shanchu8:before {
|
||||
content: "\e94f";
|
||||
}
|
||||
|
||||
.icon-sousuo6:before {
|
||||
content: "\e950";
|
||||
}
|
||||
|
||||
.icon-quanxian:before {
|
||||
content: "\e951";
|
||||
}
|
||||
|
||||
.icon-lichengbeiicon2:before {
|
||||
content: "\e952";
|
||||
}
|
||||
|
||||
.icon-xinjian3:before {
|
||||
content: "\e953";
|
||||
}
|
||||
|
||||
.icon-xuanzhong4:before {
|
||||
content: "\e954";
|
||||
}
|
||||
|
||||
.icon-youxian:before {
|
||||
content: "\e955";
|
||||
}
|
||||
|
||||
.icon-a-xiaoxi1:before {
|
||||
content: "\e956";
|
||||
}
|
||||
|
||||
.icon-yixiuicon2:before {
|
||||
content: "\e957";
|
||||
}
|
||||
|
||||
.icon-xiugaibaobiaomoban:before {
|
||||
content: "\e958";
|
||||
}
|
||||
|
||||
.icon-a-zu1614:before {
|
||||
content: "\e959";
|
||||
}
|
||||
|
||||
.icon-BOTpeizhi:before {
|
||||
content: "\e942";
|
||||
}
|
||||
|
||||
.icon-kaifabot:before {
|
||||
content: "\e943";
|
||||
}
|
||||
|
||||
.icon-jiqiren:before {
|
||||
content: "\e940";
|
||||
}
|
||||
|
||||
.icon-a-jiqirenzhineng-02:before {
|
||||
content: "\e941";
|
||||
}
|
||||
|
||||
.icon-yuyue-lishi-shijian:before {
|
||||
content: "\e93f";
|
||||
}
|
||||
|
||||
.icon-a-duobianxing1:before {
|
||||
content: "\e93c";
|
||||
}
|
||||
|
||||
.icon-a-duobianxing2:before {
|
||||
content: "\e93d";
|
||||
}
|
||||
|
||||
.icon-sousuo5:before {
|
||||
content: "\e93e";
|
||||
}
|
||||
|
||||
.icon-baogaoppt:before {
|
||||
content: "\e93b";
|
||||
}
|
||||
|
||||
.icon-gailan2:before {
|
||||
content: "\e93a";
|
||||
}
|
||||
|
||||
.icon-bianji7:before {
|
||||
content: "\e939";
|
||||
}
|
||||
|
||||
.icon-ROBOT:before {
|
||||
content: "\e937";
|
||||
}
|
||||
|
||||
.icon-a-zu1404:before {
|
||||
content: "\e938";
|
||||
}
|
||||
|
||||
.icon-tuichuicon:before {
|
||||
content: "\e936";
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -5,6 +5,398 @@
|
|||
"css_prefix_text": "icon-",
|
||||
"description": "",
|
||||
"glyphs": [
|
||||
{
|
||||
"icon_id": "36898536",
|
||||
"name": "浏览",
|
||||
"font_class": "liulan1",
|
||||
"unicode": "e96e",
|
||||
"unicode_decimal": 59758
|
||||
},
|
||||
{
|
||||
"icon_id": "36020261",
|
||||
"name": "组 2044",
|
||||
"font_class": "a-zu2044",
|
||||
"unicode": "e96d",
|
||||
"unicode_decimal": 59757
|
||||
},
|
||||
{
|
||||
"icon_id": "5287658",
|
||||
"name": "错",
|
||||
"font_class": "cuo",
|
||||
"unicode": "e96c",
|
||||
"unicode_decimal": 59756
|
||||
},
|
||||
{
|
||||
"icon_id": "8802648",
|
||||
"name": "对",
|
||||
"font_class": "dui",
|
||||
"unicode": "e96b",
|
||||
"unicode_decimal": 59755
|
||||
},
|
||||
{
|
||||
"icon_id": "887857",
|
||||
"name": "暂停",
|
||||
"font_class": "zanting",
|
||||
"unicode": "e96a",
|
||||
"unicode_decimal": 59754
|
||||
},
|
||||
{
|
||||
"icon_id": "34965902",
|
||||
"name": "仓库语言icon",
|
||||
"font_class": "cangkuyuyanicon",
|
||||
"unicode": "e962",
|
||||
"unicode_decimal": 59746
|
||||
},
|
||||
{
|
||||
"icon_id": "34965903",
|
||||
"name": "动态icon",
|
||||
"font_class": "dongtaiicon1",
|
||||
"unicode": "e963",
|
||||
"unicode_decimal": 59747
|
||||
},
|
||||
{
|
||||
"icon_id": "34965904",
|
||||
"name": "精选项目",
|
||||
"font_class": "jingxuanxiangmu",
|
||||
"unicode": "e964",
|
||||
"unicode_decimal": 59748
|
||||
},
|
||||
{
|
||||
"icon_id": "34965905",
|
||||
"name": "组织成员",
|
||||
"font_class": "zuzhichengyuan1",
|
||||
"unicode": "e965",
|
||||
"unicode_decimal": 59749
|
||||
},
|
||||
{
|
||||
"icon_id": "34965906",
|
||||
"name": "组织介绍",
|
||||
"font_class": "zuzhijieshao",
|
||||
"unicode": "e966",
|
||||
"unicode_decimal": 59750
|
||||
},
|
||||
{
|
||||
"icon_id": "34965907",
|
||||
"name": "组织团队",
|
||||
"font_class": "zuzhituandui",
|
||||
"unicode": "e967",
|
||||
"unicode_decimal": 59751
|
||||
},
|
||||
{
|
||||
"icon_id": "34965908",
|
||||
"name": "设置",
|
||||
"font_class": "shezhi6",
|
||||
"unicode": "e968",
|
||||
"unicode_decimal": 59752
|
||||
},
|
||||
{
|
||||
"icon_id": "34965909",
|
||||
"name": "自定义",
|
||||
"font_class": "zidingyi",
|
||||
"unicode": "e969",
|
||||
"unicode_decimal": 59753
|
||||
},
|
||||
{
|
||||
"icon_id": "34875122",
|
||||
"name": "组 37",
|
||||
"font_class": "a-zu37",
|
||||
"unicode": "e961",
|
||||
"unicode_decimal": 59745
|
||||
},
|
||||
{
|
||||
"icon_id": "34819652",
|
||||
"name": "关注icon",
|
||||
"font_class": "guanzhuicon",
|
||||
"unicode": "e95b",
|
||||
"unicode_decimal": 59739
|
||||
},
|
||||
{
|
||||
"icon_id": "34819653",
|
||||
"name": "已点赞_icon",
|
||||
"font_class": "yidianzan_icon",
|
||||
"unicode": "e95c",
|
||||
"unicode_decimal": 59740
|
||||
},
|
||||
{
|
||||
"icon_id": "34819654",
|
||||
"name": "默认复刻_icon",
|
||||
"font_class": "morenfuke_icon1",
|
||||
"unicode": "e95d",
|
||||
"unicode_decimal": 59741
|
||||
},
|
||||
{
|
||||
"icon_id": "34819655",
|
||||
"name": "已关注icon",
|
||||
"font_class": "yiguanzhuicon",
|
||||
"unicode": "e95e",
|
||||
"unicode_decimal": 59742
|
||||
},
|
||||
{
|
||||
"icon_id": "34819656",
|
||||
"name": "已复刻_icon",
|
||||
"font_class": "yifuke_icon",
|
||||
"unicode": "e95f",
|
||||
"unicode_decimal": 59743
|
||||
},
|
||||
{
|
||||
"icon_id": "34820092",
|
||||
"name": "形状",
|
||||
"font_class": "xingzhuang",
|
||||
"unicode": "e960",
|
||||
"unicode_decimal": 59744
|
||||
},
|
||||
{
|
||||
"icon_id": "34197190",
|
||||
"name": "开启",
|
||||
"font_class": "kaiqi",
|
||||
"unicode": "e95a",
|
||||
"unicode_decimal": 59738
|
||||
},
|
||||
{
|
||||
"icon_id": "33949760",
|
||||
"name": "3.1 时间",
|
||||
"font_class": "a-31shijian",
|
||||
"unicode": "e944",
|
||||
"unicode_decimal": 59716
|
||||
},
|
||||
{
|
||||
"icon_id": "33949761",
|
||||
"name": "成员",
|
||||
"font_class": "chengyuan2",
|
||||
"unicode": "e945",
|
||||
"unicode_decimal": 59717
|
||||
},
|
||||
{
|
||||
"icon_id": "33949762",
|
||||
"name": "编辑 (1)",
|
||||
"font_class": "a-bianji12",
|
||||
"unicode": "e946",
|
||||
"unicode_decimal": 59718
|
||||
},
|
||||
{
|
||||
"icon_id": "33949763",
|
||||
"name": "复制-删除",
|
||||
"font_class": "fuzhi-shanchu",
|
||||
"unicode": "e947",
|
||||
"unicode_decimal": 59719
|
||||
},
|
||||
{
|
||||
"icon_id": "33949764",
|
||||
"name": "创建钱包",
|
||||
"font_class": "chuangjianqianbao",
|
||||
"unicode": "e948",
|
||||
"unicode_decimal": 59720
|
||||
},
|
||||
{
|
||||
"icon_id": "33949765",
|
||||
"name": "标记2",
|
||||
"font_class": "biaoji2",
|
||||
"unicode": "e949",
|
||||
"unicode_decimal": 59721
|
||||
},
|
||||
{
|
||||
"icon_id": "33949766",
|
||||
"name": "里程碑icon",
|
||||
"font_class": "lichengbeiicon1",
|
||||
"unicode": "e94a",
|
||||
"unicode_decimal": 59722
|
||||
},
|
||||
{
|
||||
"icon_id": "33949767",
|
||||
"name": "标记",
|
||||
"font_class": "biaoji",
|
||||
"unicode": "e94b",
|
||||
"unicode_decimal": 59723
|
||||
},
|
||||
{
|
||||
"icon_id": "33949768",
|
||||
"name": "分支",
|
||||
"font_class": "fenzhi3",
|
||||
"unicode": "e94c",
|
||||
"unicode_decimal": 59724
|
||||
},
|
||||
{
|
||||
"icon_id": "33949769",
|
||||
"name": "日期",
|
||||
"font_class": "riqi",
|
||||
"unicode": "e94d",
|
||||
"unicode_decimal": 59725
|
||||
},
|
||||
{
|
||||
"icon_id": "33949770",
|
||||
"name": "入离日期小",
|
||||
"font_class": "ruliriqixiao",
|
||||
"unicode": "e94e",
|
||||
"unicode_decimal": 59726
|
||||
},
|
||||
{
|
||||
"icon_id": "33949771",
|
||||
"name": "删除",
|
||||
"font_class": "shanchu8",
|
||||
"unicode": "e94f",
|
||||
"unicode_decimal": 59727
|
||||
},
|
||||
{
|
||||
"icon_id": "33949772",
|
||||
"name": "搜索",
|
||||
"font_class": "sousuo6",
|
||||
"unicode": "e950",
|
||||
"unicode_decimal": 59728
|
||||
},
|
||||
{
|
||||
"icon_id": "33949773",
|
||||
"name": "权限",
|
||||
"font_class": "quanxian",
|
||||
"unicode": "e951",
|
||||
"unicode_decimal": 59729
|
||||
},
|
||||
{
|
||||
"icon_id": "33949774",
|
||||
"name": "里程碑icon2",
|
||||
"font_class": "lichengbeiicon2",
|
||||
"unicode": "e952",
|
||||
"unicode_decimal": 59730
|
||||
},
|
||||
{
|
||||
"icon_id": "33949775",
|
||||
"name": "新建",
|
||||
"font_class": "xinjian3",
|
||||
"unicode": "e953",
|
||||
"unicode_decimal": 59731
|
||||
},
|
||||
{
|
||||
"icon_id": "33949776",
|
||||
"name": "选中",
|
||||
"font_class": "xuanzhong4",
|
||||
"unicode": "e954",
|
||||
"unicode_decimal": 59732
|
||||
},
|
||||
{
|
||||
"icon_id": "33949777",
|
||||
"name": "优先",
|
||||
"font_class": "youxian",
|
||||
"unicode": "e955",
|
||||
"unicode_decimal": 59733
|
||||
},
|
||||
{
|
||||
"icon_id": "33949778",
|
||||
"name": "消息 (1)",
|
||||
"font_class": "a-xiaoxi1",
|
||||
"unicode": "e956",
|
||||
"unicode_decimal": 59734
|
||||
},
|
||||
{
|
||||
"icon_id": "33949779",
|
||||
"name": "易修icon",
|
||||
"font_class": "yixiuicon2",
|
||||
"unicode": "e957",
|
||||
"unicode_decimal": 59735
|
||||
},
|
||||
{
|
||||
"icon_id": "33949780",
|
||||
"name": "修改报表模版",
|
||||
"font_class": "xiugaibaobiaomoban",
|
||||
"unicode": "e958",
|
||||
"unicode_decimal": 59736
|
||||
},
|
||||
{
|
||||
"icon_id": "33949781",
|
||||
"name": "组 1614",
|
||||
"font_class": "a-zu1614",
|
||||
"unicode": "e959",
|
||||
"unicode_decimal": 59737
|
||||
},
|
||||
{
|
||||
"icon_id": "33731642",
|
||||
"name": "BOT配置",
|
||||
"font_class": "BOTpeizhi",
|
||||
"unicode": "e942",
|
||||
"unicode_decimal": 59714
|
||||
},
|
||||
{
|
||||
"icon_id": "33731643",
|
||||
"name": "开发bot",
|
||||
"font_class": "kaifabot",
|
||||
"unicode": "e943",
|
||||
"unicode_decimal": 59715
|
||||
},
|
||||
{
|
||||
"icon_id": "19591156",
|
||||
"name": "机器人",
|
||||
"font_class": "jiqiren",
|
||||
"unicode": "e940",
|
||||
"unicode_decimal": 59712
|
||||
},
|
||||
{
|
||||
"icon_id": "25885545",
|
||||
"name": "机器人、智能-02",
|
||||
"font_class": "a-jiqirenzhineng-02",
|
||||
"unicode": "e941",
|
||||
"unicode_decimal": 59713
|
||||
},
|
||||
{
|
||||
"icon_id": "6978097",
|
||||
"name": "预约-历史-时间",
|
||||
"font_class": "yuyue-lishi-shijian",
|
||||
"unicode": "e93f",
|
||||
"unicode_decimal": 59711
|
||||
},
|
||||
{
|
||||
"icon_id": "31659662",
|
||||
"name": "多边形 1",
|
||||
"font_class": "a-duobianxing1",
|
||||
"unicode": "e93c",
|
||||
"unicode_decimal": 59708
|
||||
},
|
||||
{
|
||||
"icon_id": "31659664",
|
||||
"name": "多边形 2",
|
||||
"font_class": "a-duobianxing2",
|
||||
"unicode": "e93d",
|
||||
"unicode_decimal": 59709
|
||||
},
|
||||
{
|
||||
"icon_id": "31659665",
|
||||
"name": "搜索",
|
||||
"font_class": "sousuo5",
|
||||
"unicode": "e93e",
|
||||
"unicode_decimal": 59710
|
||||
},
|
||||
{
|
||||
"icon_id": "31424249",
|
||||
"name": "报告ppt",
|
||||
"font_class": "baogaoppt",
|
||||
"unicode": "e93b",
|
||||
"unicode_decimal": 59707
|
||||
},
|
||||
{
|
||||
"icon_id": "31318120",
|
||||
"name": "概览",
|
||||
"font_class": "gailan2",
|
||||
"unicode": "e93a",
|
||||
"unicode_decimal": 59706
|
||||
},
|
||||
{
|
||||
"icon_id": "31275425",
|
||||
"name": "编辑",
|
||||
"font_class": "bianji7",
|
||||
"unicode": "e939",
|
||||
"unicode_decimal": 59705
|
||||
},
|
||||
{
|
||||
"icon_id": "30382389",
|
||||
"name": "ROBOT",
|
||||
"font_class": "ROBOT",
|
||||
"unicode": "e937",
|
||||
"unicode_decimal": 59703
|
||||
},
|
||||
{
|
||||
"icon_id": "30382697",
|
||||
"name": "组 1404",
|
||||
"font_class": "a-zu1404",
|
||||
"unicode": "e938",
|
||||
"unicode_decimal": 59704
|
||||
},
|
||||
{
|
||||
"icon_id": "29934961",
|
||||
"name": "退出icon",
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -32,7 +32,7 @@ export function initAxiosInterceptors(props) {
|
|||
// 判断网络是否连接
|
||||
initOnlineOfflineListener();
|
||||
|
||||
var proxy = "https://testforgeplus.trustie.net";
|
||||
var proxy = "https://testforgeplus.trustie.net/";
|
||||
//响应前的设置
|
||||
axios.interceptors.request.use(
|
||||
config => {
|
||||
|
|
|
|||
|
|
@ -2,14 +2,9 @@ import React, { Component } from 'react';
|
|||
import { Spin } from 'antd';
|
||||
|
||||
class Loading extends Component {
|
||||
componentDidUpdate(prevProps, prevState) {
|
||||
if (!prevProps.error && this.props.error) {
|
||||
console.log(this.props.error)
|
||||
}
|
||||
}
|
||||
|
||||
render() {
|
||||
return ""
|
||||
return <div style={{height:"100vh",display:"flex",alignItems:"center",justifyContent:"center"}}><Spin /></div>
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@ export const TEST_HOST = window.location.hostname ==="testforgeplus.educoder.net
|
|||
|
||||
export function getImageUrl(path) {
|
||||
const local = 'https://testforgeplus.educoder.net';
|
||||
const normal = TEST_HOST ? "https://new-testali-cdn.educoder.net/images" : 'https://ali-cdn.educoder.net/images';
|
||||
const normalend = TEST_HOST ? 'https://new-testali-cdn.educoder.net' :'https://ali-cdn.educoder.net';
|
||||
// const normal = TEST_HOST ? "https://new-testali-cdn.educoder.net/images" : 'https://ali-cdn.educoder.net/images';
|
||||
const normalend = TEST_HOST ? 'https://testforgeplus.educoder.net/' :'https://ali-cdn.educoder.net';
|
||||
if (isDev) {
|
||||
return `${local}/${path}`;
|
||||
}
|
||||
if(path.substr(0, 7) !== "/system"){
|
||||
if(path.substr(0, 7) !== "/images"){
|
||||
return `${normal}${path}`;
|
||||
return `/${path}`;
|
||||
}else{
|
||||
return `${normalend}${path}`;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@ import debounce from 'lodash/debounce';
|
|||
import { Select, Spin , Button , Icon } from 'antd';
|
||||
import axios from 'axios';
|
||||
import { getImageUrl } from 'educoder';
|
||||
function DebounceSelect({ fetchOptions, debounceTimeout = 600, ...props }) {
|
||||
function DebounceSelect({ fetchOptions, debounceTimeout = 600,login, ...props }) {
|
||||
const [fetching, setFetching] = useState(false);
|
||||
const [options, setOptions] = useState([]);
|
||||
const fetchRef = useRef(0);
|
||||
|
|
@ -182,7 +182,7 @@ function DebounceSelect({ fetchOptions, debounceTimeout = 600, ...props }) {
|
|||
options && options.length >0 &&
|
||||
options.map((i)=>{
|
||||
return(
|
||||
<Select.Option value={i.value}>
|
||||
<Select.Option value={login ? i.value : i.login}>
|
||||
{/* <img
|
||||
className="user_img radius"
|
||||
width="28"
|
||||
|
|
@ -243,6 +243,7 @@ const App = ({getID,login,showNotification}) => {
|
|||
<DebounceSelect
|
||||
value={value}
|
||||
style={{width:300}}
|
||||
login={login}
|
||||
placeholder="搜索需要添加的用户..."
|
||||
fetchOptions={fetchUserList}
|
||||
onChange={(newValue) => {
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ function Profile({
|
|||
|
||||
function checkProfile() {
|
||||
if(checkIfLogin()){
|
||||
if(!current_user.has_gitea_user || (current_user.has_gitea_user && !current_user.is_sync_pwd)){
|
||||
if(!current_user.has_gitea_user){
|
||||
setGiteaVisible(true);
|
||||
}else{
|
||||
if(!completeProfile){
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ class NewHeader extends Component {
|
|||
}
|
||||
|
||||
getEducoderSetting=()=>{
|
||||
const url = `https://data.educoder.net/api/setting.json`;
|
||||
const url = `/setting.json`;
|
||||
axios.get(url).then(result=>{
|
||||
if(result && result.data){
|
||||
this.setState({
|
||||
|
|
|
|||
|
|
@ -0,0 +1,65 @@
|
|||
import React , { useState , useEffect } from 'react';
|
||||
import { Form , Input, Button } from 'antd';
|
||||
import ColorCard from './colorCard';
|
||||
import axios from 'axios';
|
||||
|
||||
function AddTagsBox({onSuccess , form ,owner , projectsId,onCancel}){
|
||||
const { getFieldDecorator , getFieldsValue , validateFields } = form;
|
||||
const [ colors , setColors ] = useState(undefined);
|
||||
const [ defaultColor , setDefaultColor ]= useState(undefined);
|
||||
|
||||
useEffect(()=>{
|
||||
const c = Math.random().toString(16).substr(-6);
|
||||
c && setDefaultColor(`#${c}`);
|
||||
},[])
|
||||
|
||||
function saveFunc(){
|
||||
validateFields((error,values)=>{
|
||||
if(!error){
|
||||
const { desc , name } = getFieldsValue();
|
||||
const url = `/v1/${owner}/${projectsId}/issue_tags`;
|
||||
axios.post(url,{
|
||||
name,description:desc,color:colors || defaultColor
|
||||
}).then(result=>{
|
||||
result && onSuccess();
|
||||
}).catch(error=>{})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
function getColor(colors){
|
||||
setColors(colors);
|
||||
}
|
||||
|
||||
return(
|
||||
<Form className="addTags_form" hideRequiredMark={true}>
|
||||
<p className="manageTitle"><i className="iconfont icon-xiangzuojiantou font-15 color-grey mr5 cursor" onClick={onCancel}/>创建标记</p>
|
||||
<div className="inline">
|
||||
<Form.Item colon={false} style={{flex:1,marginRight:'20px'}}>
|
||||
{getFieldDecorator('name',{
|
||||
rules:[
|
||||
{
|
||||
required:true,
|
||||
message:"请输入标记名称"
|
||||
}
|
||||
],
|
||||
validateTrigger:"onInput",
|
||||
})(<Input placeholder="标记名称15字以内" maxLength={15}/>)}
|
||||
</Form.Item>
|
||||
<Form.Item style={{marginTop:"7px"}}>
|
||||
<ColorCard getColor={getColor} defaultColor={defaultColor}/>
|
||||
</Form.Item>
|
||||
</div>
|
||||
<Form.Item colon={false}>
|
||||
{getFieldDecorator('desc',{rules:[],
|
||||
validateTrigger:"onInput",
|
||||
})(<Input placeholder="描述30字以内" maxLength={30}/>)}
|
||||
</Form.Item>
|
||||
<div style={{textAlign:'center'}}>
|
||||
<Button style={{width:"80px"}} className="cancelTags" onClick={onCancel}>取消</Button>
|
||||
<Button style={{width:"80px"}} className="ml20" type="primary" onClick={saveFunc}>确认</Button>
|
||||
</div>
|
||||
</Form>
|
||||
)
|
||||
}
|
||||
export default Form.create({ name: 'Bind' })(AddTagsBox);
|
||||
|
|
@ -0,0 +1,255 @@
|
|||
import React,{ useState , useEffect , forwardRef ,useImperativeHandle , useRef } from 'react';
|
||||
import Menus from './menus';
|
||||
import axios from 'axios';
|
||||
|
||||
const array =[
|
||||
{id:1,name:"最新创建"},
|
||||
{id:2,name:"最早创建"},
|
||||
{id:3,name:"最新更新"},
|
||||
{id:4,name:"最早更新"},
|
||||
{id:5,name:"高优先级"},
|
||||
{id:6,name:"低优先级"},
|
||||
{id:7,name:"高悬赏金额"},
|
||||
{id:8,name:"低悬赏金额"}
|
||||
]
|
||||
const array1 =[
|
||||
{id:1,name:"最新创建"},
|
||||
{id:2,name:"最早创建"},
|
||||
{id:3,name:"最新更新"},
|
||||
{id:4,name:"最早更新"},
|
||||
{id:5,name:"高优先级"},
|
||||
{id:6,name:"低优先级"},
|
||||
]
|
||||
|
||||
function AllMenus({owner,projectsId,chooseFunc,update,defaultNames,defaultIds,open_blockchain},ref){
|
||||
// 列表右侧所有筛选项的值
|
||||
const [ authorList , setAuthorList ] = useState(undefined);
|
||||
const [ author , setAuthor ] = useState(undefined);
|
||||
const [ tagList , setTagList ] = useState(undefined);
|
||||
const [ tag , setTag ] = useState(undefined);
|
||||
const [ cases , setCases ] = useState(undefined);
|
||||
const [ millstoneList , setMillstoneList ] = useState(undefined);
|
||||
const [ millstone , setMillstone ] = useState(undefined);
|
||||
const [ chargeList , setChargeList ] = useState(undefined);
|
||||
const [ caseList , setCaseList ] = useState(undefined);
|
||||
const [ charge , setCharge ] = useState(undefined);
|
||||
const [ statusList , setStatusList ] = useState(undefined);
|
||||
const [ prioritiesList , setPrioritiesList ] = useState(undefined);
|
||||
const [ ids , setIds ] = useState({author_id:undefined,issue_priorities_id:undefined,issue_tag_ids:undefined,milestone_id:undefined,sort_by:undefined,status_id:undefined,assigner_id:undefined,test_case:undefined});
|
||||
const [ names , setNames ] = useState({author_name:undefined,issue_priorities_name:undefined,issue_tag_name:undefined,milestone_name:undefined,sortby_name:undefined,status_name:undefined,assigner_name:undefined,test_case:undefined});
|
||||
|
||||
useEffect(()=>{
|
||||
if(defaultNames){
|
||||
setNames(defaultNames);
|
||||
}
|
||||
},[defaultNames])
|
||||
|
||||
useEffect(()=>{
|
||||
if(defaultIds){
|
||||
setIds(defaultIds);
|
||||
}
|
||||
},[defaultIds])
|
||||
|
||||
useImperativeHandle(ref, () => ({
|
||||
clearChoose: () => {
|
||||
// 父组件按钮：清除筛选条件，将Ids\names里的字段全部改为undefined
|
||||
setIds({author_id:undefined,issue_tag_ids:undefined,issue_priorities_id:undefined,milestone_id:undefined,sort_by:undefined,status_id:undefined,assigner_id:undefined});
|
||||
setNames({author_name:undefined,issue_tag_name:undefined,issue_priorities_name:undefined,milestone_name:undefined,sortby_name:undefined,status_name:undefined,assigner_name:undefined});
|
||||
}
|
||||
}))
|
||||
// 获取发布人列表
|
||||
useEffect(()=>{
|
||||
getSendPerson();
|
||||
},[author])
|
||||
|
||||
function getSendPerson(){
|
||||
const url = `/v1/${owner}/${projectsId}/issue_authors`;
|
||||
axios.get(url,{params:{keyword:author,only_name:true}}).then(result=>{
|
||||
if(result && result.data){
|
||||
setAuthorList(result.data.authors);
|
||||
}
|
||||
})
|
||||
}
|
||||
// 获取标记列表
|
||||
useEffect(()=>{
|
||||
getSign();
|
||||
},[tag])
|
||||
function getSign(){
|
||||
const url = `/v1/${owner}/${projectsId}/issue_tags`;
|
||||
axios.get(url,{params:{keyword:tag,only_name:true}}).then(result=>{
|
||||
if(result && result.data){
|
||||
setTagList(result.data.issue_tags);
|
||||
}
|
||||
})
|
||||
}
|
||||
// 获取测试用例
|
||||
useEffect(()=>{
|
||||
getCase();
|
||||
},[cases])
|
||||
|
||||
function getCase(){
|
||||
const url = `/v1/${owner}/${projectsId}/issues/test_cases`;
|
||||
axios.get(url,{
|
||||
params:{
|
||||
keyword:cases
|
||||
}
|
||||
}).then(result=>{
|
||||
if(result && result.data){
|
||||
let menu = result.data.data;
|
||||
if(menu && menu.length>0){
|
||||
const l = menu.map(i=>{
|
||||
return {name:i.test_case,id:i.test_case}
|
||||
})
|
||||
setCaseList(l);
|
||||
}else{
|
||||
setCaseList([]);
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
// 获取里程碑列表
|
||||
useEffect(()=>{
|
||||
getMillstone();
|
||||
},[millstone])
|
||||
|
||||
function getMillstone(){
|
||||
const url = `/v1/${owner}/${projectsId}/milestones`;
|
||||
axios.get(url,{params:{keyword:millstone,only_name:true}}).then(result=>{
|
||||
if(result && result.data){
|
||||
setMillstoneList(result.data.milestones);
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// 获取负责人列表
|
||||
useEffect(()=>{
|
||||
getCharge();
|
||||
},[charge,update])
|
||||
|
||||
function getCharge(){
|
||||
if(update){
|
||||
const url = `/v1/${owner}/${projectsId}/collaborators`;
|
||||
axios.get(url,{params:{keyword:charge,only_name:true}}).then(result=>{
|
||||
if(result && result.data){
|
||||
setChargeList(result.data.collaborators);
|
||||
}
|
||||
})
|
||||
}else{
|
||||
const url = `/v1/${owner}/${projectsId}/issue_assigners`;
|
||||
axios.get(url,{params:{keyword:charge,only_name:true}}).then(result=>{
|
||||
if(result && result.data){
|
||||
setChargeList(result.data.assigners);
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
// 获取优先级列表
|
||||
useEffect(()=>{
|
||||
getPriorities();
|
||||
},[])
|
||||
|
||||
function getPriorities(){
|
||||
const url = `/v1/${owner}/${projectsId}/issue_priorities`;
|
||||
axios.get(url).then(result=>{
|
||||
if(result && result.data){
|
||||
setPrioritiesList(result.data.priorities);
|
||||
}
|
||||
})
|
||||
}
|
||||
// 获取状态列表
|
||||
useEffect(()=>{
|
||||
getStatus();
|
||||
},[])
|
||||
|
||||
function getStatus(){
|
||||
const url = `/v1/${owner}/${projectsId}/issue_statues`;
|
||||
axios.get(url).then(result=>{
|
||||
if(result && result.data){
|
||||
setStatusList(result.data.statues);
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
function choose(id,name){
|
||||
let copy = {...ids,author_id:id && id.length>0 ? id.join(","):undefined};
|
||||
let copyname = { ...names,author_name:name};
|
||||
setIds(copy);setNames(copyname);
|
||||
chooseFunc(copy,copyname);
|
||||
}
|
||||
|
||||
return(
|
||||
<ul className="dropboxul">
|
||||
{ !update && <Menus
|
||||
update={update}
|
||||
ids={ids && ids.author_id}
|
||||
names={names && names.author_name}
|
||||
name={"发布人" } size={"large"} imgControl
|
||||
lists={authorList} searchFunc={(value)=>setAuthor(value)}
|
||||
chooseFunc={(id,name)=>choose(id,name,'author_name')}
|
||||
/>
|
||||
}
|
||||
{update && <Menus
|
||||
update={update}
|
||||
ids={ids && ids.issue_priorities_id}
|
||||
name={"优先级" } size={"small"}
|
||||
lists={prioritiesList}
|
||||
names={names && names.issue_priorities_name}
|
||||
chooseFunc={(id,name)=>{let copy = {...ids,issue_priorities_id:id && id.length>0 ? id.join(","):undefined};let copyname = { ...names,issue_priorities_name:name};setNames(copyname);setIds(copy);chooseFunc(copy,copyname)}}
|
||||
/>
|
||||
}
|
||||
<Menus
|
||||
update={update}
|
||||
ids={ids && ids.issue_tag_ids}
|
||||
name={"标记"} size={"large"}
|
||||
double
|
||||
names={names && names.issue_tag_name}
|
||||
lists={tagList} searchFunc={(value)=>setTag(value)}
|
||||
chooseFunc={(id,name)=>{let copy = {...ids,issue_tag_ids:id && id.length>0 ? id.join(","):undefined};let copyname = { ...names,issue_tag_name:name};setNames(copyname);setIds(copy);chooseFunc(copy,copyname)}}
|
||||
/>
|
||||
<Menus
|
||||
update={update}
|
||||
ids={ids && ids.milestone_id}
|
||||
name={"里程碑"} size={"large"}
|
||||
names={names && names.milestone_name}
|
||||
lists={millstoneList} searchFunc={(value)=>setMillstone(value)}
|
||||
chooseFunc={(id,name)=>{let copy = {...ids,milestone_id:id && id.length>0 ? id.join(","):undefined};let copyname = { ...names,milestone_name:name};setNames(copyname);setIds(copy);chooseFunc(copy,copyname)}}
|
||||
/>
|
||||
<Menus
|
||||
update={update}
|
||||
ids={ids && ids.test_case}
|
||||
name={"测试用例"} size={"large"}
|
||||
names={names && names.test_case}
|
||||
lists={caseList} searchFunc={(value)=>setCases(value)}
|
||||
double={false}
|
||||
chooseFunc={(id,name)=>{let copy = {...ids,test_case:name};let copyname = { ...names,test_case:name};setNames(copyname);setIds(copy);chooseFunc(copy,copyname)}}
|
||||
/>
|
||||
<Menus
|
||||
update={update}
|
||||
ids={ids && ids.assigner_id}
|
||||
name={"负责人"} size={"large"} imgControl
|
||||
names={names && names.assigner_name}
|
||||
lists={chargeList} searchFunc={(value)=>setCharge(value)}
|
||||
double={update ? true : false }
|
||||
chooseFunc={(id,name)=>{let copy = {...ids,assigner_id:id && id.length>0 ? id.join(","):undefined};let copyname = { ...names,assigner_name:name};setNames(copyname);setIds(copy);chooseFunc(copy,copyname)}}
|
||||
/>
|
||||
<Menus
|
||||
update={update}
|
||||
ids={ids && ids.status_id}
|
||||
name={"状态"} size={"small"}
|
||||
lists={statusList}
|
||||
names={names && names.status_name}
|
||||
chooseFunc={(id,name)=>{let copy = {...ids,status_id:id && id.length>0 ? id.join(","):undefined};let copyname = { ...names,status_name:name};setNames(copyname);setIds(copy);chooseFunc(copy,copyname)}}
|
||||
/>
|
||||
{ !update && <Menus
|
||||
className="minwidth"
|
||||
ids={ids && ids.sort_by}
|
||||
name={"排序"} size={"small"}
|
||||
lists={open_blockchain ? array : array1}
|
||||
names={names && names.sortby_name}
|
||||
chooseFunc={(id,name)=>{let copy = {...ids,sort_by:id && id.length>0 ? id.join(","):undefined};let copyname = { ...names,sortby_name:name};setNames(copyname);setIds(copy);chooseFunc(copy,copyname)}}
|
||||
/>
|
||||
}
|
||||
</ul>
|
||||
)
|
||||
}
|
||||
export default forwardRef(AllMenus);
|
||||
|
|
@ -0,0 +1,65 @@
|
|||
import React , { useEffect , useState } from 'react';
|
||||
import { AutoComplete } from 'antd';
|
||||
import axios from 'axios';
|
||||
import '../index.scss';
|
||||
|
||||
const { Option } = AutoComplete;
|
||||
|
||||
function CaseDrop({
|
||||
name , owner , projectsId , changeValue , value , onBlur
|
||||
}){
|
||||
const [ filterUnitList , setFilterUnitList ] = useState([]);
|
||||
const [ v , setV ] = useState(value);
|
||||
|
||||
useEffect(()=>{
|
||||
getCaseList(value);
|
||||
},[])
|
||||
|
||||
useEffect(()=>{
|
||||
setV(value);
|
||||
},[value])
|
||||
|
||||
useEffect(()=>{
|
||||
changeValue(v);
|
||||
getCaseList(v);
|
||||
},[v])
|
||||
|
||||
async function getCaseList(value){
|
||||
setV(value);
|
||||
const url = `/v1/${owner}/${projectsId}/issues/test_cases`;
|
||||
await axios.get(url,{
|
||||
params:{
|
||||
keyword:value
|
||||
}
|
||||
}).then(response=>{
|
||||
if(response && response.data){
|
||||
setFilterUnitList(response.data.data);
|
||||
}
|
||||
}).catch(error=>{})
|
||||
}
|
||||
|
||||
return(
|
||||
<li>
|
||||
<span>{name}</span>
|
||||
<AutoComplete
|
||||
value={v}
|
||||
showSearch
|
||||
onChange={setV}
|
||||
placeholder={name}
|
||||
className={"boxStyles"}
|
||||
bordered={false}
|
||||
onBlur={()=>{if(onBlur){onBlur(v)}}}
|
||||
>
|
||||
{
|
||||
filterUnitList && filterUnitList.length > 0 &&
|
||||
filterUnitList.map(i=>{
|
||||
return(
|
||||
<Option value={i.test_case}>{i.test_case}</Option>
|
||||
)
|
||||
})
|
||||
}
|
||||
</AutoComplete>
|
||||
</li>
|
||||
)
|
||||
}
|
||||
export default CaseDrop;
|
||||
|
|
@ -0,0 +1,305 @@
|
|||
import React ,{ useState , useEffect , useRef , forwardRef } from 'react';
|
||||
import { findDOMNode } from 'react-dom';
|
||||
import { Dropdown , Menu , Input , Button, Form , Tooltip } from 'antd';
|
||||
import { getImageUrl } from 'educoder';
|
||||
import AddTagsBox from './addTagsBox';
|
||||
|
||||
const { Search } = Input;
|
||||
/**
|
||||
*
|
||||
* @param {placeholder} placeholder:默认显示内容（为空时）
|
||||
* @param {editFlag} editFlag:是否有编辑权限
|
||||
* @param {searchFlag} searchFlag:是否显示搜索框
|
||||
* @param {selectValueList} selectValueList:将选中的list保存
|
||||
* @param {searchFunc} searchFunc:搜索方法
|
||||
* @param {onAdd} onAdd:标记管理
|
||||
* @param {headImg} headImg:是否显示头像
|
||||
* @param {menus} menus:下拉列表
|
||||
* @param {chooseFunc} chooseFunc:选择下拉列表
|
||||
* @param {double} double:undefined为单选，有值就是最多选的数量
|
||||
* @param {colorFlag} colorFlag:选中值需根据颜色显示背景
|
||||
* @param {mustFlag} mustFlag:必须选择一个
|
||||
* @param {removeFlag} removeFlag:移除按钮
|
||||
* @returns
|
||||
*/
|
||||
function ChooseMenu({
|
||||
placeholder ="未设置",
|
||||
editFlag,
|
||||
searchFlag,
|
||||
selectValueList,
|
||||
searchFunc,
|
||||
onAdd,
|
||||
headImg,
|
||||
menus,
|
||||
auto,
|
||||
chooseFunc,double,colorFlag,mustFlag,removeFlag,owner,projectsId
|
||||
}){
|
||||
const [ visible , setVisible ] = useState(false);
|
||||
const [ searchValue , setSearchValue ]= useState(undefined);
|
||||
const [ valuesId , setValuesId ] = useState([]);
|
||||
const [ count , setCount ] = useState(double);
|
||||
const [ content , setContent ] = useState(false);
|
||||
|
||||
const [ saveList , setSaveList ] = useState(undefined);
|
||||
|
||||
const refFa = useRef(null);
|
||||
const refBox = useRef(null);
|
||||
|
||||
useEffect(() => {
|
||||
document.addEventListener('mousedown', clickMe , false);
|
||||
return () => {
|
||||
window.removeEventListener("mousedown", clickMe, false);
|
||||
}
|
||||
}, [])
|
||||
|
||||
const clickMe = ({ target }) => {
|
||||
// 查找父组件
|
||||
const faComponent = findDOMNode(refFa.current);
|
||||
const boxComponent = findDOMNode(refBox.current);
|
||||
if (faComponent && boxComponent) {
|
||||
const isChild = faComponent.contains(target);
|
||||
const isBox = boxComponent.contains(target);
|
||||
const arr = ["removeicon","iconfont icon-guanbi font-12 color-white","iconfont icon-guanbi font-12 color-blue","icon-a-bianji12","color-blue font-15 tagManage","iconfont icon-xiangzuojiantou font-15 color-grey mr5 cursor","cover","ant-btn cancelTags"];
|
||||
const pointer = arr.includes(target.className);
|
||||
if(!isChild && !isBox && !pointer){
|
||||
setVisible(false);
|
||||
setContent(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 根据选中的列表循环出id数组
|
||||
useEffect(()=>{
|
||||
if(selectValueList && selectValueList.length > 0 && visible ){
|
||||
renderSelectList(selectValueList);
|
||||
setSaveList(selectValueList);
|
||||
setCount(selectValueList.length);
|
||||
}else{
|
||||
setValuesId([]);
|
||||
setCount(0);
|
||||
setSaveList(undefined);
|
||||
}
|
||||
if(!visible){
|
||||
setSearchValue(undefined);
|
||||
searchFunc(undefined);
|
||||
}
|
||||
},[selectValueList,visible])
|
||||
|
||||
function renderSelectList(list){
|
||||
let a = list && list.length > 0 && list.map((i,k)=>{
|
||||
return i.id ? i.id.toString() : i.name
|
||||
})
|
||||
setValuesId(a);
|
||||
}
|
||||
|
||||
// 搜索
|
||||
function changeSearchvalue(e){
|
||||
setSearchValue(e.target.value);
|
||||
searchFunc(e.target.value);
|
||||
}
|
||||
function renderNames(nameArrs){
|
||||
return <React.Fragment>
|
||||
{
|
||||
nameArrs && nameArrs.length>0?
|
||||
nameArrs.map((i,k)=>{
|
||||
return(
|
||||
<p style={{display:"flex",alignItems:"center"}} className={removeFlag?"removeFlag":''}>
|
||||
{i.image_url && <img src={getImageUrl(i.image_url)} alt="" width="28px" height="28px" style={{borderRadius:"50%",marginTop:"5px"}} className="mr5"/>}
|
||||
{
|
||||
colorFlag ?
|
||||
(
|
||||
colorFlag === "2" ?
|
||||
<span className={"colorsquare task-hide"} style={{backgroundColor:`${i.color || "#000"}`,paddingRight:"18px"}}>
|
||||
{i.name}
|
||||
</span>
|
||||
:
|
||||
<span className={"colorsborder task-hide"} style={{borderColor:`${i.color}`,color:`${i.color}`}}>{i.name}</span>
|
||||
)
|
||||
:
|
||||
<span className={"task-hide"}>{i.name}</span>
|
||||
}
|
||||
{ !colorFlag && removeFlag && <a className="removeicon" onClick={()=>removeValueFunc(i.id)}><i className="iconfont icon-shanchu8 font-14"></i></a>}
|
||||
{ colorFlag && removeFlag && <a className="removeicon" onClick={()=>removeValueFunc(i.id)} style={{display:'block',right:"19px",position:"absolute"}}><i className="iconfont icon-guanbi font-12 color-white"></i></a>}
|
||||
</p>
|
||||
)
|
||||
})
|
||||
:<span>{placeholder}</span>
|
||||
}
|
||||
</React.Fragment>
|
||||
}
|
||||
|
||||
// 选择项
|
||||
function chooseMenu(i){
|
||||
let list = saveList && saveList.length > 0 ? [...saveList]:[] ;
|
||||
let relist = [];
|
||||
relist = list && list.length > 0 ? list:[];
|
||||
let filter = [];
|
||||
if(i.id){
|
||||
filter = list.filter(j=>j.id === i.id);
|
||||
}else{
|
||||
filter = list.filter(j=>j.name === i.name);
|
||||
}
|
||||
if(filter && filter.length > 0){
|
||||
if(i.id){
|
||||
relist = list.filter(j=>j.id !== i.id);
|
||||
}else{
|
||||
relist = list.filter(j=>j.name !== i.name);
|
||||
}
|
||||
}else{
|
||||
if(double && (saveList && saveList.length >= double)){
|
||||
setCount(-1);
|
||||
return;
|
||||
}
|
||||
if(double){
|
||||
relist.push(i);
|
||||
}else{
|
||||
relist = [i];
|
||||
}
|
||||
}
|
||||
renderSelectList(relist);
|
||||
setSaveList(relist);
|
||||
setCount(relist ? relist.length :0);
|
||||
if(!double){
|
||||
setVisible(false);
|
||||
setContent(false);
|
||||
chooseFunc(relist);
|
||||
}
|
||||
}
|
||||
|
||||
// 确认按钮
|
||||
function onSureFunc(){
|
||||
setVisible(false);
|
||||
setContent(false);
|
||||
chooseFunc(saveList);
|
||||
}
|
||||
// 移除选择的项
|
||||
function removeSaveFunc(id){
|
||||
let list = [...saveList];
|
||||
let filter = list.filter(j=>j.id !== id);
|
||||
setSaveList(filter);
|
||||
renderSelectList(filter);
|
||||
setCount(filter ? filter.length :0);
|
||||
}
|
||||
|
||||
// 移除后保存
|
||||
function removeValueFunc(id){
|
||||
let list = [...selectValueList];
|
||||
let filter = list.filter(j=>j.id !== id);
|
||||
setSaveList(filter);
|
||||
renderSelectList(filter);
|
||||
setCount(filter ? filter.length :0);
|
||||
chooseFunc(filter);
|
||||
}
|
||||
|
||||
function onSuccess(){
|
||||
setContent(false);
|
||||
onAdd();
|
||||
}
|
||||
return(
|
||||
<li>
|
||||
<span>
|
||||
{placeholder}
|
||||
{
|
||||
!editFlag &&
|
||||
<Dropdown
|
||||
visible={visible}
|
||||
overlayClassName={"overlayChooseStyle"}
|
||||
placement="bottomRight"
|
||||
trigger={['click']}
|
||||
overlay={
|
||||
<div ref={refFa}>
|
||||
{
|
||||
!content ?
|
||||
<div>
|
||||
{
|
||||
double && saveList && saveList.length>0?
|
||||
<ul className="choosedul">
|
||||
{
|
||||
saveList.map((i,k)=>{
|
||||
return(
|
||||
<li style={{backgroundColor:`${i.color}` || "#eff2ff",borderColor:`${i.color}` || "#466aff",color:`${colorFlag?"#FFF":"#466aff"}`}}>
|
||||
<span className="task-hide">{i.name}</span>
|
||||
<span className="removeicon" onClick={()=>removeSaveFunc(i.id)}><i className={`iconfont icon-guanbi font-12 ${colorFlag? "color-white":"color-blue"}`}></i></span>
|
||||
</li>
|
||||
)
|
||||
})
|
||||
}
|
||||
</ul>
|
||||
:""
|
||||
}
|
||||
{ searchFunc &&
|
||||
<div className="searchbox">
|
||||
<Search
|
||||
placeholder={`请输入${placeholder}名称进行搜索`}
|
||||
value={searchValue}
|
||||
onChange={changeSearchvalue}
|
||||
style={{marginRight:"18px"}}
|
||||
/>
|
||||
</div>
|
||||
}
|
||||
{
|
||||
menus && menus.length >0?
|
||||
<Menu className={auto && "piecemenu"} selectedKeys={valuesId}>
|
||||
{
|
||||
menus.map((i,k)=>{
|
||||
return(
|
||||
<Menu.Item key={i.id || i.name} className={colorFlag ?"colorli":"commonli"} style={{backgroundColor:colorFlag?`${i.color || "#000"}`:"#f4f6fe"}} onClick={()=>chooseMenu(i)}>
|
||||
{
|
||||
auto ? <span><span className="task-hide">{i.name}</span></span>
|
||||
:
|
||||
<Tooltip display={auto?false:true} placement={"bottom"} title={i.name}><span><span className="task-hide">{i.name}</span></span></Tooltip>
|
||||
}
|
||||
</Menu.Item>
|
||||
)
|
||||
})
|
||||
}
|
||||
</Menu>
|
||||
:
|
||||
<div className="menusEmpty">
|
||||
<p>{searchValue ? <span>暂无{placeholder}“{searchValue}”</span>: `暂无${placeholder}`}</p>
|
||||
</div>
|
||||
}
|
||||
<div className="counttips">
|
||||
<div>
|
||||
{ onAdd &&
|
||||
<a className="color-blue font-15 tagManage" onClick={()=>{setContent(true)}}>
|
||||
<i className="iconfont icon-a-bianji12 font-14 mr5"></i>创建标记</a>
|
||||
}
|
||||
</div>
|
||||
{
|
||||
double && (count<0 ?
|
||||
<p className="color-red font-13">最多添加{double}个{placeholder}！</p>
|
||||
:
|
||||
<p className="font-13" style={{color:"#898d9d"}}>还可添加{double - count}个{placeholder}！</p>
|
||||
)
|
||||
}
|
||||
</div>
|
||||
{
|
||||
double &&
|
||||
<div style={{textAlign:'center'}}>
|
||||
<Button style={{width:"80px"}} onClick={()=>setVisible(false)}>取消</Button>
|
||||
<Button style={{width:"80px"}} className="ml20" type="primary" onClick={onSureFunc}>确认</Button>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
:
|
||||
<AddTagsBox
|
||||
owner={owner}
|
||||
projectsId={projectsId}
|
||||
visible={visible}
|
||||
onCancel={()=>setContent(false)}
|
||||
onSuccess={onSuccess} />
|
||||
}
|
||||
</div>
|
||||
}>
|
||||
<a ref={refBox} onClick={()=>setVisible(visible ? false : true)}>
|
||||
<i className="iconfont icon-a-bianji12 font-13" style={{color:"#898d9d"}}></i>
|
||||
</a>
|
||||
</Dropdown>
|
||||
}
|
||||
</span>
|
||||
<div className={selectValueList && selectValueList.length > 0 ? "operatevalue color-grey-3":"operatevalue"} style={{display:colorFlag?"flex":"block"}}>{renderNames(selectValueList)}</div>
|
||||
</li>
|
||||
)
|
||||
}
|
||||
export default Form.create()(forwardRef(ChooseMenu));
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
import React,{ useState , useEffect } from 'react';
|
||||
import { SketchPicker } from 'react-color';
|
||||
|
||||
function ColorCard({getColor,defaultColor}){
|
||||
const [ displayColorPicker , setDisplayColorPicker ] = useState(false);
|
||||
const [ textcolor , setTextColor ] = useState("#F17013");
|
||||
|
||||
|
||||
useEffect(()=>{
|
||||
if(defaultColor){
|
||||
setTextColor(defaultColor);
|
||||
}
|
||||
},[defaultColor])
|
||||
|
||||
// 切换色卡
|
||||
function handleChange(color){
|
||||
setTextColor(color.hex);
|
||||
getColor(color ? color.hex : defaultColor);
|
||||
}
|
||||
|
||||
// 隐藏色卡
|
||||
function handleClick(){
|
||||
setDisplayColorPicker(!displayColorPicker);
|
||||
// reduction();
|
||||
}
|
||||
|
||||
// 还原色卡
|
||||
function reduction(){
|
||||
setTextColor("#F17013");
|
||||
// setColor({r: '241',g: '112',b: '19',a: '1',});
|
||||
}
|
||||
return(
|
||||
<div>
|
||||
<div className="swatch" onClick={handleClick}>
|
||||
<div className="color" style={{backgroundColor:`${textcolor}`}}></div>
|
||||
<p style={{ paddingLeft: 5 }}>{textcolor}</p>
|
||||
</div>
|
||||
{displayColorPicker ? (
|
||||
<div className="popover">
|
||||
<div className="cover" onClick={()=>{setDisplayColorPicker(false)}} />
|
||||
<SketchPicker color={textcolor} onChange={handleChange} />
|
||||
</div>
|
||||
) : null}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
export default ColorCard;
|
||||
|
|
@ -0,0 +1,165 @@
|
|||
import React from 'react';
|
||||
import { Button, message } from 'antd';
|
||||
import { getImageUrl } from 'educoder';
|
||||
import MDEditor from "../../../../modules/tpm/challengesnew/tpm-md-editor";
|
||||
import Upload from "../../../../forge/Upload/Index";
|
||||
import Attachments from "../../../../forge/Upload/attachment";
|
||||
import UploadImg from "../../../../forge/Images/upload.png";
|
||||
import './list.scss';
|
||||
import '../../../../forge/Order/order.scss';
|
||||
import { useState } from 'react';
|
||||
import { Link } from 'react-router-dom';
|
||||
import axios from 'axios';
|
||||
|
||||
function EditComment(props){
|
||||
const {owner, projectsId, index} = props.match.params;
|
||||
const {current_user, current_user:{login}, showLoginDialog, showNotification, reloadComment, cancelMd, parentId, replyId, updateId, showUserImg=true} = props;
|
||||
const [content, setContent] = useState(props.content);
|
||||
const [quillFlag, setQuillFlag] = useState(false);
|
||||
// 确认评论按钮loading效果
|
||||
const [journalSpin, setJournalSpin] = useState(false);
|
||||
const [atWhoLoginList, setAtWhoLoginList] = useState(undefined);
|
||||
const [fileList, setFileList] = useState(undefined);
|
||||
const [attachmentClean, setAttachmentClean] = useState(true);
|
||||
const [ save , setSave ] = useState(undefined);
|
||||
|
||||
useState(()=>{
|
||||
setSave(props.defaultFileList);
|
||||
},[props.defaultFileList])
|
||||
|
||||
// 评论点击函数
|
||||
function addJournals(){
|
||||
if(!content){
|
||||
setQuillFlag(true);
|
||||
return
|
||||
}
|
||||
setJournalSpin(true);
|
||||
if(updateId){
|
||||
// 修改评论
|
||||
axios.patch(`/v1/${owner}/${projectsId}/issues/${index}/journals/${updateId}`,{
|
||||
notes: content,
|
||||
attachment_ids: fileList,
|
||||
receivers_login:atWhoLoginList
|
||||
}).then(res=>{
|
||||
if(res && res.data){
|
||||
// 刷新评论列表
|
||||
reloadComment();
|
||||
message.success('评论成功');
|
||||
cancelMd();
|
||||
setContent(undefined);
|
||||
}
|
||||
setJournalSpin(false);
|
||||
})
|
||||
}else{
|
||||
// 新建评论
|
||||
const params = {
|
||||
parent_id: parentId,
|
||||
reply_id: replyId,
|
||||
notes: content,
|
||||
attachment_ids: fileList,
|
||||
receivers_login:atWhoLoginList
|
||||
}
|
||||
axios.post(`/v1/${owner}/${projectsId}/issues/${index}/journals`, params).then(res=>{
|
||||
if(res && res.data){
|
||||
// 刷新评论列表
|
||||
reloadComment();
|
||||
message.success('评论成功');
|
||||
cancelMd();
|
||||
setContent(undefined);
|
||||
}
|
||||
setJournalSpin(false);
|
||||
})
|
||||
}
|
||||
};
|
||||
function deleteLoad(id){
|
||||
let arr = [];
|
||||
let list = save;
|
||||
if(list && list.length>0 ){
|
||||
arr = list.filter(i=>i.id !== id);
|
||||
}
|
||||
setFileList(arr.map(i=>{return i.id}));
|
||||
setSave(arr);
|
||||
}
|
||||
function UploadFunc(f){
|
||||
let list = [];
|
||||
let arr = [];
|
||||
if(save && save.length>0 ){
|
||||
arr = save.map(i=>{return i.id});
|
||||
}
|
||||
list = arr && arr.length>0 ? f.concat(arr) : f ;
|
||||
setFileList(list);
|
||||
};
|
||||
|
||||
return(
|
||||
<div className="grid-item-top pb10">
|
||||
<Link
|
||||
to={`/${current_user && current_user.login}`}
|
||||
className="show-user-link mr10"
|
||||
>
|
||||
<img
|
||||
className="radius"
|
||||
src={getImageUrl(
|
||||
`/${current_user && current_user.image_url}`
|
||||
)}
|
||||
alt=""
|
||||
width="30"
|
||||
height="30"
|
||||
style={{display: showUserImg ? '' : 'none'}}
|
||||
/>
|
||||
</Link>
|
||||
<div style={{position:"relative"}}>
|
||||
<MDEditor
|
||||
placeholder={"添加评论..."}
|
||||
height={300}
|
||||
mdID={"orderdetail-add-descriptions" + replyId}
|
||||
initValue={content}
|
||||
onChange={(value)=>{setQuillFlag(false);setContent(value);}}
|
||||
isCanAtme = {true}
|
||||
isQuoteIssue={true}
|
||||
changeAtWhoLoginList = {(loginList)=>{setAtWhoLoginList(loginList); setAttachmentClean(true)}}
|
||||
owner = {owner}
|
||||
projectsId = {projectsId}
|
||||
></MDEditor>
|
||||
<p className="quillFlagBox">
|
||||
{quillFlag && <span>请输入评论内容</span>}
|
||||
</p>
|
||||
<Upload
|
||||
className="commentStyle"
|
||||
isComplete={attachmentClean}
|
||||
load={UploadFunc}
|
||||
icon={
|
||||
<img
|
||||
src={UploadImg}
|
||||
width="58"
|
||||
alt=""
|
||||
style={{ marginBottom: 15 }}
|
||||
/>
|
||||
}
|
||||
size={100}
|
||||
showNotification={showNotification}
|
||||
// defaultFileList={props.defaultFileList}
|
||||
/>
|
||||
{props.defaultFileList && props.defaultFileList.length > 0 &&
|
||||
<Attachments
|
||||
attachments={props.defaultFileList}
|
||||
showNotification={props.showNotification}
|
||||
canDelete={true}
|
||||
deleteLoad={deleteLoad}
|
||||
></Attachments>
|
||||
}
|
||||
<p className="clearfix mt20">
|
||||
<Button
|
||||
type="primary"
|
||||
onClick={addJournals}
|
||||
loading={journalSpin}
|
||||
className="mr15"
|
||||
>
|
||||
评论
|
||||
</Button>
|
||||
<Button onClick={()=>{cancelMd()}}>取消</Button>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
export default EditComment;
|
||||
|
|
@ -0,0 +1,242 @@
|
|||
import React, { useEffect, useState } from 'react';
|
||||
import { Button, Popconfirm, Radio, Input, message, Tooltip, Spin, Pagination } from 'antd';
|
||||
import axios from 'axios';
|
||||
import { getImageUrl, timeAgo } from 'educoder';
|
||||
import RenderHtml from '../../../../components/render-html';
|
||||
import Attachment from '../../../Upload/attachment';
|
||||
import EditComment from './editComment';
|
||||
import Nodata from '../../../Nodata';
|
||||
import CheckProfile from '../../../Component/ProfileModal/Profile';
|
||||
import './list.scss';
|
||||
import { Link } from 'react-router-dom';
|
||||
|
||||
function IssueCommentList(props){
|
||||
const{history, history: {location}, reload, reloadComment, showNotification, current_user:{login, admin, image_url, user_id}, isManager, showLoginDialog, issueInfo:{author}} = props;
|
||||
const {owner, projectsId, index} = props.match.params;
|
||||
const [category, setCategory] = useState('comment');
|
||||
const [journals, setJournals] = useState(undefined);
|
||||
// 是否展示新建/编辑评论markdown部分新建评论1 编辑父级评论2 回复评论3 编辑回复内容4 回复子机评论5
|
||||
const [showEdit, setShowEdit] = useState(false);
|
||||
const [parentId, setParentId] = useState(undefined);
|
||||
const [replyId, setReplyId] = useState(undefined);
|
||||
// 修改评论id
|
||||
const [updateId, setUpdateId] = useState(undefined);
|
||||
// 操作日志展开效果
|
||||
const [open, setOpen] = useState(undefined);
|
||||
// 加载中效果（缓冲css 线条效果）
|
||||
const [spin, setSpin] = useState(false);
|
||||
// issue 评论总数
|
||||
const [journalsCount, setJournalsCount] = useState(undefined);
|
||||
// 分页
|
||||
const limit = 50;
|
||||
const [page, setPage] = useState(1);
|
||||
const [totalCount, setTotalCount] = useState(undefined);
|
||||
// 操作记录 icon
|
||||
const journalsIcon ={
|
||||
'issue': 'icon-chuangjianqianbao',
|
||||
'branch_name': 'icon-fenzhi3',
|
||||
'assigner': 'icon-chengyuan2',
|
||||
'status_id': 'icon-xiugaibaobiaomoban',
|
||||
'fixed_version_id': 'icon-lichengbeiicon2',
|
||||
'due_date': 'icon-riqi',
|
||||
'issue_tag': 'icon-biaoji2',
|
||||
'description': 'icon-xiugaibaobiaomoban',
|
||||
'subject': 'icon-xiugaibaobiaomoban',
|
||||
'start_date': 'icon-riqi',
|
||||
'priority_id': 'icon-youxian',
|
||||
'attachment': 'icon-xiugaibaobiaomoban'
|
||||
}
|
||||
|
||||
useEffect(()=>{
|
||||
setSpin(true);
|
||||
axios.get(`/v1/${owner}/${projectsId}/issues/${index}/journals`,{params:{
|
||||
category,
|
||||
page,
|
||||
limit
|
||||
}}).then(res=>{
|
||||
if(res && res.data){
|
||||
const {journals, total_comment_journals_count, total_count} = res.data;
|
||||
if(category === 'all'){
|
||||
const array = [];
|
||||
let start = undefined;
|
||||
let isJournalCount = 0;
|
||||
journals.map((item, index)=>{
|
||||
!isJournalCount && (start = index)
|
||||
item.is_journal_detail && (isJournalCount++)
|
||||
if(!item.is_journal_detail && isJournalCount < 10){
|
||||
isJournalCount = 0;
|
||||
return
|
||||
}
|
||||
if(isJournalCount >= 10 && (!item.is_journal_detail || journals.length-1 === index)){
|
||||
array.push({start, count: isJournalCount});
|
||||
isJournalCount = 0;
|
||||
}
|
||||
})
|
||||
array.map((item, i)=>{
|
||||
journals[item.start].numCount = item.count-1;
|
||||
for (let index = 0; index < item.count; index++) {
|
||||
journals[item.start+index].start = journals[item.start].id;
|
||||
journals[item.start+index].closeAndSpan = true;
|
||||
}
|
||||
})
|
||||
}
|
||||
setTotalCount(total_count);
|
||||
setJournalsCount(total_comment_journals_count);
|
||||
setJournals(journals);
|
||||
setSpin(false)
|
||||
}
|
||||
})
|
||||
}, [reload, category, page])
|
||||
|
||||
function commentCtx(v){
|
||||
return <RenderHtml owner={owner} projectsId={projectsId} className="break_word_comments imageLayerParent commentRenderHtml" value={v} url={location}/>;
|
||||
};
|
||||
|
||||
// 删除评论内容
|
||||
function deleteComment(id){
|
||||
axios.delete(`/v1/${owner}/${projectsId}/issues/${index}/journals/${id}`).then(res=>{
|
||||
if(res && res.data && !res.data.status){
|
||||
reloadComment();
|
||||
message.success('删除成功');
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// markdown 取消操作
|
||||
function cancelMd(){
|
||||
setShowEdit(false);
|
||||
}
|
||||
|
||||
return(
|
||||
<div className="commentListBox">
|
||||
{/* 全部 / 评论 / 操作日志 */}
|
||||
<div className={`${!login && journalsCount > 0 && 'pb15'}`}>
|
||||
<div className='typeActionBox mt30 mb20'>
|
||||
<Radio.Group onChange={(e)=>{setSpin(true);setPage(1);setCategory(e.target.value);history.push(history.pathname)}} value={category}>
|
||||
<Radio value={'comment'} className='typeActionRadio font-14'>评论<span className='journalsCount font-13 ml5'>{journalsCount}</span></Radio>
|
||||
<Radio value={'operate'} className='typeActionRadio font-14'>操作日志</Radio>
|
||||
<Radio value={'all'} className='typeActionRadio font-14'>全部</Radio>
|
||||
</Radio.Group>
|
||||
</div>
|
||||
</div>
|
||||
{/* 评论快速入口-仅有评论且登录时展示 */}
|
||||
{login && category !== 'operate' && journalsCount > 0 && <div className={`pb30 ${journalsCount > 0 && 'pt15'}`}><div className='gotoComment'>点击<a className='ml5' href='#addComments'>添加评论</a></div></div>}
|
||||
{/* 评论/操作日志 展示列表 */}
|
||||
<Spin spinning={spin}>
|
||||
<div className={`issueCommentsBox ${category === 'comment' && !spin && 'justComment'}`}>
|
||||
{journals && (journals.length > 0 && journals.map(item=>{return item.is_journal_detail ? (!item.closeAndSpan || item.id === item.start || open === item.start) ? <div key={item.id} className='operationLog'>
|
||||
{/* 操作日志 */}
|
||||
<div className='operationCommentBor'></div>
|
||||
<div className='flexCenter font-14' style={{width: '100%'}}>
|
||||
<div className='flexCenter opBox'>
|
||||
<span className='iconBackBox mr10'><i className={`iconfont font-12 ${journalsIcon[item.operate_category]}`}></i></span>
|
||||
<div className='task-hide' style={{maxWidth: item.closeAndSpan && item.id === item.start? '550px' : '700px'}}>
|
||||
<Link to={`/${item.user.login}`}><img src={getImageUrl(item.user.image_url)} alt="" className='commentUserImg mr5'/></Link>
|
||||
<Link to={`/${item.user.login}`}>{item.user.name} </Link>
|
||||
{(item.user.name.length + item.operate_content.length) > 62 ? <Tooltip title={<div><span>{item.user.name} </span><span dangerouslySetInnerHTML={{__html:item.operate_content}}></span></div>}><span dangerouslySetInnerHTML={{__html:item.operate_content}}></span></Tooltip> : <span dangerouslySetInnerHTML={{__html:item.operate_content}}></span>}
|
||||
</div>
|
||||
<span className='ml15 timeAgo font-14'>{timeAgo(item.created_at)}</span>
|
||||
</div>
|
||||
{(item.closeAndSpan && item.id === item.start) && <a className='primaryColor' onClick={()=>{setOpen(open === item.id ? undefined : item.id)}}>{open === item.id ? `点击收起操作日志` : `已折叠${item.numCount}条, 点击查看`}<i className={`iconfont ${open === item.id ? `icon-sanjiaoxing-up` : 'icon-sanjiaoxing-down'} font-15`}></i></a>}
|
||||
</div>
|
||||
</div> : '' : <div key={item.id} className='commentContentBox pb30'>
|
||||
{/* 评论 */}
|
||||
<div className='commentOperationBor'></div>
|
||||
<Link to={`/${item.user.login}`}><img src={getImageUrl(item.user.image_url)} alt="" className='commentUserImg mr15'/></Link>
|
||||
<div className='commentContentRight'>
|
||||
{/* 判断是否是编辑状态 */}
|
||||
{(showEdit === 2 && updateId === item.id) ? <div className='mt15 mr20'><EditComment {...props} cancelMd={cancelMd} updateId={updateId} reloadComment={reloadComment} content={item.notes} defaultFileList={item.attachments} showUserImg={false}/></div> : <div>
|
||||
<div className='commentContent'>
|
||||
<div className='flexCenter font-14'>
|
||||
<div>
|
||||
<Link to={`/${item.user.login}`}>{item.user.name}</Link>
|
||||
<span className='ml15 timeAgo font-14'>{timeAgo(item.created_at)}</span>
|
||||
</div>
|
||||
{login && <div>
|
||||
{/* 平台管理员/仓库管理员/发布评论者/issue创建者 */}
|
||||
{(admin || isManager || login === item.user.login || user_id === author.id) && <Popconfirm
|
||||
placement="bottom"
|
||||
title={`确定要删除此条评论吗？${item.children_journals.length > 0 ? '子评论也将被一起删除。' : ''}`}
|
||||
okText="是"
|
||||
cancelText="否"
|
||||
onConfirm={() => deleteComment(item.id)}
|
||||
>
|
||||
<Button type='link' className='color-grey-89'><i className='iconfont icon-fuzhi-shanchu font-14 mr8'></i>删除</Button>
|
||||
</Popconfirm>}
|
||||
{/* 仅评论者可修改 */}
|
||||
{login === item.user.login && <Button type='link' className='color-grey-89' onClick={()=>{setUpdateId(item.id); setShowEdit(2)}}><i className='iconfont icon-a-bianji12 font-14 mr8'></i>修改</Button>}
|
||||
<CheckProfile {...props} sureFunc={()=>{setParentId(item.id); setReplyId(item.id); setShowEdit(3)}}><Button type='link' className='color-grey-89'><i className='iconfont icon-a-xiaoxi1 font-14 mr8'></i>回复</Button></CheckProfile>
|
||||
</div>}
|
||||
</div>
|
||||
<div className='contentHtml mb5'>{commentCtx(item.notes)}</div>
|
||||
{item && item.attachments && item.attachments.length > 0 && <div className='attachmentBox mb5'><Attachment
|
||||
attachments={item.attachments}
|
||||
showNotification={showNotification}
|
||||
canDelete={false}
|
||||
/></div>}
|
||||
</div>
|
||||
</div>}
|
||||
{showEdit === 3 && replyId === item.id && <div className='contentHtml mr20'><EditComment {...props} cancelMd={cancelMd} parentId={parentId} replyId={replyId} reloadComment={reloadComment}/></div>}
|
||||
{/* 评论回复部分 */}
|
||||
{item.children_journals.map(i =>{return <div className='commentReply' key={i.id}>
|
||||
{(showEdit === 4 && updateId === i.id) ? <div className='mr20'><EditComment {...props} cancelMd={cancelMd} updateId={updateId} reloadComment={reloadComment} content={i.notes} defaultFileList={i.attachments}/></div> : <div>
|
||||
<div className='flexCenter'>
|
||||
<div>
|
||||
<Link to={`/${i.user.login}`}><img src={getImageUrl(i.user.image_url)} alt="" className='commentUserImg mr8'/></Link>
|
||||
<Link to={`/${i.user.login}`}>{i.user.name}</Link>
|
||||
{i.reply_user && <span className='ml5 timeAgo mr3'>回复</span>}
|
||||
<span>{i.reply_user && i.reply_user.name}</span>
|
||||
<span className='ml15 timeAgo font-14'>{timeAgo(i.created_at)}</span>
|
||||
</div>
|
||||
{login && <div>
|
||||
{/* 平台管理员/仓库管理员/发布评论者/回复评论者/issue创建者 */}
|
||||
{(admin || isManager || login === i.user.login || (i.reply_user && login === i.reply_user.login) || user_id === author.id) && <Popconfirm
|
||||
placement="bottom"
|
||||
title={"确定要删除当前回复吗?"}
|
||||
okText="是"
|
||||
cancelText="否"
|
||||
onConfirm={() => deleteComment(i.id)}
|
||||
>
|
||||
<Button type='link' className='color-grey-89'><i className='iconfont icon-fuzhi-shanchu font-14 mr8'></i>删除</Button>
|
||||
</Popconfirm>}
|
||||
{/* 仅回复评论者可修改 */}
|
||||
{login === i.user.login && <Button type='link' className='color-grey-89' onClick={()=>{setUpdateId(i.id); setShowEdit(4)}}><i className='iconfont icon-a-bianji12 font-14 mr8'></i>修改</Button>}
|
||||
<CheckProfile {...props} sureFunc={()=>{setParentId(item.id);setReplyId(i.id); setShowEdit(5)}}>
|
||||
<Button type='link' className='color-grey-89'><i className='iconfont icon-a-xiaoxi1 font-14 mr8'></i>回复</Button>
|
||||
</CheckProfile>
|
||||
</div>}
|
||||
</div>
|
||||
<div className='contentHtml mt5 mb10'>{commentCtx(i.notes)}</div>
|
||||
{i && i.attachments && i.attachments.length > 0 && <div className='attachmentBox'><Attachment
|
||||
attachments={i.attachments}
|
||||
showNotification={showNotification}
|
||||
canDelete={false}
|
||||
/></div>}
|
||||
</div>}
|
||||
{showEdit === 5 && replyId === i.id && <div className='contentHtml mr20'><EditComment {...props} cancelMd={cancelMd} parentId={parentId} replyId={replyId} reloadComment={reloadComment}/></div>}
|
||||
</div>})}
|
||||
</div>
|
||||
</div>}))}
|
||||
</div>
|
||||
</Spin>
|
||||
{totalCount>limit && <div className='mt20 paginationIssueComment mb20'>
|
||||
<Pagination simple current={page} pageSize={limit} total={totalCount} onChange={(page)=>setPage(page)}/>
|
||||
</div>}
|
||||
{/* 添加评论 */}
|
||||
{category !== 'operate' && <div className="pb30" style={{marginTop: journalsCount ? '-5px' : '30px'}}>
|
||||
{login ? showEdit === 1 ? <EditComment {...props} cancelMd={cancelMd}/> : <div className="addComments" id='addComments'>
|
||||
<img src={getImageUrl(image_url)} alt="" />
|
||||
<div style={{flex:1}}>
|
||||
<CheckProfile {...props} sureFunc={()=>{setShowEdit(1)}}>
|
||||
<Input className='addCommentBox' placeholder="添加评论"/>
|
||||
</CheckProfile>
|
||||
</div>
|
||||
</div> : <div className='unLoginComment font-15 pl20'>
|
||||
{/* 未登录用户 */}
|
||||
<a className='mr5 loginBtn' onClick={()=>{showLoginDialog()}}>登录</a>并参与评论与回复
|
||||
</div>}
|
||||
</div>}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
export default IssueCommentList;
|
||||
|
|
@ -0,0 +1,205 @@
|
|||
.typeActionBox{
|
||||
padding: 10px 20px 4px;
|
||||
background-color:rgba(241, 243, 252, 0.55);
|
||||
border-radius:4px;
|
||||
.typeActionRadio{
|
||||
color: #333;
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
margin-right: 25px;
|
||||
&.ant-radio-wrapper-checked{
|
||||
color: $primary-color;
|
||||
}
|
||||
}
|
||||
.journalsCount{
|
||||
color:#5e6685;
|
||||
background-color:rgba(70, 106, 255, 0.09);
|
||||
border-radius:10px;
|
||||
display: inline-block;
|
||||
padding: 0px 6px;
|
||||
}
|
||||
}
|
||||
.commentUserImg{
|
||||
height: 28px;
|
||||
width: 28px;
|
||||
border-radius: 50%;
|
||||
object-fit: cover;
|
||||
}
|
||||
.issueCommentsBox{
|
||||
.iconBackBox{
|
||||
display: inline-block;
|
||||
width:24px;
|
||||
height:24px;
|
||||
border-radius: 50%;
|
||||
line-height: 24px;
|
||||
text-align: center;
|
||||
background-color:#f2f3f5;
|
||||
}
|
||||
.operationLog, .commentContentBox{
|
||||
position: relative;
|
||||
min-height: 62px;
|
||||
display: flex;
|
||||
>.flexCenter, >a{
|
||||
z-index: 2;
|
||||
}
|
||||
&::before, &::after{
|
||||
content: '';
|
||||
width: 1px;
|
||||
height: 50%;
|
||||
position: absolute;
|
||||
background: #eee;
|
||||
left: 12px;
|
||||
z-index: 1;
|
||||
}
|
||||
&::after{
|
||||
background: #eee;
|
||||
top: 50%;
|
||||
}
|
||||
}
|
||||
.commentContentBox+.operationLog .operationCommentBor, .operationLog+.commentContentBox .commentOperationBor{
|
||||
border-top: 1px solid #eee;
|
||||
width: 98.5%;
|
||||
position: absolute;
|
||||
left: 12px;
|
||||
}
|
||||
.operationLog+.commentContentBox{
|
||||
&>a, &>.commentContentRight{
|
||||
margin-top: 25px;
|
||||
}
|
||||
}
|
||||
.timeAgo{
|
||||
color:#acb0bf;
|
||||
}
|
||||
.operationLog:last-child::after, .operationLog:first-child::before, .commentContentBox:last-child::after, &.justComment .commentContentBox::before, &.justComment .commentContentBox::after{
|
||||
display: none;
|
||||
}
|
||||
.operationLog:first-child, .commentContentBox+.operationLog{
|
||||
margin-top: -15px;
|
||||
}
|
||||
.commentContentBox:last-child::before{
|
||||
height: 35%;
|
||||
}
|
||||
.flexCenter{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.commentRenderHtml.markdown-body p{
|
||||
font-size: 14px !important;
|
||||
}
|
||||
.commentReply{
|
||||
padding: 15px 0 0 20px;
|
||||
background-color: rgba(238, 240, 246, 0.41);
|
||||
&>div{
|
||||
padding-bottom: 5px;
|
||||
}
|
||||
&+.commentReply>div{
|
||||
margin-top: -15px;
|
||||
padding-top: 15px;
|
||||
border-top: 1px dashed #eee;
|
||||
}
|
||||
}
|
||||
.opBox{
|
||||
justify-content: flex-start;
|
||||
// flex: 1;
|
||||
// width: 100%;
|
||||
}
|
||||
.commentContentBox{
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
}
|
||||
.commentContentRight{
|
||||
flex: 1;
|
||||
background-color:#fafafc;
|
||||
border:1px solid rgba(42, 97, 255, 0.23);
|
||||
border-radius:6px;
|
||||
position: relative;
|
||||
top: -6px;
|
||||
padding: 10px 15px 16px;
|
||||
width: 0;
|
||||
&::before{
|
||||
content: '';
|
||||
display: block;
|
||||
position: absolute;
|
||||
top: 13px;
|
||||
left: -14px;
|
||||
width: 0;
|
||||
height: 0;
|
||||
overflow: hidden;
|
||||
font-size: 0;
|
||||
line-height: 0;
|
||||
border: 7px;
|
||||
border-style: solid;
|
||||
border-color: transparent rgba(42, 97, 255, 0.23) transparent transparent;
|
||||
}
|
||||
&::after{
|
||||
content: '';
|
||||
display: block;
|
||||
width: 0;
|
||||
height: 0;
|
||||
overflow: hidden;
|
||||
font-size: 0;
|
||||
line-height: 0;
|
||||
border: 6px;
|
||||
border-style: solid;
|
||||
border-color: transparent #fafafc transparent transparent;
|
||||
position: absolute;
|
||||
top: 14px;
|
||||
left: -11px;
|
||||
}
|
||||
}
|
||||
}
|
||||
.primaryColor, .primaryColor:link{
|
||||
color: $primary-color;
|
||||
}
|
||||
.attachmentBox{
|
||||
margin-top: -8px;
|
||||
}
|
||||
.color-grey-89{
|
||||
color: #898d9d;
|
||||
}
|
||||
// 添加评论样式
|
||||
.unLoginComment{
|
||||
height:58px;
|
||||
line-height: 58px;
|
||||
background-color:rgba(241, 243, 252, 0.55);
|
||||
border-radius:4px;
|
||||
color: rgba(84, 87, 103, 1);
|
||||
.loginBtn{
|
||||
color: $primary-color;
|
||||
}
|
||||
}
|
||||
.quillFlagBox{
|
||||
color: red;
|
||||
margin-bottom: 5px !important;
|
||||
height: 28px;
|
||||
}
|
||||
.addComments{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
background-color:rgba(241, 243, 252, 0.55);
|
||||
border-radius:4px;
|
||||
padding:7px 10px;
|
||||
&>img{
|
||||
height: 28px;
|
||||
width: 28px;
|
||||
border-radius: 50%;
|
||||
margin-right: 13px;
|
||||
}
|
||||
}
|
||||
.addCommentBox{
|
||||
width: 100%;
|
||||
height: 30px;
|
||||
border: none;
|
||||
}
|
||||
.paginationIssueComment{
|
||||
text-align: center;
|
||||
}
|
||||
.gotoComment{
|
||||
background-color:rgba(241, 243, 252, 0.55);
|
||||
border-radius:4px;
|
||||
color: rgba(172, 176, 191, 1);
|
||||
padding: 8px 20px;
|
||||
margin-top: -10px;
|
||||
&>a{color: rgba(70, 106, 255, 1);}
|
||||
}
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
import React ,{ useState } from 'react';
|
||||
import { Tooltip } from 'antd';
|
||||
import { CopyToClipboard } from 'react-copy-to-clipboard';
|
||||
|
||||
|
||||
function Copy({ children , value }){
|
||||
const [ title , setTitle ] = useState("点击复制链接");
|
||||
let host = window.location.hostname === "localhost" ? "testforgeplus.trustie.net" : window.location.hostname;
|
||||
let protocol = window.location.protocol;
|
||||
return(
|
||||
<CopyToClipboard text={`${protocol}//${host}${value}`}
|
||||
onCopy={() => setTitle("复制成功")}>
|
||||
<Tooltip
|
||||
placement="bottom"
|
||||
title={title}
|
||||
>
|
||||
{children}
|
||||
</Tooltip>
|
||||
</CopyToClipboard>
|
||||
)
|
||||
}
|
||||
export default Copy;
|
||||
|
|
@ -0,0 +1,97 @@
|
|||
import React from 'react';
|
||||
import { getImageUrl } from 'educoder';
|
||||
import gold from '../Img/gold.png';
|
||||
import { Link } from "react-router-dom";
|
||||
import Copy from '../Component/copy';
|
||||
import { Tooltip } from 'antd';
|
||||
|
||||
|
||||
// issue列表显示
|
||||
function Datas({checkbox ,item , projectsId,owner}){
|
||||
|
||||
function statusTag(name){
|
||||
switch (name) {
|
||||
case "低":
|
||||
return "status low";
|
||||
case "正常":
|
||||
return "status normals";
|
||||
case "高":
|
||||
return "status hight";
|
||||
default:
|
||||
return "status urgent";
|
||||
}
|
||||
}
|
||||
|
||||
function renderName(list){
|
||||
let l = list.map(i=>{return i.name});
|
||||
return l.join(",");
|
||||
}
|
||||
|
||||
return(
|
||||
<div>
|
||||
<div className="issuedetail">
|
||||
{checkbox}
|
||||
<div style={{flex:1}}>
|
||||
<div className="idetails">
|
||||
<span className={statusTag(item.priority_name)}>{item.priority_name}</span>
|
||||
{/* <img src={issue} alt="" width="16px" className="mr5" /> */}
|
||||
<Link to={`/${owner}/${projectsId}/issues/${item.project_issues_index}`} style={{maxWidth:`${item.tags ? 735 - item.tags.length*120 : 735}px`}} title={item.subject}>{item.subject}</Link>
|
||||
{
|
||||
item.tags && item.tags.length>0?
|
||||
item.tags.map((i,k)=>{
|
||||
return(
|
||||
<span style={{backgroundColor: `${i.color}`}} className="ml8 tagscolor task-hide" title={i.name}>{i.name}</span>
|
||||
)
|
||||
})
|
||||
:""
|
||||
}
|
||||
</div>
|
||||
<div>
|
||||
<div className="infos">
|
||||
<div className="ilog">
|
||||
{ item.project_issues_index &&
|
||||
<Copy value={`/${owner}/${projectsId}/issues/${item.project_issues_index}`}><span className="number">#{item.project_issues_index}</span></Copy>
|
||||
}
|
||||
</div>
|
||||
<Link to={`/${item.author && item.author.login}`}><i className="iconfont icon-chengyuan2 mr3 font-12" style={{color:'#898d9d'}}></i></Link>
|
||||
<span className="mr12"><Link style={{color:"#898d9d"}} to={`/${item.author && item.author.login}`}>{item.author && item.author.name}</Link></span>
|
||||
<span className="mr12">{item.created_at} 发布</span>
|
||||
<span className="mr20">{item.updated_at}更新</span>
|
||||
{item.blockchain_token_num && <span className="mr30"><img src={gold} alt="" width="13px" className="mr3"/>{item.blockchain_token_num}</span>}
|
||||
{item.milestone_name &&
|
||||
<Link to={`/${owner}/${projectsId}/milestones/${item.milestone_id}`} onClick={()=>{window.scrollTo(0,0)}} style={{maxWidth:item.blockchain_token_num ? "261px":"340px",color:"#898d9d"}} title={item.milestone_name} className="task-hide mr20">
|
||||
<i className="iconfont icon-lichengbeiicon1 font-12 mr3"></i>
|
||||
{item.milestone_name}
|
||||
</Link>
|
||||
}
|
||||
<span style={{maxWidth:"100px"}} className="task-hide"><Tooltip placement={"bottom"} title={item.test_case}>{item.test_case}</Tooltip></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div className="issuecondition">
|
||||
{
|
||||
item.assigners && item.assigners.length > 0 ?
|
||||
<Tooltip title={renderName(item.assigners)} placement="bottomRight">
|
||||
<div className={item.assigners.length > 1 ?"principal hovers":"principal"}>
|
||||
{/* {
|
||||
item.assigners.map((i,k)=>{
|
||||
return(
|
||||
k<5 && <Link to={`/${i.login}`} style={{right:`${(item.assigners.length-k-1)*(22-7)}px`,zIndex:k+1}}><img src={getImageUrl(i.image_url)} alt="" /></Link>
|
||||
)
|
||||
})
|
||||
} */}
|
||||
<span className="task-hide" style={{wordBreak:'break-all'}}>{renderName(item.assigners)}</span>
|
||||
</div>
|
||||
</Tooltip>
|
||||
:""
|
||||
}
|
||||
<div style={{color:item.status_name === "已解决" ?"#28bd6c":'#40424a'}}>{item.status_name}</div>
|
||||
<div className="commentnum">
|
||||
<Link to={`/${owner}/${projectsId}/issues/${item.project_issues_index}#commentList`}><i className="iconfont icon-a-xiaoxi1 mr5 font-15"></i>{item.comment_journals_count}</Link>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
export default Datas;
|
||||
|
|
@ -0,0 +1,149 @@
|
|||
import React,{useRef,useEffect, useState , forwardRef } from 'react';
|
||||
import { Dropdown , Calendar , Select, Radio, Col, Row } from 'antd';
|
||||
import { findDOMNode } from 'react-dom';
|
||||
import moment from 'moment';
|
||||
const { Group , Button } = Radio;
|
||||
|
||||
function Date({name , today , setDate , editFlag},ref){
|
||||
const [ visible , setVisible ] = useState(false);
|
||||
const [ time , setTime ] = useState();
|
||||
|
||||
useEffect(()=>{
|
||||
if(today){
|
||||
setTime(today);
|
||||
}
|
||||
},[today])
|
||||
|
||||
const refFa = useRef(null);
|
||||
const refBox = useRef(null);
|
||||
|
||||
useEffect(()=>{
|
||||
if(!visible && !editFlag && (time && time !== today)){
|
||||
setDate(time);
|
||||
}
|
||||
},[visible,editFlag,time])
|
||||
|
||||
|
||||
useEffect(() => {
|
||||
document.addEventListener('click', clickMe , false);
|
||||
}, [])
|
||||
|
||||
const clickMe = ({ target }) => {
|
||||
// 查找父组件
|
||||
const faComponent = findDOMNode(refFa.current);
|
||||
const boxComponent = findDOMNode(refBox.current);
|
||||
if (faComponent && boxComponent) {
|
||||
const isChild = faComponent.contains(target);
|
||||
const isBox = boxComponent.contains(target);
|
||||
let role = target.getAttribute("role");
|
||||
if(!isChild && !isBox && !(role && role === "option")){
|
||||
setVisible(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
function onSelect(t){
|
||||
setTime(moment(t).format('YYYY-MM-DD'));
|
||||
setDate(moment(t).format('YYYY-MM-DD'));
|
||||
setVisible(false);
|
||||
}
|
||||
const overlay=(
|
||||
<div ref={refFa} style={{ width: 280, border: '1px solid #d9d9d9', borderRadius: 4 ,backgroundColor:"#fff",marginTop:"-10px"}}>
|
||||
<Calendar
|
||||
fullscreen={false}
|
||||
headerRender={({ value, type, onChange, onTypeChange }) => {
|
||||
const start = 0;
|
||||
const end = 12;
|
||||
const monthOptions = [];
|
||||
const current = value.clone();
|
||||
const localeData = value.localeData();
|
||||
const months = [];
|
||||
for (let i = 0; i < 12; i++) {
|
||||
current.month(i);
|
||||
months.push(localeData.monthsShort(current));
|
||||
}
|
||||
|
||||
for (let index = start; index < end; index++) {
|
||||
monthOptions.push(
|
||||
<Select.Option className="month-item" key={`${index}`}>
|
||||
{months[index]}
|
||||
</Select.Option>,
|
||||
);
|
||||
}
|
||||
const month = value.month();
|
||||
|
||||
const year = value.year();
|
||||
const options = [];
|
||||
for (let i = year - 10; i < year + 10; i += 1) {
|
||||
options.push(
|
||||
<Select.Option key={i} value={i} className="year-item">
|
||||
{i}
|
||||
</Select.Option>,
|
||||
);
|
||||
}
|
||||
return (
|
||||
<div style={{ padding: 10 }}>
|
||||
|
||||
<Row type="flex" justify="space-between">
|
||||
<Col>
|
||||
<Group size="small" onChange={e => {console.log("typyCHange:",e);onTypeChange(e.target.value)}} value={type}>
|
||||
<Button value="month">日期</Button>
|
||||
<Button value="year">月份</Button>
|
||||
</Group>
|
||||
</Col>
|
||||
<Col>
|
||||
<Select
|
||||
size="small"
|
||||
dropdownMatchSelectWidth={false}
|
||||
className="my-year-select"
|
||||
style={{ width: 80 }}
|
||||
onChange={newYear => {
|
||||
const now = value.clone().year(newYear);
|
||||
setTime(moment(now).format('YYYY-MM-DD'));
|
||||
onChange(now);
|
||||
}}
|
||||
value={String(year)}
|
||||
>
|
||||
{options}
|
||||
</Select>
|
||||
</Col>
|
||||
<Col>
|
||||
<Select
|
||||
size="small"
|
||||
dropdownMatchSelectWidth={false}
|
||||
value={String(month)}
|
||||
onChange={selectedMonth => {
|
||||
const newValue = value.clone();
|
||||
newValue.month(parseInt(selectedMonth, 10));
|
||||
setTime(moment(newValue).format('YYYY-MM-DD'));
|
||||
onChange(newValue);
|
||||
}}
|
||||
>
|
||||
{monthOptions}
|
||||
</Select>
|
||||
</Col>
|
||||
</Row>
|
||||
</div>
|
||||
);
|
||||
}}
|
||||
onSelect={onSelect}
|
||||
/>
|
||||
</div>
|
||||
)
|
||||
return(
|
||||
<Dropdown
|
||||
placement={"bottomLeft"}
|
||||
overlay={overlay}
|
||||
visible={visible}
|
||||
trigger={['click']}
|
||||
>
|
||||
<li>
|
||||
<span>
|
||||
{name}
|
||||
{!editFlag && <a ref={refBox} onClick={()=>setVisible(visible ? false : true)}><i className="iconfont icon-riqi font-14" style={{color:"#898d9d"}}></i></a> }
|
||||
</span>
|
||||
<p className={time ? "operatevalue color-grey-3 task-hide" : "operatevalue task-hide"}>{time || "未设置"}</p>
|
||||
</li>
|
||||
</Dropdown>
|
||||
)
|
||||
}
|
||||
export default forwardRef(Date);
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
import React from "react";
|
||||
import Modals from '../../Component/PublicModal/Index';
|
||||
import { AlignTop } from '../../Component/layout';
|
||||
import { Button } from 'antd';
|
||||
|
||||
function DelBox({visible,onCancel,onSuccess,content,title}){
|
||||
return(
|
||||
<Modals
|
||||
visible={visible}
|
||||
onCancel={onCancel}
|
||||
title={title || "删除疑修"}
|
||||
btn={
|
||||
<div>
|
||||
<Button size={'large'} onClick={onCancel}>取消</Button>
|
||||
<Button type={"danger"} size={"large"} onClick={onSuccess}>确认删除</Button>
|
||||
</div>
|
||||
}
|
||||
>
|
||||
<div className="desc">
|
||||
<AlignTop className="deldesc">
|
||||
<i className="iconfont icon-jinggao1 mr10 font-20 red"></i>
|
||||
{ content ?
|
||||
content
|
||||
:
|
||||
<div style={{paddingTop:"3px"}}><p className="font-15 mb20">您确定要删除所有选中的疑修？</p><p className="color-grey-6">此操作将清空所有已选中的疑修，请谨慎操作</p></div>
|
||||
}
|
||||
</AlignTop>
|
||||
</div>
|
||||
</Modals>
|
||||
)
|
||||
}
|
||||
export default DelBox;
|
||||
|
|
@ -0,0 +1,54 @@
|
|||
import React , { useState , useEffect , useRef,useMemo} from 'react';
|
||||
import { Select , Spin } from 'antd';
|
||||
import debounce from 'lodash/debounce';
|
||||
|
||||
function DebounceSelect({ fetchOptions, debounceTimeout = 600, ...props }) {
|
||||
const [fetching, setFetching] = useState(false);
|
||||
const [options, setOptions] = useState([]);
|
||||
const fetchRef = useRef(0);
|
||||
|
||||
useEffect(()=>{
|
||||
fetchOptions("").then((newOptions) => {
|
||||
setOptions(newOptions);
|
||||
});
|
||||
},[])
|
||||
|
||||
const debounceFetcher = useMemo(() => {
|
||||
const loadOptions = (value) => {
|
||||
fetchRef.current += 1;
|
||||
const fetchId = fetchRef.current;
|
||||
setOptions([]);
|
||||
setFetching(true);
|
||||
fetchOptions(value).then((newOptions) => {
|
||||
if (fetchId !== fetchRef.current) {
|
||||
// for fetch callback order
|
||||
return;
|
||||
}
|
||||
setOptions(newOptions);
|
||||
setFetching(false);
|
||||
});
|
||||
};
|
||||
return debounce(loadOptions, debounceTimeout);
|
||||
}, [fetchOptions, debounceTimeout]);
|
||||
|
||||
return (
|
||||
<Select
|
||||
labelInValue
|
||||
filterOption={false}
|
||||
onSearch={debounceFetcher}
|
||||
notFoundContent={fetching ? <Spin size="small" /> : null}
|
||||
{...props}
|
||||
defaultActiveFirstOption={false}
|
||||
>
|
||||
{
|
||||
options && options.length >0 &&
|
||||
options.map((i)=>{
|
||||
return(
|
||||
<Select.Option value={i.value}>{i.value}</Select.Option>
|
||||
)
|
||||
})
|
||||
}
|
||||
</Select>
|
||||
);
|
||||
}
|
||||
export default DebounceSelect
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
import React,{useState, useEffect, useRef, useImperativeHandle,forwardRef} from 'react';
|
||||
import { Dropdown } from 'antd';
|
||||
import { findDOMNode } from 'react-dom';
|
||||
|
||||
function Drop({overlay , children , placement, overlayClassName},ref){
|
||||
const [ visible , setVisible ] = useState(false);
|
||||
const refFa = useRef(null);
|
||||
const refBox = useRef(null);
|
||||
|
||||
useImperativeHandle(ref, () => ({
|
||||
clearVisible: (v) => {
|
||||
// 父组件按钮：清除筛选条件，将dropmenu里的choose字段全部改为0
|
||||
setVisible(v);
|
||||
}
|
||||
}))
|
||||
|
||||
useEffect(() => {
|
||||
document.addEventListener('click', clickMe , false);
|
||||
}, [])
|
||||
|
||||
const clickMe = ({ target }) => {
|
||||
// 查找父组件
|
||||
const faComponent = findDOMNode(refFa.current);
|
||||
const boxComponent = findDOMNode(refBox.current);
|
||||
if (faComponent && boxComponent) {
|
||||
const isChild = faComponent.contains(target);
|
||||
const isBox = boxComponent.contains(target);
|
||||
if(!isChild && !isBox){
|
||||
setVisible(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
return(
|
||||
<Dropdown
|
||||
placement={placement}
|
||||
visible={visible}
|
||||
overlay={<div ref={refFa}>{overlay}</div>}
|
||||
trigger={['click']}
|
||||
overlayClassName={overlayClassName}
|
||||
>
|
||||
<span className="dropspan" ref={refBox} onClick={()=>setVisible(visible ? false : true)}>
|
||||
{children}
|
||||
</span>
|
||||
</Dropdown>
|
||||
)
|
||||
}
|
||||
export default forwardRef(Drop);
|
||||
|
|
@ -0,0 +1,210 @@
|
|||
import React ,{ useState , useEffect , useRef } from 'react';
|
||||
import { findDOMNode } from 'react-dom';
|
||||
import { Dropdown , Menu , Input , message} from 'antd';
|
||||
import { getImageUrl } from 'educoder';
|
||||
|
||||
const { Search } = Input;
|
||||
/**
|
||||
*
|
||||
* @param {placeholder} placeholder:默认显示内容（为空时）
|
||||
* @param {editFlag} editFlag:是否有编辑权限
|
||||
* @param {searchFlag} searchFlag:是否显示搜索框
|
||||
* @param {selectValueList} selectValueList:将选中的list保存
|
||||
* @param {searchFunc} searchFunc:搜索方法
|
||||
* @param {onAdd} onAdd:标记管理
|
||||
* @param {headImg} headImg:是否显示头像
|
||||
* @param {menus} menus:下拉列表
|
||||
* @param {chooseFunc} chooseFunc:选择下拉列表
|
||||
* @param {double} double:undefined为单选，有值就是最多选的数量
|
||||
* @param {colorFlag} colorFlag:选中值需根据颜色显示背景
|
||||
* @param {mustFlag} mustFlag:必须选择一个
|
||||
* @param {removeFlag} removeFlag:移除按钮
|
||||
* @returns
|
||||
*/
|
||||
function DropMenu({
|
||||
placeholder ="未设置",
|
||||
editFlag,
|
||||
searchFlag,
|
||||
selectValueList,
|
||||
searchFunc,
|
||||
onAdd,
|
||||
headImg,
|
||||
menus,
|
||||
chooseFunc,double,colorFlag,mustFlag,removeFlag
|
||||
}){
|
||||
const [ visible , setVisible ] = useState(false);
|
||||
const [ searchValue , setSearchValue ]= useState(undefined);
|
||||
const [ valuesId , setValuesId ] = useState([]);
|
||||
const [ valuesName , setValuesName ] = useState([]);
|
||||
|
||||
const refFa = useRef(null);
|
||||
const refBox = useRef(null);
|
||||
|
||||
// 根据选中的列表循环出id数组
|
||||
useEffect(()=>{
|
||||
if(selectValueList && selectValueList.length > 0 ){
|
||||
renderSelectList(selectValueList);
|
||||
}else{
|
||||
setValuesId([])
|
||||
}
|
||||
},[selectValueList])
|
||||
|
||||
function renderSelectList(list){
|
||||
let a = list && list.length > 0 && list.map((i,k)=>{
|
||||
return i.id ? i.id.toString() : i.name
|
||||
})
|
||||
setValuesId(a);
|
||||
setValuesName(list);
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
document.addEventListener('click', clickMe , false);
|
||||
}, [])
|
||||
|
||||
const clickMe = ({ target }) => {
|
||||
// 查找父组件
|
||||
const faComponent = findDOMNode(refFa.current);
|
||||
const boxComponent = findDOMNode(refBox.current);
|
||||
if (faComponent && boxComponent) {
|
||||
const isChild = faComponent.contains(target);
|
||||
const isBox = boxComponent.contains(target);
|
||||
if(!isChild && !isBox){
|
||||
setVisible(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
// 搜索
|
||||
function changeSearchvalue(e){
|
||||
setSearchValue(e.target.value);
|
||||
searchFunc(e.target.value);
|
||||
}
|
||||
|
||||
function chooseMenu(i){
|
||||
let list = selectValueList;
|
||||
let re = [];
|
||||
re = list && list.length > 0 ? list:[];
|
||||
let filter = [];
|
||||
if(i.id){
|
||||
filter = list.filter(j=>j.id === i.id);
|
||||
}else{
|
||||
filter = list.filter(j=>j.name === i.name);
|
||||
}
|
||||
if(filter && filter.length > 0){
|
||||
if(!mustFlag){
|
||||
if(i.id){
|
||||
re = list.filter(j=>j.id !== i.id);
|
||||
}else{
|
||||
re = list.filter(j=>j.name !== i.name);
|
||||
}
|
||||
renderSelectList(re);
|
||||
chooseFunc(re);
|
||||
!double && setVisible(false);
|
||||
}else{
|
||||
setVisible(false);
|
||||
}
|
||||
}else{
|
||||
if(double && (selectValueList && selectValueList.length >= double)){
|
||||
message.info(`最多只能添加${double}个${placeholder}`);
|
||||
return;
|
||||
}
|
||||
if(double){
|
||||
re.push(i);
|
||||
}else{
|
||||
re = [i];
|
||||
setVisible(false);
|
||||
}
|
||||
renderSelectList(re);
|
||||
chooseFunc(re);
|
||||
}
|
||||
}
|
||||
|
||||
function showRemoveFunc(item){
|
||||
let l = selectValueList ;
|
||||
l = l.filter(i=>(i.id ? i.id.toString() : i.name) !== item.toString());
|
||||
renderSelectList(l);
|
||||
chooseFunc(l);
|
||||
}
|
||||
|
||||
function renderNames(nameArrs){
|
||||
return <React.Fragment>
|
||||
{
|
||||
nameArrs && nameArrs.length>0?
|
||||
nameArrs.map((i,k)=>{
|
||||
return(
|
||||
<p style={{display:"flex",alignItems:"center"}} className={removeFlag?"removeFlag":''}>
|
||||
{i.image_url && <img src={getImageUrl(i.image_url)} alt="" width="28px" height="28px" style={{borderRadius:"50%",marginTop:"5px"}} className="mr5"/>}
|
||||
{
|
||||
colorFlag ?
|
||||
(
|
||||
colorFlag === "2" ?
|
||||
<span className={"colorsquare task-hide"} style={{backgroundColor:`${i.color}`}}>{i.name}</span>
|
||||
:
|
||||
<span className={"colorsborder task-hide"} style={{borderColor:`${i.color}`,color:`${i.color}`}}>{i.name}</span>
|
||||
)
|
||||
:
|
||||
<span className={"task-hide"}>{i.name}</span>
|
||||
}
|
||||
{ removeFlag && <a className="removeicon" onClick={()=>showRemoveFunc(i.id || i.name)}><i className="iconfont icon-shanchu8 font-14"></i></a>}
|
||||
</p>
|
||||
)
|
||||
})
|
||||
:<span>{placeholder}</span>
|
||||
}
|
||||
</React.Fragment>
|
||||
}
|
||||
return(
|
||||
<li>
|
||||
<span>
|
||||
{placeholder}
|
||||
{!editFlag &&
|
||||
<a ref={refBox} onClick={()=>setVisible(visible ? false : true)}>
|
||||
<i className="iconfont icon-a-bianji12 font-13" style={{color:"#898d9d"}}></i>
|
||||
</a>
|
||||
}
|
||||
</span>
|
||||
<Dropdown
|
||||
visible={visible}
|
||||
overlayClassName={"overlayStyle"}
|
||||
placement="bottomLeft"
|
||||
trigger={['click']}
|
||||
overlay={
|
||||
<div ref={refFa}>
|
||||
{ searchFunc &&
|
||||
<div className="searchbox">
|
||||
<Search
|
||||
placeholder={`搜索${placeholder}`}
|
||||
value={searchValue}
|
||||
onChange={changeSearchvalue}
|
||||
style={{marginRight:"18px"}}
|
||||
/>
|
||||
</div>
|
||||
}
|
||||
{
|
||||
menus && menus.length >0?
|
||||
<Menu className="piecemenu" selectedKeys={valuesId}>
|
||||
{
|
||||
menus.map((i,k)=>{
|
||||
return(
|
||||
<Menu.Item key={i.id || i.name} onClick={()=>chooseMenu(i)}>
|
||||
{ headImg && <img src={getImageUrl(i.image_url)} alt="" width="22px" className="mr5 radius"/>}
|
||||
{i.color && <span style={{backgroundColor:i.color}} className="colorpiece"></span>}
|
||||
<span className="task-hide">{i.name}</span>
|
||||
</Menu.Item>
|
||||
)
|
||||
})
|
||||
}
|
||||
</Menu>
|
||||
:
|
||||
<div className="menusEmpty">
|
||||
<p>{searchValue ? <span>暂无{placeholder}“{searchValue}”</span>: `暂无${placeholder}`}</p>
|
||||
</div>
|
||||
}
|
||||
{ onAdd && <div className="pl35 pr20 pb20"><a className="color-blue font-15" onClick={()=>{setVisible(false);onAdd()}}><i className="iconfont icon-a-bianji12 font-14 mr5"></i>创建标记</a></div>}
|
||||
</div>
|
||||
}>
|
||||
<div className={selectValueList && selectValueList.length > 0 ? "operatevalue color-grey-3":"operatevalue"}>{renderNames(selectValueList)}</div>
|
||||
</Dropdown>
|
||||
</li>
|
||||
)
|
||||
}
|
||||
export default DropMenu;
|
||||
|
|
@ -0,0 +1,93 @@
|
|||
import React ,{ useState , useRef , useEffect } from 'react';
|
||||
import { Input , Menu , Icon } from 'antd';
|
||||
import { getImageUrl } from 'educoder';
|
||||
import Drop from './drop';
|
||||
const { Search } = Input;
|
||||
|
||||
/**
|
||||
* @param {className} <li>的样式名称
|
||||
* @param {name} 未选择时显示的内容
|
||||
* @param {lists} 下拉列表，从接口获取，需一一填充
|
||||
* @param {imgControl} 控制是否显示头像
|
||||
* @param {size} 下拉框宽度，small：120px,large:260px
|
||||
* @param {ids} 默认选择的项的id数组
|
||||
* @param {search} 搜索方法
|
||||
* @param {chooseFunc} 选择项后需调用列表的查询方法
|
||||
* @param {update} 编辑状态
|
||||
* @param {double} 是否可以多选
|
||||
*/
|
||||
function Menus({className,name, ids , lists , size , imgControl , searchFunc , chooseFunc , update , double ,names },ref){
|
||||
const dropRef = useRef(null);
|
||||
const [ chooseValue , setChooseValue ] = useState([]);
|
||||
const [ showValue , setShowValue ] = useState(undefined);
|
||||
|
||||
useEffect(()=>{
|
||||
ids ? setChooseValue(ids.split(",")) : setChooseValue([]);
|
||||
setShowValue(names);
|
||||
},[ids,names])
|
||||
|
||||
|
||||
// 修改menus数组里的字段值
|
||||
function changeMenusValue(i){
|
||||
let l = ids;
|
||||
let id = i.id.toString();
|
||||
if(double){
|
||||
l = ids ? ids.split(",") : [] ;
|
||||
let nameArr = names ? names.split(",") : [] ;
|
||||
if(l && l.indexOf(id)>=0){
|
||||
l = l.filter(k=>k.toString() !== id);
|
||||
nameArr = nameArr.filter(k=>k.toString() !== i.name);
|
||||
}else{
|
||||
l.push(id);
|
||||
nameArr.push(i.name);
|
||||
}
|
||||
setChooseValue(l);
|
||||
setShowValue(nameArr.join(","));
|
||||
chooseFunc(l,nameArr.join(","));
|
||||
}else{
|
||||
if(l && l.indexOf(id)>=0){
|
||||
setChooseValue([]);
|
||||
setShowValue(undefined);
|
||||
chooseFunc([]);
|
||||
}else{
|
||||
setChooseValue([`${i.id}`]);
|
||||
setShowValue([i.name]);
|
||||
chooseFunc([id],i.name);
|
||||
}
|
||||
dropRef.current && dropRef.current.clearVisible(false);
|
||||
}
|
||||
}
|
||||
|
||||
function menu(data){
|
||||
return <div className={`overlaydrop ${size}`}>
|
||||
{ size !== "small" &&
|
||||
<div className="pb10"><Search placeholder={`搜索${name}`} onChange={(e)=>searchFunc(e.target.value)}/></div>
|
||||
}
|
||||
{
|
||||
data && data.length>0 ?
|
||||
<Menu selectedKeys={chooseValue}>
|
||||
{
|
||||
data.map((i,j)=>{
|
||||
return <Menu.Item key={i.id}>
|
||||
{imgControl && <img src={getImageUrl(i.image_url)} alt=""/>}
|
||||
{i.color && <span style={{backgroundColor:i.color,marginRight:"0px"}} className="colorpiece"></span>}
|
||||
<span className="task-hide" onClick={()=>changeMenusValue(i)}>{i.name}</span>
|
||||
</Menu.Item>
|
||||
})
|
||||
}
|
||||
</Menu>
|
||||
:
|
||||
<div className="pl15">暂无{ids ? <span>'{name}'</span>: name}</div>
|
||||
}
|
||||
</div>
|
||||
}
|
||||
return(
|
||||
<li className={className || ""}>
|
||||
<Drop className={className} ref={dropRef} overlay={menu(lists)} placement={"bottomRight"} >
|
||||
<span className="task-hide">{showValue || (update ? `更换${name}` : name) }</span>
|
||||
<Icon type="caret-down" className="color-grey-6" />
|
||||
</Drop>
|
||||
</li>
|
||||
)
|
||||
}
|
||||
export default Menus;
|
||||
|
|
@ -0,0 +1,129 @@
|
|||
import React , { forwardRef , useState } from 'react';
|
||||
import { Form , Input , Button } from 'antd';
|
||||
import MDEditor from "../../../modules/tpm/challengesnew/tpm-md-editor";
|
||||
import Upload from "../../Upload/Index";
|
||||
import Attachments from "../../Upload/attachment";
|
||||
import UploadImg from '../Img/UploadImg.png';
|
||||
|
||||
function NewPanel(props,ref){
|
||||
const [ description , setDescription ] = useState(undefined);
|
||||
const [ fileList , setFileList] = useState(undefined);
|
||||
const [ attachments , setAttachments ] = useState([]);
|
||||
const [ save , setSave ] = useState([]);
|
||||
const [ receivers_login , setReceiversLogin ] = useState(undefined);
|
||||
|
||||
const { createFunc , title , desc , files , onCancel , owner , projectsId } = props;
|
||||
|
||||
const { form: { getFieldDecorator, validateFields , setFieldsValue } } = props;
|
||||
useState(()=>{
|
||||
title && setTimeout(()=>{
|
||||
setFieldsValue({subject:title});
|
||||
desc && onContentChange(desc);
|
||||
},100)
|
||||
files && setAttachments(files);
|
||||
files && setSave(files);
|
||||
},[title , desc , files])
|
||||
|
||||
function onContentChange(value){
|
||||
setDescription(value);
|
||||
}
|
||||
function UploadFunc(f){
|
||||
let list = [];
|
||||
let arr = [];
|
||||
if(save && save.length>0 ){
|
||||
arr = save.map(i=>{return i.id});
|
||||
}
|
||||
list = arr && arr.length>0 ? f.concat(arr) : f ;
|
||||
setFileList(list);
|
||||
};
|
||||
|
||||
function deleteLoad(id){
|
||||
let arr = [];
|
||||
let list = save;
|
||||
if(list && list.length>0 ){
|
||||
arr = list.filter(i=>i.id !== id);
|
||||
}
|
||||
setFileList(arr.map(i=>{return i.id}));
|
||||
setSave(arr);
|
||||
}
|
||||
|
||||
function changeAtWhoLoginList(loginList){
|
||||
let list = new Set(receivers_login);
|
||||
loginList.map(item => list.add(item));
|
||||
setReceiversLogin(Array.from(list));
|
||||
};
|
||||
|
||||
function sureFunc(){
|
||||
validateFields((error,values)=>{
|
||||
if (!error) {
|
||||
createFunc(values,fileList,receivers_login,description);
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
function cancelFunc(){
|
||||
if(onCancel){
|
||||
onCancel();
|
||||
}else{
|
||||
window.history.back(-1);
|
||||
}
|
||||
}
|
||||
return(
|
||||
<React.Fragment>
|
||||
<Form className="explain">
|
||||
<Form.Item>
|
||||
{getFieldDecorator("subject",{
|
||||
rules:[{required:true,message:"请输入疑修标题"}]
|
||||
})(
|
||||
<Input placeholder="标题" maxLength={100}/>
|
||||
)}
|
||||
</Form.Item>
|
||||
</Form>
|
||||
<div style={{position: 'relative'}}>
|
||||
<MDEditor
|
||||
placeholder={"请输入描述信息"}
|
||||
height={392}
|
||||
mdID={"issue-edit-description"}
|
||||
initValue={description}
|
||||
onChange={onContentChange}
|
||||
className="mt20"
|
||||
isCanAtme = {true}
|
||||
isQuoteIssue={true}
|
||||
owner = {owner}
|
||||
projectsId = {projectsId}
|
||||
changeAtWhoLoginList = {changeAtWhoLoginList}
|
||||
></MDEditor>
|
||||
</div>
|
||||
<div className="pb20">
|
||||
<Upload
|
||||
className="commentStyle mt20"
|
||||
isComplete={true}
|
||||
load={UploadFunc}
|
||||
icon={
|
||||
<img
|
||||
src={UploadImg}
|
||||
width="58"
|
||||
alt=""
|
||||
style={{ marginBottom: 15 }}
|
||||
/>
|
||||
}
|
||||
size={100}
|
||||
showNotification={props.showNotification}
|
||||
/>
|
||||
{attachments && attachments.length > 0 &&
|
||||
<Attachments
|
||||
attachments={attachments}
|
||||
showNotification={props.showNotification}
|
||||
canDelete={true}
|
||||
deleteLoad={deleteLoad}
|
||||
></Attachments>
|
||||
}
|
||||
</div>
|
||||
<div style={{display:"flex"}}>
|
||||
<Button type="primary" className="operateButton" style={{width:"100px"}} onClick={sureFunc}>{ title ? "保存" :"创建"}</Button>
|
||||
<Button className="ml30" style={{width:"100px"}} onClick={cancelFunc}>取消</Button>
|
||||
</div>
|
||||
</React.Fragment>
|
||||
)
|
||||
}
|
||||
export default forwardRef(NewPanel);
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 2.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 255 B |
Binary file not shown.
|
After Width: | Height: | Size: 133 B |
Binary file not shown.
|
After Width: | Height: | Size: 50 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 708 B |
Binary file not shown.
|
After Width: | Height: | Size: 2.9 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 608 B |
Binary file not shown.
|
After Width: | Height: | Size: 2.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.0 KiB |
|
|
@ -0,0 +1,525 @@
|
|||
import React , { useEffect , useState , forwardRef , useRef } from 'react';
|
||||
import { Spin , Form , InputNumber, message } from 'antd';
|
||||
import { getImageUrl } from 'educoder';
|
||||
import { Link } from 'react-router-dom';
|
||||
import { Box , LongWidth } from '../../Component/layout';
|
||||
import RenderHtml from "../../../components/render-html";
|
||||
import DropMenu from '../Component/dropMenu';
|
||||
import NewPanel from '../Component/newPanel';
|
||||
import Attachments from "../../Upload/attachment";
|
||||
import DelBox from '../Component/delBox';
|
||||
import Date from '../Component/date';
|
||||
import moment from 'moment';
|
||||
import Copy from '../Component/copy';
|
||||
import axios from 'axios';
|
||||
import CommentList from '../Component/comments/list';
|
||||
import Claims from '../../claims/claims';
|
||||
import ChooseMenu from '../Component/chooseMenu';
|
||||
import CaseDrop from '../Component/caseDrop';
|
||||
|
||||
function Details(props){
|
||||
const owner = props.match.params.owner;
|
||||
const projectsId = props.match.params.projectsId;
|
||||
const index = props.match.params.index;
|
||||
|
||||
const [ details , setDetails ] = useState(undefined);
|
||||
const [ statusList , setStatusList ] = useState([]);
|
||||
const [ prioritiesList , setPrioritiesList ] = useState([]);
|
||||
const [ chargeList , setChargeList ] = useState([]);
|
||||
const [ charge , setCharge ] = useState(undefined);
|
||||
const [ millstoneList , setMillstoneList ] = useState([]);
|
||||
const [ millstone , setMillstone ] = useState(undefined);
|
||||
const [ tagList , setTagList ] = useState(undefined);
|
||||
const [ tag , setTag ] = useState(undefined);
|
||||
const [ branchList , setBranchList ] = useState(undefined);
|
||||
const [ branch , setBranch ] = useState(undefined);
|
||||
const [ desc , setDesc ] = useState(undefined);
|
||||
|
||||
const [ orderId , setOrderId ] = useState(undefined);
|
||||
|
||||
const [ delVisible , setDelVisible] = useState(false);
|
||||
const [ edit , setEdit] = useState(false);
|
||||
const [ copy , setCopy] = useState(false);
|
||||
|
||||
const [ start_date, setStartDate ] = useState("");
|
||||
const [ due_date, setDueDate ] = useState("");
|
||||
const [ commentReload, setCommentReload] = useState(undefined);
|
||||
const [ editFlag , setEditFlag ] = useState(false);
|
||||
const [ amountEditFlag , setAmountEditFlag ] = useState(false);
|
||||
|
||||
const [ assigner_choose , setAssigner_choose ] = useState([]);
|
||||
const [ prioritie_choose , setPrioritie_choose ] = useState([]);
|
||||
const [ status_choose , setStatus_choose ] = useState([]);
|
||||
const [ tag_choose , setTag_choose ] = useState([]);
|
||||
const [ millstone_choose , setMillstone_choose ] = useState([]);
|
||||
const [ branch_choose , setBranch_choose ] = useState([]);
|
||||
const [ rewardAmount , setRewardAmount ] = useState(undefined);
|
||||
const [ rewardFlag , setRewardFlag ] = useState(false);
|
||||
const [ caseValue, setCaseValue ] = useState(undefined);
|
||||
|
||||
const pathname = props.history.location.pathname;
|
||||
const permission = props && props.projectDetail && props.projectDetail.permission;
|
||||
let colors = ["#1abcb1","#28be6c","#e67e22","#db3d1d"];
|
||||
|
||||
const {projectDetail , open_blockchain ,current_user } = props;
|
||||
useEffect(()=>{
|
||||
if(pathname === `/${owner}/${projectsId}/issues/${index}/copy`){
|
||||
setEdit(true);
|
||||
setCopy(true);
|
||||
}else{
|
||||
setEdit(false);
|
||||
setCopy(false);
|
||||
}
|
||||
},[pathname])
|
||||
|
||||
useEffect(()=>{
|
||||
if(projectDetail && details){
|
||||
const { author, name} = projectDetail;
|
||||
document.title = `${details.subject}-疑修-${author.name}/${name}`;
|
||||
}
|
||||
},[details,projectDetail])
|
||||
|
||||
useEffect(()=>{
|
||||
if(index){
|
||||
Init();
|
||||
}
|
||||
},[index])
|
||||
|
||||
function Init(){
|
||||
const url = `/v1/${owner}/${projectsId}/issues/${index}`;
|
||||
axios.get(url).then(result=>{
|
||||
if(result && result.data){
|
||||
let data = result.data;
|
||||
setDetails(data);
|
||||
let per = data && !data.user_permission;
|
||||
setEditFlag(per);
|
||||
|
||||
setDesc(data && data.description);
|
||||
|
||||
const aut = current_user && data.author && (data.author.login === current_user.login);
|
||||
const con = data.pull_fixed === false && aut;
|
||||
setAmountEditFlag(con);
|
||||
|
||||
setAssigner_choose(data.assigners);
|
||||
if(data.priority && data.priority.id){
|
||||
setPrioritie_choose([{...data.priority,color:colors[data.priority.id-1]}]);
|
||||
}else{
|
||||
setPrioritie_choose([]);
|
||||
}
|
||||
setStatus_choose(data.status && data.status.id ? [data.status]:[]);
|
||||
setTag_choose(data.tags);
|
||||
setMillstone_choose(data.milestone && data.milestone.id ? [data.milestone]:[]);
|
||||
setBranch_choose(data.branch_name ? [{name:data.branch_name}] : []);
|
||||
setRewardAmount(data.blockchain_token_num);
|
||||
setCaseValue(data.test_case);
|
||||
|
||||
data.start_date && setStartDate(moment(data.start_date).format('YYYY-MM-DD'));
|
||||
data.due_date && setDueDate(moment(data.due_date).format('YYYY-MM-DD'));
|
||||
|
||||
setOrderId(data.id);
|
||||
}
|
||||
}).catch(error=>{
|
||||
console.log(error);
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
function statusTag(name){
|
||||
switch (name) {
|
||||
case "低":
|
||||
return "status low";
|
||||
case "正常":
|
||||
return "status normals";
|
||||
case "高":
|
||||
return "status hight";
|
||||
default:
|
||||
return "status urgent";
|
||||
}
|
||||
}
|
||||
// 获取状态列表
|
||||
useEffect(()=>{
|
||||
getStatus();
|
||||
},[])
|
||||
function getStatus(){
|
||||
const url = `/v1/${owner}/${projectsId}/issue_statues`;
|
||||
axios.get(url).then(result=>{
|
||||
if(result && result.data){
|
||||
setStatusList(result.data.statues);
|
||||
}
|
||||
})
|
||||
}
|
||||
// 获取优先级列表
|
||||
useEffect(()=>{
|
||||
getPriorities();
|
||||
},[])
|
||||
|
||||
function getPriorities(){
|
||||
const url = `/v1/${owner}/${projectsId}/issue_priorities`;
|
||||
axios.get(url).then(result=>{
|
||||
if(result && result.data){
|
||||
let priorities = result.data.priorities;
|
||||
let array = addColorForPriorities(priorities);
|
||||
setPrioritiesList(array);
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
function addColorForPriorities(list){
|
||||
let array =[];
|
||||
if(list && list.length>0){
|
||||
array = list.map((i,k)=>{
|
||||
let arr = {...i,color:colors[k]}
|
||||
return arr;
|
||||
})
|
||||
}
|
||||
return array;
|
||||
}
|
||||
|
||||
// 获取负责人列表
|
||||
useEffect(()=>{
|
||||
getCharge();
|
||||
},[charge])
|
||||
|
||||
function getCharge(){
|
||||
const url = `/v1/${owner}/${projectsId}/collaborators`;
|
||||
axios.get(url,{params:{keyword:charge,only_name:true}}).then(result=>{
|
||||
if(result && result.data){
|
||||
setChargeList(result.data.collaborators);
|
||||
}
|
||||
})
|
||||
}
|
||||
// 获取里程碑列表
|
||||
useEffect(()=>{
|
||||
getMillstone();
|
||||
},[millstone])
|
||||
|
||||
function getMillstone(){
|
||||
const url = `/v1/${owner}/${projectsId}/milestones`;
|
||||
axios.get(url,{params:{keyword:millstone,only_name:true}}).then(result=>{
|
||||
if(result && result.data){
|
||||
setMillstoneList(result.data.milestones);
|
||||
}
|
||||
})
|
||||
}
|
||||
// 获取标记列表
|
||||
useEffect(()=>{
|
||||
getSign();
|
||||
},[tag])
|
||||
function getSign(){
|
||||
const url = `/v1/${owner}/${projectsId}/issue_tags`;
|
||||
axios.get(url,{params:{keyword:tag,only_name:true}}).then(result=>{
|
||||
if(result && result.data){
|
||||
setTagList(result.data.issue_tags);
|
||||
}
|
||||
})
|
||||
}
|
||||
// 获取标记列表
|
||||
useEffect(()=>{
|
||||
getBranch(branch);
|
||||
},[branch])
|
||||
function getBranch(branch){
|
||||
if(branch){
|
||||
let b = [...branchList];
|
||||
let l = b.filter(i=>i.name.indexOf(branch)>-1);
|
||||
setBranchList(l);
|
||||
return ;
|
||||
}
|
||||
const url = `/${owner}/${projectsId}/branches.json`;
|
||||
axios.get(url,{params:{keyword:tag}}).then(result=>{
|
||||
if(result && result.data){
|
||||
setBranchList(result.data);
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// 可单个编辑保存右侧的项(!copy:非复制状态下)
|
||||
function saveForeach(c,s,p,t,m,b,sDate,eDate,rewardAmount,caseValue){
|
||||
if(!copy){
|
||||
const url = `/v1/${owner}/${projectsId}/issues/${index}`;
|
||||
axios.patch(url,{
|
||||
branch_name: b ? b.join(",") :undefined,
|
||||
status_id: s ? s.join(",") : undefined,
|
||||
priority_id: p ? p.join(",") :undefined,
|
||||
milestone_id: m ? m.join(",") :undefined,
|
||||
issue_tag_ids: t?t:undefined,
|
||||
assigner_ids: c?c:undefined,
|
||||
start_date:sDate,
|
||||
due_date:eDate,
|
||||
blockchain_token_num:rewardAmount,
|
||||
test_case:caseValue
|
||||
}).then(result=>{
|
||||
if(result){
|
||||
Init();
|
||||
// 更新操作日志
|
||||
setCommentReload(Math.random());
|
||||
}
|
||||
}).catch(error=>{})
|
||||
}
|
||||
}
|
||||
|
||||
function deleteFunc(){
|
||||
const url = `/v1/${owner}/${projectsId}/issues/${index}`;
|
||||
axios.delete(url).then(result=>{
|
||||
if(result){
|
||||
props.showNotification("疑修删除成功！");
|
||||
props.history.push(`/${owner}/${projectsId}/issues`);
|
||||
}
|
||||
}).catch(error=>{})
|
||||
}
|
||||
|
||||
// 编辑保存
|
||||
function createFunc(values,fileList,receivers_login,description){
|
||||
let params ={
|
||||
subject: values.subject,
|
||||
attachment_ids: fileList,
|
||||
receivers_login: receivers_login,
|
||||
description: description
|
||||
}
|
||||
if(!copy){
|
||||
// 调用编辑保存接口
|
||||
const url = `/v1/${owner}/${projectsId}/issues/${index}`;
|
||||
axios.patch(url,{
|
||||
...params
|
||||
}).then(result=>{
|
||||
if(result){
|
||||
window.scrollTo(0,0);
|
||||
props.showNotification("疑修更新成功！");
|
||||
Init();
|
||||
setEdit(false);
|
||||
// 刷新操作记录
|
||||
setCommentReload(Math.random());
|
||||
}
|
||||
}).catch(error=>{})
|
||||
}else{
|
||||
// 调用新建保存接口
|
||||
const url = `/v1/${owner}/${projectsId}/issues`;
|
||||
let b = branch_choose && branch_choose.length>0 ? branch_choose.map(i=>{return i.name}) :undefined;
|
||||
let t = tag_choose && tag_choose.length>0 ? tag_choose.map(i=>{return i.id}) :undefined;
|
||||
let a = assigner_choose && assigner_choose.length>0 ? assigner_choose.map(i=>{return i.id}) :undefined;
|
||||
let m = millstone_choose && millstone_choose.length>0 ? millstone_choose.map(i=>{return i.id}) :undefined;
|
||||
let p = prioritie_choose && prioritie_choose.length>0 ? prioritie_choose.map(i=>{return i.id}) :undefined;
|
||||
let s = status_choose && status_choose.length>0 ? status_choose.map(i=>{return i.id}) :undefined;
|
||||
axios.post(url,{
|
||||
...params,
|
||||
branch_name: b && b.join(","),
|
||||
status_id: s && s.join(","),
|
||||
priority_id: p && p.join(","),
|
||||
milestone_id: m && m.join(","),
|
||||
issue_tag_ids: t,
|
||||
assigner_ids: a,
|
||||
start_date,
|
||||
due_date
|
||||
}).then(result=>{
|
||||
if(result && result.data && result.data.project_issues_index){
|
||||
window.scrollTo(0,0);
|
||||
props.showNotification("任务复制成功！");
|
||||
props.history.push(`/${owner}/${projectsId}/issues/${result.data.project_issues_index}`);
|
||||
}
|
||||
}).catch(error=>{})
|
||||
}
|
||||
}
|
||||
|
||||
// 取消编辑或复制
|
||||
function onCancel(){
|
||||
if(copy){
|
||||
props.history.push(`/${owner}/${projectsId}/issues/${index}`);
|
||||
}else{
|
||||
setEdit(false);
|
||||
window.scrollTo(0,0);
|
||||
}
|
||||
}
|
||||
|
||||
function refreshFunc(){
|
||||
// 更新操作日志
|
||||
setCommentReload(Math.random());
|
||||
}
|
||||
|
||||
|
||||
// 悬赏金额 失去焦点保存数据
|
||||
function amountBlur(e){
|
||||
if(!editFlag){
|
||||
setRewardFlag(false);
|
||||
const value = e.target.value;
|
||||
if(value<0){
|
||||
message.info("请输入大于0的正整数");
|
||||
setRewardAmount(rewardAmount);
|
||||
return;
|
||||
}
|
||||
setRewardAmount(e.target.value);
|
||||
if((value && value >= 0) || !value){
|
||||
saveForeach(undefined,undefined,undefined,undefined,undefined,undefined,undefined,undefined,value);
|
||||
}
|
||||
}
|
||||
}
|
||||
function changeAmount(value){
|
||||
if(amountEditFlag){
|
||||
setRewardAmount(value);
|
||||
}else{
|
||||
setRewardAmount(rewardAmount);
|
||||
}
|
||||
}
|
||||
return(
|
||||
details ?
|
||||
<Box>
|
||||
<LongWidth>
|
||||
<DelBox
|
||||
visible={delVisible}
|
||||
onCancel={()=>setDelVisible(false)}
|
||||
onSuccess={deleteFunc}
|
||||
content={<div style={{paddingTop:"3px"}}><p className="font-15 mb20">您确定要删除当前疑修？</p></div>}
|
||||
/>
|
||||
{
|
||||
edit ?
|
||||
<div style={{paddingTop:"25px"}} >
|
||||
<NewPanel
|
||||
{...props}
|
||||
onCancel={onCancel}
|
||||
title={details.subject}
|
||||
desc={edit ? desc : undefined}
|
||||
files={copy ? undefined : details.attachments}
|
||||
createFunc={createFunc}
|
||||
owner = {owner} projectsId = {projectsId}
|
||||
/>
|
||||
</div>
|
||||
:
|
||||
<div>
|
||||
<div className="editpanel">
|
||||
<div className="detailbanner">
|
||||
<div className="detailtitle">
|
||||
<div className="mb12">
|
||||
{details.priority && <span className={statusTag(details.priority.name)}>{ details.priority.name }</span> }
|
||||
<p className="name">{details.subject}</p>
|
||||
</div>
|
||||
<div>
|
||||
<div className="ilog mt5">
|
||||
<Copy value={`/${owner}/${projectsId}/issues/${index}`}><span className="number">#{details.project_issues_index}</span></Copy>
|
||||
</div>
|
||||
{
|
||||
details.author &&
|
||||
<div>
|
||||
<Link to={`/${details.author.login}`} className="author"><img src={getImageUrl(details.author.image_url)} alt="" />{details.author.name}</Link>
|
||||
<span className="ml10" style={{color:"#898d9d"}}>添加于{details.created_at}</span>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
{
|
||||
details.user_permission &&
|
||||
<ul className="detailoperate">
|
||||
<li><a className="color-blue" onClick={()=>setEdit(true)}><i className="iconfont icon-a-bianji12 font-12 mr5"></i>编辑</a></li>
|
||||
<li><Link to={`/${owner}/${projectsId}/issues/${index}/copy`} className="color-blue ml20"><i className="iconfont icon-a-fuzhi2 font-12 mr5"></i>复制</Link></li>
|
||||
<li><a className="color-red ml20" onClick={()=>setDelVisible(true)}><i className="iconfont icon-fuzhi-shanchu font-12 mr5"></i>删除</a></li>
|
||||
</ul>
|
||||
}
|
||||
</div>
|
||||
<div class="descPanel">
|
||||
{desc ?
|
||||
<RenderHtml owner={owner} projectsId={projectsId} className="break_word_comments imageLayerParent" value={desc} url={props.history.location} />
|
||||
:
|
||||
<span className="color-grey-9 ml3 mr3">暂无描述</span>
|
||||
}
|
||||
{details.attachments && details.attachments.length > 0 ?
|
||||
<Attachments
|
||||
attachments={details.attachments}
|
||||
showNotification={props.showNotification}
|
||||
/>
|
||||
: ""
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
<div id="commentList">
|
||||
<CommentList {...props} issueInfo={details} reload = {commentReload} reloadComment = {()=>{setCommentReload(Math.random())}}/>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
</LongWidth>
|
||||
<div className="shortwidth mt25">
|
||||
{orderId && <div className="claimpart"><Claims issue_id={orderId} {...props} refreshFunc={refreshFunc}/></div>}
|
||||
<ChooseMenu
|
||||
placeholder="负责人"
|
||||
menus={chargeList}
|
||||
searchFunc={(value)=>{setCharge(value)}}
|
||||
headImg
|
||||
selectValueList={assigner_choose}
|
||||
editFlag={editFlag}
|
||||
chooseFunc={(list)=>{setAssigner_choose(list);let l = list && list.length>0 ?list.map(i=>{return i.id || i.name}):[];saveForeach(l);}}
|
||||
double={5}
|
||||
removeFlag={!editFlag}
|
||||
/>
|
||||
<DropMenu
|
||||
placeholder="状态"
|
||||
menus={statusList}
|
||||
selectValueList={status_choose}
|
||||
mustFlag
|
||||
editFlag={editFlag}
|
||||
chooseFunc={(list)=>{setStatus_choose(list);let l = list && list.length>0 ?list.map(i=>{return i.id || i.name}):[];saveForeach(undefined,l);}}
|
||||
/>
|
||||
<DropMenu
|
||||
placeholder="优先级"
|
||||
menus={prioritiesList}
|
||||
selectValueList={prioritie_choose}
|
||||
colorFlag="1"
|
||||
mustFlag
|
||||
editFlag={editFlag}
|
||||
chooseFunc={(list)=>{setPrioritie_choose(list);let l = list && list.length>0 ?list.map(i=>{return i.id || i.name}):[];saveForeach(undefined,undefined,l);}}
|
||||
/>
|
||||
<ChooseMenu
|
||||
placeholder="标记"
|
||||
menus={tagList}
|
||||
searchFunc={(value)=>{setTag(value)}}
|
||||
selectValueList={tag_choose}
|
||||
chooseFunc={(list)=>{setTag_choose(list);let l = list && list.length>0 ?list.map(i=>{return i.id || i.name}):[];saveForeach(undefined,undefined,undefined,l);}}
|
||||
double={3}
|
||||
colorFlag="2"
|
||||
removeFlag={!editFlag}
|
||||
editFlag={editFlag}
|
||||
onAdd={permission && permission !== "Reporter" ? ()=>{getSign();} :false}
|
||||
owner={owner}
|
||||
projectsId={projectsId}
|
||||
/>
|
||||
<ChooseMenu
|
||||
placeholder="里程碑"
|
||||
menus={millstoneList}
|
||||
searchFunc={(value)=>{setMillstone(value)}}
|
||||
selectValueList={millstone_choose}
|
||||
editFlag={editFlag}
|
||||
auto
|
||||
chooseFunc={(list)=>{setMillstone_choose(list);let l = list && list.length>0 ?list.map(i=>{return i.id || i.name}):[];saveForeach(undefined,undefined,undefined,undefined,l);}}
|
||||
/>
|
||||
<ChooseMenu
|
||||
placeholder="关联分支"
|
||||
menus={branchList}
|
||||
auto
|
||||
searchFunc={(value)=>{setBranch(value)}}
|
||||
selectValueList={branch_choose}
|
||||
editFlag={editFlag}
|
||||
chooseFunc={(list)=>{setBranch_choose(list);let l = list && list.length>0 ?list.map(i=>{return i.id || i.name}):[];saveForeach(undefined,undefined,undefined,undefined,undefined,l);}}
|
||||
/>
|
||||
{
|
||||
open_blockchain &&
|
||||
<li style={{paddingBottom:"0px"}}>
|
||||
<span>
|
||||
悬赏金额
|
||||
{/* {!editFlag && <a onClick={editReward}><i className="iconfont icon-a-bianji12 font-13" style={{color:"#898d9d"}}></i></a> } */}
|
||||
</span>
|
||||
<InputNumber
|
||||
onBlur={amountBlur}
|
||||
placeholder="请输入悬赏金额"
|
||||
style={{width:"100%",color:rewardAmount?"#333":"#acb0bf"}}
|
||||
value={rewardAmount}
|
||||
onChange={changeAmount}
|
||||
className="borderNo mt5"
|
||||
disabled={!amountEditFlag}
|
||||
/>
|
||||
</li>
|
||||
}
|
||||
<CaseDrop name="测试用例" value={caseValue} owner={owner} projectsId={projectsId} changeValue={(v)=>setCaseValue(v)} onBlur={(v)=>saveForeach(undefined,undefined,undefined,undefined,undefined,undefined,undefined,undefined,undefined,v)}/>
|
||||
<Date name="开始日期" today={start_date} setDate={(date)=>{setStartDate(date);saveForeach(undefined,undefined,undefined,undefined,undefined,undefined,date)}} editFlag={editFlag}/>
|
||||
<Date name="结束日期" today={due_date} setDate={(date)=>{setDueDate(date);saveForeach(undefined,undefined,undefined,undefined,undefined,undefined,undefined,date)}} editFlag={editFlag}/>
|
||||
</div>
|
||||
</Box>
|
||||
:
|
||||
<div style={{width:"100%",display:"flex",alignItems:"center",justifyContent:'center',height:"400px"}}><Spin /></div>
|
||||
)
|
||||
}
|
||||
export default Form.create()(forwardRef(Details));
|
||||
|
|
@ -0,0 +1,461 @@
|
|||
import React , { useRef , useState , useEffect } from 'react';
|
||||
import { Dropdown , Menu , Icon , Input , Checkbox , Pagination, Button , Tooltip ,Spin , DatePicker } from 'antd';
|
||||
import bj from '../Img/biaoji.png';
|
||||
import issueEmp from '../Img/issue-big.png';
|
||||
import { Link } from "react-router-dom";
|
||||
import AllMenus from '../Component/allMenus';
|
||||
import CheckProfile from '../../Component/ProfileModal/Profile';
|
||||
import Datas from '../Component/datas';
|
||||
import DelBox from '../Component/delBox';
|
||||
import axios from 'axios';
|
||||
import cookie from 'react-cookies';
|
||||
import emp from '../Img/emp.png';
|
||||
import moment from 'moment';
|
||||
|
||||
const { RangePicker } = DatePicker;
|
||||
|
||||
const { Search } = Input;
|
||||
const defaultLimit = 15;
|
||||
|
||||
function List(props){
|
||||
const [ visible , setVisible ] = useState(false);
|
||||
const [ issueList , setIssueList ] = useState(undefined);
|
||||
const [ closedCount , setClosedCount ] = useState(0);
|
||||
const [ openedCount , setOpenedCount ] = useState(0);
|
||||
|
||||
const[ aboutMe , setAboutMe ] = useState("all");
|
||||
const[ value , setValue ] = useState("");
|
||||
const[ keyword , setKeyword ] = useState(undefined);
|
||||
|
||||
const [ category , setCategory] = useState("opened");
|
||||
const [ begin_date , setBegin] = useState(undefined);
|
||||
const [ end_date , setEnd] = useState(undefined);
|
||||
|
||||
const [ allValue , setAllValue ] = useState([]);
|
||||
const [ allIds , setAllIds ] = useState([]);
|
||||
const [ checkAll , setCheckAll ] = useState(false);
|
||||
|
||||
const [ names , setNames ] = useState(undefined);
|
||||
const [ updateIds , setUpdateIds ] = useState(undefined);
|
||||
const [ updateChooseIds , setUpdateChooseIds ] = useState(undefined);
|
||||
|
||||
const [ page , setPage ] = useState(1);
|
||||
const [ limit , setLimit ] = useState(15);
|
||||
const [ total , setTotal ] = useState(undefined);
|
||||
const [ issueTotal , setIssueTotal ] = useState(0);
|
||||
|
||||
const [ clearFlag , setClearFlag ] = useState(false);
|
||||
const [ has_created_issues , setHas_created_issues] = useState(false);
|
||||
|
||||
const menuRef = useRef(null);
|
||||
const owner = props.match.params.owner;
|
||||
const projectsId = props.match.params.projectsId;
|
||||
const permission = props && props.projectDetail && props.projectDetail.permission;
|
||||
const { projectDetail , current_user , open_blockchain} = props;
|
||||
|
||||
useEffect(()=>{
|
||||
if(projectDetail){
|
||||
const { author, name } = projectDetail;
|
||||
document.title = `疑修-${author.name}/${name}`;
|
||||
}
|
||||
},[projectDetail])
|
||||
|
||||
useEffect(()=>{
|
||||
const datas = cookie.load('issuestates');
|
||||
let states = datas === "undefined" ? undefined : datas;
|
||||
if(states){
|
||||
setAboutMe(states.participant_category);
|
||||
setCategory(states.category);
|
||||
setPage(states.page);
|
||||
setLimit(states.limit || defaultLimit);
|
||||
setUpdateIds({...states});
|
||||
setNames(states.names);
|
||||
setBegin(states.begin_date);
|
||||
setEnd(states.end_date);
|
||||
// if(states.participant_category ==="all" && states.category === "opened" && states.page === 1 && states.limit===defaultLimit)
|
||||
// Init({...states},states.page,states.names);
|
||||
}else{
|
||||
Init();
|
||||
}
|
||||
},[])
|
||||
|
||||
useEffect(()=>{
|
||||
let v = allValue && allValue > 0;
|
||||
if((updateIds && !v && (updateIds.author_id || updateIds.issue_priorities_id || updateIds.issue_tag_ids || updateIds.milestone_id || updateIds.sort_by || updateIds.status_id ||updateIds.assigner_id)) || value || end_date || begin_date || aboutMe !=="all"){
|
||||
setClearFlag(true);
|
||||
}else{
|
||||
setClearFlag(false);
|
||||
}
|
||||
},[updateIds,value,allValue,begin_date,end_date,aboutMe])
|
||||
// 自定义一个初始不更新的hook
|
||||
const useUpdateEffect = (fn, inputs) => {
|
||||
const didMountRef = useRef(false);
|
||||
useEffect(() => {
|
||||
if (didMountRef.current) fn();
|
||||
else didMountRef.current = true;
|
||||
}, inputs);
|
||||
};
|
||||
|
||||
// 定义处理函数
|
||||
function handleAllDisabled(){
|
||||
Init(updateIds,page,names);
|
||||
}
|
||||
|
||||
// 使用自定义hook
|
||||
useUpdateEffect(handleAllDisabled, [aboutMe,keyword,category,limit,end_date,updateIds]);
|
||||
|
||||
|
||||
function getDirection(id){
|
||||
if(!id) return undefined;
|
||||
if(id === "1" || id === "3" || id === "5"|| id === "7"){
|
||||
return "desc"
|
||||
}else{
|
||||
return "asc"
|
||||
}
|
||||
}
|
||||
function getBy(id){
|
||||
if(!id) return undefined;
|
||||
if(id === "1" || id === "2"){
|
||||
return "issues.created_on"
|
||||
}else if(id === "3" || id === "4"){
|
||||
return "issues.updated_on"
|
||||
}else if(id === "5" || id === "6"){
|
||||
return "issue_priorities.position"
|
||||
}else{
|
||||
return "issues.blockchain_token_num"
|
||||
}
|
||||
}
|
||||
|
||||
// 获取issue列表数据
|
||||
function Init(params,p,names){
|
||||
setTotal(undefined);
|
||||
const datas = cookie.load('issuestates');
|
||||
let states = datas === "undefined" ? undefined : datas;
|
||||
if(states){
|
||||
cookie.remove('issuestates');
|
||||
}
|
||||
const url = `/v1/${owner}/${projectsId}/issues`;
|
||||
axios.get(url,{
|
||||
params:{
|
||||
...params,
|
||||
page:p || 1,
|
||||
keyword,
|
||||
participant_category:aboutMe,
|
||||
category,
|
||||
limit,
|
||||
begin_date,end_date,
|
||||
sort_direction:getDirection(params && params.sort_by),
|
||||
sort_by:getBy(params && params.sort_by),names:undefined
|
||||
}
|
||||
}).then(result=>{
|
||||
if(result){
|
||||
setIssueList(result.data.issues);
|
||||
setTotal(result.data.total_count);
|
||||
setClosedCount(result.data.closed_count);
|
||||
setOpenedCount(result.data.opened_count);
|
||||
const ids = result.data.issues.length>0 ? result.data.issues.map(i=>{return i.id}) : [];
|
||||
setAllIds(ids);
|
||||
setIssueTotal(result.data.total_issues_count);
|
||||
setHas_created_issues(result.data.has_created_issues);
|
||||
|
||||
const d = {...params,keyword,participant_category:aboutMe,category,limit,page:p || 1,
|
||||
sort_direction:getDirection(params && params.sort_by),begin_date,end_date,
|
||||
sort_by:getBy(params && params.sort_by),names:names};
|
||||
|
||||
let inFifteenMinutes = new Date(new Date().getTime() + 24 * 3600 * 1000);
|
||||
cookie.save('issuestates', {...d},{ expires: inFifteenMinutes,path:`/` });
|
||||
}
|
||||
}).then(error=>{})
|
||||
}
|
||||
|
||||
// 第一个下拉搜索
|
||||
const menu = (
|
||||
<Menu selectedKeys={[`${aboutMe}`]} onClick={chooseAboutMe}>
|
||||
<Menu.Item key={"all"}>全部</Menu.Item>
|
||||
<Menu.Item key={"aboutme"}><Tooltip title="指我创建的、我负责的和@我的疑修">与我相关</Tooltip></Menu.Item>
|
||||
<Menu.Item key={"assignedme"}>我负责的</Menu.Item>
|
||||
<Menu.Item key={"authoredme"}>我创建的</Menu.Item>
|
||||
<Menu.Item key={"atme"}>@我的</Menu.Item>
|
||||
</Menu>
|
||||
)
|
||||
function chooseAboutMe(e){
|
||||
setPage(1);
|
||||
// setCategory("opened");
|
||||
setAboutMe(e.key);
|
||||
}
|
||||
|
||||
//清除筛选条件
|
||||
function clearCondition(){
|
||||
setKeyword(undefined);
|
||||
setAboutMe("all");
|
||||
setCategory("opened");
|
||||
setUpdateIds(undefined);
|
||||
setAllValue([]);
|
||||
setPage(1);
|
||||
setValue(undefined);
|
||||
setNames(undefined);
|
||||
setEnd(undefined);
|
||||
setBegin(undefined);
|
||||
// if(!value){
|
||||
// Init();
|
||||
// }
|
||||
// 清除下拉选项
|
||||
menuRef.current && menuRef.current.clearChoose();
|
||||
}
|
||||
|
||||
// 全选所有issue
|
||||
function chooseAll(e){
|
||||
setCheckAll(e.target.checked);
|
||||
// 清除下拉选项
|
||||
menuRef.current && menuRef.current.clearChoose();
|
||||
if(e.target.checked){
|
||||
setAllValue(allIds);
|
||||
}else{
|
||||
setAllValue([]);
|
||||
}
|
||||
}
|
||||
|
||||
// 选择列表里的issue
|
||||
function checkIssues(value){
|
||||
// 清除下拉选项
|
||||
menuRef.current && menuRef.current.clearChoose();
|
||||
setAllValue(value);
|
||||
if(value.length === allIds.length){
|
||||
setCheckAll(true);
|
||||
}else{
|
||||
setCheckAll(false);
|
||||
}
|
||||
}
|
||||
|
||||
// 取消
|
||||
function cancelUpdate(){
|
||||
setAllValue([]);
|
||||
setCheckAll(false);
|
||||
// 清除下拉选项
|
||||
menuRef.current && menuRef.current.clearChoose();
|
||||
}
|
||||
// 确认修改 allValue updateIds
|
||||
function sureUpdate(){
|
||||
const url = `/v1/${owner}/${projectsId}/issues/batch_update`;
|
||||
axios.patch(url,{
|
||||
assigner_ids: updateChooseIds && updateChooseIds.assigner_id && updateChooseIds.assigner_id.split(","),
|
||||
ids: allValue,
|
||||
issue_tag_ids: updateChooseIds && updateChooseIds.issue_tag_ids && updateChooseIds.issue_tag_ids.split(","),
|
||||
milestone_id: updateChooseIds && updateChooseIds.milestone_id,
|
||||
priority_id: updateChooseIds && updateChooseIds.issue_priorities_id,
|
||||
status_id: updateChooseIds && updateChooseIds.status_id
|
||||
}).then(result=>{
|
||||
if(result){
|
||||
setUpdateIds(undefined);
|
||||
setAllValue([]);
|
||||
setTotal(undefined);
|
||||
Init();
|
||||
cancelUpdate();
|
||||
}
|
||||
}).catch(error=>{})
|
||||
}
|
||||
|
||||
// 切换页码
|
||||
function changepage(p){
|
||||
setPage(p);
|
||||
Init(updateIds,p,names);
|
||||
if (document) { // 可以排除不需要置顶的页面
|
||||
if (document.documentElement || document.body) {
|
||||
document.documentElement.scrollTop = document.body.scrollTop = 0; // 切换路由时手动置顶
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 删除issue相关 func
|
||||
function onSuccess(){
|
||||
const url = `/v1/${owner}/${projectsId}/issues/batch_destroy`;
|
||||
axios.delete(url,{
|
||||
params:{ids:allValue}
|
||||
}).then(result=>{
|
||||
if(result){
|
||||
setUpdateIds(undefined);
|
||||
setAllValue([]);
|
||||
setVisible(false);
|
||||
setCheckAll(false);
|
||||
props.showNotification("疑修删除成功！");
|
||||
Init();
|
||||
}
|
||||
}).catch(error=>{})
|
||||
}
|
||||
|
||||
function chooseFunc(ids,n){
|
||||
setNames(n);
|
||||
setPage(1);
|
||||
if(allValue && allValue.length>0){
|
||||
// 将ids保存下来以便修改
|
||||
// setUpdateIds(ids);
|
||||
setUpdateChooseIds(ids);
|
||||
}else{
|
||||
if(ids.status_id === "5"){
|
||||
setCategory("closed");
|
||||
}else{
|
||||
setCategory("opened");
|
||||
}
|
||||
setUpdateIds(ids);
|
||||
setTotal(undefined);
|
||||
// Init(ids,1,n);
|
||||
}
|
||||
}
|
||||
|
||||
function chageLimit(c,p){
|
||||
setPage(1);
|
||||
setLimit(p);
|
||||
}
|
||||
function changeCategory(value){
|
||||
if(value !== category){
|
||||
let ids = {...updateIds};
|
||||
let ns = {...names};
|
||||
if(value === "closed"){
|
||||
ns = {...ns,status_name:"关闭"}
|
||||
ids = {...ids,status_id:'5'};
|
||||
setNames(ns)
|
||||
setUpdateIds(ids);
|
||||
}else{
|
||||
ns = {...ns,status_name:undefined}
|
||||
ids = {...ids,status_id:undefined};
|
||||
setNames(ns)
|
||||
setUpdateIds(ids);
|
||||
}
|
||||
setCategory(value);
|
||||
setPage(1);
|
||||
setTotal(undefined);
|
||||
}
|
||||
}
|
||||
|
||||
function changeSearchValueFunc(e){
|
||||
setValue(e.target.value);
|
||||
if(e.target.value===""){
|
||||
setKeyword(undefined);
|
||||
}
|
||||
}
|
||||
|
||||
// 选择搜索时间
|
||||
function changeBeginTime(data, value){
|
||||
setPage(1);
|
||||
setBegin(value[0] || '');
|
||||
setEnd(value[1] || '');
|
||||
}
|
||||
return(
|
||||
<div>
|
||||
<DelBox visible={visible} onCancel={()=>setVisible(false)} onSuccess={onSuccess}/>
|
||||
<div className="pageheader">
|
||||
<div>
|
||||
{
|
||||
(current_user && current_user.login) &&
|
||||
<Dropdown overlay={menu} trigger={['click']} placement="bottomLeft" arrow={{pointAtCenter: true}}>
|
||||
<span className="dorpdownButton mr20">
|
||||
<span>{aboutMe === "all" ? "全部":aboutMe === "aboutme"?"与我相关":aboutMe === "assignedme"?"我负责的":aboutMe === "authoredme"?"我创建的":"@我的"}</span>
|
||||
<Icon type="caret-down" className="ml5 color-grey-6" />
|
||||
</span>
|
||||
</Dropdown>
|
||||
}
|
||||
<Search
|
||||
placeholder="输入关键字搜索疑修"
|
||||
value={value}
|
||||
onChange={changeSearchValueFunc}
|
||||
onSearch={()=>setKeyword(value)}
|
||||
style={{ width: 354 , height : 32 }}
|
||||
allowClear
|
||||
/>
|
||||
{
|
||||
clearFlag &&
|
||||
<a className="color-blue ml25" onClick={clearCondition} style={{ display: "flex" , alignItems: "center"}}>
|
||||
<i className="iconfont icon-roundclose font-16 mr5"></i>清除筛选条件</a>
|
||||
}
|
||||
</div>
|
||||
<div>
|
||||
<RangePicker value={[begin_date ? moment(begin_date, 'YYYY-MM-DD') : "",end_date ? moment(end_date, 'YYYY-MM-DD') : ""]} onChange={changeBeginTime} style={{width:240,marginRight:20}}/>
|
||||
{
|
||||
permission && permission !== "Reporter" &&
|
||||
<Link to={`/${owner}/${projectsId}/issues/sign`} className="dorpdownButton"><img src={bj} alt="" className="mr5" />标记管理</Link>
|
||||
}
|
||||
<CheckProfile {...props} sureFunc={()=>{props.history.push(`/${owner}/${projectsId}/issues/new`)}} checklogin className="operateButton ml20">创建疑修</CheckProfile>
|
||||
</div>
|
||||
</div>
|
||||
<div className="lists">
|
||||
<div className="listheader">
|
||||
<div style={{display:"flex"}}>
|
||||
<Checkbox value="all" style={{marginRight: "16px",display: (permission && permission !== "Reporter") ?"block":"none"}} checked={checkAll} onChange={chooseAll}></Checkbox>
|
||||
{
|
||||
allValue && allValue.length>0 ?
|
||||
<span>选择{allValue.length}个issue</span>
|
||||
:
|
||||
<ul className="statusul">
|
||||
<li className={category === "all" ?"active":""} onClick={()=>{changeCategory("all")}}>全部<span>{issueTotal}</span></li>
|
||||
<li className={category === "opened" ?"active":""} onClick={()=>{changeCategory("opened")}}>开启中<span>{openedCount}</span></li>
|
||||
<li className={category === "closed" ?"active":""} onClick={()=>{changeCategory("closed")}}>已关闭<span>{closedCount}</span></li>
|
||||
</ul>
|
||||
}
|
||||
</div>
|
||||
<div className="menusul">
|
||||
<AllMenus
|
||||
ref={menuRef}
|
||||
update={allValue && allValue.length>0}
|
||||
owner={owner}
|
||||
projectsId={projectsId}
|
||||
chooseFunc={chooseFunc}
|
||||
defaultNames={names}
|
||||
defaultIds={allValue && allValue.length>0 ? undefined : updateIds}
|
||||
open_blockchain={open_blockchain}
|
||||
/>
|
||||
{
|
||||
allValue && allValue.length>0 ?
|
||||
<div>
|
||||
<Button type="primary" ghost onClick={sureUpdate}>确定</Button>
|
||||
<Button type="danger" ghost className="ml10" onClick={()=>setVisible(true)}>删除</Button>
|
||||
<Button ghost className="ml10 mr10" onClick={cancelUpdate}>取消</Button>
|
||||
</div>
|
||||
:""
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
{
|
||||
total === 0 &&
|
||||
(!has_created_issues ?
|
||||
<div className="listempty">
|
||||
<img src={issueEmp} alt="" width="68px" />
|
||||
<p className="font-22 mt5 mb10">欢迎使用疑修(Issue)</p>
|
||||
<p className="font-15">疑修用于记录与跟踪待办事项、项目bug、功能需求等。在使用之前，请您先<CheckProfile {...props} checklogin sureFunc={()=>{props.history.push(`/${owner}/${projectsId}/issues/new`)}} className="color-blue">创建一个疑修</CheckProfile></p>
|
||||
</div>
|
||||
:
|
||||
<div className="dataempty"><img src={emp} alt="" /></div>
|
||||
)
|
||||
}
|
||||
{
|
||||
total > 0 &&
|
||||
<React.Fragment>
|
||||
<Checkbox.Group name="issues" onChange={checkIssues} value={allValue} style={{ width: "100%"}}>
|
||||
<div className="listdatas">
|
||||
{issueList.map((item,key)=>{
|
||||
return(
|
||||
<Datas
|
||||
key={key}
|
||||
checkbox={(permission && permission !== "Reporter") && <Checkbox value={item.id} key={item.id} style={{marginRight: "16px"}}></Checkbox> }
|
||||
item={item}
|
||||
owner={owner}
|
||||
projectsId={projectsId}
|
||||
/>
|
||||
)
|
||||
})
|
||||
}
|
||||
</div>
|
||||
</Checkbox.Group>
|
||||
{
|
||||
total > defaultLimit &&
|
||||
<div className="pt25 pb30" style={{textAlign:"right"}}>
|
||||
<Pagination total={total} onShowSizeChange={chageLimit} current={page} pageSize={limit} onChange={changepage} showSizeChanger pageSizeOptions={[15,30,40,50]} showQuickJumper />
|
||||
</div>
|
||||
}
|
||||
</React.Fragment>
|
||||
}
|
||||
{total === undefined && <div style={{height:344,display:"flex",alignItems:"center",justifyContent:"center"}}><Spin /></div> }
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
export default List;
|
||||
|
|
@ -0,0 +1,306 @@
|
|||
import React , { useEffect , useState , forwardRef , useRef } from 'react';
|
||||
import { Form , InputNumber } from 'antd';
|
||||
import { Box , LongWidth } from '../../Component/layout';
|
||||
import DropMenu from '../Component/dropMenu';
|
||||
import ChooseMenu from '../Component/chooseMenu';
|
||||
import AddTagsBox from '../Component/addTagsBox';
|
||||
import Date from '../Component/date';
|
||||
import NewPanel from '../Component/newPanel';
|
||||
import axios from 'axios';
|
||||
import CaseDrop from '../Component/caseDrop';
|
||||
|
||||
function New(props){
|
||||
// history search 是否含有意见反馈标识
|
||||
const {location:{search}, projectDetail} = props;
|
||||
const feedBack = search && search.indexOf('type=feedback') !== -1;
|
||||
// 里程碑id
|
||||
const milepostId = props.match.params.milepostId;
|
||||
|
||||
|
||||
const [ statusList , setStatusList ] = useState([]);
|
||||
const [ prioritiesList , setPrioritiesList ] = useState([]);
|
||||
const [ chargeList , setChargeList ] = useState([]);
|
||||
const [ charge , setCharge ] = useState(undefined);
|
||||
const [ millstoneList , setMillstoneList ] = useState([]);
|
||||
const [ millstone , setMillstone ] = useState(undefined);
|
||||
const [ tagList , setTagList ] = useState(undefined);
|
||||
const [ tag , setTag ] = useState(undefined);
|
||||
const [ branchList , setBranchList ] = useState(undefined);
|
||||
const [ branch , setBranch ] = useState(undefined);
|
||||
|
||||
|
||||
const [ assigner_choose , setAssigner_choose ] = useState([]);
|
||||
const [ prioritie_choose , setPrioritie_choose ] = useState([]);
|
||||
const [ status_choose , setStatus_choose ] = useState([]);
|
||||
const [ tag_choose , setTag_choose ] = useState([]);
|
||||
const [ millstone_choose , setMillstone_choose ] = useState([]);
|
||||
const [ branch_choose , setBranch_choose ] = useState([]);
|
||||
const [ caseValue, setCaseValue ] = useState(undefined);
|
||||
|
||||
const [ start_date, setStartDate ] = useState("");//moment().format('YYYY-MM-DD')
|
||||
const [ due_date, setDueDate ] = useState("");
|
||||
|
||||
const [ rewardAmount , setRewardAmount ] = useState(undefined);
|
||||
|
||||
const owner = props.match.params.owner;
|
||||
const projectsId = props.match.params.projectsId;
|
||||
const permission = props && props.projectDetail && props.projectDetail.permission;
|
||||
const { open_blockchain } = props;
|
||||
const ref = useRef(null);
|
||||
|
||||
useEffect(()=>{
|
||||
if(projectDetail){
|
||||
if(feedBack){
|
||||
document.title = `意见反馈`;
|
||||
return;
|
||||
}
|
||||
const { author, name} = projectDetail;
|
||||
document.title = `新建疑修-${author.name}/${name}`
|
||||
}
|
||||
},[projectDetail, feedBack])
|
||||
|
||||
useEffect(()=>{
|
||||
if(milepostId){
|
||||
getMillstone(milepostId);
|
||||
}
|
||||
},[milepostId])
|
||||
|
||||
|
||||
// 获取状态列表
|
||||
useEffect(()=>{
|
||||
getStatus();
|
||||
},[])
|
||||
function getStatus(){
|
||||
const url = `/v1/${owner}/${projectsId}/issue_statues`;
|
||||
axios.get(url).then(result=>{
|
||||
if(result && result.data){
|
||||
let status = result.data.statues;
|
||||
setStatusList(status);
|
||||
if(status && status.length>0){
|
||||
setStatus_choose(status.filter(i=>i.id === 1));
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
// 获取优先级列表
|
||||
useEffect(()=>{
|
||||
getPriorities();
|
||||
},[])
|
||||
|
||||
function getPriorities(){
|
||||
const url = `/v1/${owner}/${projectsId}/issue_priorities`;
|
||||
axios.get(url).then(result=>{
|
||||
if(result && result.data){
|
||||
let priorities = result.data.priorities;
|
||||
let array =[];
|
||||
let colors = ["#1abcb1","#28be6c","#e67e22","#db3d1d"];
|
||||
if(priorities && priorities.length>0){
|
||||
array = priorities.map((i,k)=>{
|
||||
let arr = {...i,color:colors[k]}
|
||||
return arr;
|
||||
})
|
||||
}
|
||||
setPrioritiesList(array);
|
||||
setPrioritie_choose(array.filter(i=>i.id === 2));
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// 获取负责人列表
|
||||
useEffect(()=>{
|
||||
getCharge();
|
||||
},[charge])
|
||||
|
||||
function getCharge(){
|
||||
const url = `/v1/${owner}/${projectsId}/collaborators`;
|
||||
axios.get(url,{params:{keyword:charge,only_name:true}}).then(result=>{
|
||||
if(result && result.data){
|
||||
setChargeList(result.data.collaborators);
|
||||
if(feedBack && !charge){
|
||||
// 指定指派成员-意见反馈
|
||||
const {collaborators} = result.data;
|
||||
const id = collaborators.filter(item=>item.id === 86107);
|
||||
setAssigner_choose(id.length === 0 ? [collaborators[0]] : id)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
// 获取里程碑列表
|
||||
useEffect(()=>{
|
||||
getMillstone(millstone);
|
||||
},[millstone])
|
||||
|
||||
function getMillstone(keyword){
|
||||
const url = `/v1/${owner}/${projectsId}/milestones`;
|
||||
axios.get(url,{params:{keyword,only_name:true}}).then(result=>{
|
||||
if(result && result.data){
|
||||
let milestones = result.data.milestones;
|
||||
if(milepostId && milepostId === keyword){
|
||||
setMillstone_choose(milestones);
|
||||
}else{
|
||||
setMillstoneList(milestones);
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
// 获取标记列表
|
||||
useEffect(()=>{
|
||||
getSign();
|
||||
},[tag])
|
||||
function getSign(){
|
||||
const url = `/v1/${owner}/${projectsId}/issue_tags`;
|
||||
axios.get(url,{params:{keyword:tag,only_name:true}}).then(result=>{
|
||||
if(result && result.data){
|
||||
setTagList(result.data.issue_tags);
|
||||
}
|
||||
})
|
||||
}
|
||||
// 获取标记列表
|
||||
useEffect(()=>{
|
||||
getBranch(branch);
|
||||
},[branch])
|
||||
function getBranch(branch){
|
||||
if(branch){
|
||||
let b = [...branchList];
|
||||
let l = b.filter(i=>i.name.indexOf(branch)>-1);
|
||||
setBranchList(l);
|
||||
return ;
|
||||
}
|
||||
const url = `/${owner}/${projectsId}/branches.json`;
|
||||
axios.get(url,{params:{keyword:tag}}).then(result=>{
|
||||
if(result && result.data){
|
||||
setBranchList(result.data);
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
// 创建
|
||||
function createFunc(values,fileList,receivers_login,description){
|
||||
const { subject } = values;
|
||||
const url = `/v1/${owner}/${projectsId}/issues`;
|
||||
let b = branch_choose && branch_choose.length>0 ? branch_choose.map(i=>{return i.name}) :undefined;
|
||||
let t = tag_choose && tag_choose.length>0 ? tag_choose.map(i=>{return i.id}) :undefined;
|
||||
let a = assigner_choose && assigner_choose.length>0 ? assigner_choose.map(i=>{return i.id}) :undefined;
|
||||
let m = millstone_choose && millstone_choose.length>0 ? millstone_choose.map(i=>{return i.id}) :undefined;
|
||||
let p = prioritie_choose && prioritie_choose.length>0 ? prioritie_choose.map(i=>{return i.id}) :undefined;
|
||||
let s = status_choose && status_choose.length>0 ? status_choose.map(i=>{return i.id}) :undefined;
|
||||
axios.post(url,{
|
||||
description,subject,
|
||||
branch_name:b && b.join(","),
|
||||
status_id:s && s.join(","),
|
||||
priority_id:p && p.join(","),
|
||||
milestone_id:m && m.join(","),
|
||||
issue_tag_ids:t,
|
||||
assigner_ids:a,
|
||||
attachment_ids:fileList,
|
||||
start_date,due_date,receivers_login,
|
||||
blockchain_token_num:rewardAmount,
|
||||
test_case:caseValue
|
||||
}).then(result=>{
|
||||
if(result && result.data && result.data.project_issues_index){
|
||||
window.scrollTo(0,0);
|
||||
props.showNotification("任务创建成功！");
|
||||
props.history.push(`/${owner}/${projectsId}/issues/${result.data.project_issues_index}`);
|
||||
}
|
||||
}).catch(error=>{})
|
||||
}
|
||||
|
||||
|
||||
function changeAmount(value){
|
||||
if(value && value > 0){
|
||||
setRewardAmount(value);
|
||||
}
|
||||
if(!value){
|
||||
setRewardAmount(value);
|
||||
}
|
||||
}
|
||||
return(
|
||||
<div>
|
||||
<p className="font-17 color-grey-3 mt20 mb15">新建疑修</p>
|
||||
<Box>
|
||||
<LongWidth>
|
||||
{/* 意见反馈初始化内容 */}
|
||||
<NewPanel {...props} createFunc={createFunc} owner = {owner} projectsId = {projectsId} desc={feedBack ? "####问题描述\n\n\n####重现问题步骤\n\n\n####截图\n\n\n####建议解决办法\n" : undefined}/>
|
||||
</LongWidth>
|
||||
<div className="shortwidth">
|
||||
<ChooseMenu
|
||||
placeholder="负责人"
|
||||
menus={chargeList}
|
||||
searchFunc={(value)=>{setCharge(value)}}
|
||||
headImg
|
||||
selectValueList={assigner_choose}
|
||||
chooseFunc={(list)=>{setAssigner_choose(list);}}
|
||||
double={5}
|
||||
removeFlag
|
||||
/>
|
||||
<DropMenu
|
||||
placeholder="状态"
|
||||
menus={statusList}
|
||||
selectValueList={status_choose}
|
||||
mustFlag
|
||||
editFlag={false}
|
||||
chooseFunc={(list)=>{setStatus_choose(list);}}
|
||||
/>
|
||||
<DropMenu
|
||||
placeholder="优先级"
|
||||
menus={prioritiesList}
|
||||
selectValueList={prioritie_choose}
|
||||
colorFlag="1"
|
||||
mustFlag
|
||||
chooseFunc={(list)=>{setPrioritie_choose(list);}}
|
||||
/>
|
||||
<ChooseMenu
|
||||
placeholder="标记"
|
||||
menus={tagList}
|
||||
searchFunc={(value)=>{setTag(value)}}
|
||||
selectValueList={tag_choose}
|
||||
chooseFunc={(list)=>{setTag_choose(list);}}
|
||||
double={3}
|
||||
colorFlag="2"
|
||||
removeFlag
|
||||
onAdd={permission && permission !== "Reporter" ? ()=>{getSign();} :false}
|
||||
owner={owner}
|
||||
projectsId={projectsId}
|
||||
/>
|
||||
<ChooseMenu
|
||||
placeholder="里程碑"
|
||||
menus={millstoneList}
|
||||
auto
|
||||
searchFunc={(value)=>{setMillstone(value)}}
|
||||
selectValueList={millstone_choose}
|
||||
editFlag={milepostId ? true : false}
|
||||
chooseFunc={(list)=>{setMillstone_choose(list);}}
|
||||
/>
|
||||
<ChooseMenu
|
||||
placeholder="关联分支"
|
||||
menus={branchList}
|
||||
auto
|
||||
searchFunc={(value)=>{setBranch(value)}}
|
||||
selectValueList={branch_choose}
|
||||
chooseFunc={(list)=>{setBranch_choose(list);}}
|
||||
/>
|
||||
{
|
||||
open_blockchain &&
|
||||
<li style={{paddingBottom:"0px"}}>
|
||||
<span>
|
||||
悬赏金额
|
||||
{/* {!(milepostId ? true : false) && <a onClick={editReward}><i className="iconfont icon-a-bianji12 font-13" style={{color:"#898d9d"}}></i></a> } */}
|
||||
</span>
|
||||
<InputNumber
|
||||
placeholder="请输入悬赏金额"
|
||||
style={{width:"100%",color:rewardAmount?"#333":"#acb0bf"}}
|
||||
value={rewardAmount}
|
||||
onChange={changeAmount}
|
||||
className="borderNo mt5" disabled={milepostId ? true : false}/>
|
||||
</li>
|
||||
}
|
||||
<CaseDrop name="测试用例" owner={owner} projectsId={projectsId} changeValue={(v)=>{console.log("case:",v);setCaseValue(v)}}/>
|
||||
<Date name="开始日期" today={start_date} setDate={(date)=>setStartDate(date)}/>
|
||||
<Date name="结束日期" today={due_date} setDate={(date)=>setDueDate(date)}/>
|
||||
</div>
|
||||
</Box>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
export default Form.create()(forwardRef(New));
|
||||
|
|
@ -0,0 +1,267 @@
|
|||
import React , { useEffect , useState } from 'react';
|
||||
import create from '../Img/create.png';
|
||||
import { Menu , Dropdown , Icon, Input, Button , Spin , Pagination } from 'antd';
|
||||
import ColorCard from '../Component/colorCard';
|
||||
import DelBox from '../Component/delBox';
|
||||
import axios from 'axios';
|
||||
import {Link} from 'react-router-dom';
|
||||
const limit = 15;
|
||||
function Sign(props){
|
||||
const [ edit , setEdit ] = useState(false);
|
||||
const [ colors , setColors ] = useState(undefined);
|
||||
const [ delVisible , setDelVisible ] = useState(false);
|
||||
const [ editId , setEditId ] = useState(undefined);
|
||||
const [ list , setList ] = useState(undefined);
|
||||
const [ total , setTotal ] = useState(undefined);
|
||||
const [ page , setPage ] = useState(1);
|
||||
|
||||
const [ name , setName ] = useState(undefined);
|
||||
const [ desc , setDesc ] = useState(undefined);
|
||||
const [ order_name , setOrderName ] = useState(undefined);
|
||||
const [ order_type , setOrderType ] = useState(undefined);
|
||||
const [ nameFlag , setNameFlag ] = useState(undefined);
|
||||
const [ defaultColor , setDefaultColor ]= useState(undefined);
|
||||
|
||||
const [ arrayName , setArrayName ] = useState("标记");
|
||||
const [ key , setKey ] = useState("0");
|
||||
const owner = props.match.params.owner;
|
||||
const projectsId = props.match.params.projectsId;
|
||||
const { projectDetail } = props;
|
||||
const permission = projectDetail && props.projectDetail.permission;
|
||||
|
||||
|
||||
useEffect(()=>{
|
||||
if(permission !== undefined){
|
||||
if(!permission || (permission && permission === "Reporter")){
|
||||
window.location.href = "/403";
|
||||
}
|
||||
}
|
||||
},[permission])
|
||||
|
||||
useEffect(()=>{
|
||||
if(projectDetail){
|
||||
const { author, name } = projectDetail;
|
||||
document.title = `项目标记-${author.name}/${name}`;
|
||||
}
|
||||
},[projectDetail])
|
||||
|
||||
useEffect(()=>{
|
||||
Init();
|
||||
},[page,order_name,order_type])
|
||||
|
||||
function Init(){
|
||||
const url = `/v1/${owner}/${projectsId}/issue_tags`;
|
||||
axios.get(url,{
|
||||
params:{
|
||||
page,limit,sort_by:order_name,sort_direction:order_type
|
||||
}
|
||||
}).then(result=>{
|
||||
if(result && result.data){
|
||||
setList(result.data.issue_tags);
|
||||
setTotal(result.data.total_count);
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
function arrayList(e){
|
||||
const { eventKey , value , children , createName } = e.item.props;
|
||||
setPage(1);
|
||||
if(value === order_type && createName === order_name){
|
||||
setOrderName(undefined);
|
||||
setOrderType(undefined);
|
||||
setArrayName("标记");
|
||||
setKey("0");
|
||||
}else{
|
||||
setOrderName(createName);
|
||||
setOrderType(value);
|
||||
setArrayName(children);
|
||||
setKey(eventKey);
|
||||
}
|
||||
}
|
||||
|
||||
const menu = (
|
||||
<Menu onClick={arrayList} selectedKeys={[`${key}`]}>
|
||||
<Menu.Item key={"1"} value="desc" createName="created_at">
|
||||
按创建时间降序排序
|
||||
</Menu.Item>
|
||||
<Menu.Item key={"2"} value="asc" createName="created_at">
|
||||
按创建时间升序排序
|
||||
</Menu.Item>
|
||||
<Menu.Item key={"3"} value="desc" createName="issues_count">
|
||||
按疑修数量降序排序
|
||||
</Menu.Item>
|
||||
<Menu.Item key={"4"} value="asc" createName="issues_count">
|
||||
按疑修数量升序排序
|
||||
</Menu.Item>
|
||||
<Menu.Item key={"5"} value="desc" createName="pull_requests_count">
|
||||
按合并请求数量降序排序
|
||||
</Menu.Item>
|
||||
<Menu.Item key={"6"} value="asc" createName="pull_requests_count">
|
||||
按合并请求数量升序排序
|
||||
</Menu.Item>
|
||||
</Menu>
|
||||
);
|
||||
|
||||
function getColor(colors){
|
||||
setColors(colors);
|
||||
}
|
||||
|
||||
function deleteFunc(){
|
||||
if(editId){
|
||||
const url = `/v1/${owner}/${projectsId}/issue_tags/${editId}`;
|
||||
axios.delete(url).then(result=>{
|
||||
if(result){
|
||||
props.showNotification("项目标记删除成功!");
|
||||
if(list && list.length === 1 && page>1){
|
||||
setPage(page-1);
|
||||
}else{
|
||||
Init();
|
||||
}
|
||||
setDelVisible(false);
|
||||
}
|
||||
}).catch(error=>{})
|
||||
}
|
||||
}
|
||||
|
||||
function sureSave(){
|
||||
if(!name){
|
||||
setNameFlag(true);
|
||||
}else{
|
||||
setNameFlag(false);
|
||||
if(editId){
|
||||
// 编辑
|
||||
const url = `/v1/${owner}/${projectsId}/issue_tags/${editId}`;
|
||||
axios.patch(url,{
|
||||
color: colors || defaultColor,
|
||||
description: desc,
|
||||
name
|
||||
}).then(result=>{
|
||||
if(result){
|
||||
props.showNotification("标记编辑成功！");
|
||||
Init();
|
||||
cancel();
|
||||
}
|
||||
}).catch(error=>{})
|
||||
}else{
|
||||
// 保存
|
||||
const url = `/v1/${owner}/${projectsId}/issue_tags`;
|
||||
axios.post(url,{
|
||||
color: colors || defaultColor,
|
||||
description: desc,
|
||||
name
|
||||
}).then(result=>{
|
||||
if(result){
|
||||
props.showNotification("标记新增成功！");
|
||||
Init();
|
||||
cancel();
|
||||
}
|
||||
}).catch(error=>{})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function cancel(){
|
||||
setNameFlag(false);
|
||||
setName(undefined);
|
||||
setEdit(false);
|
||||
setDesc(undefined);
|
||||
}
|
||||
|
||||
function editFunc(i){
|
||||
setEditId(i.id);
|
||||
setDefaultColor(i.color);
|
||||
setName(i.name);
|
||||
setDesc(i.description);
|
||||
setEdit(true);
|
||||
}
|
||||
|
||||
function onChangeValue(e){
|
||||
setName(e.target.value);
|
||||
if(e.target.value){
|
||||
setNameFlag(false);
|
||||
}else{
|
||||
setNameFlag(true);
|
||||
}
|
||||
}
|
||||
|
||||
function createSign(){
|
||||
const c = Math.random().toString(16).substr(-6);
|
||||
c && setDefaultColor(`#${c}`);
|
||||
setEdit(true);
|
||||
}
|
||||
return(
|
||||
<div>
|
||||
<DelBox
|
||||
visible={delVisible}
|
||||
onCancel={()=>setDelVisible(false)}
|
||||
onSuccess={deleteFunc}
|
||||
title="删除标记"
|
||||
content={<div style={{paddingTop:"3px"}}><p className="font-15 mb20">您确定要删除当前标记？</p></div>}
|
||||
/>
|
||||
<div className="between mt30 mb25">
|
||||
<span><Link to={`/${owner}/${projectsId}/issues`}>疑修</Link> / 项目标记</span>
|
||||
<a className="operateButton" onClick={createSign}><img src={create} alt="" className="mr5"/>创建标记</a>
|
||||
</div>
|
||||
{
|
||||
edit &&
|
||||
<div className="editbar">
|
||||
<div>
|
||||
<Input style={{width:"163px"}} className={nameFlag ?"inputred":""} value={name} onChange={onChangeValue} placeholder="名称15字以内"/>
|
||||
{ nameFlag && <p className="red">请输入标记名称</p>}
|
||||
</div>
|
||||
<Input style={{width:"276px"}} value={desc} onChange={(e)=>setDesc(e.target.value)} placeholder="描述30字以内"/>
|
||||
<ColorCard
|
||||
getColor={getColor}
|
||||
defaultColor={defaultColor}
|
||||
/>
|
||||
<span>
|
||||
<Button type="primary" ghost onClick={sureSave}>确定</Button>
|
||||
<Button ghost className="ml15" onClick={cancel}>取消</Button>
|
||||
</span>
|
||||
</div>
|
||||
}
|
||||
<div className="between bluebar">
|
||||
<span className="font-17">项目标记({total || 0})</span>
|
||||
<Dropdown overlay={menu} trigger={["click"]} placement="bottomRight">
|
||||
<span className="cursor">{arrayName}<Icon type="caret-down" className="ml5 color-grey-6" /></span>
|
||||
</Dropdown>
|
||||
</div>
|
||||
{
|
||||
list && list.length > 0 ?
|
||||
<ul className="signlist">
|
||||
{
|
||||
list.map((i,k)=>{
|
||||
return(
|
||||
<li>
|
||||
<p>
|
||||
<span className="square mr10" style={{backgroundColor:`${i.color}`}}></span>
|
||||
<i className="iconfont icon-biaoji mr3 font-12 " style={{color:`${i.color}`}}></i>
|
||||
<span className="task-hide" title={i.name} style={{maxWidth:210}}>{i.name}</span>
|
||||
</p>
|
||||
<p style={{flex:2}} className="task-hide">{i.description}</p>
|
||||
<p>
|
||||
<span className="mr12">{i.issues_count || 0} 疑修</span>
|
||||
<span className="line">{i.pull_requests_count || 0} 合并请求</span>
|
||||
</p>
|
||||
<p>
|
||||
<a className="color-blue mr12" onClick={()=>editFunc(i)}>编辑</a>
|
||||
<a className="color-red line" onClick={()=>{setEditId(i.id);setDelVisible(true);}}>删除</a>
|
||||
</p>
|
||||
</li>
|
||||
)
|
||||
})
|
||||
}
|
||||
</ul>
|
||||
:""
|
||||
}
|
||||
{
|
||||
total > limit &&
|
||||
<div style={{paddingBottom:"30px",textAlign:"center"}}>
|
||||
<Pagination total={total} current={page} onChange={(p)=>setPage(p)} pageSize={limit}/>
|
||||
</div>
|
||||
}
|
||||
{total === undefined && <div style={{height:344,display:"flex",alignItems:"center",justifyContent:"center"}}><Spin /></div> }
|
||||
</div>
|
||||
)
|
||||
}
|
||||
export default Sign;
|
||||
|
|
@ -0,0 +1,80 @@
|
|||
import React,{useEffect} from 'react';
|
||||
import { Route, Switch } from "react-router-dom";
|
||||
import Loadable from "react-loadable";
|
||||
import Loading from "../../Loading";
|
||||
import './index.scss';
|
||||
|
||||
const List = Loadable({
|
||||
loader: () => import("./Pages/list"),
|
||||
loading: Loading,
|
||||
});
|
||||
const Detail = Loadable({
|
||||
loader: () => import("./Pages/details"),
|
||||
loading: Loading,
|
||||
});
|
||||
const Sign = Loadable({
|
||||
loader: () => import("./Pages/sign"),
|
||||
loading: Loading,
|
||||
});
|
||||
const New = Loadable({
|
||||
loader: () => import("./Pages/new"),
|
||||
loading: Loading,
|
||||
});
|
||||
|
||||
function Index(props){
|
||||
const pathname = props.history.location.pathname;
|
||||
const { project } = props;
|
||||
const open_blockchain = project && project.open_blockchain;
|
||||
|
||||
useEffect(() => {
|
||||
if (document) { // 可以排除不需要置顶的页面
|
||||
if (document.documentElement || document.body) {
|
||||
document.documentElement.scrollTop = document.body.scrollTop = 0; // 切换路由时手动置顶
|
||||
}
|
||||
}
|
||||
}, [pathname]);
|
||||
return(
|
||||
<div className="pagebox">
|
||||
<Switch>
|
||||
<Route
|
||||
path="/:owner/:projectsId/issues/:index/copy"
|
||||
render={(p) => (
|
||||
<Detail {...props} {...p} open_blockchain={open_blockchain}/>
|
||||
)}
|
||||
></Route>
|
||||
{/* 里程碑创建issue */}
|
||||
<Route
|
||||
path="/:owner/:projectsId/issues/:milepostId/new"
|
||||
render={(p) => (
|
||||
<New {...props} {...p} open_blockchain={open_blockchain}/>
|
||||
)}
|
||||
></Route>
|
||||
<Route
|
||||
path="/:owner/:projectsId/issues/new"
|
||||
render={(p) => (
|
||||
<New {...props} {...p} open_blockchain={open_blockchain}/>
|
||||
)}
|
||||
></Route>
|
||||
<Route
|
||||
path="/:owner/:projectsId/issues/sign"
|
||||
render={(p) => (
|
||||
<Sign {...props} {...p} open_blockchain={open_blockchain}/>
|
||||
)}
|
||||
></Route>
|
||||
<Route
|
||||
path="/:owner/:projectsId/issues/:index"
|
||||
render={(p) => (
|
||||
<Detail {...props} {...p} open_blockchain={open_blockchain}/>
|
||||
)}
|
||||
></Route>
|
||||
<Route
|
||||
path="/:owner/:projectsId/issues"
|
||||
render={(p) => (
|
||||
<List {...props} {...p} open_blockchain={open_blockchain}/>
|
||||
)}
|
||||
></Route>
|
||||
</Switch>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
export default Index;
|
||||
|
|
@ -0,0 +1,870 @@
|
|||
.borderNo.ant-input,.borderNo .ant-input-number-input,.borderNo,.borderNo.ant-input-number-focused{
|
||||
border:none!important;
|
||||
padding:4px 0px!important;
|
||||
background-color: transparent!important;
|
||||
box-shadow: none!important;
|
||||
.ant-input-number-handler-wrap{
|
||||
display: none;
|
||||
}
|
||||
&:focus{
|
||||
border:none!important;
|
||||
box-shadow: none!important;
|
||||
}
|
||||
}
|
||||
|
||||
.pagebox{
|
||||
width: 1200px;
|
||||
margin:0px auto;
|
||||
}
|
||||
// 删除issue弹框
|
||||
.deldesc{
|
||||
justify-content: center;
|
||||
.red{
|
||||
color: #DF0002;
|
||||
}
|
||||
}
|
||||
// 可公用样式（在issue的页面中）
|
||||
// 可点击(有向下箭头且点击出现下拉框，移入灰色背景加深)的灰色按钮样式
|
||||
.dorpdownButton{
|
||||
padding:0px 15px;
|
||||
height:32px;
|
||||
color: #333333!important;
|
||||
cursor: pointer;
|
||||
line-height: 32px;
|
||||
background-color:#fafbfc;
|
||||
border:1px solid #d0d0d0;
|
||||
border-radius: 4px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
min-width: 107px;
|
||||
box-sizing: border-box;
|
||||
&>span{
|
||||
display: block;
|
||||
width: 56px;
|
||||
text-align: center;
|
||||
}
|
||||
&:hover{
|
||||
background-color: #f3f4f6;
|
||||
}
|
||||
}
|
||||
// flex-左右，上下居中
|
||||
.between{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
// 蓝色背景操作栏
|
||||
.bluebar{
|
||||
height:50px;
|
||||
background-color:#fafcff;
|
||||
border:1px solid rgba(42, 97, 255, 0.23);
|
||||
border-radius:4px 4px 0px 0px;
|
||||
padding:0px 26px;
|
||||
}
|
||||
// 按钮样式
|
||||
.ant-btn-background-ghost{
|
||||
border-color:#acb0bf;
|
||||
color: #acb0bf;
|
||||
background-color: #fff!important;
|
||||
&.ant-btn-primary{
|
||||
color: #466aff;
|
||||
border-color: #466aff;
|
||||
background-color: #fff!important;
|
||||
}
|
||||
&.ant-btn-danger{
|
||||
color: #f60011;
|
||||
border-color: #f60011;
|
||||
background-color:rgba(196, 0, 14, 0.09)!important;
|
||||
}
|
||||
}
|
||||
.lists{
|
||||
margin-bottom: 50px;
|
||||
}
|
||||
.dataempty{
|
||||
height: 420px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
border: 1px solid;
|
||||
border-color: #d9d9d9;
|
||||
border-radius: 0px 0px 4px 4px;
|
||||
border-top: none;
|
||||
}
|
||||
// 列表为空样式
|
||||
.listempty{
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
background-color:#fafcff;
|
||||
border:1px solid rgba(42, 97, 255, 0.23);
|
||||
border-top: none;
|
||||
border-radius:0px 0px 4px 4px;
|
||||
height: 344px;
|
||||
padding-top: 62px;
|
||||
color: #333;
|
||||
}
|
||||
// 列表页面样式
|
||||
.pageheader{
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
padding:30px 0px;
|
||||
align-items: center;
|
||||
&>div{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
}
|
||||
.listheader{
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
height:50px;
|
||||
background-color:#fafcff;
|
||||
border:1px solid;
|
||||
border-color:rgba(42, 97, 255, 0.23);
|
||||
border-radius:4px 4px 0px 0px;
|
||||
padding-left: 18px;
|
||||
.menusul{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
ul{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
&.statusul{
|
||||
li{
|
||||
width: 106px;
|
||||
font-size: 15px;
|
||||
&>span{
|
||||
height:19px;
|
||||
line-height: 17px;
|
||||
color: #666;
|
||||
background-color:rgba(70, 106, 255, 0.09);
|
||||
border-radius:10px;
|
||||
margin-left: 5px;
|
||||
padding:0px 6px;
|
||||
font-size: 13px;
|
||||
display: block;
|
||||
border:1px solid ;
|
||||
border-color: rgba(70, 106, 255, 0.01);
|
||||
min-width: 30px;
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
}
|
||||
li{
|
||||
color: #898d9d;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
cursor: pointer;
|
||||
&.active{
|
||||
color: #466aff;
|
||||
// font-weight: 500;
|
||||
&>span{
|
||||
font-weight: normal;
|
||||
color: #466aff;
|
||||
border-color: #466aff;
|
||||
background-color: #fff;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.dropboxul{
|
||||
padding-right: 20px;
|
||||
li.minwidth{
|
||||
min-width: 70px;
|
||||
}
|
||||
li{
|
||||
min-width:88px;
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
cursor: default;
|
||||
margin-left: 12px;
|
||||
.dropspan{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
cursor: pointer;
|
||||
&>span{
|
||||
max-width: 80px;
|
||||
display: inline-block;
|
||||
text-align: right;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
// issue列表
|
||||
.listdatas{
|
||||
border:1px solid #d0d0d0;
|
||||
border-top: none;
|
||||
border-radius: 0px 0px 2px 2px;
|
||||
&>div:not(.none_panels){
|
||||
padding:20px 18px;
|
||||
border-bottom: 1px solid #eee;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
&:hover{
|
||||
background-color:rgba(231, 233, 242, 0.26);
|
||||
}
|
||||
&:last-child{
|
||||
border-bottom: none;
|
||||
}
|
||||
.issuedetail{
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
flex:1;
|
||||
}
|
||||
}
|
||||
.idetails{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
&>a{
|
||||
color: #40424a;
|
||||
margin-right: 10px;
|
||||
font-size: 15px;
|
||||
display: block;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
max-width: 375px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.tagscolor{
|
||||
padding:0px 6px;
|
||||
border-radius: 2px;
|
||||
height: 20px;
|
||||
line-height: 20px;
|
||||
max-width: 108px;
|
||||
font-size: 13px;
|
||||
cursor: default;
|
||||
color: #fff;
|
||||
}
|
||||
}
|
||||
.infos{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
color: #898d9d;
|
||||
margin-top: 12px;
|
||||
font-size: 13px;
|
||||
// img{
|
||||
// height: 22px;
|
||||
// width: 22px;
|
||||
// margin-right: 4px;
|
||||
// border-radius: 50%;
|
||||
// }
|
||||
}
|
||||
.issuecondition{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
color: #40424a;
|
||||
.principal{
|
||||
position: relative;
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
width: 150px;
|
||||
text-align: justify;
|
||||
// &.hovers:hover{
|
||||
// a{
|
||||
// position:initial;
|
||||
// }
|
||||
// }
|
||||
// a{
|
||||
// position: absolute;
|
||||
// right: 0px;
|
||||
// transition: 0.6s;
|
||||
// }
|
||||
// img,span{
|
||||
// width: 22px;
|
||||
// height: 22px;
|
||||
// border-radius: 50%;
|
||||
// }
|
||||
// span{
|
||||
// background-color:#ced5ef;
|
||||
// text-align: center;
|
||||
// line-height: 12px;
|
||||
// color:#000000;
|
||||
// z-index: 6;
|
||||
// }
|
||||
}
|
||||
&>div{
|
||||
width: 90px;
|
||||
text-align: right;
|
||||
}
|
||||
.commentnum{
|
||||
padding-right: 5px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: flex-end;
|
||||
}
|
||||
}
|
||||
}
|
||||
// 状态样式-公用
|
||||
|
||||
.status{
|
||||
display: block;
|
||||
height:22px;
|
||||
border-radius:6px;
|
||||
text-align: center;
|
||||
margin-right: 10px;
|
||||
line-height: 20px;
|
||||
width: 45px;
|
||||
font-size: 14px;
|
||||
border:1px solid #fff;
|
||||
&.normals{
|
||||
border-color:#28be6c;
|
||||
color:#28be6c;
|
||||
}
|
||||
&.hight{
|
||||
border-color: #e67e22;
|
||||
color: #e67e22;
|
||||
}
|
||||
&.urgent{
|
||||
border-color: #db3d1d;
|
||||
color: #db3d1d;
|
||||
}
|
||||
&.low{
|
||||
border-color: #1abcb1;
|
||||
color: #1abcb1;
|
||||
}
|
||||
}
|
||||
.ilog{
|
||||
min-width: 45px;
|
||||
margin-right: 10px;
|
||||
clear: both;
|
||||
.number{
|
||||
background-color:rgba(213, 220, 246, 0.36);
|
||||
border-radius:4px;
|
||||
height: 19px;
|
||||
line-height: 19px;
|
||||
color: #666666;
|
||||
text-align: center;
|
||||
float: left;
|
||||
padding:0px 4px;
|
||||
cursor: pointer;
|
||||
font-size: 13px;
|
||||
}
|
||||
}
|
||||
// colorCard
|
||||
.color{
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
border-radius: 2px;
|
||||
}
|
||||
.swatch{
|
||||
padding: 5px;
|
||||
background: #fff;
|
||||
border-radius: 1px;
|
||||
width: 92px;
|
||||
height: 28px;
|
||||
line-height: 20px;
|
||||
box-shadow: 0 0 0 1px rgba(0,0,0,.1);
|
||||
display: flex;
|
||||
cursor: pointer;
|
||||
}
|
||||
.popover {
|
||||
position: absolute;
|
||||
z-index: 2;
|
||||
}
|
||||
.cover {
|
||||
position: fixed;
|
||||
top: 0px;
|
||||
right: 0px;
|
||||
bottom: 0px;
|
||||
left: 0px;
|
||||
}
|
||||
.modalcolor {
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
border-radius: 2px;
|
||||
}
|
||||
// 标记管理页面
|
||||
.editbar{
|
||||
padding:18px 20px;
|
||||
background-color:rgba(218, 225, 251, 0.24);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-bottom: 30px;
|
||||
justify-content: space-between;
|
||||
&>div{
|
||||
position: relative;
|
||||
.inputred{
|
||||
border-color: red;
|
||||
}
|
||||
.red{
|
||||
position: absolute;
|
||||
left: 166px;
|
||||
width: 100%;
|
||||
top: 2px;
|
||||
color: red;
|
||||
}
|
||||
}
|
||||
}
|
||||
.signlist{
|
||||
padding:10px 0px;
|
||||
margin-bottom: 40px!important;
|
||||
&>li{
|
||||
display: flex;
|
||||
margin-bottom: 5px;
|
||||
padding:10px 20px;
|
||||
&>p{
|
||||
flex:1;
|
||||
color: 40424a;
|
||||
&:first-child{
|
||||
flex:1.2;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: flex-start;
|
||||
}
|
||||
&:last-child{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: flex-start;
|
||||
justify-content: flex-end;
|
||||
}
|
||||
.square{
|
||||
display: block;
|
||||
width: 22px;
|
||||
height: 15px;
|
||||
border-radius:2px;
|
||||
}
|
||||
.line{
|
||||
position: relative;
|
||||
padding-left: 13px;
|
||||
&::before{
|
||||
position: absolute;
|
||||
height:13px;
|
||||
width: 1px;
|
||||
left: 0px;
|
||||
top:7px;
|
||||
background-color:#d5d5d5;
|
||||
content: "";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// 新建页面样式
|
||||
.shortwidth{
|
||||
width: 330px;
|
||||
padding-left: 50px;
|
||||
&>li{
|
||||
border-bottom: 1px solid rgba(172, 176, 191, 0.17);
|
||||
padding-bottom: 8px;
|
||||
margin-bottom: 22px!important;
|
||||
&>span{
|
||||
font-size: 15px;
|
||||
position: relative;
|
||||
color: #40424a;
|
||||
display: flex;
|
||||
width: 100%;
|
||||
height: 20px;
|
||||
line-height: 20px;
|
||||
font-weight: 600;
|
||||
a{
|
||||
position: absolute;
|
||||
right: 0px;
|
||||
}
|
||||
}
|
||||
.operatevalue{
|
||||
line-height: 30px;
|
||||
color: #acb0bf;
|
||||
margin-top: 10px;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
.colorsborder{
|
||||
padding: 0px 8px;
|
||||
height: 20px;
|
||||
line-height: 18px;
|
||||
border-radius: 4px;
|
||||
text-align: center;
|
||||
border:1px solid ;
|
||||
font-size: 13px;
|
||||
}
|
||||
.colorsquare{
|
||||
padding: 0px 8px;
|
||||
height: 20px;
|
||||
line-height: 20px;
|
||||
border-radius: 4px;
|
||||
text-align: center;
|
||||
color: #fff;
|
||||
font-size: 13px;
|
||||
}
|
||||
&>p{
|
||||
margin-top: 5px!important;
|
||||
position: relative;
|
||||
padding-right: 15px;
|
||||
&.removeFlag>span{
|
||||
max-width: 230px;
|
||||
}
|
||||
.removeicon{
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
.removeFlag:hover{
|
||||
border-radius:2px;
|
||||
.removeicon{
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
&>p:first-child{
|
||||
margin-top: 0px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.addTags_form{
|
||||
.ant-row.ant-form-item{
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
.manageTitle{
|
||||
margin-bottom: 20px!important;
|
||||
padding-bottom: 15px;
|
||||
line-height: 22px;
|
||||
color:#5f6872;
|
||||
font-size:16px;
|
||||
border-bottom:1px solid #e1e3e8;
|
||||
}
|
||||
.inline{
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
}
|
||||
}
|
||||
.addTagsModal{
|
||||
.ant-modal-content{
|
||||
background-image:linear-gradient(359.37deg,#ebf3ff 0%,#f8fbff 55.01%,#f1f5ff 100%);
|
||||
}
|
||||
.ant-modal-header{
|
||||
background-color: unset;
|
||||
padding:0px 24px;
|
||||
height: 50px;
|
||||
line-height: 50px;
|
||||
.ant-modal-title{
|
||||
text-align: left;
|
||||
color:#333333;
|
||||
font-size:17px;
|
||||
font-weight: normal!important;
|
||||
height: 50px;
|
||||
line-height: 50px!important;
|
||||
}
|
||||
}
|
||||
.ant-modal-close{
|
||||
top:0px !important;
|
||||
}
|
||||
.popover{
|
||||
left: 94px;
|
||||
top:0px;
|
||||
}
|
||||
}
|
||||
.menusEmpty{
|
||||
padding:12px 20px 10px 16px;
|
||||
&>p{
|
||||
padding:10px 16px;
|
||||
}
|
||||
&>a{
|
||||
padding:10px 16px;
|
||||
display: block;
|
||||
border-top: 1px solid rgba(172, 176, 191, 0.17);
|
||||
}
|
||||
}
|
||||
.piecemenu{
|
||||
li{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
}
|
||||
.colorpiece{
|
||||
display: block;
|
||||
width: 22px!important;
|
||||
height: 15px;
|
||||
margin-right: 9px;
|
||||
border-radius:2px;
|
||||
}
|
||||
.overlayStyle{
|
||||
background-color:#ffffff;
|
||||
border-radius:6px;
|
||||
box-shadow:0px 0px 10px rgba(24, 54, 181, 0.17);
|
||||
max-width: 280px;
|
||||
z-index: 100;
|
||||
.searchbox{
|
||||
padding:12px 20px 0px 16px;
|
||||
}
|
||||
.ant-menu{
|
||||
padding:10px 16px 10px 16px;
|
||||
max-height: 324px;
|
||||
overflow-y: auto;
|
||||
li{
|
||||
padding:0px 16px;
|
||||
height: 38px;
|
||||
line-height: 38px;
|
||||
border-bottom: none;
|
||||
color:#898d9d;
|
||||
position: relative;
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
&:hover,&.ant-menu-item-selected{
|
||||
background-color:rgba(70, 106, 255, 0.07);
|
||||
color:#40424a;
|
||||
}
|
||||
&.ant-menu-item-selected::before{
|
||||
content:"✓";
|
||||
position: absolute;
|
||||
right: 15px;
|
||||
color: #acb0bf;
|
||||
top: 0px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
//详情页面
|
||||
.editpanel{
|
||||
padding:20px;
|
||||
margin-top: 25px;
|
||||
border:1px solid rgba(42, 97, 255, 0.23);
|
||||
border-radius: 2px;
|
||||
}
|
||||
.detailbanner{
|
||||
// margin-top: 25px;
|
||||
// height:82px;
|
||||
// background-color:#fafcff;
|
||||
// border:1px solid rgba(42, 97, 255, 0.23);
|
||||
// border-radius:4px;
|
||||
// padding:12px 25px 12px 20px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
.detailtitle{
|
||||
flex: 1;
|
||||
&>div{
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
}
|
||||
.name{
|
||||
font-size: 16px;
|
||||
font-weight: 700;
|
||||
color:#333;
|
||||
line-height: 22px;
|
||||
max-width: 580px;
|
||||
word-break: break-all;
|
||||
}
|
||||
.author{
|
||||
img{
|
||||
width: 26px;
|
||||
height: 26px;
|
||||
margin-right: 4px;
|
||||
border-radius: 50%;
|
||||
}
|
||||
color: #466aff;
|
||||
}
|
||||
}
|
||||
.detailoperate{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
}
|
||||
.descPanel{
|
||||
margin-top:30px;
|
||||
// padding:20px;
|
||||
// background-color: #f7f8fd;
|
||||
// border:1px solid #c9d8ff;
|
||||
// border-radius: 2px;
|
||||
}
|
||||
// 新建页面
|
||||
.explain{
|
||||
.ant-form-explain{
|
||||
position: absolute;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
.overlaydrop{
|
||||
&.large{
|
||||
width: 260px;
|
||||
}
|
||||
&.small{
|
||||
width: 120px;
|
||||
padding:12px 0px!important;
|
||||
}
|
||||
padding:18px 15px;
|
||||
position: relative;
|
||||
border-radius:6px;
|
||||
box-shadow:0px 0px 10px rgba(24, 54, 181, 0.17);
|
||||
background-color: #fff;
|
||||
.ant-menu{
|
||||
max-height: 305px;
|
||||
overflow-y: auto;
|
||||
li{
|
||||
height: 38px;
|
||||
line-height: 38px;
|
||||
border-bottom: none!important;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding-left: 6px;
|
||||
padding-right: 0px;
|
||||
img{
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
border-radius: 50%;
|
||||
}
|
||||
span{
|
||||
display: block;
|
||||
width:100%;
|
||||
margin-left: 10px;
|
||||
padding-right: 25px;
|
||||
}
|
||||
&:hover,&.ant-menu-item-selected{
|
||||
background-color:rgba(70, 106, 255, 0.07);
|
||||
color:#40424a;
|
||||
}
|
||||
&.ant-menu-item-selected::before{
|
||||
content:"✓";
|
||||
position: absolute;
|
||||
right: 15px;
|
||||
color: #acb0bf;
|
||||
top: 0px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 声明
|
||||
.claimpart{
|
||||
padding-bottom: 15px;
|
||||
border-bottom: 1px solid #eee;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
// issue版本2
|
||||
.overlayChooseStyle{
|
||||
width: 636px;
|
||||
background-color:#ffffff;
|
||||
border-radius:6px;
|
||||
box-shadow:0px 0px 10px rgba(24, 54, 181, 0.17);
|
||||
z-index: 100;
|
||||
padding:30px 20px;
|
||||
.choosedul{
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
padding-bottom: 10px;
|
||||
border-bottom: 1px solid #e4e4e6;
|
||||
margin-bottom: 20px!important;
|
||||
li{
|
||||
height:24px;
|
||||
background-color:#eff2ff;
|
||||
border:1px solid;
|
||||
border-color:#466aff;
|
||||
border-radius:2px;
|
||||
color:#466aff;
|
||||
font-size:14px;
|
||||
margin-right: 15px;
|
||||
margin-bottom: 10px!important;
|
||||
padding:0px 7px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
span{
|
||||
display: block;
|
||||
max-width:120px ;
|
||||
}
|
||||
}
|
||||
}
|
||||
.counttips{
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
.ant-menu{
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
padding:20px 0px 5px 0px;
|
||||
box-sizing: border-box;
|
||||
max-height: 307px;
|
||||
overflow-y: auto;
|
||||
&.piecemenu li{
|
||||
width: auto;
|
||||
&>span{
|
||||
display: flex;
|
||||
}
|
||||
span.task-hide{
|
||||
max-width: unset;
|
||||
}
|
||||
&:nth-child(5n){
|
||||
margin-right: 24px!important;
|
||||
}
|
||||
}
|
||||
li{
|
||||
width: 98px;
|
||||
height:32px;
|
||||
line-height:30px;
|
||||
text-align: center;
|
||||
font-size:14px;
|
||||
border-radius:2px;
|
||||
margin-right: 24px!important;
|
||||
margin-bottom: 15px!important;
|
||||
border:1px solid!important;
|
||||
border-color: #f4f6fe!important;
|
||||
padding:0px 5px;
|
||||
&.commonli{
|
||||
background-color:#f4f6fe!important;
|
||||
}
|
||||
.removeicon{
|
||||
display: block;
|
||||
}
|
||||
span.task-hide{
|
||||
color: #3f455b;
|
||||
margin:0px auto;
|
||||
position: relative;
|
||||
color:#3f455b;
|
||||
max-width: 80px;
|
||||
display: inline-block;
|
||||
}
|
||||
span{
|
||||
position: relative;
|
||||
margin:0px auto;
|
||||
}
|
||||
&.colorli{
|
||||
border-color: transparent!important;
|
||||
span{
|
||||
color: #fff;
|
||||
position: relative;
|
||||
margin:0px auto;
|
||||
}
|
||||
}
|
||||
&.commonli.ant-menu-item-selected{
|
||||
background-color:#e2e8ff!important;
|
||||
color:#3f5097;
|
||||
border-color:#466aff!important;
|
||||
}
|
||||
&.colorli.ant-menu-item-selected{
|
||||
border-color: transparent!important;
|
||||
}
|
||||
&.colorli.ant-menu-item-selected{
|
||||
&>span::before{
|
||||
content:"✓";
|
||||
position: absolute;
|
||||
right: -12px;
|
||||
color: #fff;
|
||||
top: -16px;
|
||||
}
|
||||
}
|
||||
&:nth-child(5n){
|
||||
margin-right: 0px!important;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.boxStyles{
|
||||
margin-top: 10px!important;
|
||||
width: 100%;
|
||||
input,input[class~="ant-input"]:focus{
|
||||
border:none!important;
|
||||
padding:0px;
|
||||
}
|
||||
div[class~='ant-select-selection__placeholder']{
|
||||
margin-left: 0px!important;
|
||||
margin-right: 0px!important;
|
||||
}
|
||||
span[class~='ant-select-arrow']{
|
||||
opacity: 0;
|
||||
}
|
||||
}
|
||||
|
|
@ -32,7 +32,7 @@ const OrderDetail = Loadable({
|
|||
loading: Loading,
|
||||
})
|
||||
const OrderIndex = Loadable({
|
||||
loader: () => import('../Order/order'),
|
||||
loader: () => import('../Issues/index'),
|
||||
loading: Loading,
|
||||
})
|
||||
const CoderRootIndex = Loadable({
|
||||
|
|
@ -93,7 +93,7 @@ const UpdateMerge = Loadable({
|
|||
})
|
||||
|
||||
const MilepostDetail = Loadable({
|
||||
loader: () => import('../Order/MilepostDetail'),
|
||||
loader: () => import('../Order/MilepostDetail.jsx'),
|
||||
loading: Loading,
|
||||
})
|
||||
const WatchUsers = Loadable({
|
||||
|
|
@ -711,11 +711,11 @@ class Detail extends Component {
|
|||
}
|
||||
></Route>
|
||||
{/* 标签列表 */}
|
||||
<Route path="/:owner/:projectsId/issues/tags"
|
||||
{/* <Route path="/:owner/:projectsId/issues/tags"
|
||||
render={
|
||||
(props) => (<TagList {...this.props} {...props} {...this.state} {...common} />)
|
||||
}
|
||||
></Route>
|
||||
></Route> */}
|
||||
{/* 仓库设置 */}
|
||||
<Route path="/:owner/:projectsId/settings"
|
||||
render={
|
||||
|
|
@ -736,7 +736,7 @@ class Detail extends Component {
|
|||
}
|
||||
></Route>
|
||||
{/*里程碑详情*/}
|
||||
<Route path="/:owner/:projectsId/milestones/:meilid"
|
||||
<Route path="/:owner/:projectsId/milestones/:mileId"
|
||||
render={
|
||||
(props) => (<MilepostDetail {...this.props} {...props} {...this.state} {...common} />)
|
||||
}
|
||||
|
|
@ -748,36 +748,36 @@ class Detail extends Component {
|
|||
}
|
||||
></Route>
|
||||
{/* 里程碑页面新建任务 */}
|
||||
<Route path="/:owner/:projectsId/issues/:milepostId/new"
|
||||
{/* <Route path="/:owner/:projectsId/issues/:milepostId/new"
|
||||
render={
|
||||
(props) => (<OrderNew {...this.props} {...props} {...this.state} {...common} />)
|
||||
}
|
||||
></Route>
|
||||
></Route> */}
|
||||
{/* 新建任务 */}
|
||||
<Route path="/:owner/:projectsId/issues/new"
|
||||
{/* <Route path="/:owner/:projectsId/issues/new"
|
||||
render={
|
||||
(props) => (<OrderNew {...this.props} {...props} {...this.state} {...common} />)
|
||||
}
|
||||
></Route>
|
||||
></Route> */}
|
||||
{/* 修改详情 edit*/}
|
||||
<Route path="/:owner/:projectsId/issues/:orderId/edit"
|
||||
{/* <Route path="/:owner/:projectsId/issues/:orderId/edit"
|
||||
render={
|
||||
(props) => (<OrderupdateDetail {...this.props} {...props} {...this.state} {...common} form_type={"edit"}/>)
|
||||
}
|
||||
></Route>
|
||||
></Route> */}
|
||||
{/* 复制详情 copyetail*/}
|
||||
<Route path="/:owner/:projectsId/issues/:orderId/copyetail"
|
||||
{/* <Route path="/:owner/:projectsId/issues/:orderId/copyetail"
|
||||
render={
|
||||
(props) => (<OrderupdateDetail {...this.props} {...props} {...this.state} {...common} form_type={"copy"}/>)
|
||||
}
|
||||
></Route>
|
||||
></Route> */}
|
||||
|
||||
{/* 任务详情 */}
|
||||
<Route path="/:owner/:projectsId/issues/:orderId"
|
||||
{/* <Route path="/:owner/:projectsId/issues/:orderId"
|
||||
render={
|
||||
(props) => (<OrderDetail {...this.props} {...this.state} {...props} {...common} />)
|
||||
}
|
||||
></Route>
|
||||
></Route> */}
|
||||
{/* 动态 */}
|
||||
<Route path="/:owner/:projectsId/activity"
|
||||
render={
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ import axios from 'axios';
|
|||
import { Pagination , Spin } from 'antd';
|
||||
import NoData from '../../Nodata';
|
||||
import { getImageUrl } from 'educoder';
|
||||
import { Link } from 'react-router-dom';
|
||||
|
||||
function Contribute(props){
|
||||
const [ list , setList ] = useState(undefined);
|
||||
|
|
|
|||
|
|
@ -3,23 +3,60 @@ import CopyTool from '../../Component/CopyTool';
|
|||
import { truncateCommitId } from '../../common/util';
|
||||
import { Link } from 'react-router-dom';
|
||||
import { getImageUrl , turnbar } from 'educoder';
|
||||
import { Dropdown , Menu , Spin } from 'antd';
|
||||
import Nodata from '../../Nodata';
|
||||
import { Button, Dropdown , Input, Menu , message, Modal, Select, Spin, Table, Tooltip } from 'antd';
|
||||
import Modals from '../../Component/PublicModal/Index';
|
||||
import './Index.scss';
|
||||
|
||||
import Tree from '../img/tree.png';
|
||||
import Axios from 'axios';
|
||||
|
||||
function Index(props) {
|
||||
const [ reload, setReload] = useState(undefined);
|
||||
const [ list , setList ] = useState([]);
|
||||
const [ isSpin , setIsSpin ] = useState(true);
|
||||
// 删除分支
|
||||
const [visible, setVisible] = useState(false);
|
||||
// 新建分支
|
||||
const [addBranch, setAddBranch] = useState(false);
|
||||
const [newBranchName, setNewBranchName] = useState(undefined);
|
||||
const [newFormBranchName, setNewFormBranchName] = useState(undefined);
|
||||
const [newBranchError, setNewBranchError] = useState(undefined);
|
||||
const [branchList, setBranchList] = useState([]);//所有分支
|
||||
// 通过分支名搜索分支
|
||||
const [name, setName] = useState(undefined);
|
||||
// 分页
|
||||
const [current, setCurrent] = useState(1);
|
||||
const [total, setTotal] = useState(0);
|
||||
const [pageSize, setPageSize] = useState(10);
|
||||
|
||||
const { projectsId , owner } = props.match.params;
|
||||
const { isManager , isDeveloper , projectDetail , defaultBranch } = props;
|
||||
const { isManager , isDeveloper , projectDetail , defaultBranch, getDetail } = props;
|
||||
useEffect(()=>{
|
||||
// getList();
|
||||
const url = `/v1/${owner}/${projectsId}/branches.json`;
|
||||
Axios.get(url,{
|
||||
params:{
|
||||
keyword: name,
|
||||
page: current,
|
||||
limit: pageSize
|
||||
}
|
||||
}).then(result=>{
|
||||
if(result){
|
||||
const {branches, total_count} = result.data;
|
||||
setTotal(total_count)
|
||||
setList(branches);
|
||||
setNewFormBranchName(branches[0].name);
|
||||
}
|
||||
setIsSpin(false);
|
||||
}).catch(error=>{setIsSpin(false);})
|
||||
},[name, reload, pageSize, current])
|
||||
|
||||
useEffect(()=>{
|
||||
getList();
|
||||
},[])
|
||||
if(projectDetail && document.title.indexOf('所有分支-') === -1){
|
||||
const { author, name} = projectDetail;
|
||||
document.title = `所有分支-${author.name}/${name}`;
|
||||
}
|
||||
}, [projectDetail])
|
||||
|
||||
|
||||
const menu =(zip_url,tar_url)=> (
|
||||
|
|
@ -29,6 +66,105 @@ function Index(props) {
|
|||
</Menu>
|
||||
)
|
||||
|
||||
const columns = [
|
||||
{
|
||||
title: "分支名称",
|
||||
dataIndex: "name",
|
||||
key: 1,
|
||||
ellipsis: true,
|
||||
className: "branchNameColumn",
|
||||
render: (txt, item) => {
|
||||
return (
|
||||
<Link to={`/${owner}/${projectsId}/tree/${turnbar(txt)}`} onClick={()=>{window.scrollTo(0,0)}} className="task-hide">{txt}</Link>
|
||||
)
|
||||
}
|
||||
},
|
||||
{
|
||||
title: "更新信息",
|
||||
dataIndex: "commit",
|
||||
key: 3,
|
||||
ellipsis: true,
|
||||
width: "240px",
|
||||
render: (txt, item) => {
|
||||
return (
|
||||
<div className='treeinfo'>
|
||||
{
|
||||
txt && txt.committer && txt.committer.id?
|
||||
<Link to={`/${ txt.committer.login}`}>
|
||||
<img style={{borderRadius:"50%"}} src={getImageUrl(`/${ txt.committer.image_url}`)} alt="" className='branchLastUpdateUserImage'/>
|
||||
<span style={{fontWeight:"500"}}>{txt && txt.committer && txt.committer.name}</span>
|
||||
</Link>
|
||||
:
|
||||
<React.Fragment>
|
||||
<img style={{borderRadius:"50%"}} src={getImageUrl(`/${ txt.committer.image_url}`)} alt="" className='branchLastUpdateUserImage'/>
|
||||
<span style={{fontWeight:"500"}}>{txt && txt.committer && txt.committer.name}</span>
|
||||
</React.Fragment>
|
||||
}
|
||||
<span className="color-grey-3">更新于{txt && txt.time_ago}</span>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
},
|
||||
{
|
||||
title: "commit信息",
|
||||
dataIndex: "commit_id",
|
||||
key: 4,
|
||||
ellipsis: true,
|
||||
width: "250px",
|
||||
render: (txt, item) => {
|
||||
return <div className="treecopy">
|
||||
<div className='treeCopyBox'>
|
||||
<span>
|
||||
<img src={Tree} alt="sha" width={"16px"}/>
|
||||
<Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(txt)}`}>{truncateCommitId(txt)}</Link>
|
||||
<input type="text" id={`value${truncateCommitId(txt)}`} value={`${truncateCommitId(txt)}`}/>
|
||||
</span>
|
||||
<CopyTool beforeText="复制commit id" afterText="复制成功" inputId={`value${truncateCommitId(txt)}`}/>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
},
|
||||
{
|
||||
title: "分支类型",
|
||||
dataIndex: "default_branch",
|
||||
key: 5,
|
||||
width: "150px",
|
||||
render: (txt, item) => {
|
||||
return isManager ? txt === item.name ? <a className='btn-83' style={{width: '93px'}}>默认分支</a> : <Select value={1} onChange={(value)=>{updateDefaultBranch(value, item)}}>
|
||||
<Select.Option value={0}>默认分支</Select.Option>
|
||||
<Select.Option value={1}>普通分支</Select.Option>
|
||||
</Select> : txt === item.name ? '默认分支' : '普通分支'
|
||||
}
|
||||
},
|
||||
{
|
||||
title: "操作",
|
||||
dataIndex: "name",
|
||||
key: 6,
|
||||
align: "center",
|
||||
width: "320px",
|
||||
className: "branchActionColumn",
|
||||
render: (txt, item) => {
|
||||
return (
|
||||
<div className="treeabout">
|
||||
{
|
||||
(isManager || isDeveloper) && (projectDetail && projectDetail.type!==2) &&
|
||||
<Tooltip title={`以${txt}为源分支创建一个合并请求`}><Link to={
|
||||
// 如果项目是fork的项目，pr自动指向源仓库，否则指向本仓库默认分支
|
||||
projectDetail && projectDetail.fork_info?
|
||||
`/${projectDetail.fork_info.fork_project_user_login}/${projectDetail.fork_info.fork_project_identifier}/compare/${turnbar(txt || defaultBranch)}...${owner + ':' + turnbar(txt)}`
|
||||
:`/${owner}/${projectsId}/compare/${turnbar(defaultBranch)}...${turnbar(txt)}`
|
||||
} className="btn-83">+ 合并请求</Link></Tooltip>
|
||||
}
|
||||
<Dropdown overlay={menu(item.zip_url,item.tar_url)} trigger={['click']} placement="bottomRight">
|
||||
<a className="btn-83" style={{width: '76px'}}>下载<i className="iconfont icon-sanjiaoxing-down font-14"></i></a>
|
||||
</Dropdown>
|
||||
{isManager && (txt === item.default_branch ? <Tooltip title={`该分支为默认分支，不支持删除操作`}><Button style={{width: '76px'}} disabled>删除</Button></Tooltip> : <Button className='f6_bor_but' style={{width: '76px'}} onClick={()=>{setVisible(item)}}>删除</Button>)}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
}
|
||||
];
|
||||
|
||||
function getList() {
|
||||
const url = `/${owner}/${projectsId}/branches_slice.json`;
|
||||
Axios.get(url).then(result=>{
|
||||
|
|
@ -39,10 +175,121 @@ function Index(props) {
|
|||
}).catch(error=>{setIsSpin(false);})
|
||||
}
|
||||
|
||||
// 删除分支确认函数
|
||||
function deleteLabel(){
|
||||
Axios.delete(`/v1/${owner}/${projectsId}/branches/${visible.name}.json`).then(res=>{
|
||||
if(res && res.data){
|
||||
if(current>1 && (list && list.length===1)){
|
||||
setCurrent(current-1);
|
||||
}else{
|
||||
setReload(Math.random());
|
||||
}
|
||||
setVisible(false);
|
||||
!res.data.status && message.success('删除成功');
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// 新建分支确认函数
|
||||
function createBranch(){
|
||||
setNewBranchError(undefined);
|
||||
if(!newBranchName){
|
||||
setNewBranchError("请输入新建分支名称");
|
||||
}else{
|
||||
Axios.post(`/v1/${owner}/${projectsId}/branches.json`, {
|
||||
new_branch_name: newBranchName,
|
||||
old_branch_name: newFormBranchName
|
||||
}).then(res=>{
|
||||
if(res && res.data){
|
||||
// 重新请求仓库详情接口，更新分支总数信息
|
||||
getDetail();
|
||||
setReload(Math.random());
|
||||
setAddBranch(false);
|
||||
message.success('新建分支成功');
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// 新建分支名检查格式
|
||||
function checkNewBranchName(e) {
|
||||
setNewBranchError(undefined);
|
||||
const value = e.target.value;
|
||||
if (value) {
|
||||
const str = '^*';
|
||||
let reg = /\\/g;
|
||||
if(reg.test(value)){
|
||||
setNewBranchError('分支名不能包含下列任何字符：^ * \\ ');
|
||||
}else{
|
||||
for(var i=0;i<str.length;i++){
|
||||
let s = str[i];
|
||||
if(value.indexOf(s) > -1){
|
||||
setNewBranchError('分支名不能包含下列任何字符：^ * \\ ');
|
||||
return;
|
||||
}else{
|
||||
setNewBranchName(e.target.value);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 更新默认仓库分支
|
||||
function updateDefaultBranch(value, info){
|
||||
Axios.patch(`/v1/${owner}/${projectsId}/branches/update_default_branch.json`,{
|
||||
name: info.name
|
||||
}).then(res=>{
|
||||
if(res && res.data){
|
||||
getDetail();
|
||||
setReload(Math.random());
|
||||
!res.data.status && message.success('操作成功');
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// 改变pagesize
|
||||
function onShowSizeChange(current, pageSize){
|
||||
window.scrollTo(0, 0);
|
||||
setCurrent(1);
|
||||
setPageSize(pageSize);
|
||||
}
|
||||
|
||||
// 切换页数
|
||||
function changePage(page, pageSize){
|
||||
window.scrollTo(0, 0);
|
||||
setCurrent(page);
|
||||
}
|
||||
|
||||
// 新建分支按钮点击函数
|
||||
function addBranchBtn(){
|
||||
setAddBranch(true);
|
||||
const url = `/v1/${owner}/${projectsId}/branches/all.json`;
|
||||
Axios.get(url).then(result=>{
|
||||
if(result){
|
||||
setBranchList(result.data);
|
||||
}
|
||||
}).catch(error=>{console.log('error', error);})
|
||||
}
|
||||
|
||||
return(
|
||||
<Spin spinning={isSpin}>
|
||||
<div style={{paddingTop:"10px",minHeight:"400px",paddingBottom:"30px"}}>
|
||||
{
|
||||
<div className='branchListActionBox'>
|
||||
<Input.Search placeholder='请输入分支名称' style={{width: '354px'}} className='searchBranch' onSearch={(value)=>{setCurrent(1);setName(value)}} allowClear/>
|
||||
<div>
|
||||
{isManager && <Link to={`/${owner}/${projectsId}/settings/branches`} className="btn-83" style={{width: '102px'}}><i className="iconfont icon-xuanzhongjibenshezhiicon font-14 mr5"></i>分支设置</Link>}
|
||||
{(isManager || isDeveloper) && (projectDetail && projectDetail.type!==2) && <Button type='primary' onClick={addBranchBtn}>+ 新建分支</Button>}
|
||||
</div>
|
||||
</div>
|
||||
<Table
|
||||
rowKey={'name'}
|
||||
className='branchListTable'
|
||||
dataSource={list}
|
||||
columns={columns}
|
||||
pagination={{current: current, pageSize: pageSize, total: total, showSizeChanger: true, onShowSizeChange:onShowSizeChange, showQuickJumper: true, onChange: changePage}}
|
||||
>
|
||||
</Table>
|
||||
{/* {
|
||||
list && list.length>0 && list.map((item,key)=>{
|
||||
return(
|
||||
<React.Fragment>
|
||||
|
|
@ -86,7 +333,12 @@ function Index(props) {
|
|||
<div className="treeabout">
|
||||
{
|
||||
(isManager || isDeveloper) && (projectDetail && projectDetail.type!==2) &&
|
||||
<Link to={`/${owner}/${projectsId}/compare/${turnbar(defaultBranch)}...${turnbar(i.name)}`} className="btn-83">+ 合并请求</Link>
|
||||
<Link to={
|
||||
// 如果项目是fork的项目，pr自动指向源仓库，否则指向本仓库默认分支
|
||||
projectDetail && projectDetail.fork_info?
|
||||
`/${projectDetail.fork_info.fork_project_user_login}/${projectDetail.fork_info.fork_project_identifier}/compare/${turnbar(i.name || defaultBranch)}...${owner + ':' + turnbar(i.name)}`
|
||||
:`/${owner}/${projectsId}/compare/${turnbar(defaultBranch)}...${turnbar(i.name)}`
|
||||
} className="btn-83">+ 合并请求</Link>
|
||||
}
|
||||
<Dropdown overlay={menu(i.zip_url,i.tar_url)} trigger={['click']} placement="bottomRight">
|
||||
<a className="btn-83 ml15">下载<i className="iconfont icon-sanjiaoxing-down font-14"></i></a>
|
||||
|
|
@ -101,11 +353,47 @@ function Index(props) {
|
|||
</React.Fragment>
|
||||
)
|
||||
})
|
||||
}
|
||||
{
|
||||
list && list.length === 0 && <Nodata _html="暂无数据"/>
|
||||
}
|
||||
} */}
|
||||
</div>
|
||||
<Modals
|
||||
title="删除分支"
|
||||
onCancel={()=>{setVisible(false)}}
|
||||
visible={Boolean(visible)}
|
||||
width="456px"
|
||||
btn={
|
||||
<div>
|
||||
<Button size={"large"} onClick={()=>{setVisible(false)}}>取消</Button>
|
||||
<Button type={'danger'} ghost size={"large"} onClick={deleteLabel}>确认删除</Button>
|
||||
</div>
|
||||
}
|
||||
>
|
||||
<div className="contents mb30" style={{justifyContent: 'flex-start'}}>
|
||||
<i className='iconfont icon-shanchu_tc_icon1 font-36 mr18' style={{color: '#ca0002'}}></i>
|
||||
<p style={{color: '#333'}}>确定删除{visible.name}分支?</p>
|
||||
</div>
|
||||
</Modals>
|
||||
<Modal
|
||||
title="新建分支"
|
||||
onCancel={()=>{setAddBranch(false)}}
|
||||
visible={addBranch}
|
||||
width="388px"
|
||||
footer={
|
||||
<Button type={'primary'} style={{width:'334px', height: '42px'}} onClick={createBranch}>确认新建</Button>
|
||||
}
|
||||
className="createNewBranchModal"
|
||||
>
|
||||
<div className="mb30" style={{justifyContent: 'flex-start'}}>
|
||||
<div className='font-15 createBranchLabel'>分支名称</div>
|
||||
<Input placeholder='请输入分支名称' className='createBranchInput' onChange={checkNewBranchName} maxLength={100}/>
|
||||
<div className='newBranchError mt5'>{newBranchError}</div>
|
||||
<div className='font-15 createBranchLabel mt20'>分支起点</div>
|
||||
<Select showSearch style={{width: '340px'}} className='createBranchInput' placeholder="请选择分支起点" onChange={(value)=>{setNewFormBranchName(value)}} getPopupContainer={triggerNode => triggerNode.parentNode}>
|
||||
{branchList && branchList.map((item, index)=>{
|
||||
return <Select.Option value={item.name} key={index}>{item.name}</Select.Option>
|
||||
})}
|
||||
</Select>
|
||||
</div>
|
||||
</Modal>
|
||||
</Spin>
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,98 @@
|
|||
.treeinfo{
|
||||
.branchLastUpdateUserImage{
|
||||
height: 20px;
|
||||
width: 20px;
|
||||
margin-right: 5px;
|
||||
}
|
||||
}
|
||||
.f6_bor_but, .f6_bor_but:focus{
|
||||
color:#f60011;
|
||||
background-color:rgba(196, 0, 14, 0.09);
|
||||
border:1px solid #f60011;
|
||||
border-radius:5px;
|
||||
&:hover{
|
||||
color:#f60011;
|
||||
background-color:rgba(196, 0, 14, 0.18);
|
||||
border-color:#ff727c;
|
||||
}
|
||||
&:active{
|
||||
color:#f60011;
|
||||
background-color:rgba(196, 0, 14, 0.22);
|
||||
border-color:#f60011;
|
||||
}
|
||||
}
|
||||
.branchListTable{
|
||||
.ant-table-thead > tr > th{
|
||||
border-top: 1px solid rgba(42, 97, 255, 0.23);
|
||||
border-bottom: 1px solid rgba(42, 97, 255, 0.23) !important;
|
||||
background-color:#fafcff;
|
||||
}
|
||||
.ant-table-column-title{
|
||||
color:#40424a;
|
||||
}
|
||||
.ant-table-thead > tr:first-child > th:last-child{
|
||||
border-right: 1px solid rgba(42, 97, 255, 0.23);
|
||||
}
|
||||
.ant-table-thead > tr:first-child > th:first-child{
|
||||
border-left: 1px solid rgba(42, 97, 255, 0.23);
|
||||
}
|
||||
.ant-table-tbody > tr > td{
|
||||
border-color: #eeeeee;
|
||||
padding: 18.5px 16px;
|
||||
}
|
||||
.branchNameColumn{
|
||||
border-left: 1px solid #d0d0d0;
|
||||
}
|
||||
.branchActionColumn{
|
||||
border-right: 1px solid #d0d0d0;
|
||||
}
|
||||
.task-hide{
|
||||
color: $primary-color;
|
||||
}
|
||||
.ant-table-empty .ant-table-placeholder{
|
||||
border-left: 1px solid #d0d0d0;
|
||||
border-right: 1px solid #d0d0d0;
|
||||
}
|
||||
}
|
||||
.branchListActionBox{
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin: 20px 0 30px;
|
||||
}
|
||||
.createNewBranchModal{
|
||||
.ant-modal-title{
|
||||
text-align: left;
|
||||
color:#333333;
|
||||
font-size:17px;
|
||||
font-weight: normal !important;
|
||||
}
|
||||
.ant-modal-header{
|
||||
border-bottom: none;
|
||||
background-color:rgba(70, 106, 255, 0.05);
|
||||
}
|
||||
.ant-modal-close{right: 5px;}
|
||||
.ant-modal-close-x{font-size: 26px;}
|
||||
.ant-modal-footer{
|
||||
border-top: none;
|
||||
text-align: center;
|
||||
padding-bottom: 53px;
|
||||
}
|
||||
.ant-modal-content{
|
||||
background-image:linear-gradient(359.37deg,#ebf3ff 0%,#f8fbff 55.01%,#f1f5ff 100%);
|
||||
}
|
||||
.createBranchLabel{
|
||||
color:#27282d;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
.createBranchInput, .createBranchInput .ant-select-selection{
|
||||
border-color:#9eaacb;
|
||||
background-color: transparent !important;
|
||||
}
|
||||
.newBranchError{
|
||||
color:#df0002;
|
||||
}
|
||||
}
|
||||
.branchSort{
|
||||
font-weight: 500;
|
||||
color: #333333;
|
||||
|
|
@ -50,13 +145,15 @@
|
|||
.treecopy{
|
||||
flex:1;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
// justify-content: center;
|
||||
&>div:not(.treeCopyBox){
|
||||
position: relative;
|
||||
}
|
||||
&>div{
|
||||
height: 32px;
|
||||
background: #FAFBFC;
|
||||
border-radius: 4px;
|
||||
border: 1px solid #D0D0D0;
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
|
@ -64,6 +161,7 @@
|
|||
padding:0px 15px;
|
||||
border-right: 1px solid rgba(153, 153, 153, 0.4);
|
||||
height: 100%;
|
||||
width: 140px;
|
||||
img{
|
||||
margin-right: 4px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import React from 'react';
|
||||
import { Modal } from 'antd';
|
||||
|
||||
import './order.css';
|
||||
import './order.scss';
|
||||
function AmplifyImg(props) {
|
||||
|
||||
return (
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import React, { Component, useRef } from "react";
|
||||
import React, { Component } from "react";
|
||||
import { Link } from "react-router-dom";
|
||||
|
||||
import axios from "axios";
|
||||
|
|
@ -8,7 +8,7 @@ import Attachments from "../Upload/attachment";
|
|||
import RenderHtml from "../../components/render-html";
|
||||
import Comments from "../comments/comments";
|
||||
import Claims from "../claims/claims"
|
||||
import "./order.css";
|
||||
import "./order.scss";
|
||||
|
||||
class Detail extends Component {
|
||||
constructor(props) {
|
||||
|
|
@ -44,6 +44,20 @@ class Detail extends Component {
|
|||
this.getDetail();
|
||||
};
|
||||
|
||||
componentDidUpdate=()=>{
|
||||
this.updateDocumentTitle();
|
||||
}
|
||||
|
||||
// 更新网页标题
|
||||
updateDocumentTitle(){
|
||||
const {projectDetail} = this.props;
|
||||
const {data} = this.state;
|
||||
if(projectDetail && data){
|
||||
const { author, name} = projectDetail;
|
||||
document.title = `${data.subject}-疑修-${author.name}/${name}`;
|
||||
}
|
||||
}
|
||||
|
||||
getDetail = () => {
|
||||
const { projectsId, orderId, owner } = this.props.match.params;
|
||||
const url = `/${owner}/${projectsId}/issues/${orderId}.json`;
|
||||
|
|
@ -55,11 +69,6 @@ class Detail extends Component {
|
|||
data: result.data,
|
||||
isSpins: false
|
||||
});
|
||||
const {projectDetail} = this.props;
|
||||
if(projectDetail){
|
||||
const { author, name} = projectDetail;
|
||||
document.title = `${result.data && result.data.subject}-疑修-${author.name}/${name}`;
|
||||
}
|
||||
}
|
||||
})
|
||||
.catch((error) => {
|
||||
|
|
|
|||
|
|
@ -1,54 +1,49 @@
|
|||
import React, { Component } from 'react';
|
||||
import { Link } from 'react-router-dom';
|
||||
import { Dropdown, Icon, Menu, Pagination, Typography, Popconfirm, Spin } from 'antd';
|
||||
import NoneData from '../Nodata';
|
||||
import { Dropdown, Icon, Menu, Pagination, Popconfirm, Spin, Button, Tooltip } from 'antd';
|
||||
import emp from '../../forge/Issues/Img/emp.png';
|
||||
import axios from 'axios';
|
||||
import './order.css';
|
||||
import CheckProfile from '../Component/ProfileModal/Profile';
|
||||
|
||||
const { Text } = Typography;
|
||||
|
||||
import './milepost.scss';
|
||||
class Milepost extends Component {
|
||||
constructor(props) {
|
||||
super(props);
|
||||
this.state = {
|
||||
data: undefined,
|
||||
limit: 15,
|
||||
limit: 10,
|
||||
page: 1,
|
||||
order_type: undefined,
|
||||
//新建标签区域是否显示 none 隐藏 block 显示
|
||||
display: 'none',
|
||||
// 里程碑 开启/关闭 状态
|
||||
status: 'open',
|
||||
openselect: 1,
|
||||
closeselect: undefined,
|
||||
order_name: undefined,
|
||||
|
||||
spinings: true
|
||||
spinings: true,
|
||||
// tooltip显隐
|
||||
visible: false
|
||||
}
|
||||
}
|
||||
componentDidUpdate(){
|
||||
this.updateDocumentTitle();
|
||||
}
|
||||
|
||||
componentDidMount = () => {
|
||||
this.getList(1, this.state.status, 'desc');
|
||||
}
|
||||
componentDidUpdate = () => {
|
||||
this.getList(1, this.state.limit, this.state.status);
|
||||
this.updateDocumentTitle();
|
||||
}
|
||||
|
||||
// 更新网页标题
|
||||
updateDocumentTitle(){
|
||||
const {projectDetail} = this.props;
|
||||
if(projectDetail){
|
||||
const { author, name} = projectDetail;
|
||||
document.title = `新建合并请求-${author.name}/${name}`;
|
||||
document.title = `里程碑-${author.name}/${name}`;
|
||||
}
|
||||
}
|
||||
|
||||
getList = (page, status, order_type, order_name) => {
|
||||
getList = (page, limit, category, sort_by, sort_direction) => {
|
||||
const { projectsId ,owner } = this.props.match.params;
|
||||
const { limit } = this.state;
|
||||
const url = `/${owner}/${projectsId}/milestones.json`;
|
||||
const url = `/v1/${owner}/${projectsId}/milestones.json`;
|
||||
axios.get(url, {
|
||||
params: {
|
||||
projectsId, page, limit, status, order_type, order_name
|
||||
page, limit: limit, category, sort_by, sort_direction
|
||||
}
|
||||
}).then((result) => {
|
||||
if (result) {
|
||||
|
|
@ -63,45 +58,24 @@ class Milepost extends Component {
|
|||
}
|
||||
|
||||
opneMilelist = (type) => {
|
||||
const { order_name } = this.state;
|
||||
if (type) {
|
||||
const { current_user } = this.props;
|
||||
if (type === 1) {
|
||||
this.setState({
|
||||
status: 'open',
|
||||
openselect: current_user.user_id,
|
||||
closeselect: undefined,
|
||||
|
||||
status: type === 1 ? 'open' : 'closed'
|
||||
})
|
||||
this.getList(1, 'open', 'desc', order_name);
|
||||
} else {
|
||||
this.setState({
|
||||
status: 'closed',
|
||||
openselect: undefined,
|
||||
closeselect: current_user.user_id
|
||||
})
|
||||
this.getList(1, 'closed', 'desc', order_name);
|
||||
this.getList(1, this.state.limit, type === 1 ? 'open' : 'closed', this.state.order_name, this.state.order_type);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
updatestatusemile = (status, arr) => {
|
||||
const { projectsId , owner } = this.props.match.params;
|
||||
const url = `/${owner}/${projectsId}/milestones/${arr.id}/update_status.json`;
|
||||
const { current_user } = this.props;
|
||||
axios.post(url, {
|
||||
project_id: projectsId,
|
||||
id: arr.id,
|
||||
status: status
|
||||
}).then(result => {
|
||||
if (result) {
|
||||
this.setState({
|
||||
status: status,
|
||||
closeselect: status === "closed" ? current_user.user_id : undefined,
|
||||
openselect: status === "closed" ? undefined : current_user.user_id
|
||||
})
|
||||
this.getList(1, status, 'desc');
|
||||
this.getList(1, this.state.limit, this.state.status, this.state.order_name, this.state.order_type);
|
||||
const { getDetail } = this.props;
|
||||
getDetail && getDetail();
|
||||
}
|
||||
|
|
@ -120,7 +94,7 @@ class Milepost extends Component {
|
|||
}
|
||||
}).then((result) => {
|
||||
if (result) {
|
||||
this.getList(1, this.state.status, 'desc');
|
||||
this.getList(1, this.state.limit, this.state.status, this.state.order_name, this.state.order_type);
|
||||
const { getDetail } = this.props;
|
||||
getDetail && getDetail();
|
||||
}
|
||||
|
|
@ -134,39 +108,44 @@ class Milepost extends Component {
|
|||
this.setState({
|
||||
page
|
||||
})
|
||||
const { status } = this.state;
|
||||
this.getList( page , status );
|
||||
this.getList(page, this.state.limit, this.state.status, this.state.order_name, this.state.order_type);
|
||||
}
|
||||
|
||||
// 排序
|
||||
arrayList = (e) => {
|
||||
const name = e.key !== 'order' ? e.key : undefined;
|
||||
const type = e.item.props.value !== 'order' ? e.item.props.value : undefined;
|
||||
this.setState({
|
||||
order_name: e.key,
|
||||
order_type: e.item.props.value
|
||||
order_name: name,
|
||||
order_type: type
|
||||
})
|
||||
this.getList(1, this.state.status, e.item.props.value, e.key);
|
||||
this.getList(1, this.state.limit, this.state.status, name, type);
|
||||
}
|
||||
|
||||
|
||||
//控制新建标签页是否显示
|
||||
newshow = () => {
|
||||
// 分页组件
|
||||
onShowSizeChange = (current, pageSize) =>{
|
||||
this.setState({
|
||||
display: 'block'
|
||||
});
|
||||
|
||||
};
|
||||
newclose = () => {
|
||||
this.setState({
|
||||
display: 'none'
|
||||
});
|
||||
};
|
||||
page: 1,
|
||||
limit: pageSize
|
||||
})
|
||||
this.getList(1, pageSize, this.state.status, this.state.order_name, this.state.order_type);
|
||||
}
|
||||
|
||||
// tooltip判断是否显示
|
||||
// onVisibleChange = (visible, value) => {
|
||||
// console.log('visible, value', visible, value);
|
||||
// this.setState({
|
||||
// visible: value.length >24 ? visible : false
|
||||
// })
|
||||
// }
|
||||
|
||||
render() {
|
||||
const { data, limit, page, openselect, closeselect, spinings } = this.state;
|
||||
const { data, limit, page, spinings, status, order_name, order_type, visible } = this.state;
|
||||
const { projectsId , owner } = this.props.match.params;
|
||||
const { isManager, isDeveloper} = this.props;
|
||||
const menu = (
|
||||
<Menu className="orderCondition" onClick={this.arrayList}>
|
||||
<Menu className="orderCondition milepostSort" onClick={this.arrayList}>
|
||||
<Menu.Item key={'order'} value={'order'}>默认排序</Menu.Item>
|
||||
<Menu.Item key={'effective_date'} value="desc">到期日从后到先</Menu.Item>
|
||||
<Menu.Item key={'effective_date'} value="asc">到期日从先到后</Menu.Item>
|
||||
<Menu.Item key={'percent'} value="asc">完成度从低到高</Menu.Item>
|
||||
|
|
@ -176,103 +155,90 @@ class Milepost extends Component {
|
|||
</Menu>
|
||||
)
|
||||
|
||||
// 排序字段 选中显示文本
|
||||
const sortByMile = {
|
||||
'effective_date':{
|
||||
'desc': '到期日从后到先',
|
||||
'asc': '到期日从先到后'
|
||||
},
|
||||
'percent':{
|
||||
'desc': '完成度从低到高',
|
||||
'asc': '完成度从高到低'
|
||||
},
|
||||
'issues_count':{
|
||||
'desc': '任务从多到少',
|
||||
'asc': '任务从少到多'
|
||||
},
|
||||
'order':{
|
||||
'order': '排序'
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<Spin spinning={spinings}>
|
||||
<div className="main" style={{minHeight:"400px"}}>
|
||||
<div style={{ display: this.state.display }}>
|
||||
<div className="tagdiv" >
|
||||
<span>里程碑{data && data.issue_tags_count}已创建</span>
|
||||
<div className="main milepostBox">
|
||||
{/* 创建里程碑按钮 */}
|
||||
{/* <div className='createMilepost mb25'>
|
||||
{(isManager || isDeveloper) && <Button type='primary' onClick={() => {this.props.history.push(`/${owner}/${projectsId}/milestones/new`)}} className='createMilepostBtn'>+ 创建里程碑</Button>}
|
||||
</div> */}
|
||||
{/* 里程碑列表表头 */}
|
||||
<div className='milepostHead flexSpaceBetween'>
|
||||
<div>
|
||||
<span className={`pointBox font-15 postStatus ${status === "closed" ? "" : "active"}`} onClick={() => this.opneMilelist(1)}>开启中<span className='statusCount font-13'>{data && data.opening_milestone_count}</span></span>
|
||||
<span className={`pointBox ml35 font-15 postStatus ${status === "closed" ? "active" : ""}`} onClick={() => this.opneMilelist(2)}>已关闭<span className='statusCount font-13'>{data && data.closed_milestone_count}</span></span>
|
||||
</div>
|
||||
</div>
|
||||
<div className="topWrapper" style={{borderBottom:"1px solid #eee"}}>
|
||||
<div className="topWrapper_type_infos">
|
||||
<li className={openselect ? "active" : ""} onClick={() => this.opneMilelist(1)}>{data && data.open_count}个开启中</li>
|
||||
<li className={closeselect ? "active" : ""} onClick={() => this.opneMilelist(2)}>{data && data.closed_count}个已关闭</li>
|
||||
</div>
|
||||
<div className="topWrapper_select">
|
||||
<ul className="topWrapper_select mb-0">
|
||||
<li>
|
||||
<div>
|
||||
{(isManager || isDeveloper) && <Button type='primary' onClick={() => {this.props.history.push(`/${owner}/${projectsId}/milestones/new`)}} className='createMilepostBtn mr20'>+ 创建里程碑</Button>}
|
||||
<Dropdown className="topWrapperSelect" overlay={menu} trigger={['click']} placement="bottomCenter">
|
||||
<span>排序<Icon type="caret-down" className="ml5" /></span>
|
||||
<span className='pointBox'>{order_name ? sortByMile[order_name][order_type] : '排序'}<Icon type="caret-down" className="ml5"/></span>
|
||||
</Dropdown>
|
||||
</li>
|
||||
</ul>
|
||||
{
|
||||
data && data.user_admin_or_member ?
|
||||
<CheckProfile {...this.props} className="topWrapper_btn" sureFunc={() => {this.props.history.push(`/${owner}/${projectsId}/milestones/new`)}}>新的里程碑</CheckProfile>
|
||||
: ''
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
{/* 里程碑列表展示 */}
|
||||
{data && data.milestones && data.milestones.length === 0 && <div className="milestonesNoDate"><img src={emp} alt=""/><span>暂无数据~</span></div>}
|
||||
{data && data.milestones && data.milestones.length > 0 && <div className='milepostList'>
|
||||
{data.milestones.map((item, key)=>{
|
||||
return <div className='flexSpaceBetween milepostItemBox'>
|
||||
<div>
|
||||
<div className="flexSpaceBetween">
|
||||
<i className="iconfont icon-lichengbeiicon1 font-12 mr10 primaryColor"></i>
|
||||
<Link to={`/${owner}/${projectsId}/milestones/${item.id}`} className="font-16 task-hide milepostInfo">{item.name}</Link>
|
||||
</div>
|
||||
{item.description && item.description.length > 44 ? <Tooltip title={item.description} placement={'topLeft'} overlayStyle={{width: '600px'}}><span className='color-grey-89 task-hide milepostInfo'>{item.description}</span></Tooltip> : <span className='color-grey-89 milepostInfo'>{item.description}</span>}
|
||||
</div>
|
||||
<div className="flexSpaceBetween actionMileBox">
|
||||
<div className="grid-item effectiveDate">
|
||||
<i className={`iconfont icon-a-31shijian font-15 mr10 ${item.effective_date ? "effectiveDate" : "color-grey-89"}`}></i>
|
||||
<span className={`${item.effective_date ? "" : "color-grey-89"} ${item.effective_date && status !== 'closed' && new Date().getTime()-new Date(`${item.effective_date} 24:0`).getTime() > 0 ? 'outTime' : ''}`}>{item.effective_date || "暂无截止时间"}</span>
|
||||
</div>
|
||||
<div className="mr10 effectiveDate">
|
||||
<span>{item.opened_issues_count || 0}个开启</span>
|
||||
<span className='color-grey-89'> | </span>
|
||||
<span>{item.close_issues_count || 0}个关闭</span>
|
||||
</div>
|
||||
{
|
||||
data && data.versions && data.versions.length > 0
|
||||
&&
|
||||
<div className="tagList">
|
||||
{
|
||||
data.versions.map((item, key) => {
|
||||
return (
|
||||
<div style={{ display: 'block' }} key={key}>
|
||||
<div className="milepostdiv">
|
||||
<div className="milepostwidth">
|
||||
<div className="grid-item width100">
|
||||
<i className="iconfont icon-lubiaosignpost3 font-12 mr3"></i>
|
||||
<Link to={`/${owner}/${projectsId}/milestones/${item.id}`} className="font-16">{item.name}</Link>
|
||||
(isManager || isDeveloper) && <div className="flexSpaceBetween">
|
||||
<Link to={`/${owner}/${projectsId}/milestones/${item.id}/edit`} className="primaryColor"><i className="iconfont icon-a-bianji12 font-14 mr5 primaryColor"></i>编辑</Link>
|
||||
<div className="grid-item ml15">
|
||||
<i className={`effectiveDate iconfont font-14 mr5 ${item.status === "closed" ? "icon-gouxuan":"icon-shanchu8"}`}></i>
|
||||
<a onClick={() => this.updatestatusemile(item.status === "closed" ? "open" : "closed", item)} className="effectiveDate">{item.status === "closed" ? "开启" : "关闭"}</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div className="milepostdiv" style={{ marginTop: 5 }}>
|
||||
<div className="milepostrighe">
|
||||
<div className="grid-item mr10">
|
||||
<i className="iconfont icon-rili font-14 mr5"></i>
|
||||
<span className={item.effective_date ? "color-red" : "color-grey-c"}>{item.effective_date || "暂无截止时间"}</span>
|
||||
</div>
|
||||
<div className="grid-item mr10 color-grey-9">
|
||||
<i className="iconfont icon-issue font-14 mr5"></i>
|
||||
<span>{item.open_issues_count}个开启</span>
|
||||
</div>
|
||||
<div className="grid-item mr10 color-grey-9">
|
||||
<i className="iconfont icon-shanchudiao font-14 mr5"></i>
|
||||
<span>{item.close_issues_count}个关闭</span>
|
||||
</div>
|
||||
</div>
|
||||
{
|
||||
data && data.user_admin_or_member ?
|
||||
<div className="milepostleft">
|
||||
<div className="grid-item ml15 color-grey-9">
|
||||
<i className="iconfont icon-bianji3 font-14 mr5"></i>
|
||||
<Link to={`/${owner}/${projectsId}/milestones/${item.id}/edit`} className="color-grey-9">编辑</Link>
|
||||
</div>
|
||||
<div className="grid-item ml15 color-grey-9">
|
||||
<i className={item.status === "closed" ? "iconfont icon-gouxuan font-14 mr5":"iconfont icon-yiguanbi1 font-14 mr5"}></i>
|
||||
<a onClick={() => this.updatestatusemile(item.status === "closed" ? "open" : "closed", item)} className="color-grey-9">{this.state.status === "closed" ? "开启" : "关闭"}</a>
|
||||
</div>
|
||||
<div className="grid-item ml15 color-grey-9">
|
||||
<i className="iconfont icon-lajitong font-14 mr5" ></i>
|
||||
<div className="grid-item ml15">
|
||||
<i className="iconfont icon-fuzhi-shanchu font-14 mr5 colorRed" ></i>
|
||||
<Popconfirm placement="bottom" title={'是否删除里程碑？'} okText="是" cancelText="否" onConfirm={() => this.closemile(item)}>
|
||||
<a className="color-grey-9">删除</a>
|
||||
<a className="colorRed">删除</a>
|
||||
</Popconfirm>
|
||||
</div>
|
||||
</div>
|
||||
: ''
|
||||
}
|
||||
</div>
|
||||
<div className="milepostdiv" style={{ marginTop: 5 }}>
|
||||
<div className="textwidth">
|
||||
<Text type="secondary" ellipsis={{ rows: 30, expandable: false, onExpand: Function }} >{item.description}</Text>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
})
|
||||
}
|
||||
</div>
|
||||
}
|
||||
{ data && data.versions && data.versions.length === 0 && <NoneData _html="暂无里程碑"></NoneData> }
|
||||
})}
|
||||
</div>}
|
||||
{
|
||||
data && data.versions_count > limit ?
|
||||
<div className="mt30 mb50 edu-txt-center">
|
||||
<Pagination simple current={page} total={data && data.versions_count} pageSize={limit} onChange={this.ChangePage}></Pagination>
|
||||
data && data.total_count > limit ?
|
||||
<div className="mt30 mb50 edu-txt-right">
|
||||
<Pagination current={page} total={data && data.total_count} pageSize={limit} onChange={this.ChangePage} showQuickJumper showSizeChanger onShowSizeChange={this.onShowSizeChange}></Pagination>
|
||||
</div> : ""
|
||||
}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ class MilepostDetail extends Component {
|
|||
getIssueList = ( page , item , value , update , updateValue , type ) => {
|
||||
const { projectsId, meilid , owner } = this.props.match.params;
|
||||
const { limit , order_name , order_type , issue_tag_id , author_id , assigned_to_id , tracker_id , status_id , done_ratio , status_type } = this.state;
|
||||
|
||||
console.log(this.props);
|
||||
const url = `/${owner}/${projectsId}/milestones/${meilid}.json`;
|
||||
let params = update ? {
|
||||
page, limit , order_name:value , order_type:updateValue , issue_tag_id ,
|
||||
|
|
|
|||
|
|
@ -0,0 +1,264 @@
|
|||
import React , { useRef , useState , useEffect } from 'react';
|
||||
import { Menu, Input , Checkbox , Pagination, Button , Tooltip ,Spin } from 'antd';
|
||||
import { Link } from "react-router-dom";
|
||||
import AllMenus from './component/allMenus';
|
||||
import Datas from '../Issues/Component/datas';
|
||||
import axios from 'axios';
|
||||
import { FlexAJ } from '../Component/layout';
|
||||
import CheckProfile from '../Component/ProfileModal/Profile';
|
||||
import millestones from '../../forge/Issues/Img/millestones-big.png';
|
||||
import './milepost.scss';
|
||||
import './order.scss';
|
||||
import '../Issues/index.scss';
|
||||
|
||||
function MilepostDetail(props){
|
||||
const [ milepost, setMilepost] = useState(undefined);
|
||||
const [ issueList , setIssueList ] = useState(undefined);
|
||||
const [ closedCount , setClosedCount ] = useState(0);
|
||||
const [ openedCount , setOpenedCount ] = useState(0);
|
||||
|
||||
|
||||
const [ category , setCategory] = useState("opened");
|
||||
|
||||
const [ allValue , setAllValue ] = useState([]);
|
||||
const [ allIds , setAllIds ] = useState([]);
|
||||
const [ checkAll , setCheckAll ] = useState(false);
|
||||
|
||||
const [ updateIds , setUpdateIds ] = useState([]);
|
||||
const [ limit, setLimit] = useState(10);
|
||||
const [ page , setPage ] = useState(1);
|
||||
const [ total , setTotal ] = useState(undefined);
|
||||
const [ issuesCount, setIssueCount] = useState(undefined);
|
||||
|
||||
const [ chooseValue, setChooseValue ] = useState(undefined);
|
||||
|
||||
const menuRef = useRef(null);
|
||||
const { projectsId, mileId , owner } = props.match.params;
|
||||
const {current_user, projectDetail, showLoginDialog, history} = props;
|
||||
const permission = props && props.projectDetail && props.projectDetail.permission;
|
||||
// 排序字段
|
||||
const sortBy = {
|
||||
'1': {'sort_by': 'issues.created_on', 'sort_direction': 'desc'},
|
||||
'2': {'sort_by': 'issues.created_on', 'sort_direction': 'asc'},
|
||||
'3': {'sort_by': 'issues.updated_on', 'sort_direction': 'desc'},
|
||||
'4': {'sort_by': 'issues.updated_on', 'sort_direction': 'asc'},
|
||||
'5': {'sort_by': 'issue_priorities.position', 'sort_direction': 'desc'},
|
||||
'6': {'sort_by': 'issue_priorities.position', 'sort_direction': 'asc'}
|
||||
}
|
||||
|
||||
useEffect(()=>{
|
||||
Init(chooseValue);
|
||||
},[category, page, limit])
|
||||
|
||||
useEffect(()=>{
|
||||
updateDocumentTitle()
|
||||
}, [projectDetail, milepost])
|
||||
|
||||
// 更新网页标题
|
||||
function updateDocumentTitle(){
|
||||
if(projectDetail && milepost){
|
||||
const { author, name} = projectDetail;
|
||||
document.title = `${milepost.name}-里程碑-${author.name}/${name}`;
|
||||
}
|
||||
}
|
||||
|
||||
// 获取issue列表数据
|
||||
function Init(params){
|
||||
const url = `/v1/${owner}/${projectsId}/milestones/${mileId}.json`;
|
||||
axios.get(url,{
|
||||
params:{
|
||||
page,
|
||||
limit,
|
||||
category,
|
||||
...params
|
||||
}
|
||||
}).then(result=>{
|
||||
if(result){
|
||||
const {milestone, issues, total_count, closed_issues_count, opened_issues_count, total_issues_count} = result.data;
|
||||
if(issues.length === 0 && page>1){
|
||||
setPage(page-1);
|
||||
return;
|
||||
}
|
||||
setMilepost(milestone);
|
||||
setIssueList(issues);
|
||||
setTotal(total_count);
|
||||
setClosedCount(closed_issues_count);
|
||||
setOpenedCount(opened_issues_count);
|
||||
setIssueCount(total_issues_count)
|
||||
const ids = issues.length>0 ? issues.map(i=>{return i.id}) : [];
|
||||
setAllIds(ids);
|
||||
}
|
||||
}).then(error=>{console.log("error:",error)})
|
||||
}
|
||||
|
||||
|
||||
// 全选所有issue
|
||||
function chooseAll(e){
|
||||
setCheckAll(e.target.checked);
|
||||
if(e.target.checked){
|
||||
setAllValue(allIds);
|
||||
}else{
|
||||
setAllValue([]);
|
||||
}
|
||||
}
|
||||
|
||||
// 选择列表里的issue
|
||||
function checkIssues(value){
|
||||
setAllValue(value);
|
||||
if(value.length === allIds.length){
|
||||
setCheckAll(true);
|
||||
}else{
|
||||
setCheckAll(false);
|
||||
}
|
||||
}
|
||||
|
||||
// 取消
|
||||
function cancelUpdate(){
|
||||
setAllValue([]);
|
||||
setCheckAll(false);
|
||||
// 清除下拉选项
|
||||
menuRef.current && menuRef.current.clearChoose();
|
||||
}
|
||||
|
||||
// 确认修改 allValue updateIds
|
||||
function sureUpdate(){
|
||||
const url = `/v1/${owner}/${projectsId}/issues/batch_update`;
|
||||
axios.patch(url,{
|
||||
assigner_ids: updateIds && updateIds.assigner_id && updateIds.assigner_id.split(","),
|
||||
ids: allValue,
|
||||
issue_tag_ids: updateIds && updateIds.issue_tag_ids && updateIds.issue_tag_ids.split(","),
|
||||
milestone_id: updateIds && updateIds.milestone_id,
|
||||
}).then(result=>{
|
||||
if(result){
|
||||
setUpdateIds(undefined);
|
||||
setAllValue([]);
|
||||
setTotal(undefined);
|
||||
Init();
|
||||
cancelUpdate();
|
||||
}
|
||||
}).catch(error=>{})
|
||||
}
|
||||
|
||||
// 切换页码
|
||||
function changepage(page){
|
||||
setPage(page);
|
||||
window.scrollTo(0,0);
|
||||
}
|
||||
|
||||
function chooseFunc(ids){
|
||||
if(allValue && allValue.length>0){
|
||||
// 将ids保存下来以便修改
|
||||
setUpdateIds(ids);
|
||||
setChooseValue(undefined);
|
||||
}else{
|
||||
const {sort_by} = ids;
|
||||
const params = {...ids, ...sortBy[sort_by]}
|
||||
setChooseValue(params);
|
||||
page===1 && Init(params);
|
||||
setPage(1);
|
||||
}
|
||||
}
|
||||
|
||||
return(
|
||||
<div className="main milepostDetail">
|
||||
{milepost && <FlexAJ>
|
||||
<div>
|
||||
<p className="font-17 font-bd color-black" style={{width: '900px'}}>{milepost.name}</p>
|
||||
<p className="mt7">
|
||||
<span className="mr20">
|
||||
<i className="iconfont icon-a-31shijian font-14 mr5 color-grey-89"></i>
|
||||
<span className="color-grey-89">{milepost.effective_date || '暂无截止时间'}</span>
|
||||
</span>
|
||||
{(milepost.percent || milepost.percent===0) ? <span style={{color: '#1aaf42'}}> {milepost.percent > 0 ? parseInt(milepost.percent*100):milepost.percent}%完成 </span> :"" }
|
||||
</p>
|
||||
</div>
|
||||
<div className="milepostdiv">
|
||||
{
|
||||
(current_user && current_user.login) && (permission && permission !== "Reporter") ?
|
||||
<Link to={`/${owner}/${projectsId}/milestones/${mileId}/edit`} className="grayButton" style={{ marginRight: 15 }}><i className="iconfont icon-lichengbeiicon1 font-12 mr5"></i>编辑里程碑</Link>
|
||||
:""
|
||||
}
|
||||
{/* {
|
||||
current_user && current_user.login ?
|
||||
<Button type='primary' onClick={() => {history.push(`/${owner}/${projectsId}/issues/${mileId}/new`)}} className='createMilepostBtn' style={{width: '83px'}}>+ 创建疑修</Button>
|
||||
:<Button type='primary' onClick={showLoginDialog} className='createMilepostBtn' style={{width: '83px'}}>+ 创建疑修</Button>
|
||||
} */}
|
||||
<CheckProfile {...props} sureFunc={()=>{history.push(`/${owner}/${projectsId}/issues/${mileId}/new`)}} checklogin className="operateButton ml20">+ 创建疑修</CheckProfile>
|
||||
</div>
|
||||
</FlexAJ>}
|
||||
{/* 里程碑描述 */}
|
||||
<div className="color-grey-89 mt10">{milepost && milepost.description}</div>
|
||||
<div className="lists mt25">
|
||||
<div className="listheader">
|
||||
<div style={{display:"flex"}}>
|
||||
<Checkbox value="all" style={{marginRight: "16px", display: (permission && permission !== "Reporter") ?"block":"none"}} checked={checkAll} onChange={chooseAll}></Checkbox>
|
||||
{
|
||||
allValue && allValue.length>0 ?
|
||||
<span>选择{allValue.length}个issue</span>
|
||||
:
|
||||
<ul className="statusul">
|
||||
<li className={category === "all" ?"active":""} onClick={()=>setCategory("all")}>全部<span>{issuesCount}</span></li>
|
||||
<li className={category === "opened" ?"active":""} onClick={()=>setCategory("opened")}>开启中<span>{openedCount}</span></li>
|
||||
<li className={category === "closed" ?"active":""} onClick={()=>setCategory("closed")}>已关闭<span>{closedCount}</span></li>
|
||||
</ul>
|
||||
}
|
||||
</div>
|
||||
<div className="menusul">
|
||||
<AllMenus
|
||||
ref={menuRef}
|
||||
update={allValue && allValue.length>0}
|
||||
owner={owner}
|
||||
projectsId={projectsId}
|
||||
chooseFunc={chooseFunc}
|
||||
/>
|
||||
{
|
||||
allValue && allValue.length>0 ?
|
||||
<div>
|
||||
<Button type="primary" ghost onClick={sureUpdate}>确定</Button>
|
||||
<Button ghost className="ml10 mr10" onClick={cancelUpdate}>取消</Button>
|
||||
</div>
|
||||
:""
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
{
|
||||
total === 0 &&
|
||||
<div className="listempty">
|
||||
<img src={millestones} style={{width:"68px"}} alt="" />
|
||||
<p className="font-22 mt5 mb10">欢迎使用里程碑</p>
|
||||
<p className="font-15">里程碑用于集中归类管理项目的疑修及进度。在使用之前，您可以先<CheckProfile {...props} checklogin sureFunc={()=>{props.history.push(`/${owner}/${projectsId}/issues/${mileId}/new`)}} className="color-blue">创建一个疑修</CheckProfile></p>
|
||||
</div>
|
||||
}
|
||||
{
|
||||
total > 0 &&
|
||||
<React.Fragment>
|
||||
<Checkbox.Group name="issues" onChange={checkIssues} value={allValue} style={{ width: "100%" }}>
|
||||
<div className="listdatas">
|
||||
{issueList.map((item,key)=>{
|
||||
return(
|
||||
<Datas
|
||||
key={key}
|
||||
checkbox={ <Checkbox value={item.id} key={item.id} style={{marginRight: "16px", display: (permission && permission !== "Reporter") ?"block":"none"}}></Checkbox> }
|
||||
item={item}
|
||||
owner={owner}
|
||||
projectsId={projectsId}
|
||||
/>
|
||||
)
|
||||
})
|
||||
}
|
||||
</div>
|
||||
</Checkbox.Group>
|
||||
{
|
||||
total > 10 &&
|
||||
<div className="pt25 pb30" style={{textAlign:"right"}}>
|
||||
<Pagination total={total} pageSize={limit} current={page} onChange={changepage} showSizeChanger showQuickJumper onShowSizeChange={(current, pageSize)=>{setPage(1);setLimit(pageSize);}}/>
|
||||
</div>
|
||||
}
|
||||
</React.Fragment>
|
||||
}
|
||||
{total === undefined && <div style={{height:344,display:"flex",alignItems:"center",justifyContent:"center"}}><Spin /></div> }
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
export default MilepostDetail;
|
||||
|
|
@ -0,0 +1,407 @@
|
|||
import React, { Component } from "react";
|
||||
import { Link } from 'react-router-dom';
|
||||
import { Dropdown, Menu, Icon, Pagination, Spin, Button, Checkbox } from 'antd';
|
||||
import './order.scss';
|
||||
import { FlexAJ } from '../Component/layout';
|
||||
import CheckProfile from '../Component/ProfileModal/Profile';
|
||||
import AllMenus from "../Issues/Component/allMenus";
|
||||
import NoneData from '../Nodata';
|
||||
import OrderItem from './OrderItem';
|
||||
|
||||
import axios from 'axios';
|
||||
import './milepost.scss';
|
||||
|
||||
/**
|
||||
* issue_chosen:下拉的筛选列表,
|
||||
* data:列表接口返回的所有数据,
|
||||
* issues:列表数组,
|
||||
* isSpin:加载中,
|
||||
* author_id:发布者id,
|
||||
* assigned_to_id:指派给。。。的id，
|
||||
* limit:每页条数,
|
||||
* page:当前页,
|
||||
* search_count:列表总条数
|
||||
* issue_type:搜索条件
|
||||
* status_type: issue的关闭和开启，1表示开启中的，2表示关闭的
|
||||
* category: issue状态： 全部、开启、关闭
|
||||
*/
|
||||
class MilepostDetail extends Component {
|
||||
constructor(props) {
|
||||
super(props);
|
||||
this.state = {
|
||||
issue_chosen: undefined,
|
||||
data: undefined,
|
||||
issues: undefined,
|
||||
isSpin: true,
|
||||
author_id: undefined,
|
||||
status_id: undefined,
|
||||
assigned_to_id: undefined,
|
||||
limit: 15,
|
||||
page: 1,
|
||||
search_count: undefined,
|
||||
issue_type: undefined,
|
||||
status_type: '1',
|
||||
//设置选择高亮
|
||||
issue_tag_ids: '标记',
|
||||
tracker_ids: '类型',
|
||||
author_ids: '发布人',
|
||||
assigned_to_ids: '负责人',
|
||||
status_ids: "状态",
|
||||
done_ratios: '完成度',
|
||||
paix: '排序',
|
||||
issueFlag:true,
|
||||
checkAll: false,
|
||||
allValue: [],
|
||||
allIds: [],
|
||||
category: 'all'
|
||||
}
|
||||
}
|
||||
|
||||
componentDidMount = () => {
|
||||
this.getSelectList();
|
||||
const { page } = this.state;
|
||||
this.getIssueList(page);
|
||||
}
|
||||
|
||||
componentDidUpdate=(prevProps)=>{
|
||||
this.updateDocumentTitle();
|
||||
const prebannerList = prevProps && prevProps.bannerList;
|
||||
const bannerList = this.props && this.props.bannerList;
|
||||
if(prebannerList !== bannerList){
|
||||
if(bannerList && bannerList.length>0){
|
||||
let i = bannerList.filter(i=>i.menu_name === "issues");
|
||||
this.setState({
|
||||
issueFlag:i && i.length === 0 ? false :true
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 更新网页标题
|
||||
updateDocumentTitle(){
|
||||
const {projectDetail} = this.props;
|
||||
const {data} = this.state;
|
||||
if(projectDetail && data){
|
||||
const { author, name} = projectDetail;
|
||||
document.title = `${data.name}-里程碑-${author.name}/${name}`;
|
||||
}
|
||||
}
|
||||
|
||||
getSelectList = () => {
|
||||
const { projectsId , owner } = this.props.match.params;
|
||||
const url = `/${owner}/${projectsId}/issues/index_chosen.json`;
|
||||
axios.get(url).then((result) => {
|
||||
if (result) {
|
||||
this.setState({
|
||||
issue_chosen: result.data.issue_chosen
|
||||
})
|
||||
}
|
||||
}).catch((error) => {
|
||||
console.log(error);
|
||||
})
|
||||
}
|
||||
|
||||
deletedetail = (id) => {
|
||||
const { projectsId , owner } = this.props.match.params;
|
||||
const url = `/${owner}/${projectsId}/issues/${id}.json`;
|
||||
axios.delete(url, {
|
||||
data: {
|
||||
project_id: projectsId,
|
||||
id: id,
|
||||
},
|
||||
})
|
||||
.then((result) => {
|
||||
if (result) {
|
||||
const { page } = this.state;
|
||||
this.getIssueList(page);
|
||||
const { getDetail } = this.props;
|
||||
getDetail && getDetail();
|
||||
}
|
||||
})
|
||||
.catch((error) => {
|
||||
console.log(error);
|
||||
});
|
||||
};
|
||||
// 获取列表数据
|
||||
getIssueList = ( page , item , value , update , updateValue , type ) => {
|
||||
const { projectsId, meilid , owner } = this.props.match.params;
|
||||
const { limit , order_name , order_type , issue_tag_id , author_id , assigned_to_id , tracker_id , status_id , done_ratio , status_type } = this.state;
|
||||
|
||||
const url = `/v1/${owner}/${projectsId}/milestones/${meilid}.json`;
|
||||
let params = update ? {
|
||||
page, limit , order_name:value , order_type:updateValue , issue_tag_id ,
|
||||
author_id , assigned_to_id , tracker_id , status_id , done_ratio,
|
||||
status_type:type || status_type,
|
||||
}:{
|
||||
page, limit , order_name , order_type , issue_tag_id ,
|
||||
author_id , assigned_to_id , tracker_id , status_id , done_ratio,
|
||||
status_type:type || status_type,
|
||||
[item]:value
|
||||
}
|
||||
axios.get(url, {
|
||||
params: params
|
||||
}).then((result) => {
|
||||
if (result) {
|
||||
this.setState({
|
||||
data: result.data.milestone,
|
||||
issues: result.data.issues,
|
||||
search_count: params.status_type ==="1" ? result.data.open_issues_count : result.data.close_issues_count,
|
||||
isSpin: false
|
||||
})
|
||||
}
|
||||
}).catch((error) => {
|
||||
console.log(error);
|
||||
})
|
||||
}
|
||||
|
||||
getOption = (e, id, name) => {
|
||||
if (e.key === "created_on") {
|
||||
if (e.item.props.value === "desc") {
|
||||
this.setState({
|
||||
paix: '最新创建'
|
||||
})
|
||||
} else {
|
||||
this.setState({
|
||||
paix: '最早创建'
|
||||
})
|
||||
}
|
||||
} else if (e.key === "updated_on") {
|
||||
if (e.item.props.value === "desc") {
|
||||
this.setState({
|
||||
paix: '最新更新'
|
||||
})
|
||||
} else {
|
||||
this.setState({
|
||||
paix: '最早更新'
|
||||
})
|
||||
}
|
||||
}
|
||||
this.setState({
|
||||
[id]: e.key,
|
||||
[id+"s"]:name,
|
||||
page:1
|
||||
})
|
||||
if (e.key === "created_on" || e.key === "updated_on") {
|
||||
this.setState({
|
||||
order_name: e.key,
|
||||
order_type: e.item.props.value
|
||||
})
|
||||
this.getIssueList(1,id,e.key,true,e.item.props.value);
|
||||
}else{
|
||||
this.getIssueList(1,id,e.key);
|
||||
}
|
||||
}
|
||||
|
||||
renderMenu = (array, name, id) => {
|
||||
return (
|
||||
<Menu className="orderCondition">
|
||||
<Menu.Item key={"all"} onClick={(e) => this.getOption(e, id, name)}>{name}</Menu.Item>
|
||||
{
|
||||
array && array.length > 0 && array.map((item, key) => {
|
||||
return (
|
||||
<Menu.Item key={item.id} onClick={(e) => this.getOption(e, id, item.name)}>{item.name}</Menu.Item>
|
||||
)
|
||||
})
|
||||
}
|
||||
</Menu>
|
||||
)
|
||||
}
|
||||
|
||||
// 翻页
|
||||
ChangePage = (page) => {
|
||||
this.setState({
|
||||
page,
|
||||
isSpin: true
|
||||
})
|
||||
this.getIssueList(page);
|
||||
}
|
||||
|
||||
category = (type) => {
|
||||
this.setState({
|
||||
status_type: type,
|
||||
issue_tag_id : undefined,
|
||||
author_id : undefined,
|
||||
tracker_id : undefined,
|
||||
done_ratio : undefined,
|
||||
status_id: undefined,
|
||||
assigned_to_id: undefined,
|
||||
issue_tag_ids: '标记',
|
||||
tracker_ids: '类型',
|
||||
author_ids: '发布人',
|
||||
assigned_to_ids: '负责人',
|
||||
status_ids: "状态",
|
||||
done_ratios: '完成度',
|
||||
paix: '排序'
|
||||
},() => {
|
||||
this.getIssueList(1,undefined,undefined,undefined,undefined,type);
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
// 全选所有issue
|
||||
chooseAll = (e) =>{
|
||||
const {allIds} = this.state;
|
||||
this.setState({
|
||||
checkAll: e.target.checked,
|
||||
allValue: e.target.checked ? allIds : []
|
||||
});
|
||||
}
|
||||
|
||||
render() {
|
||||
|
||||
const { issue_chosen, issues, limit, page, search_count, data, isSpin , status_type , issueFlag, checkAll, allValue, category } = this.state;
|
||||
const { projectsId, meilid ,owner} = this.props.match.params;
|
||||
const { current_user , showLoginDialog , projectDetail } = this.props;
|
||||
const menu = (
|
||||
<Menu onClick={(e) => this.getOption(e)}>
|
||||
<Menu.Item key={'created_on'} value="desc">最新创建</Menu.Item>
|
||||
<Menu.Item key={'created_on'} value="asc">最早创建</Menu.Item>
|
||||
<Menu.Item key={'updated_on'} value="desc">最新更新</Menu.Item>
|
||||
<Menu.Item key={'updated_on'} value="asc">最早更新</Menu.Item>
|
||||
</Menu>
|
||||
)
|
||||
return (
|
||||
<div className="main milepostDetail">
|
||||
<FlexAJ>
|
||||
<div>
|
||||
<p className="font-17 font-bd color-black" style={{width: '900px'}}>{data && data.name}</p>
|
||||
<p className="mt7">
|
||||
<span className="mr20">
|
||||
<i className="iconfont icon-a-31shijian font-14 mr5 color-grey-89">
|
||||
</i>
|
||||
{
|
||||
data && data.effective_date ?
|
||||
<span className="color-grey-89">{data && data.effective_date}</span>
|
||||
:
|
||||
<span className="color-grey-89">暂无截止时间</span>
|
||||
}
|
||||
</span>
|
||||
{data && (data.percent || data.percent===0) ? <span style={{color: '#1aaf42'}}> {data.percent > 0 ? data.percent.toFixed(2):data.percent}%完成 </span> :"" }
|
||||
</p>
|
||||
</div>
|
||||
<div className="milepostdiv">
|
||||
{
|
||||
(current_user && current_user.login) && ( projectDetail && projectDetail.permission && projectDetail.permission !== "Reporter") ?
|
||||
<Link to={`/${owner}/${projectsId}/milestones/${meilid}/edit`} className="grayButton" style={{ marginRight: 15 }}><i className="iconfont icon-lichengbeiicon1 font-12 mr5"></i>编辑里程碑</Link>
|
||||
:""
|
||||
}
|
||||
{
|
||||
issueFlag ? (current_user && current_user.login ?
|
||||
<Button type='primary' onClick={() => {this.props.history.push(`/${owner}/${projectsId}/issues/${meilid}/new`)}} className='createMilepostBtn' style={{width: '83px'}}>+ 创建疑修</Button>
|
||||
:<Button type='primary' onClick={showLoginDialog} className='createMilepostBtn' style={{width: '83px'}}>+ 创建疑修</Button>)
|
||||
:""
|
||||
}
|
||||
</div>
|
||||
</FlexAJ>
|
||||
|
||||
<Spin spinning={isSpin}>
|
||||
<div className="listheader">
|
||||
<div style={{display:"flex"}}>
|
||||
<Checkbox value="all" style={{marginRight: "16px"}} checked={checkAll} onChange={this.chooseAll}></Checkbox>
|
||||
{
|
||||
allValue && allValue.length>0 ?
|
||||
<span>选择{allValue.length}个issue</span>
|
||||
:
|
||||
<ul className="statusul">
|
||||
<li className={category === "all" ?"active":""} onClick={() => this.category("all")}>全部<span>{total}</span></li>
|
||||
<li className={category === "opened" ?"active":""} onClick={() => this.category("opened")}>开启中<span>{openedCount}</span></li>
|
||||
<li className={category === "closed" ?"active":""} onClick={() => this.category("closed")}>已关闭<span>{closedCount}</span></li>
|
||||
</ul>
|
||||
}
|
||||
</div>
|
||||
<div className="menusul">
|
||||
<AllMenus
|
||||
ref={menuRef}
|
||||
update={allValue && allValue.length>0}
|
||||
owner={owner}
|
||||
projectsId={projectsId}
|
||||
chooseFunc={chooseFunc}
|
||||
/>
|
||||
{
|
||||
allValue && allValue.length>0 ?
|
||||
<div>
|
||||
<Button type="primary" ghost onClick={sureUpdate}>确定</Button>
|
||||
<Button type="danger" ghost className="ml10" onClick={()=>setVisible(true)}>删除</Button>
|
||||
<Button ghost className="ml10 mr10" onClick={cancelUpdate}>取消</Button>
|
||||
</div>
|
||||
:""
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
{/* <div className="pl20 pr20">
|
||||
<div className="f-wrap-between pt15 pb15 bor-bottom-greyE">
|
||||
<ul className="topWrapper_type_infos">
|
||||
<li className={status_type==="1" ? "active" : ""} onClick={() => this.openorder("1")}>{data && data.open_issues_count}个开启中</li>
|
||||
<li className={status_type==="2" ? "active" : ""} onClick={() => this.openorder("2")}>{data && data.close_issues_count}个已关闭</li>
|
||||
</ul>
|
||||
<ul className="topWrapper_select">
|
||||
<li>
|
||||
<Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.issue_tag, '标记', 'issue_tag_id')} trigger={['click']} placement="bottomCenter">
|
||||
<span>{this.state.issue_tag_ids}<Icon type="caret-down" className="ml5" /></span>
|
||||
</Dropdown>
|
||||
</li>
|
||||
<li>
|
||||
<Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.assign_user, '发布人', 'author_id')} trigger={['click']} placement="bottomCenter">
|
||||
<span>{this.state.author_ids}<Icon type="caret-down" className="ml5" /></span>
|
||||
</Dropdown>
|
||||
</li>
|
||||
<li>
|
||||
<Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.assign_user, '负责人', 'assigned_to_id')} trigger={['click']} placement="bottomCenter">
|
||||
<span>{this.state.assigned_to_ids}<Icon type="caret-down" className="ml5" /></span>
|
||||
</Dropdown>
|
||||
</li>
|
||||
<li>
|
||||
<Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.tracker, '类型', 'tracker_id')} trigger={['click']} placement="bottomCenter">
|
||||
<span>{this.state.tracker_ids}<Icon type="caret-down" className="ml5" /></span>
|
||||
</Dropdown>
|
||||
</li>
|
||||
<li>
|
||||
<Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.issue_status, '状态', 'status_id')} trigger={['click']} placement="bottomCenter">
|
||||
<span>{this.state.status_ids}<Icon type="caret-down" className="ml5" /></span>
|
||||
</Dropdown>
|
||||
</li>
|
||||
<li>
|
||||
<Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.done_ratio, '完成度', 'done_ratio')} trigger={['click']} placement="bottomCenter">
|
||||
<span>{this.state.done_ratios}<Icon type="caret-down" className="ml5" /></span>
|
||||
</Dropdown>
|
||||
</li>
|
||||
<li>
|
||||
<Dropdown className="topWrapperSelect" overlay={menu} trigger={['click']} placement="bottomCenter">
|
||||
<span>{this.state.paix}<Icon type="caret-down" className="ml5" /></span>
|
||||
</Dropdown>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div className="setItemStyle">
|
||||
{
|
||||
search_count === 0 ?
|
||||
<NoneData _html="暂时还没有相关数据!" />
|
||||
:
|
||||
issues && issues.length>0 && issues.map((item,key)=>{
|
||||
return(
|
||||
<OrderItem
|
||||
key={key} mile
|
||||
item={item}
|
||||
search_count={search_count}
|
||||
page={page}
|
||||
limit={limit}
|
||||
{...this.props} {...this.state}
|
||||
deletedetail={this.deletedetail}
|
||||
></OrderItem>
|
||||
)
|
||||
})
|
||||
}
|
||||
</div>
|
||||
{
|
||||
search_count > limit?
|
||||
<div className="pt30 pb30 edu-txt-center" style={{borderTop:"1px solid #eee"}}>
|
||||
<Pagination simple current={page} total={search_count} pageSize={limit} onChange={this.ChangePage}></Pagination>
|
||||
</div>:""
|
||||
}
|
||||
</div> */}
|
||||
</Spin>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
}
|
||||
export default MilepostDetail;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
import React , { Component } from "react";
|
||||
import { NavLink } from 'react-router-dom';
|
||||
import './order.css'
|
||||
import './order.scss'
|
||||
class Nav extends Component{
|
||||
|
||||
render(){
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import React, { Component } from 'react';
|
||||
import { Link } from 'react-router-dom';
|
||||
import { Popconfirm } from 'antd'
|
||||
import { Popconfirm,Tooltip } from 'antd'
|
||||
import { TagInfo } from '../Utils/TagColor';
|
||||
class OrderItem extends Component {
|
||||
constructor(props) {
|
||||
|
|
@ -84,7 +84,9 @@ class OrderItem extends Component {
|
|||
}
|
||||
</li>
|
||||
<li>{item.tracker || "--"}</li>
|
||||
{ !mile ?<li>{item.version || "--"}</li>:""}
|
||||
{!mile ? <li>
|
||||
{item.version ? <Tooltip placement="topLeft" title={item.version}>{item.version}</Tooltip> : "--"}
|
||||
</li> : ""}
|
||||
<li>{item.issue_status || "--"}</li>
|
||||
<li style={{color:`${item.done_ratio === "100%"?"#28BD6C":"#F73030"}`}}>{item.done_ratio || "--"}</li>
|
||||
<li>
|
||||
|
|
|
|||
|
|
@ -76,11 +76,6 @@ class Tags extends Component {
|
|||
|
||||
componentDidMount = () => {
|
||||
this.getList();
|
||||
const {projectDetail} = this.props;
|
||||
if(projectDetail){
|
||||
const { author, name} = projectDetail;
|
||||
document.title = `标签列表-${author.name}/${name}`;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -110,7 +105,6 @@ class Tags extends Component {
|
|||
const url = `/projects/${owner}/${projectsId}/labels.json`;
|
||||
axios.post(url, {
|
||||
...values,
|
||||
project_id: projectsId,
|
||||
color: this.state.textcolor
|
||||
}).then(result => {
|
||||
if (result) {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import React, { Component } from 'react';
|
|||
import { Calendar, Select, Radio, Col, Row, Divider, Input, Form, Spin } from 'antd';
|
||||
import axios from 'axios';
|
||||
import moment from 'moment';
|
||||
import '../Order/order.css';
|
||||
import '../Order/order.scss';
|
||||
|
||||
|
||||
const TextArea = Input.TextArea;
|
||||
|
|
@ -22,6 +22,20 @@ class UpdateMilepost extends Component {
|
|||
this.getmeil();
|
||||
}
|
||||
|
||||
componentDidUpdate=()=>{
|
||||
this.updateDocumentTitle();
|
||||
}
|
||||
|
||||
// 更新网页标题
|
||||
updateDocumentTitle(){
|
||||
const {projectDetail} = this.props;
|
||||
const {data} = this.state;
|
||||
if(projectDetail && data){
|
||||
const { author, name} = projectDetail;
|
||||
document.title = `${data.name}-里程碑-${author.name}/${name}`;
|
||||
}
|
||||
}
|
||||
|
||||
onPanelChange = (time, mode) => {
|
||||
this.setState({
|
||||
value: time
|
||||
|
|
@ -53,7 +67,6 @@ class UpdateMilepost extends Component {
|
|||
name: result.data.name,
|
||||
description: result.data.description
|
||||
});
|
||||
|
||||
}
|
||||
}).catch((error) => {
|
||||
console.log(error);
|
||||
|
|
@ -79,8 +92,8 @@ class UpdateMilepost extends Component {
|
|||
}).then(result => {
|
||||
if (result) {
|
||||
this.setState({ isSpin: false })
|
||||
this.props.history.push(`/${owner}/${projectsId}/milestones`);
|
||||
|
||||
window.scrollTo(0,0);
|
||||
this.props.history.push(`/${owner}/${projectsId}/milestones/${meilid}`);
|
||||
}
|
||||
|
||||
}).catch(error => {
|
||||
|
|
@ -120,7 +133,7 @@ class UpdateMilepost extends Component {
|
|||
required: true, message: '请输入标题'
|
||||
}],
|
||||
})(
|
||||
<Input placeholder="标题" />
|
||||
<Input placeholder="标题" maxLength={30}/>
|
||||
)}
|
||||
</Form.Item>
|
||||
</div>
|
||||
|
|
@ -131,8 +144,7 @@ class UpdateMilepost extends Component {
|
|||
required: true, message: '请输入描述内容'
|
||||
}],
|
||||
})(
|
||||
<TextArea placeholder="请输入描述内容..." style={{ height: "150px" }} />
|
||||
|
||||
<TextArea placeholder="请输入描述内容..." style={{ height: "150px" }} maxLength={500}/>
|
||||
)}
|
||||
</Form.Item>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,155 @@
|
|||
import React,{ useState , useEffect , forwardRef ,useImperativeHandle , useRef } from 'react';
|
||||
import Menus from '../../Issues/Component/menus';
|
||||
import axios from 'axios';
|
||||
|
||||
const array =[
|
||||
{id:1,name:"最新创建"},
|
||||
{id:2,name:"最早创建"},
|
||||
{id:3,name:"最新更新"},
|
||||
{id:4,name:"最早更新"},
|
||||
{id:5,name:"高优先级"},
|
||||
{id:6,name:"低优先级"}
|
||||
]
|
||||
|
||||
function AllMenus({owner,projectsId,chooseFunc,update},ref){
|
||||
// 列表右侧所有筛选项的值
|
||||
const [ authorList , setAuthorList ] = useState(undefined);
|
||||
const [ author , setAuthor ] = useState(undefined);
|
||||
const [ tagList , setTagList ] = useState(undefined);
|
||||
const [ tag , setTag ] = useState(undefined);
|
||||
const [ chargeList , setChargeList ] = useState(undefined);
|
||||
const [ charge , setCharge ] = useState(undefined);
|
||||
const [ millstone , setMillstone ] = useState(undefined);
|
||||
const [ millstoneList , setMillstoneList ] = useState(undefined);
|
||||
const [ ids , setIds ] = useState({author_id:undefined,issue_priorities_id:undefined,issue_tag_ids:undefined,milestone_id:undefined,sort_by:undefined,status_id:undefined,assigner_id:undefined});
|
||||
const [ names , setNames ] = useState({author_name:undefined,issue_priorities_name:undefined,issue_tag_name:undefined,milestone_name:undefined,sortby_name:undefined,status_name:undefined,assigner_name:undefined});
|
||||
|
||||
useImperativeHandle(ref, () => ({
|
||||
clearChoose: () => {
|
||||
// 父组件按钮：清除筛选条件，将Ids\names里的字段全部改为undefined
|
||||
setIds({author_id:undefined,issue_tag_ids:undefined,issue_priorities_id:undefined,milestone_id:undefined,sort_by:undefined,status_id:undefined,assigner_id:undefined});
|
||||
setNames({author_name:undefined,issue_tag_name:undefined,issue_priorities_name:undefined,milestone_name:undefined,sortby_name:undefined,status_name:undefined,assigner_name:undefined});
|
||||
}
|
||||
}))
|
||||
|
||||
// 获取发布人列表
|
||||
useEffect(()=>{
|
||||
getSendPerson();
|
||||
},[author])
|
||||
|
||||
function getSendPerson(){
|
||||
const url = `/v1/${owner}/${projectsId}/issue_authors`;
|
||||
axios.get(url,{params:{keyword:author,only_name:true}}).then(result=>{
|
||||
if(result && result.data){
|
||||
setAuthorList(result.data.authors);
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// 获取标记列表
|
||||
useEffect(()=>{
|
||||
getSign();
|
||||
},[tag])
|
||||
|
||||
function getSign(){
|
||||
const url = `/v1/${owner}/${projectsId}/issue_tags`;
|
||||
axios.get(url,{params:{keyword:tag,only_name:true}}).then(result=>{
|
||||
if(result && result.data){
|
||||
setTagList(result.data.issue_tags);
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
// 获取负责人列表
|
||||
useEffect(()=>{
|
||||
getCharge();
|
||||
},[charge,update])
|
||||
|
||||
function getCharge(){
|
||||
if(update){
|
||||
const url = `/v1/${owner}/${projectsId}/collaborators`;
|
||||
axios.get(url,{params:{keyword:charge,only_name:true}}).then(result=>{
|
||||
if(result && result.data){
|
||||
setChargeList(result.data.collaborators);
|
||||
}
|
||||
})
|
||||
}else{
|
||||
const url = `/v1/${owner}/${projectsId}/issue_assigners`;
|
||||
axios.get(url,{params:{keyword:charge,only_name:true}}).then(result=>{
|
||||
if(result && result.data){
|
||||
setChargeList(result.data.assigners);
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
function choose(id,name){
|
||||
let copy = {...ids,author_id:id && id.length>0 ? id.join(","):undefined};
|
||||
let copyname = { ...names,author_name:name};
|
||||
setIds(copy);setNames(copyname);
|
||||
chooseFunc(copy,copyname);
|
||||
}
|
||||
|
||||
// 获取里程碑列表
|
||||
useEffect(()=>{
|
||||
getMillstone();
|
||||
},[millstone])
|
||||
|
||||
function getMillstone(){
|
||||
const url = `/v1/${owner}/${projectsId}/milestones`;
|
||||
axios.get(url,{params:{keyword:millstone,only_name:true}}).then(result=>{
|
||||
if(result && result.data){
|
||||
setMillstoneList(result.data.milestones);
|
||||
}
|
||||
})
|
||||
}
|
||||
return(
|
||||
<ul className="dropboxul">
|
||||
{ !update && <Menus
|
||||
update={update}
|
||||
ids={ids && ids.author_id}
|
||||
names={names && names.author_name}
|
||||
name={"发布人" } size={"large"} imgControl
|
||||
lists={authorList} searchFunc={(value)=>setAuthor(value)}
|
||||
chooseFunc={(id,name)=>choose(id,name,'author_name')}
|
||||
/>
|
||||
}
|
||||
<Menus
|
||||
update={update}
|
||||
ids={ids && ids.issue_tag_ids}
|
||||
name={"标记"} size={"large"}
|
||||
double
|
||||
names={names && names.issue_tag_name}
|
||||
lists={tagList} searchFunc={(value)=>setTag(value)}
|
||||
chooseFunc={(id,name)=>{let copy = {...ids,issue_tag_ids:id && id.length>0 ? id.join(","):undefined};let copyname = { ...names,issue_tag_name:name};setNames(copyname);setIds(copy);chooseFunc(copy,copyname)}}
|
||||
/>
|
||||
<Menus
|
||||
update={update}
|
||||
ids={ids && ids.assigner_id}
|
||||
name={"负责人"} size={"large"} imgControl
|
||||
names={names && names.assigner_name}
|
||||
lists={chargeList} searchFunc={(value)=>setCharge(value)}
|
||||
double={update ? true : false }
|
||||
chooseFunc={(id,name)=>{let copy = {...ids,assigner_id:id && id.length>0 ? id.join(","):undefined};let copyname = { ...names,assigner_name:name};setNames(copyname);setIds(copy);chooseFunc(copy,copyname)}}
|
||||
/>
|
||||
{ !update && <Menus
|
||||
ids={ids && ids.sort_by}
|
||||
name={"排序"} size={"small"}
|
||||
lists={array}
|
||||
names={names && names.sortby_name}
|
||||
chooseFunc={(id,name)=>{let copy = {...ids,sort_by:id && id.length>0 ? id.join(","):undefined};let copyname = { ...names,sortby_name:name};setNames(copyname);setIds(copy);chooseFunc(copy,copyname)}}
|
||||
/>
|
||||
}
|
||||
{update && <Menus
|
||||
update={update}
|
||||
ids={ids && ids.milestone_id}
|
||||
name={"里程碑"} size={"large"}
|
||||
names={names && names.milestone_name}
|
||||
lists={millstoneList} searchFunc={(value)=>setMillstone(value)}
|
||||
chooseFunc={(id,name)=>{let copy = {...ids,milestone_id:id && id.length>0 ? id.join(","):undefined};let copyname = { ...names,milestone_name:name};setNames(copyname);setIds(copy);chooseFunc(copy,copyname)}}
|
||||
/>}
|
||||
</ul>
|
||||
)
|
||||
}
|
||||
export default forwardRef(AllMenus);
|
||||
|
|
@ -1,9 +1,14 @@
|
|||
.screenWrap{
|
||||
background:rgba(250,250,250,1);
|
||||
border-top:1px solid rgba(221,221,221,1);
|
||||
border-bottom:1px solid rgba(221,221,221,1);
|
||||
background:#fafcff;
|
||||
border:1px solid rgba(42, 97, 255, 0.23);
|
||||
padding-left: 20px;
|
||||
box-sizing: border-box;
|
||||
border-radius: 4px 4px 0px 0px;
|
||||
}
|
||||
.mergeData{
|
||||
border:1px solid #d0d0d0;
|
||||
border-top: none;
|
||||
border-radius: 0px 0px 2px 2px;
|
||||
}
|
||||
.attachment-list-div:hover {
|
||||
background-color: #e6f7ff;
|
||||
|
|
@ -39,7 +44,7 @@
|
|||
content: '';
|
||||
left: 0px;
|
||||
bottom:0px;
|
||||
background-color:#5091FF;
|
||||
background-color:$primary-color;
|
||||
}
|
||||
}
|
||||
.milepostleft{
|
||||
|
|
|
|||
|
|
@ -0,0 +1,113 @@
|
|||
.milepostBox{
|
||||
border: none;
|
||||
padding: 0;
|
||||
.createMilepost{
|
||||
text-align: right;
|
||||
}
|
||||
}
|
||||
.flexSpaceBetween{
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
}
|
||||
.milepostHead{
|
||||
background-color:#fafcff;
|
||||
border:1px solid rgba(42, 97, 255, 0.23);
|
||||
color:#898d9d;
|
||||
padding: 15px 15px 15px 20px;
|
||||
border-radius:4px 4px 0px 0px;
|
||||
.postStatus.active{
|
||||
color:$primary-color;
|
||||
.statusCount{
|
||||
color: $primary-color;
|
||||
border: 1px solid $primary-color;
|
||||
background-color: #fff;
|
||||
}
|
||||
}
|
||||
.statusCount{
|
||||
background-color:rgba(70, 106, 255, 0.09);
|
||||
border-radius:10px;
|
||||
margin-left: 5px;
|
||||
color:#666666;
|
||||
font-weight: normal;
|
||||
height: 19px;
|
||||
line-height: 19px;
|
||||
display: inline-block;
|
||||
min-width: 30px;
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
.pointBox{
|
||||
cursor: pointer;
|
||||
}
|
||||
.milepostSort{
|
||||
box-shadow:0px 0px 10px rgba(24, 54, 181, 0.17);
|
||||
}
|
||||
.milepostList{
|
||||
border-left: 1px solid #d0d0d0;
|
||||
border-right: 1px solid #d0d0d0;
|
||||
.milepostItemBox{
|
||||
border-bottom: 1px solid #d0d0d0;
|
||||
padding: 15px 20px;
|
||||
}
|
||||
.milepostInfo{
|
||||
display: inline-block;
|
||||
width: 640px;
|
||||
}
|
||||
.actionMileBox{
|
||||
width: 550px;
|
||||
.outTime{
|
||||
color: red;
|
||||
}
|
||||
}
|
||||
}
|
||||
.createMilepostBtn{
|
||||
width: 96px;
|
||||
padding: 0;
|
||||
}
|
||||
.primaryColor, .primaryColor:link, .flexSpaceBetween .primaryColor{
|
||||
color: $primary-color;
|
||||
}
|
||||
.effectiveDate, .flexSpaceBetween .effectiveDate{
|
||||
color:#40424a;
|
||||
}
|
||||
.color-grey-89{
|
||||
color: #898d9d;
|
||||
}
|
||||
.colorRed, .colorRed:hover{
|
||||
color:#f30000;
|
||||
}
|
||||
.milestonesNoDate{
|
||||
border:1px solid#d0d0d0;
|
||||
border-top: none;
|
||||
min-height: 500px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
span{
|
||||
color: #666;
|
||||
}
|
||||
}
|
||||
// 浅灰色按钮
|
||||
.grayButton{
|
||||
width:108px;
|
||||
height:32px;
|
||||
text-align: center;
|
||||
background-color:#fafbfc;
|
||||
border:1px solid #d0d0d0;
|
||||
border-radius:4px;
|
||||
&:hover{
|
||||
background-color: #f3f4f6;
|
||||
}
|
||||
}
|
||||
|
||||
// 里程碑详情页面
|
||||
.milepostDetail{
|
||||
border: none;
|
||||
padding: 0;
|
||||
}
|
||||
.noDataMile{
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
}
|
||||
|
|
@ -2,7 +2,7 @@ import React, { Component } from 'react';
|
|||
import { Calendar, Select, Radio, Col, Row, Divider, Input, Form, Spin } from 'antd';
|
||||
import axios from 'axios';
|
||||
import moment from 'moment';
|
||||
import '../Order/order.css';
|
||||
import '../Order/order.scss';
|
||||
|
||||
const TextArea = Input.TextArea;
|
||||
const { Group, Button } = Radio;
|
||||
|
|
@ -16,19 +16,30 @@ class NewMilepost extends Component {
|
|||
isSpin: false
|
||||
}
|
||||
}
|
||||
|
||||
componentDidMount = () => {
|
||||
this.updateDocumentTitle();
|
||||
}
|
||||
|
||||
componentDidUpdate=(prevPros)=>{
|
||||
if(prevPros && this.props && !this.props.checkIfLogin()){
|
||||
this.props.history.push("/403")
|
||||
return
|
||||
}
|
||||
this.updateDocumentTitle();
|
||||
}
|
||||
componentDidMount = () => {
|
||||
|
||||
// 更新网页标题
|
||||
updateDocumentTitle(){
|
||||
const {projectDetail} = this.props;
|
||||
if(projectDetail){
|
||||
const { author, name} = projectDetail;
|
||||
document.title = `新建里程碑-${author.name}/${name}`;
|
||||
}
|
||||
};
|
||||
}
|
||||
// componentDidMount = () => {
|
||||
// this.check_is_login();
|
||||
// };
|
||||
// check_is_login =() =>{
|
||||
// if(!this.props.checkIfLogin()){
|
||||
// this.props.history.push("/403")
|
||||
|
|
@ -61,12 +72,12 @@ class NewMilepost extends Component {
|
|||
}
|
||||
axios.post(url, {
|
||||
...values,
|
||||
project_id: projectsId,
|
||||
effective_date: time,
|
||||
status: 'open'
|
||||
}).then(result => {
|
||||
if (result) {
|
||||
this.setState({ isSpin: false })
|
||||
window.scrollTo(0,0);
|
||||
this.props.history.push(`/${owner}/${projectsId}/milestones`);
|
||||
const { getDetail } = this.props;
|
||||
getDetail && getDetail();
|
||||
|
|
@ -106,7 +117,7 @@ class NewMilepost extends Component {
|
|||
required: true, message: '请输入标题'
|
||||
}],
|
||||
})(
|
||||
<Input placeholder="标题" autoComplete="off" maxLength="30" />
|
||||
<Input placeholder="标题" autoComplete="off" maxLength={30} />
|
||||
)}
|
||||
</Form.Item>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import React, { Component } from "react";
|
||||
import { Input, Dropdown, Menu, Icon, Pagination, Spin, DatePicker, Checkbox } from "antd";
|
||||
import "./order.css";
|
||||
import "./order.scss";
|
||||
import './index.scss';
|
||||
import moment from 'moment';
|
||||
|
||||
|
|
@ -78,17 +78,9 @@ class order extends Component {
|
|||
componentDidUpdate(){
|
||||
this.updateDocumentTitle();
|
||||
}
|
||||
// 更新网页标题
|
||||
updateDocumentTitle(){
|
||||
const {projectDetail} = this.props;
|
||||
if(projectDetail){
|
||||
const { author, name} = projectDetail;
|
||||
document.title = `疑修-${author.name}/${name}`;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
componentDidMount = () => {
|
||||
this.updateDocumentTitle();
|
||||
const datas = cookie.load('states');
|
||||
let states = datas === "undefined" ? undefined : datas;
|
||||
if(states){
|
||||
|
|
@ -104,6 +96,14 @@ class order extends Component {
|
|||
}
|
||||
};
|
||||
|
||||
// 更新网页标题
|
||||
updateDocumentTitle(){
|
||||
const {projectDetail} = this.props;
|
||||
if(projectDetail){
|
||||
const { author, name} = projectDetail;
|
||||
document.title = `疑修-${author.name}/${name}`;
|
||||
}
|
||||
}
|
||||
|
||||
getSelectList = () => {
|
||||
this.setState({
|
||||
|
|
@ -126,11 +126,11 @@ class order extends Component {
|
|||
};
|
||||
|
||||
// 获取列表数据
|
||||
getIssueList = (status_type, begin, end) => {
|
||||
getIssueList = (status_type,) => {
|
||||
this.setState({
|
||||
isSpin: true
|
||||
})
|
||||
const { select_params } = this.state;
|
||||
const { select_params ,begin,end} = this.state;
|
||||
const { projectsId, owner } = this.props.match.params;
|
||||
const url = `/${owner }/${projectsId}/issues.json`;
|
||||
axios
|
||||
|
|
@ -164,7 +164,6 @@ class order extends Component {
|
|||
};
|
||||
|
||||
saveCookies=(status_type)=>{
|
||||
const { projectsId, owner } = this.props.match.params;
|
||||
const {
|
||||
select_params,
|
||||
issue_tag_ids,//标记
|
||||
|
|
@ -292,13 +291,17 @@ class order extends Component {
|
|||
// 翻页
|
||||
ChangePage = (page) => {
|
||||
window.scrollTo(0,0);
|
||||
const { status_type } = this.state;
|
||||
const { status_type,select_params } = this.state;
|
||||
this.setState({
|
||||
isSpin: true,
|
||||
checkedValue: [],
|
||||
all: false,
|
||||
select_params:{
|
||||
...select_params,
|
||||
page
|
||||
}
|
||||
},()=>{
|
||||
this.state.select_params.page=page;
|
||||
// this.state.select_params.page=page;
|
||||
this.getIssueList(status_type);
|
||||
});
|
||||
};
|
||||
|
|
@ -442,18 +445,28 @@ class order extends Component {
|
|||
|
||||
// 修改开始时间
|
||||
changeBeginTime = (data, value) => {
|
||||
const { status_type } = this.state;
|
||||
const { status_type,select_params } = this.state;
|
||||
this.setState({
|
||||
begin: value
|
||||
})
|
||||
begin: value,
|
||||
select_params:{
|
||||
...select_params,
|
||||
page:1
|
||||
}
|
||||
},()=>{
|
||||
this.getIssueList(status_type, value, this.state.end);
|
||||
})
|
||||
}
|
||||
changeEndTime = (data, value) => {
|
||||
const { status_type } = this.state;
|
||||
const { status_type,select_params } = this.state;
|
||||
this.setState({
|
||||
end: value
|
||||
})
|
||||
end: value,
|
||||
select_params:{
|
||||
...select_params,
|
||||
page:1
|
||||
}
|
||||
},()=>{
|
||||
this.getIssueList(status_type, this.state.begin, value);
|
||||
});
|
||||
}
|
||||
|
||||
// 选择列表里面的checkbox
|
||||
|
|
@ -639,15 +652,14 @@ class order extends Component {
|
|||
issues,
|
||||
search_count,
|
||||
data,
|
||||
author_id,
|
||||
assigned_to_id,
|
||||
isSpin,
|
||||
status_type,
|
||||
select_params,
|
||||
begin, end, checkedValue, all,search
|
||||
} = this.state;
|
||||
const { assigned_to_id , author_id } = this.state.select_params;
|
||||
return (
|
||||
<div className="main" style={{padding:"0px"}}>
|
||||
<div className="main mt20" style={{padding:"0px"}}>
|
||||
<div style={{padding:"10px 20px 0px 20px"}}>
|
||||
<div className="topWrapper" style={{ paddingTop: "10px" }}>
|
||||
<ul className="topWrapper_type">
|
||||
|
|
|
|||
|
|
@ -0,0 +1,718 @@
|
|||
.topWrapper {
|
||||
padding-bottom: 20px;
|
||||
box-sizing: border-box;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
.quillContent {
|
||||
position: relative;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
.quillFlag {
|
||||
position: absolute;
|
||||
bottom: 30px;
|
||||
left: 6px;
|
||||
height: 20px;
|
||||
line-height: 18px;
|
||||
color: red;
|
||||
}
|
||||
.overlayBox{
|
||||
width: 230px;
|
||||
}
|
||||
.hideOverlay{
|
||||
display: none;
|
||||
}
|
||||
.topmilepost {
|
||||
box-sizing: border-box;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
.topWrapper_nav {
|
||||
display: flex;
|
||||
}
|
||||
.detail_p {
|
||||
display: flex;
|
||||
}
|
||||
|
||||
.detail_right {
|
||||
flex-grow: 1;
|
||||
text-align: right;
|
||||
}
|
||||
.commit_p {
|
||||
font-size: 12px;
|
||||
padding-top: 10px;
|
||||
padding-left: 5px;
|
||||
}
|
||||
|
||||
.ul_width {
|
||||
width: 100%;
|
||||
}
|
||||
.a_btn {
|
||||
border-radius: 4px;
|
||||
padding: 0 12px;
|
||||
margin-right: 15px;
|
||||
line-height: 30px;
|
||||
}
|
||||
.cancel_btn {
|
||||
border: 1px solid #e6e6e6;
|
||||
color: #333 !important;
|
||||
}
|
||||
.delete_btn {
|
||||
border: 1px solid red;
|
||||
color: red !important;
|
||||
}
|
||||
.cancel_btn:hover {
|
||||
background: #e6e6e6;
|
||||
}
|
||||
.Closeor_btn {
|
||||
border: 1px solid red;
|
||||
color: red;
|
||||
height: 32px;
|
||||
text-align: center;
|
||||
border-radius: 4px;
|
||||
padding: 0px 12px;
|
||||
margin-right: 15px;
|
||||
line-height: 32px;
|
||||
}
|
||||
.rectangle {
|
||||
width: 8px;
|
||||
height: 8px;
|
||||
border-radius: 100%;
|
||||
margin-top: 15px;
|
||||
margin-left: -4px;
|
||||
margin-bottom: 10px;
|
||||
background: green;
|
||||
}
|
||||
.order_line {
|
||||
display: flex;
|
||||
height: 32px;
|
||||
margin: auto;
|
||||
border-left: 1px solid #eee;
|
||||
}
|
||||
.comment_img {
|
||||
height: 25px;
|
||||
width: 25px;
|
||||
margin-top: 5px;
|
||||
border-radius: 100%;
|
||||
}
|
||||
|
||||
.topWrapper_nav a,
|
||||
.topWrapper_nav span {
|
||||
border: 1px solid #f4f4f4;
|
||||
border-radius: 5px 0px 0px 5px;
|
||||
height: 34px;
|
||||
line-height: 34px;
|
||||
text-align: center;
|
||||
padding: 0px 10px;
|
||||
display: block;
|
||||
cursor: pointer;
|
||||
}
|
||||
.topWrapper_nav a:hover {
|
||||
background: #f4f4f4;
|
||||
}
|
||||
.topWrapper_nav a:last-child,
|
||||
.topWrapper_nav span:last-child {
|
||||
border-left: none;
|
||||
border-radius: 0px 5px 5px 0px;
|
||||
}
|
||||
.topWrapper_btn {
|
||||
background: #fff;
|
||||
border: 1px solid $primary-color;
|
||||
color: $primary-color!important ;
|
||||
padding: 0px 12px;
|
||||
text-align: center;
|
||||
height: 32px;
|
||||
line-height: 32px;
|
||||
border-radius: 4px;
|
||||
}
|
||||
.topWrapper_type_infos{
|
||||
border:1px solid #eee;
|
||||
border-radius: 3px;
|
||||
height: 35px;
|
||||
line-height: 35px;
|
||||
}
|
||||
.topWrapper_type_infos li{
|
||||
cursor: pointer;
|
||||
padding:0px 10px;
|
||||
}
|
||||
.topWrapper_type_infos li.active{
|
||||
color: $primary-color
|
||||
}
|
||||
.topWrapper_type_infos li:last-child{
|
||||
border-left: 1px solid #eee;
|
||||
}
|
||||
.topWrapper_type,.topWrapper_type_infos {
|
||||
display: flex;
|
||||
}
|
||||
.topWrapper_type li {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-right: 30px;
|
||||
}
|
||||
.topWrapper_type li > span {
|
||||
display: block;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
padding: 0px 13px;
|
||||
border-radius: 5px;
|
||||
min-width: 60px;
|
||||
box-sizing: border-box;
|
||||
text-align: center;
|
||||
background: rgba(250, 250, 250, 1);
|
||||
border: 1px solid rgba(221, 221, 221, 1);
|
||||
cursor: pointer;
|
||||
}
|
||||
.topWrapper_type li > span.active {
|
||||
color: $primary-color;
|
||||
border: 1px solid rgba(80, 145, 255, 1);
|
||||
}
|
||||
.topWrapper_select {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
}
|
||||
.topWrapper .ant-btn.ant-input-search-button {
|
||||
height: 30px;
|
||||
}
|
||||
.title_overflow {
|
||||
max-width: 160px;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
-o-text-overflow: ellipsis;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
.topWrapper_select.wrapperStyle li{
|
||||
width:90px;
|
||||
}
|
||||
.topWrapper_select li {
|
||||
text-align: center;
|
||||
cursor: pointer;
|
||||
color: #666;
|
||||
width: 86px;
|
||||
text-align: center;
|
||||
display: inline-block;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
-o-text-overflow: ellipsis;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
.topWrapper_select li:active {
|
||||
background: #f4f4f4;
|
||||
border-radius: 4px;
|
||||
}
|
||||
.no-cursor li {
|
||||
cursor: default !important;
|
||||
}
|
||||
.ant-dropdown-menu .ant-dropdown-menu-item {
|
||||
text-align: center;
|
||||
padding: 6px 30px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.setItemStyle{
|
||||
min-height:440px;
|
||||
}
|
||||
.setItemStyle .issueItem{
|
||||
padding:16px 0px;
|
||||
}
|
||||
.issueItem {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-content: center;
|
||||
border-bottom: 1px solid #eee;
|
||||
padding: 16px 0px 16px 20px;
|
||||
}
|
||||
.issueIndex{
|
||||
display: inline-block;
|
||||
height:19px;
|
||||
line-height:19px;
|
||||
background-color:rgba(213, 220, 246, 0.36);
|
||||
border-radius:4px;
|
||||
padding:0px 8px;
|
||||
color: #666!important;
|
||||
}
|
||||
.issueItem:last-child{
|
||||
border-bottom: none;
|
||||
}
|
||||
.issueNo {
|
||||
padding: 0px 5px;
|
||||
border-radius: 4px;
|
||||
background: #f4f4f4;
|
||||
display: block;
|
||||
margin-right: 8px;
|
||||
color: #666;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
}
|
||||
.issueOpen {
|
||||
background: #21ba45 !important;
|
||||
color: #fff !important;
|
||||
}
|
||||
|
||||
.margin_detail {
|
||||
margin-left: 15px;
|
||||
margin-right: 15px;
|
||||
}
|
||||
|
||||
/* 新建 */
|
||||
.user_img {
|
||||
height: 49px;
|
||||
width: 49px;
|
||||
border-radius: 100%;
|
||||
}
|
||||
.new_context {
|
||||
flex: 1;
|
||||
border: 1px solid #f4f4f4;
|
||||
border-radius: 4px;
|
||||
margin-left: 15px;
|
||||
padding: 15px;
|
||||
position: relative;
|
||||
background: #ffffff;
|
||||
}
|
||||
.new_context:before {
|
||||
position: absolute;
|
||||
content: "";
|
||||
height: 0;
|
||||
width: 0;
|
||||
border: solid transparent;
|
||||
border-right-color: #f4f4f4;
|
||||
border-width: 9px;
|
||||
top: 12px;
|
||||
right: 100%;
|
||||
}
|
||||
.new_context::after {
|
||||
position: absolute;
|
||||
content: "";
|
||||
height: 0;
|
||||
width: 0;
|
||||
border: solid transparent;
|
||||
border-right-color: #fff;
|
||||
border-width: 7px;
|
||||
top: 14px;
|
||||
right: 100%;
|
||||
}
|
||||
.list-l-panel {
|
||||
border: 1px solid #f4f4f4;
|
||||
border-radius: 4px;
|
||||
padding: 10px 15px;
|
||||
}
|
||||
.list-l-panel .ant-row {
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
|
||||
/*编辑任务*/
|
||||
.editingsheet {
|
||||
background: #ffffff;
|
||||
color: #21ba45 !important;
|
||||
padding: 0px 12px;
|
||||
text-align: center;
|
||||
height: 32px;
|
||||
line-height: 32px;
|
||||
}
|
||||
/*开启中 关闭中*/
|
||||
.opendetail {
|
||||
display: inline-block;
|
||||
background: #21ba45;
|
||||
color: #ffffff !important;
|
||||
padding: 0px 12px;
|
||||
text-align: center;
|
||||
height: 32px;
|
||||
border-radius: 4px;
|
||||
line-height: 32px;
|
||||
}
|
||||
.closedetail {
|
||||
display: inline-block;
|
||||
background: #e60b0b;
|
||||
color: #ffffff !important;
|
||||
padding: 0px 12px;
|
||||
text-align: center;
|
||||
height: 32px;
|
||||
/*width: 110px;*/
|
||||
border-radius: 4px;
|
||||
line-height: 32px;
|
||||
}
|
||||
|
||||
.commenttitle {
|
||||
color: #21ba45 !important;
|
||||
}
|
||||
|
||||
.topWrapper_detali {
|
||||
display: flex;
|
||||
background-color: #eee;
|
||||
align-items: center;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.towwrapper_img_detali {
|
||||
display: flex;
|
||||
padding-left: 80px;
|
||||
margin-left: 80px;
|
||||
margin-right: 20px;
|
||||
border: 1px solid $primary-color;
|
||||
}
|
||||
.div_line {
|
||||
width: 100%;
|
||||
border: 10px solid $primary-color;
|
||||
}
|
||||
.list_img {
|
||||
height: 145px;
|
||||
padding: 15px;
|
||||
width: 145px;
|
||||
}
|
||||
|
||||
.detail_context {
|
||||
flex: 1;
|
||||
border: 1px solid #f4f4f4;
|
||||
margin-left: 15px;
|
||||
padding: 10px;
|
||||
position: relative;
|
||||
background: #ffffff;
|
||||
border-radius: 4px;
|
||||
width: 0;
|
||||
}
|
||||
.detail_context:before {
|
||||
position: absolute;
|
||||
content: "";
|
||||
height: 0;
|
||||
width: 0;
|
||||
border: solid transparent;
|
||||
border-right-color: #f4f4f4;
|
||||
border-width: 9px;
|
||||
top: 12px;
|
||||
right: 100%;
|
||||
}
|
||||
.detail_context::after {
|
||||
position: absolute;
|
||||
content: "";
|
||||
height: 0;
|
||||
width: 0;
|
||||
border: solid transparent;
|
||||
border-right-color: #fff;
|
||||
border-width: 7px;
|
||||
top: 14px;
|
||||
right: 100%;
|
||||
}
|
||||
/* 任务标签列表 */
|
||||
.tagList > div {
|
||||
border-bottom: 1px dashed #efefef;
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
padding: 15px 0px;
|
||||
}
|
||||
.divwidth {
|
||||
width: 74%;
|
||||
}
|
||||
.listTowItems {
|
||||
width: 80%;
|
||||
padding-left: 80px;
|
||||
}
|
||||
|
||||
.tagList > div:last-child {
|
||||
border-bottom: none;
|
||||
}
|
||||
.mr10 {
|
||||
margin-right: 10px;
|
||||
}
|
||||
.text-right {
|
||||
text-align: right;
|
||||
}
|
||||
.tagColor {
|
||||
display: inline-block;
|
||||
width: 28px;
|
||||
height: 14px;
|
||||
border-radius: 4px;
|
||||
margin-right: 5px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
/*里程碑*/
|
||||
.milepostdiv {
|
||||
display: flex;
|
||||
}
|
||||
.milepostwidth {
|
||||
display: flex;
|
||||
width: 60%;
|
||||
}
|
||||
.mileposwidth {
|
||||
background: #21ba45;
|
||||
border-radius: 4px;
|
||||
width: 40%;
|
||||
}
|
||||
.milepostrighe {
|
||||
display: flex;
|
||||
flex:1;
|
||||
}
|
||||
.milepostleft {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
}
|
||||
.textwidth {
|
||||
display: flex;
|
||||
width: 100%;
|
||||
}
|
||||
.newmilepostleft {
|
||||
padding: 15px;
|
||||
margin-right: 50px;
|
||||
width: 60%;
|
||||
}
|
||||
.newmilepostrighe {
|
||||
margin-left: 50px;
|
||||
padding: 15px;
|
||||
width: 30%;
|
||||
}
|
||||
/* 任务详情 */
|
||||
.detailContent {
|
||||
padding: 15px 0px;
|
||||
border-bottom: 1px solid #f4f4f4;
|
||||
}
|
||||
.DetailRight {
|
||||
padding: 10px 15px;
|
||||
border: 1px solid #f4f4f4;
|
||||
border-radius: 4px;
|
||||
}
|
||||
.DetailRight > p {
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
}
|
||||
.inptwidth {
|
||||
width: 20%;
|
||||
}
|
||||
.inputcount {
|
||||
width: 40%;
|
||||
}
|
||||
.loginDiv {
|
||||
border: 1px solid #f7c977;
|
||||
background: rgba(255, 204, 113, 0.3);
|
||||
text-align: center;
|
||||
padding: 8px 0px;
|
||||
border-radius: 4px;
|
||||
width: 100%;
|
||||
color: #999;
|
||||
margin-top: 15px;
|
||||
}
|
||||
.loginDiv a {
|
||||
text-decoration: underline;
|
||||
color: $primary-color;
|
||||
margin-right: 3px;
|
||||
}
|
||||
|
||||
.tagdiv {
|
||||
padding: 15px;
|
||||
height: 75px;
|
||||
box-sizing: border-box;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
border: 1px solid #eeeeee;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.dialogdiv {
|
||||
padding: 5px;
|
||||
height: 45px;
|
||||
box-sizing: border-box;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
.issue-tag-show {
|
||||
padding: 3px 8px;
|
||||
color: #fff;
|
||||
border-radius: 6px;
|
||||
}
|
||||
.journal-list-item {
|
||||
padding: 10px 0px;
|
||||
}
|
||||
|
||||
.span_title {
|
||||
min-width: 40px;
|
||||
margin-right: 15px;
|
||||
text-align: right;
|
||||
color: rgba(0, 0, 0, 0.65);
|
||||
}
|
||||
.target-detail-search .ant-input-group-addon {
|
||||
border: none !important;
|
||||
}
|
||||
.target-detail-search .ant-input-search-button {
|
||||
height: 32px !important;
|
||||
}
|
||||
a.issue-type-button.active {
|
||||
background: $primary-color;
|
||||
color: #fff;
|
||||
}
|
||||
a.issue-type-button.active:hover {
|
||||
background: #f4f4f4;
|
||||
color: $primary-color;
|
||||
}
|
||||
@media screen and (max-width: 700px) {
|
||||
.topWrapper_select li {
|
||||
width: auto;
|
||||
}
|
||||
}
|
||||
.ml10 {
|
||||
margin-left: 10px;
|
||||
}
|
||||
.lineH32 {
|
||||
line-height: 32px;
|
||||
}
|
||||
.lineH40 {
|
||||
line-height: 40px;
|
||||
}
|
||||
.item-list-right {
|
||||
width: 74%;
|
||||
border:1px solid #eee;
|
||||
}
|
||||
.detail_edit_action {
|
||||
padding: 10px;
|
||||
color: #999;
|
||||
cursor: pointer;
|
||||
line-height: 40px;
|
||||
}
|
||||
.paper-clip-color {
|
||||
color: #29bd8b !important;
|
||||
}
|
||||
.attachment-list-a {
|
||||
color: rgba(0, 0, 0, 0.65) !important;
|
||||
}
|
||||
.attachment-list-a>span{
|
||||
word-break: break-all;
|
||||
}
|
||||
.btp1 {
|
||||
border-top: 1px solid #f4f4f4;
|
||||
}
|
||||
|
||||
.grid-item {
|
||||
display: grid;
|
||||
align-items: center;
|
||||
grid-template-columns: max-content 1fr;
|
||||
}
|
||||
.grid-item-left {
|
||||
display: grid;
|
||||
align-items: center;
|
||||
grid-template-columns: 1fr max-content;
|
||||
}
|
||||
.grid-item-top {
|
||||
display: grid;
|
||||
align-items: center;
|
||||
grid-template-columns: max-content 1fr;
|
||||
align-items: flex-start;
|
||||
}
|
||||
.fwb {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
/* 发布人、指派人数量过多时要出现滚动条 */
|
||||
.ant-dropdown-menu.orderCondition {
|
||||
max-height: 350px;
|
||||
overflow-y: auto;
|
||||
}
|
||||
.ql-bubble .ql-editor img {
|
||||
min-width: 100px !important;
|
||||
}
|
||||
.AmplifyImg .ant-modal {
|
||||
padding: 0px;
|
||||
}
|
||||
.AmplifyImg img {
|
||||
max-width: 100%;
|
||||
margin: 0px auto;
|
||||
}
|
||||
.AmplifyImg .ant-modal-body {
|
||||
padding: 25px;
|
||||
}
|
||||
.amplifyContent {
|
||||
text-align: center;
|
||||
}
|
||||
.mb-0 {
|
||||
margin-bottom: 0 !important;
|
||||
}
|
||||
.text-yellow {
|
||||
color: #ff6e21;
|
||||
}
|
||||
.border-1f {
|
||||
border-bottom: 1px solid #f4f4f4;
|
||||
}
|
||||
.background-f {
|
||||
background: #fff;
|
||||
}
|
||||
.issue_detail_info {
|
||||
width: 65px;
|
||||
color: #888888;
|
||||
}
|
||||
.list-left-padding {
|
||||
padding: 0 0 0 20px !important;
|
||||
}
|
||||
.comment-background {
|
||||
background: #fff;
|
||||
border-radius: 4px;
|
||||
padding: 0px 30px;
|
||||
}
|
||||
.border-bottom-comment {
|
||||
border-bottom: 1px solid #eee;
|
||||
}
|
||||
|
||||
.custom-comment-tabs .ant-tabs-top-bar{
|
||||
border-bottom: none;
|
||||
padding-top:15px;
|
||||
}
|
||||
.custom-comment-tabs .search-count-button{
|
||||
line-height: 18px;
|
||||
margin-left: 8px;
|
||||
background-color: rgba(235,244,254,1);
|
||||
color: $primary-color;
|
||||
font-size: 12px;
|
||||
padding: 2px 8px;
|
||||
border-radius: 9px;
|
||||
}
|
||||
.comment-background .ant-list-item {
|
||||
padding-left: 20px;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.border-top-e {
|
||||
border-top: 1px solid #e8e8e8;
|
||||
}
|
||||
.commentStyle {
|
||||
background-color: #fff !important;
|
||||
}
|
||||
.reply-comment-input .add_reply_button {
|
||||
background-color: #fff !important;
|
||||
color: #bbb;
|
||||
width: 100%;
|
||||
text-align: left;
|
||||
border: 1px solid rgba(238, 238, 238, 1);
|
||||
box-shadow: none;
|
||||
}
|
||||
.children-comment-bg {
|
||||
background:rgba(250,250,250,1);
|
||||
}
|
||||
|
||||
.display-in{
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
}
|
||||
.issue-form-right{
|
||||
border:1px solid #eee;
|
||||
}
|
||||
.issue-form-right .ant-form-item{
|
||||
margin-bottom: 8px !important;
|
||||
}
|
||||
.issue-form-right .ant-row label{font-size: 14px !important; font-weight: 500;}
|
||||
.issue-edit-form-right{margin-bottom: 0 !important;}
|
||||
.plr10{padding: 0 10px;}
|
||||
.issue-form-index .editormd-toolbar{position: absolute !important;}
|
||||
.list-right-item-padding{padding: 20px 35px 10px 35px;margin-bottom: 20px;}
|
||||
.tagColor {
|
||||
display: inline-block;
|
||||
width: 28px;
|
||||
height: 14px;
|
||||
border-radius: 4px;
|
||||
margin-right: 5px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.boder-4{border-radius: 4px;}
|
||||
.pbt20{padding: 20px 0;}
|
||||
.inline-block{display: inline-block;}
|
||||
.pd10{padding: 10px;}
|
||||
|
||||
.searchIcon .ant-select-arrow{
|
||||
margin-top:-9px
|
||||
}
|
||||
|
|
@ -4,7 +4,7 @@ import Upload from "../Upload/Index";
|
|||
import UploadImg from "../Images/upload.png";
|
||||
import MDEditor from "../../modules/tpm/challengesnew/tpm-md-editor";
|
||||
import moment from "moment";
|
||||
import "./order.css";
|
||||
import "./order.scss";
|
||||
import Attachments from "../Upload/attachment";
|
||||
|
||||
import axios from "axios";
|
||||
|
|
@ -44,11 +44,28 @@ class order_form extends Component {
|
|||
this.props.history.push("/403")
|
||||
return
|
||||
}
|
||||
this.updateDocumentTitle();
|
||||
}
|
||||
componentDidMount = () => {
|
||||
this.getSelectList();
|
||||
};
|
||||
|
||||
// 更新网页标题
|
||||
updateDocumentTitle(){
|
||||
const {form_type, projectDetail} = this.props;
|
||||
const {subject} = this.state;
|
||||
if(projectDetail && form_type){
|
||||
const { author, name} = projectDetail;
|
||||
if(form_type === 'feedback'){
|
||||
document.title = `意见反馈`
|
||||
}else if(form_type === 'new'){
|
||||
document.title = `新建疑修-${author.name}/${name}`
|
||||
}else{
|
||||
subject && (document.title = `${subject}-疑修-${author.name}/${name}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
copyIssueAtWhoInit = (description) =>{
|
||||
if (description.indexOf("@") !== -1){
|
||||
this.setState({isSpin: true});
|
||||
|
|
@ -102,7 +119,6 @@ class order_form extends Component {
|
|||
subject: result.data.subject,
|
||||
}
|
||||
if (this.props.form_type === "copy" && result.data.description){
|
||||
|
||||
this.copyIssueAtWhoInit(result.data.description);
|
||||
}
|
||||
this.props.form.setFieldsValue({ ...data });
|
||||
|
|
@ -213,6 +229,7 @@ class order_form extends Component {
|
|||
this.props.history.push(`/${owner}/${projectsId}/issues/${result.data.id}`);
|
||||
const { getDetail } = this.props;
|
||||
getDetail && getDetail();
|
||||
this.props.showNpsModal("createIssue", 1);
|
||||
}
|
||||
this.setState({
|
||||
isSpin: false,
|
||||
|
|
@ -239,6 +256,7 @@ class order_form extends Component {
|
|||
this.props.showNotification("任务更新成功！");
|
||||
const { getDetail } = this.props;
|
||||
getDetail && getDetail();
|
||||
this.props.showNpsModal("submitIssue", 1);
|
||||
}
|
||||
this.setState({
|
||||
isSpin: false
|
||||
|
|
|
|||
|
|
@ -362,3 +362,21 @@ button.btngrey{
|
|||
color: #666666;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// 操作按钮-蓝色
|
||||
.operateButton{
|
||||
padding:0px 15px;
|
||||
height:32px;
|
||||
color: #fff!important;
|
||||
cursor: pointer;
|
||||
line-height: 30px;
|
||||
background-color:rgba(70, 106, 255, 1);
|
||||
border:1px solid rgba(70, 106, 255, 1);
|
||||
border-radius: 4px;
|
||||
display: block;
|
||||
&:hover{
|
||||
background-color:#708cff;
|
||||
border-color:#708cff;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
$primary-color: #466aff;
|
||||
$primary-color-hover: #6684FE;
|
||||
$primary-color-active: #1A47FF;
|
||||
$link-color: #466aff;
|
||||
$link-black-color: #05101a;
|
||||
|
|
@ -166,7 +166,6 @@ export function TPMIndexHOC(WrappedComponent) {
|
|||
tpmLoading: false,
|
||||
completeProfile:response.data.profile_completed
|
||||
})
|
||||
console.log("11：",response.data);
|
||||
if(response.data && response.data.login){
|
||||
if(!response.data.has_gitea_user){
|
||||
this.setState({
|
||||
|
|
|
|||
Loading…
Reference in New Issue