From 22ccc3c974c61ddde1cf60e0c804db78eff9b936 Mon Sep 17 00:00:00 2001 From: caishi Date: Fri, 3 Sep 2021 19:06:14 +0800 Subject: [PATCH 01/48] =?UTF-8?q?fork=E7=99=BD=E5=B1=8F+=E5=85=B3=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Main/Detail.js | 2 +- src/forge/UsersList/common_users.js | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index 3303d42c3..b3262f880 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -142,7 +142,7 @@ const WikiEdit = Loadable({ function checkPathname(projectsId, owner, pathname) { let name = ""; if (pathname && pathname !== `/${owner}/${projectsId}`) { - let url = pathname.split(`/${owner}/${projectsId}`)[1]; + let url = pathname.split(`/${owner}/${projectsId}`)[1] || ""; if (url.indexOf("/about") > -1) { name = "about" } else if (url.indexOf("/issues") > -1 || url.indexOf("Milepost") > 0) { diff --git a/src/forge/UsersList/common_users.js b/src/forge/UsersList/common_users.js index dac45f480..e8404b387 100644 --- a/src/forge/UsersList/common_users.js +++ b/src/forge/UsersList/common_users.js @@ -93,7 +93,13 @@ class CommonUsers extends Component { {count === 0 ? ( ) : ( - + )} From b611308f3c278036d12be17a2c97e9cfe9b5c82c Mon Sep 17 00:00:00 2001 From: hc1913847458 <1422588487@qq.com> Date: Wed, 25 Aug 2021 15:04:16 +0800 Subject: [PATCH 02/48] 'update' --- .idea/workspace.xml | 322 +-------------- public/css/edu-purge.css | 11 +- src/forge/Component/EAccount.css | 9 + src/forge/Component/EAccount.css.map | 1 + src/forge/Main/Index.css | 375 ++++++++++++++++++ src/forge/Main/Index.css.map | 1 + src/forge/Wiki/Index.css | 348 ++++++++++++++++ src/forge/Wiki/Index.css.map | 1 + src/forge/Wiki/Welcome/index.css | 51 +++ src/forge/Wiki/Welcome/index.css.map | 1 + .../Wiki/components/FolderTree/index.css | 32 ++ .../Wiki/components/FolderTree/index.css.map | 1 + src/forge/Wiki/components/Login/index.css | 56 +++ src/forge/Wiki/components/Login/index.css.map | 1 + src/forge/Wiki/components/ModalFun/index.css | 56 +++ .../Wiki/components/ModalFun/index.css.map | 1 + src/forge/users/Index.css | 247 ++++++++++++ src/forge/users/Index.css.map | 1 + 18 files changed, 1192 insertions(+), 323 deletions(-) create mode 100644 src/forge/Component/EAccount.css create mode 100644 src/forge/Component/EAccount.css.map create mode 100644 src/forge/Main/Index.css create mode 100644 src/forge/Main/Index.css.map create mode 100644 src/forge/Wiki/Index.css create mode 100644 src/forge/Wiki/Index.css.map create mode 100644 src/forge/Wiki/Welcome/index.css create mode 100644 src/forge/Wiki/Welcome/index.css.map create mode 100644 src/forge/Wiki/components/FolderTree/index.css create mode 100644 src/forge/Wiki/components/FolderTree/index.css.map create mode 100644 src/forge/Wiki/components/Login/index.css create mode 100644 src/forge/Wiki/components/Login/index.css.map create mode 100644 src/forge/Wiki/components/ModalFun/index.css create mode 100644 src/forge/Wiki/components/ModalFun/index.css.map create mode 100644 src/forge/users/Index.css create mode 100644 src/forge/users/Index.css.map diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f221492f6..aed6ebd49 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,294 +1,12 @@ + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - @@ -685,22 +393,7 @@ - - - - - + @@ -719,6 +412,7 @@ + diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css index f721824be..4dfc7bb88 100644 --- a/public/css/edu-purge.css +++ b/public/css/edu-purge.css @@ -1363,10 +1363,6 @@ a:visited { color: #05101a; } -a:hover { - color: #459be5; -} - ol, ul, li { @@ -2436,7 +2432,7 @@ a.hoverLine:hover{ .color-grey-9 { - color: #999999 !important; + color: #333333 !important; } .color-grey-98 { @@ -2482,13 +2478,10 @@ a.color-grey-c:hover { } /*蓝色*/ -.color-blue { +.color-blue, .color-green-file{ color: #4CACFF !important; } /* 绿色 */ -.color-green-file{ - color: #28BD6C; -} /*主*/ .color-blue_4C { color: #4CACFF !important; diff --git a/src/forge/Component/EAccount.css b/src/forge/Component/EAccount.css new file mode 100644 index 000000000..e8b834202 --- /dev/null +++ b/src/forge/Component/EAccount.css @@ -0,0 +1,9 @@ +.ant-modal-mask { + z-index: 1001; +} + +.ant-modal-wrap { + z-index: 1002; +} + +/*# sourceMappingURL=EAccount.css.map */ diff --git a/src/forge/Component/EAccount.css.map b/src/forge/Component/EAccount.css.map new file mode 100644 index 000000000..7260caa40 --- /dev/null +++ b/src/forge/Component/EAccount.css.map @@ -0,0 +1 @@ +{"version":3,"sourceRoot":"","sources":["EAccount.scss"],"names":[],"mappings":"AAAA;EACE;;;AAEF;EACE","file":"EAccount.css"} \ No newline at end of file diff --git a/src/forge/Main/Index.css b/src/forge/Main/Index.css new file mode 100644 index 000000000..4cb80f0ef --- /dev/null +++ b/src/forge/Main/Index.css @@ -0,0 +1,375 @@ +.recommandOri.slick-slider { + width: 1300px; + margin: 20px auto 40px; +} +.recommandOri.slick-slider .slick-track { + margin-left: 0px; +} +.recommandOri.slick-slider .slick-slide li > a { + display: flex; + align-items: center; + justify-content: center; +} + +/* recommandProjects */ +.recommandProjects.slick-slider { + width: 1230px; + margin: 20px auto 40px; +} +.recommandProjects.slick-slider .slick-track { + margin-left: 0px; +} +.recommandProjects.slick-slider .slick-arrow.slick-prev:before, .recommandProjects.slick-slider .slick-arrow.slick-next:before { + color: #999; +} +.recommandProjects.slick-slider .slick-arrow.slick-prev li.slick-active button:before, .recommandProjects.slick-slider .slick-arrow.slick-next li.slick-active button:before { + color: #999; +} +.recommandProjects.slick-slider .slick-dots { + bottom: -29px; +} +.recommandProjects.slick-slider .slick-dots li button:before { + color: #909090; +} +.recommandProjects.slick-slider .slick-slide { + padding: 0px 15px; + box-sizing: border-box; +} +.recommandProjects.slick-slider .slick-slide > div { + background-color: #fff; + border-radius: 10px; + width: 100%; + cursor: pointer; + border: 1px solid #eee; +} +.recommandProjects.slick-slider .slick-slide > div:hover { + box-shadow: 0px 2px 20px 0px rgba(0, 0, 0, 0.1); +} +.recommandProjects.slick-slider .baseInfo { + padding: 18px 15px; + display: flex; + font-size: 12px; + color: #888; +} +.recommandProjects.slick-slider .baseInfo .look { + margin-right: 10px; +} +.recommandProjects.slick-slider .baseInfo .look i { + margin-right: 5px; +} +.recommandProjects.slick-slider .baseInfo .type { + flex: 1; + width: 0; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + text-align: right; +} +.recommandProjects.slick-slider .mainInfo { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + min-height: 160px; + border-bottom: 1px solid #eee; + padding: 20px; + box-sizing: border-box; +} +.recommandProjects.slick-slider .mainInfo img { + height: 50px; + width: 50px; + border-radius: 50%; +} +.recommandProjects.slick-slider .mainInfo .name { + font-size: 13px; + color: #666; + height: 18px; + line-height: 18px; + margin-top: 12px; +} +.recommandProjects.slick-slider .mainInfo .school { + margin-top: 12px; + color: #333; + font-size: 16px; + height: 22px; + line-height: 22px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + max-width: 100%; +} + +.Panels { + max-width: 1200px; + margin: 0 auto; +} +.Panels .panelmenu { + padding-top: 30px; +} +.Panels .addOptionBtn { + height: 32px; + line-height: 30px; + display: flex; + border: 1px solid #d9d9d9; + border-radius: 2px; +} +.Panels .addOptionBtn a { + padding: 0px 13px; + color: rgba(0, 0, 0, 0.65); + cursor: pointer; +} +.Panels .addOptionBtn > a:first-child { + border-right: 1px solid #d9d9d9; +} +.Panels .addOptionBtn > a:last-child { + border-right: none; +} +.Panels .infoCount { + display: inline-block; + padding: 0px 5px; + height: 16px; + line-height: 16px; + background-color: #eee; + color: #999; + border-radius: 12px; + margin-left: 10px; + font-size: 12px; +} +.Panels .attrPerson { + padding-top: 15px; + display: flex; + flex-wrap: wrap; +} +.Panels .attrPerson a { + margin: 10px 10px 0px 0px; +} +.Panels .attrPerson a img { + border-radius: 50%; + width: 35px; + height: 35px; +} +.Panels .attrPerson a:nth-child(6) { + margin-right: 0px; +} +.Panels .progress { + display: flex; + border-radius: 10px; + height: 7px; + margin-top: 12px; +} +.Panels .progress span:first-child { + border-radius: 10px 0px 0px 10px; +} +.Panels .progress span:last-child { + border-radius: 0px 10px 10px 0px; +} +.Panels .progresstip { + margin-top: 15px; + flex-wrap: wrap; +} +.Panels .progresstip i.zero { + position: absolute; + display: block; + border-radius: 50%; + height: 8px; + width: 8px; + left: 0px; + top: 10px; +} +.Panels .progresstip > span { + padding-left: 15px; + position: relative; + min-width: 33.5%; +} +.Panels .progresstip > span span { + color: #666; +} +.Panels .progresstip > span span:last-child { + color: #999; + margin-left: 5px; +} +.Panels .listtable { + margin-top: 20px; + border: 1px solid #d9d9d9; + border-radius: 4px; +} +.Panels .listtable .listtablehead { + display: flex; + justify-content: space-between; + align-items: flex-start; + border-bottom: 1px solid #d9d9d9; + padding: 7px 20px; + border-radius: 4px 4px 0px 0px; + background-color: #FAFBFC; +} +.Panels .listtable .listtablehead .ellipsistxt { + margin-top: 6px; + margin-left: 13px; + line-height: 18px; + flex: 1; + width: 0; + color: #666; +} +.Panels .listtable .listtablehead .ellipsistxt #ptxt { + margin-bottom: 0px; + word-break: break-all; + overflow: unset; + white-space: pre-wrap; + /* css3.0 */ + white-space: -moz-pre-wrap; + /* Firefox */ + white-space: -pre-wrap; + /* Opera 4-6 */ + white-space: -o-pre-wrap; + /* Opera 7 */ + word-wrap: break-word; +} +.Panels .listtable .listtablehead .ellipsistxt.hidetxt { + height: 18px; + overflow: hidden; + position: relative; + padding-right: 8px; +} +.Panels .listtable .listtablehead .ellipsistxt.hidetxt::after { + position: absolute; + right: 0px; + bottom: 0px; + content: "..."; +} +.Panels .listtable .listtablehead .ellipsis { + margin-left: 8px; + cursor: pointer; + border-radius: 2px; + background-color: #c1c1c1; + padding: 0px 4px; + height: 14px; + line-height: 14px; + margin-top: 9px; +} +.Panels .listtable .listtablehead .ellipsis i { + font-size: 15px !important; + color: #fff; + height: 14px; + line-height: 14px; +} +.Panels .listtable .listtablebody li.listtablepath a { + color: #40a9ff; +} +.Panels .listtable .listtablebody li.listtablepath p { + margin-bottom: 0px !important; +} +.Panels .listtable .listtablebody > li { + height: 42px; + display: flex; + justify-content: space-between; + align-items: center; + border-bottom: 1px solid #d9d9d9; + padding: 0px 20px 0px 24px; +} +.Panels .listtable .listtablebody > li > span:first-child { + width: 30%; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} +.Panels .listtable .listtablebody > li > span:nth-child(2) { + width: 60%; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} +.Panels .listtable .listtablebody > li > span:nth-child(3) { + width: 10%; + text-align: right; +} +.Panels .listtable .listtablebody > li:last-child { + border-bottom: none; +} + +.drawerBtn { + position: fixed; + left: -13px; + border: 1px solid #cfcddf; + width: 34px; + border-radius: 0px 12px 12px 0px; + height: 70px; + top: 50%; + margin-top: -35px; + cursor: pointer; + display: flex; + flex-direction: column; + align-items: flex-end; + justify-content: center; +} +.drawerBtn:hover { + box-shadow: 1px 0px 7px rgba(0, 0, 0, 0.1); +} +.drawerBtn span { + writing-mode: vertical-lr; + color: #202429; + width: 25px; +} +.drawerBtn i { + color: #24292e; + height: 18px; + line-height: 18px; + width: 18px; +} + +.downMenu { + width: 330px; + box-shadow: 0px 0px 9px rgba(134, 134, 134, 0.4); + background-color: #fff; +} +.downMenu .ant-menu-vertical .ant-menu-item:hover { + background-color: #e6f7ff; +} + +.menuslist { + max-height: 200px; + overflow-y: auto; + padding: 10px 15px; + border-radius: 4px; +} +.menuslist .ant-dropdown-menu-item { + border-radius: 8px; + text-align: left !important; +} +.menuslist .ant-dropdown-menu-item a { + width: 350px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} +.menuslist .ant-dropdown-menu-item.active { + background-color: #e6f7ff; +} + +.catelogue { + border: 1px solid lightgray; + font-size: 15px; + font-weight: normal; + border-radius: 5px; + margin-right: 10px; + padding: 0px 10px; + height: 30px; + line-height: 30px; + color: #666 !important; + display: flex; + align-items: center; +} +.catelogue span { + margin-top: 1px; +} + +.submoduleStyle { + cursor: default; +} +.submoduleStyle i { + cursor: default; +} +.submoduleStyle:hover { + color: #05101a; +} + +/*# sourceMappingURL=Index.css.map */ diff --git a/src/forge/Main/Index.css.map b/src/forge/Main/Index.css.map new file mode 100644 index 000000000..35f6a1bf5 --- /dev/null +++ b/src/forge/Main/Index.css.map @@ -0,0 +1 @@ +{"version":3,"sourceRoot":"","sources":["Index.scss"],"names":[],"mappings":"AAAA;EACE;EACA;;AACA;EACE;;AAGA;EAEE;EACA;EACA;;;AAIN;AACA;EACE;EACA;;AACA;EACE;;AAGA;EACE;;AAEF;EACE;;AAGJ;EACE;;AACA;EACE;;AAGJ;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;;AAIN;EACE;EACA;EACA;EACA;;AACA;EAIE;;AAHA;EACE;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAKN;EACE;EACA;;AACA;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;;AAEF;EACE;;AAEF;EACE;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;AACA;EACE;;AACA;EACE;EACA;EACA;;AAEF;EACE;;AAIN;EACE;EACA;EACA;EACA;;AAEE;EACE;;AAEF;EACE;;AAIN;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;AACA;EACE;;AACA;EACE;EACA;;AAKR;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EAWA;EACA;EACA;EACA;EACA;;AAdA;EACE;EACA;EACA;EACA;AAAsB;EACtB;AAA2B;EAC3B;AAAuB;EACvB;AAAyB;EACzB;;AAOF;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AAIN;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AAMF;EAAE;;AACF;EACE;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;;AAGJ;EACE;;;AAKR;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;;AAGJ;EACE;EACA;EACA;;AACA;EACE;;;AAIJ;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;;AAGJ;EACE;;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;;AAGJ;EACE;;AACA;EACE;;AAEF;EACE","file":"Index.css"} \ No newline at end of file diff --git a/src/forge/Wiki/Index.css b/src/forge/Wiki/Index.css new file mode 100644 index 000000000..9649763ac --- /dev/null +++ b/src/forge/Wiki/Index.css @@ -0,0 +1,348 @@ +body { + width: 100% !important; +} + +.ant-spin-nested-loading > div > .ant-spin.opacitySpin { + max-height: 100vh; + background: white; +} + +.wiki-main { + width: 1200px; + min-height: 400px; + margin: 20px auto; +} +.wiki-main .ant-btn-primary { + background-color: #466aff; + border-color: #466aff; +} +.wiki-main .ant-btn-primary:hover, .wiki-main .ant-btn-primary:focus, .wiki-main .ant-btn-primary:active { + background-color: #6482ff; +} +.wiki-main .ant-btn-default:hover, +.wiki-main .ant-btn-default:active, +.wiki-main .ant-btn-default:focus { + background: #f3f4f6; + color: #333; + border-color: #d0d0d0; +} +.wiki-main .wiki-head { + display: flex; + justify-content: space-between; + align-items: center; + padding: 0 20px; + height: 64px; + background: #fafcff; + box-shadow: 0px 1px 4px 0px rgba(0, 0, 0, 0.13); + border-radius: 4px; + border-bottom-left-radius: 0; +} +.wiki-main .wiki-head .ant-btn .anticon { + margin: 0 -3px 0 0; +} +.wiki-main .head-title { + font-size: 20px; + color: #05101a; + line-height: 30px; + font-weight: 500; +} +.wiki-main .head-title .anticon-right { + color: #666; + font-size: 0.9rem; +} +.wiki-main .back-wiki { + color: #466aff; + cursor: pointer; +} +.wiki-main .back-wiki:hover { + color: #6482ff; +} +.wiki-main .head-log-middle { + width: 3rem; + height: 3rem; + margin-right: 0.35rem; + border-radius: 50%; +} +.wiki-main .head-log-small { + width: 1.25rem; + height: 1.25rem; + margin-right: 0.35rem; + border-radius: 50%; +} +.wiki-main .user-box { + font-size: 12px; + font-family: "PingFangSC-Medium"; + color: #466aff; + cursor: pointer; +} +.wiki-main .user-box:hover { + color: #6482ff; +} +.wiki-main .user-box .head-log-small { + position: relative; + top: -2px; +} +.wiki-main .time-ago { + font-size: 12px; + color: #333; + letter-spacing: 0; + line-height: 17px; + font-weight: 400; + font-family: "PingFangSC-Regular"; +} +.wiki-main .has-error .ant-form-explain, +.wiki-main .has-error .ant-form-split { + position: absolute; +} +.wiki-main .wiki-nav { + max-height: 60vh; +} +.wiki-main .wiki-nav .wiki-search { + padding: 0 14px; +} +.wiki-main .wiki-nav .wiki-search .ant-input { + padding-left: 30px; +} +.wiki-main .wiki-nav .wiki-search .ant-input-suffix { + left: 26px; + right: auto; +} +.wiki-main .wiki-nav .wiki-search:hover .ant-input, .wiki-main .wiki-nav .wiki-search:focus .ant-input { + border-color: #466aff !important; +} +.wiki-main .wiki-nav-parent { + width: 260px; + flex: none; +} +.wiki-main .ant-form-item-children .ant-input:hover { + border-color: #466aff !important; +} +.wiki-main .ant-checkbox-checked .ant-checkbox-inner { + background-color: #466aff; + border-color: #466aff; +} +.wiki-main .ant-radio-checked .ant-radio-inner, +.wiki-main .ant-radio-checked::after { + border-color: #466aff; +} +.wiki-main .ant-radio-inner::after { + background-color: #466aff; +} +.wiki-main .ant-radio-group { + display: block; + margin: 10px 0 0 30px; +} +.wiki-main .ant-radio-wrapper:hover .ant-radio, +.wiki-main .ant-radio:hover .ant-radio-inner, +.wiki-main .ant-radio-input:focus + .ant-radio-inner { + border-color: #466aff; +} + +#wikiUrl:focus { + border-right: 1px solid #d9d9d9 !important; +} + +.wiki-body { + display: flex; +} + +.wiki-content { + flex: auto; + width: 75%; +} + +.wiki-content-detail { + padding: 0 20px; + word-break: break-all; +} + +.ant-input-group.ant-input-group-compact.copy-url { + display: flex; + margin-top: 20px; +} +.ant-input-group.ant-input-group-compact.copy-url .ant-select-selection__rendered { + margin: 0 14px 0 5px; + width: 3rem; + font-size: 12px; +} +.ant-input-group.ant-input-group-compact.copy-url .ant-select-arrow { + right: 4px; +} +.ant-input-group.ant-input-group-compact.copy-url .ant-input { + font-size: 12px; + font-family: "PingFangSC-Regular"; + color: #666; + letter-spacing: 0; + font-weight: 400; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + word-break: break-all; +} +.ant-input-group.ant-input-group-compact.copy-url .copy-svg { + display: inline-flex; + align-items: center; + justify-content: center; + padding: 0 5px; + background: #fff; + font-size: 1rem !important; + border: 1px solid #d9d9d9; + border-left: 0; + color: #466aff; + cursor: pointer; +} + +.wiki-url-type .ant-select-dropdown-menu-item { + font-size: 12px; +} + +.wiki-nav { + min-height: 300px; + padding: 20px 0; + background: #ffffff; + border: 1px solid rgba(153, 153, 153, 0.22); + overflow-y: scroll; + flex: none; + color: #333; +} + +.wiki-nav-title { + display: flex; + justify-content: space-between; + align-items: center; + height: 50px; + padding: 0 10px 0 10px; + font-size: 14px; + letter-spacing: 0; + font-weight: 400; + font-family: "PingFangSC-Regular"; + border-bottom: 1px solid #eee; + line-height: 16px; + cursor: pointer; +} +.wiki-nav-title .delete-title-icon { + display: none; +} +.wiki-nav-title:hover { + background-color: #fbfbfb; +} +.wiki-nav-title:hover .delete-title-icon { + display: inline-block; +} + +.wiki-nav-title-parent { + padding: 0 14px; +} +.wiki-nav-title-parent:hover { + background: #fbfbfb; +} + +.wiki-nav-title.active { + color: #466aff; +} + +.wiki-content-head { + margin: 20px 0 20px 20px; + padding: 0 20px 20px 0; + display: flex; + justify-content: space-between; + align-items: center; + border-bottom: 1px solid #eee; +} + +.wiki-content-head-left { + width: 90%; +} + +.nav-title-left { + display: inline-flex; + max-width: 90%; +} +.nav-title-left svg { + margin-right: 0.5rem; + flex: none; +} +.nav-title-left .nav-title-left-text { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} + +.wiki-detail-title { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} + +.wiki-preview { + overflow-y: scroll; + height: 100%; +} +.wiki-preview .wiki-body { + width: 90%; +} +.wiki-preview .ant-btn-primary { + background-color: #466aff; + border-color: #466aff; +} +.wiki-preview .ant-btn-primary:hover, .wiki-preview .ant-btn-primary:focus, .wiki-preview .ant-btn-primary:active { + background-color: #6482ff; +} +.wiki-preview .preview-head { + display: flex; + justify-content: space-between; + align-items: center; + padding: 0 12rem 0 2rem; + width: 100%; + height: 80px; + background: #272f4c; + color: #fff; +} +.wiki-preview .preview-head-left { + display: inline-flex; + align-items: center; + font-size: 24px; + cursor: pointer; +} +.wiki-preview .preview-head-left .icon-wendangyulan_icon { + font-size: 24px !important; + font-weight: 700; +} +.wiki-preview .preview-head-right { + display: flex; +} +.wiki-preview .preview-head-right .copy-url { + margin-top: 0; +} +.wiki-preview .preview-head-right .copy-desc { + width: 6rem; + padding-top: 1px; +} +.wiki-preview .wiki-nav-title { + padding: 0 10px 0 40px; +} +.wiki-preview .wiki-nav-title.active { + background-color: #f3f4f6; +} +.wiki-preview .wiki-content-head { + padding: 10px 20px 10px 20px; +} +.wiki-preview .wiki-nav { + padding: 20px 0; + width: 20vw; + border-bottom: 0; + height: 80vh; +} +.wiki-preview .wiki-content-detail { + padding: 0 40px; +} +.wiki-preview .wiki-content-detail img { + max-width: 100%; +} +.wiki-preview .ant-btn:hover { + background: #f3f4f6; + color: #333; + border-color: #d0d0d0; +} + +/*# sourceMappingURL=Index.css.map */ diff --git a/src/forge/Wiki/Index.css.map b/src/forge/Wiki/Index.css.map new file mode 100644 index 000000000..eaa14087d --- /dev/null +++ b/src/forge/Wiki/Index.css.map @@ -0,0 +1 @@ +{"version":3,"sourceRoot":"","sources":["Index.scss"],"names":[],"mappings":"AAEA;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;;AAEA;EACE,kBAfQ;EAgBR,cAhBQ;;AAiBR;EAGE,kBAnBY;;AAuBhB;AAAA;AAAA;EAGE;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAIJ;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAIJ;EACE,OA5DQ;EA6DR;;AACA;EACE,OA9DY;;AAkEhB;EACE;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA,OApFQ;EAqFR;;AACA;EACE,OAtFY;;AAwFd;EACE;EACA;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;;AAGF;AAAA;EAEE;;AAEF;EACE;;AACA;EACE;;AACA;EACE;;AAEF;EACE;EACA;;AAEF;EAEE;;AAKN;EACE;EACA;;AAGF;EACE;;AAGF;EACE,kBAxIQ;EAyIR,cAzIQ;;AA2IV;AAAA;EAEE,cA7IQ;;AAgJV;EACE,kBAjJQ;;AAoJV;EACE;EACA;;AAGF;AAAA;AAAA;EAGE,cA5JQ;;;AAgKZ;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;AACA;EACE;EACA;EACA;;AAEF;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,OAlNQ;EAmNR;;;AAKF;EACE;;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAGF;EACE;;AACA;EACE;;;AAKN;EACE;;AACA;EACE;;;AAIJ;EACE,OAzQU;;;AA4QZ;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;;AACA;EACE;EACA;;AAEF;EACE;EACA;EACA;;;AAIJ;EACE;EACA;EACA;;;AAGF;EACE;EACA;;AACA;EACE;;AAEF;EACE,kBApTQ;EAqTR,cArTQ;;AAsTR;EAGE,kBAxTY;;AA2ThB;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAIJ;EACE;;AAEA;EACE;;AAEF;EACE;EACA;;AAIJ;EACE;;AAEF;EACE;;AAGF;EACE;;AAGF;EACE;EACA;EACA;EACA;;AAEF;EACE;;AACA;EACE;;AAIJ;EACE;EACA;EACA","file":"Index.css"} \ No newline at end of file diff --git a/src/forge/Wiki/Welcome/index.css b/src/forge/Wiki/Welcome/index.css new file mode 100644 index 000000000..d146549c8 --- /dev/null +++ b/src/forge/Wiki/Welcome/index.css @@ -0,0 +1,51 @@ +.welcome-main { + display: flex; + flex-flow: column nowrap; + justify-content: center; + align-items: center; + width: 1200px; + min-height: 400px; + padding: 20px; + margin: 20px auto; + background: #fafcff; + font-family: "PingFangSC-Medium"; + border-radius: 4px; + border: 1px solid rgba(42, 97, 255, 0.23); +} +.welcome-main .icon-huanying_icon { + font-size: 48px !important; + font-weight: 700; +} +.welcome-main .welcome-title { + display: inline-flex; + align-items: center; + margin: 10px 0; + font-size: 26px; + color: #333333; + font-weight: 500; +} +.welcome-main .wiki-title { + display: inline-block; + max-width: 20em; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} +.welcome-main .welcome-content { + font-size: 14px; + color: #333333; + font-weight: 400; +} +.welcome-main .wiki-line { + margin: 50px 0 40px; + width: 400px; + height: 1px; + background: #eeeeee; +} +.welcome-main .welcome-des { + font-size: 16px; + color: #333333; + font-weight: 500; +} + +/*# sourceMappingURL=index.css.map */ diff --git a/src/forge/Wiki/Welcome/index.css.map b/src/forge/Wiki/Welcome/index.css.map new file mode 100644 index 000000000..2dcfff0d3 --- /dev/null +++ b/src/forge/Wiki/Welcome/index.css.map @@ -0,0 +1 @@ +{"version":3,"sourceRoot":"","sources":["index.scss"],"names":[],"mappings":"AAAA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA","file":"index.css"} \ No newline at end of file diff --git a/src/forge/Wiki/components/FolderTree/index.css b/src/forge/Wiki/components/FolderTree/index.css new file mode 100644 index 000000000..58d79c6be --- /dev/null +++ b/src/forge/Wiki/components/FolderTree/index.css @@ -0,0 +1,32 @@ +.hide-file-icon.ant-tree.ant-tree-directory li span.ant-tree-switcher { + display: none !important; +} +.hide-file-icon.ant-tree.ant-tree-directory .ant-tree-node-content-wrapper { + display: inline-flex; + width: 100%; +} +.hide-file-icon.ant-tree.ant-tree-directory .tree-title-icon { + display: none; +} +.hide-file-icon.ant-tree.ant-tree-directory .ant-tree-node-content-wrapper:hover .tree-title-icon { + transition: all 0.3s; + display: inline-block; +} +.hide-file-icon.ant-tree.ant-tree-directory.ant-tree.ant-tree-directory > li.ant-tree-treenode-selected > span.ant-tree-node-content-wrapper::before, .hide-file-icon.ant-tree.ant-tree-directory.ant-tree.ant-tree-directory .ant-tree-child-tree > li.ant-tree-treenode-selected > span.ant-tree-node-content-wrapper::before { + background: #fff; + margin-top: -3px; +} +.hide-file-icon.ant-tree.ant-tree-directory.ant-tree.ant-tree-directory > li span.ant-tree-node-content-wrapper::before, .hide-file-icon.ant-tree.ant-tree-directory.ant-tree.ant-tree-directory .ant-tree-child-tree > li span.ant-tree-node-content-wrapper::before { + margin-top: -3px; +} +.hide-file-icon.ant-tree.ant-tree-directory > li span.ant-tree-node-content-wrapper.ant-tree-node-selected, +.hide-file-icon.ant-tree.ant-tree-directory .ant-tree-child-tree > li span.ant-tree-node-content-wrapper.ant-tree-node-selected { + color: #2a61ff; +} +.hide-file-icon.ant-tree.ant-tree-directory .ant-tree-title { + display: inline-flex; + justify-content: space-between; + flex: auto; +} + +/*# sourceMappingURL=index.css.map */ diff --git a/src/forge/Wiki/components/FolderTree/index.css.map b/src/forge/Wiki/components/FolderTree/index.css.map new file mode 100644 index 000000000..8f0725b11 --- /dev/null +++ b/src/forge/Wiki/components/FolderTree/index.css.map @@ -0,0 +1 @@ +{"version":3,"sourceRoot":"","sources":["index.scss"],"names":[],"mappings":"AACE;EACE;;AASF;EACE;EACA;;AAGF;EACE;;AAGF;EACE;EACA;;AAGF;EAOE;EACA;;AAGF;EAKE;;AAGF;AAAA;EAIE;;AAKF;EACE;EACA;EACA","file":"index.css"} \ No newline at end of file diff --git a/src/forge/Wiki/components/Login/index.css b/src/forge/Wiki/components/Login/index.css new file mode 100644 index 000000000..448243d6d --- /dev/null +++ b/src/forge/Wiki/components/Login/index.css @@ -0,0 +1,56 @@ +.delete-modal .ant-modal-header { + padding: 9px 24px; + background: #f8f8f8; + border-bottom: 1px solid #eee; +} +.delete-modal .ant-modal-title { + text-align: left; +} +.delete-modal .ant-modal-close { + top: 0px !important; +} +.delete-modal .ant-modal-close-x { + font-size: 24px; +} +.delete-modal .ant-modal-body { + text-align: center; +} +.delete-modal .delete-title { + display: flex; + justify-content: center; + align-items: center; + margin: 2rem 0 1rem !important; + font-size: 16px; + color: #333; + letter-spacing: 0; + line-height: 29px; + font-weight: 400; +} +.delete-modal .red-circle { + align-self: flex-start; + color: #ca0002; + font-size: 1.5rem !important; +} +.delete-modal .delete-descibe { + font-size: 14px; + color: #666; + line-height: 33px; + font-weight: 400; +} +.delete-modal .ant-modal-footer { + padding: 2rem 0; + text-align: center; + border: 0; +} +.delete-modal .ant-modal-footer .ant-btn { + width: 6rem; +} +.delete-modal .foot-submit { + margin-left: 3rem; + color: #df0002; +} +.delete-modal .foot-submit:hover { + border-color: #df0002; +} + +/*# sourceMappingURL=index.css.map */ diff --git a/src/forge/Wiki/components/Login/index.css.map b/src/forge/Wiki/components/Login/index.css.map new file mode 100644 index 000000000..a770694cb --- /dev/null +++ b/src/forge/Wiki/components/Login/index.css.map @@ -0,0 +1 @@ +{"version":3,"sourceRoot":"","sources":["index.scss"],"names":[],"mappings":"AACE;EACE;EACA;EACA;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;AACA;EACE;;AAGJ;EACE;EACA;;AACA;EACE","file":"index.css"} \ No newline at end of file diff --git a/src/forge/Wiki/components/ModalFun/index.css b/src/forge/Wiki/components/ModalFun/index.css new file mode 100644 index 000000000..0f7ef9484 --- /dev/null +++ b/src/forge/Wiki/components/ModalFun/index.css @@ -0,0 +1,56 @@ +.myself-modal .ant-modal-header { + padding: 9px 24px; + background: #f8f8f8; + border-bottom: 1px solid #eee; +} +.myself-modal .ant-modal-title { + text-align: left; +} +.myself-modal .ant-modal-close { + top: 0px !important; +} +.myself-modal .ant-modal-close-x { + font-size: 24px; +} +.myself-modal .ant-modal-body { + text-align: center; +} +.myself-modal .delete-title { + display: flex; + justify-content: center; + align-items: center; + margin: 2rem 0 1rem !important; + font-size: 16px; + color: #333; + letter-spacing: 0; + line-height: 29px; + font-weight: 400; +} +.myself-modal .red-circle { + align-self: flex-start; + color: #ca0002; + font-size: 1.5rem !important; +} +.myself-modal .delete-descibe { + font-size: 14px; + color: #666; + line-height: 33px; + font-weight: 400; +} +.myself-modal .ant-modal-footer { + padding: 2rem 0; + text-align: center; + border: 0; +} +.myself-modal .ant-modal-footer .ant-btn { + width: 6rem; +} +.myself-modal .foot-submit { + margin-left: 3rem; + color: #df0002; +} +.myself-modal .foot-submit:hover { + border-color: #df0002; +} + +/*# sourceMappingURL=index.css.map */ diff --git a/src/forge/Wiki/components/ModalFun/index.css.map b/src/forge/Wiki/components/ModalFun/index.css.map new file mode 100644 index 000000000..a770694cb --- /dev/null +++ b/src/forge/Wiki/components/ModalFun/index.css.map @@ -0,0 +1 @@ +{"version":3,"sourceRoot":"","sources":["index.scss"],"names":[],"mappings":"AACE;EACE;EACA;EACA;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;AACA;EACE;;AAGJ;EACE;EACA;;AACA;EACE","file":"index.css"} \ No newline at end of file diff --git a/src/forge/users/Index.css b/src/forge/users/Index.css new file mode 100644 index 000000000..280cce1b3 --- /dev/null +++ b/src/forge/users/Index.css @@ -0,0 +1,247 @@ +.headerbox { + padding: 20px; + border-bottom: 1px solid #E0E0E0; + display: flex; + align-items: center; + justify-content: space-between; +} +.headerbox > div { + width: 400px; +} +.headerbox > p { + display: flex; + align-items: center; +} +.headerbox > p a { + color: #5091FF; + margin-left: 30px; + font-size: 16px; + display: flex; + align-items: center; +} +.headerbox .ant-btn.ant-input-search-button { + margin-top: -1px; + margin-right: -1px; +} + +.echartBox { + border: 1px solid #DEDEDE; +} +.echartBox > p { + color: #999; + padding: 15px 20px; + text-align: center; +} + +.contentBox { + padding: 20px 20px 0px 20px; +} +.contentBox > div { + margin-bottom: 20px; + display: flex; + align-items: center; + padding: 20px 25px; + background-color: #fafafa; +} +.contentBox > div .imgBox { + width: 190px; + height: 90px; + display: flex; + align-items: center; + justify-content: center; + margin-right: 20px; + background-color: #fff; +} +.contentBox > div .imgBox img { + max-width: 90%; + max-height: 90%; +} +.contentBox .item-news { + display: flex; + justify-content: space-between; + font-size: 12px; + color: #888; + margin-top: 3px; + margin-bottom: 0px; +} +.contentBox .teamdesc { + word-break: break-all; + line-height: 20px; +} + +.infosType { + padding: 20px 30px 0px 20px; + display: flex; + justify-content: space-between; +} +.infosType .infoStatus { + height: 30px; + background: white; + border-radius: 15px; + border: 1px solid #dddddd; + line-height: 30px; + font-size: 12px; + color: #888; + display: flex; +} +.infosType .infoStatus > span { + display: block; + padding: 0px 12px; + border-radius: 15px; + cursor: pointer; +} +.infosType .infoStatus > span.active { + background-color: #5091FF; + color: #fff; + padding: 0px 15px; +} +.infosType .infoStatus .statusDivider { + margin: 8px 0 0 0 !important; +} + +.userDescription { + color: #666666; + line-height: 18px; + text-align: left; + margin: 10px 0px; + word-break: break-all; + text-align: justify; + font-size: 16px; + text-align: center; +} + +.focusBox, .infoBox { + width: 100% !important; + display: inline-block; + margin-top: 30px; + padding-top: 30px; + border-top: 1px solid #f1f1f1; +} + +.infoBox { + padding-bottom: 10px; + text-align: left; + line-height: 28px; + color: #666; + margin-top: 20px; +} +.infoBox > div { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} +.infoBox i { + color: #DEDEDE; + font-size: 15px !important; +} +.infoBox span { + margin-left: 10px; +} + +.headimg { + position: relative; + display: block; +} +.headimg img { + width: 110px; + height: 110px; + border-radius: 50%; +} +.headimg span { + position: absolute; + bottom: -6px; + right: 0px; + left: 65px; +} +.headimg span i { + font-size: 25px !important; + border-radius: 50%; + color: #fff; +} +.headimg span i.icon-nan1 { + background-color: #1890FF; +} +.headimg span i.icon-nv1 { + background-color: pink; +} + +ul.ant-menu.menuStyle { + padding: 0px 30px; + font-size: 16px; +} +ul.ant-menu.menuStyle li { + height: 70px; + line-height: 70px; + padding: 0px; + margin-right: 30px !important; + border-bottom: transparent !important; +} + +.disposeInfo { + padding: 0px 30px; + min-height: 400px; +} +.disposeInfo .disposeItem { + display: flex; + justify-content: space-between; + padding: 30px 0px; + border-bottom: 1px solid #eee; +} + +.authTag { + display: inline-block; + padding: 0px 10px; + border-radius: 12px; + font-size: 12px; + height: 22px; + line-height: 22px; +} +.authTag.red { + border: 1px solid #F73030; + color: #F73030; +} +.authTag.green { + border: 1px solid #28BD6C; + color: #28BD6C; +} + +.CIList { + padding: 0px 30px; + min-height: 400px; +} +.CIList li { + display: flex; + justify-content: space-between; + padding: 28px 0px; + border-bottom: 1px solid #eee; +} + +.infosRightMenu .ant-menu-item { + padding: 0px; + margin: 0px 20px !important; + font-size: 17px; + height: 32px; + line-height: 0px; + border-bottom: 2px solid transparent !important; + position: relative; +} +.infosRightMenu .ant-menu-item a > i { + font-size: 15px !important; + margin-right: 8px; +} +.infosRightMenu .ant-menu-item .menuNum { + font-size: 12px; + margin-left: 3px; + color: #FF6E21; +} +.infosRightMenu .ant-menu-item.ant-menu-item-selected::before { + position: absolute; + width: 100%; + bottom: -1px; + height: 2px; + left: 0px; + background-color: #1890ff; + content: ""; +} + +/*# sourceMappingURL=Index.css.map */ diff --git a/src/forge/users/Index.css.map b/src/forge/users/Index.css.map new file mode 100644 index 000000000..356d318b8 --- /dev/null +++ b/src/forge/users/Index.css.map @@ -0,0 +1 @@ +{"version":3,"sourceRoot":"","sources":["Index.scss"],"names":[],"mappings":"AACA;EACE;EACA;EACA,SAJI;EAKJ;EACA;;AACA;EACE;;AAEF;EACE,SAXE;EAYF;;AAEF;EACE;EACA;EACA;EACA,SAlBE;EAmBF;;AAEF;EACE;EACA;;;AAIJ;EACE;;AACA;EACE;EACA;EACA;;;AAGJ;EACE;;AACA;EACE;EACA,SAvCE;EAwCF;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAIN;EACE,SA1DE;EA2DF;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;;;AAGJ;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;AAEF;EACE;;;AAIN;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;;AAEF;EACE;EACA;;AAEF;EACE;;;AAGJ;EACE;EACA;;AACA;EACE;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;;AACA;EACE;;AAEF;EACE;;;AAKR;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;;;AAGJ;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAEF;EACE;EACA;;;AAGJ;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;;;AAKF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEE;EACE;EACA;;AAGJ;EACE;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA","file":"Index.css"} \ No newline at end of file From 411b4e9de6728e6578c430009c3639c8adb9a744 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Thu, 12 Aug 2021 11:45:56 +0800 Subject: [PATCH 03/48] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BA=93=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/edu-common.css | 8 -- public/css/edu-main.css | 4 - public/css/edu-purge.css | 27 ++--- public/css/iconfont.js | 2 +- src/college/colleagecss/colleage.css | 2 +- src/common/UrlTool.js | 17 +++ src/common/educoder.js | 2 +- src/forge/Branch/Select.jsx | 106 +++--------------- src/forge/Branch/SelectOverlay.jsx | 84 ++++++++++++++ src/forge/Branch/branch.scss | 66 ++++++----- src/forge/Component/Releases.jsx | 15 +-- src/forge/Main/CoderDepot.jsx | 4 +- src/forge/Main/CoderDepotCatalogue.jsx | 6 +- src/forge/Main/CoderDepotReadme.jsx | 21 ++-- src/forge/Main/CoderRootBranch.js | 2 +- src/forge/Main/CoderRootFileDetail.js | 2 +- src/forge/Main/Detail.js | 3 +- src/forge/Main/Index.js | 2 +- src/forge/Main/Index.scss | 52 ++++----- src/forge/Main/IndexItem.js | 2 +- src/forge/Main/{list.css => list.scss} | 84 ++++++++++---- src/forge/Main/sub/DetailBanner.jsx | 7 +- src/forge/Main/sub/Invite.jsx | 2 +- src/forge/Main/sub/ReadmeCatelogue.jsx | 57 ++++++++++ src/forge/Main/sub/sub.scss | 46 +++++++- src/forge/Team/Setting/TeamSettingCommon.jsx | 12 +- src/forge/css/index.scss | 5 +- .../tpm/challengesnew/tpm-md-editor.js | 12 +- 28 files changed, 401 insertions(+), 251 deletions(-) create mode 100644 src/forge/Branch/SelectOverlay.jsx rename src/forge/Main/{list.css => list.scss} (90%) create mode 100644 src/forge/Main/sub/ReadmeCatelogue.jsx diff --git a/public/css/edu-common.css b/public/css/edu-common.css index 96a8277df..56790f055 100755 --- a/public/css/edu-common.css +++ b/public/css/edu-common.css @@ -114,14 +114,6 @@ a:visited { color: #898989; } -a:hover { - color: #FF7500; -} - -a:hover.fa { - color: #FF7500; -} - input, textarea, select { diff --git a/public/css/edu-main.css b/public/css/edu-main.css index 3cbe5fcbb..1d9959033 100644 --- a/public/css/edu-main.css +++ b/public/css/edu-main.css @@ -97,10 +97,6 @@ a:visited { color: #05101a; } -a:hover { - color: #459be5; -} - ol, ul, li { diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css index 4dfc7bb88..3e3750775 100644 --- a/public/css/edu-purge.css +++ b/public/css/edu-purge.css @@ -1363,6 +1363,10 @@ a:visited { color: #05101a; } +a:hover { + color: #2A61FF!important; +} + ol, ul, li { @@ -1469,7 +1473,7 @@ a.edu-txt-w80, /*隐藏*/ .none { - display: none + display: none!important; } .block { @@ -2467,19 +2471,16 @@ a.hoverLine:hover{ a.color-grey-name:hover, a.color-dark:hover, a.color-grey-6:hover, -a.color-grey-3:hover { - color: #4cacff !important; -} - -a.color-grey-9:hover, -a.color-grey-8:hover, -a.color-grey-c:hover { - color: #111C24 !important; +a.color-grey-3:hover,a.color-ooo:hover { + color: #2A61FF !important; } /*蓝色*/ -.color-blue, .color-green-file{ - color: #4CACFF !important; +.color-blue { + color: #2A61FF !important; +} +.color-blue-file { + color: #0054CC!important; } /* 绿色 */ /*主*/ @@ -2487,10 +2488,6 @@ a.color-grey-c:hover { color: #4CACFF !important; } -a.color-blue:hover, -a.color-blue_4C:hover { - color: #459BE6 !important; -} /*橙色*/ .color-orange { diff --git a/public/css/iconfont.js b/public/css/iconfont.js index 2aaace214..e50f44e1a 100644 --- a/public/css/iconfont.js +++ b/public/css/iconfont.js @@ -1 +1 @@ -!function(c){var l,a,h,i,o,z='',t=(t=document.getElementsByTagName("script"))[t.length-1].getAttribute("data-injectcss"),p=function(c,l){l.parentNode.insertBefore(c,l)};if(t&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}function v(){o||(o=!0,h())}function m(){try{i.documentElement.doScroll("left")}catch(c){return void setTimeout(m,50)}v()}l=function(){var c,l;(l=document.createElement("div")).innerHTML=z,z=null,(c=l.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",l=c,(c=document.body).firstChild?p(l,c.firstChild):c.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(l,0):(a=function(){document.removeEventListener("DOMContentLoaded",a,!1),l()},document.addEventListener("DOMContentLoaded",a,!1)):document.attachEvent&&(h=l,i=c.document,o=!1,m(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,v())})}(window); \ No newline at end of file +!function(c){var l,a,h,i,o,z='',t=(t=document.getElementsByTagName("script"))[t.length-1].getAttribute("data-injectcss"),p=function(c,l){l.parentNode.insertBefore(c,l)};if(t&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}function v(){o||(o=!0,h())}function m(){try{i.documentElement.doScroll("left")}catch(c){return void setTimeout(m,50)}v()}l=function(){var c,l;(l=document.createElement("div")).innerHTML=z,z=null,(c=l.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",l=c,(c=document.body).firstChild?p(l,c.firstChild):c.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(l,0):(a=function(){document.removeEventListener("DOMContentLoaded",a,!1),l()},document.addEventListener("DOMContentLoaded",a,!1)):document.attachEvent&&(h=l,i=c.document,o=!1,m(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,v())})}(window); diff --git a/src/college/colleagecss/colleage.css b/src/college/colleagecss/colleage.css index 9220b8acc..65f32322a 100644 --- a/src/college/colleagecss/colleage.css +++ b/src/college/colleagecss/colleage.css @@ -218,7 +218,7 @@ a:hover { } .color-blue { - color: #4CACFF; + color: #2A61FF; } .color-huang { diff --git a/src/common/UrlTool.js b/src/common/UrlTool.js index 07e141ebf..f1800a75d 100644 --- a/src/common/UrlTool.js +++ b/src/common/UrlTool.js @@ -18,6 +18,23 @@ export function getImageUrl(path) { return `${path}`; } +export function numFormat(num, digits){ + let d = digits || 1; + var si = [ + { value: 1, symbol: "" }, + { value: 1E3, symbol: "k" }, + { value: 1E4, symbol: "W" } + ]; + var rx = /\.0+$|(\.[0-9]*[1-9])0+$/; + var i; + for (i = si.length - 1; i > 0; i--) { + if (num >= si[i].value) { + break; + } + } + return (num / si[i].value).toFixed(d).replace(rx, "$1") + si[i].symbol; +} + export function getImage(path) { // https://www.educoder.net // https://testbdweb.trustie.net diff --git a/src/common/educoder.js b/src/common/educoder.js index c6eaf176d..1a063d823 100644 --- a/src/common/educoder.js +++ b/src/common/educoder.js @@ -3,7 +3,7 @@ // export { default as OrderStateUtil } from '../routes/Order/components/OrderStateUtil'; export { - getUploadLogoActionUrl as getUploadLogoActionUrl, + getUploadLogoActionUrl as getUploadLogoActionUrl,numFormat as numFormat, getImageUrl as getImageUrl,getImage as getImage, getmyUrl as getmyUrl, getRandomNumber as getRandomNumber, getUrl as getUrl, publicSearchs as publicSearchs, getRandomcode as getRandomcode, getUrlmys as getUrlmys, getUrl2 as getUrl2, setImagesUrl as setImagesUrl , getUploadActionUrl as getUploadActionUrl, getUploadActionUrltwo as getUploadActionUrltwo, getUploadActionUrlthree as getUploadActionUrlthree, getUploadActionUrlOfAuth as getUploadActionUrlOfAuth , getTaskUrlById as getTaskUrlById, TEST_HOST, htmlEncode as htmlEncode, getupload_git_file as getupload_git_file, getcdnImageUrl as getcdnImageUrl diff --git a/src/forge/Branch/Select.jsx b/src/forge/Branch/Select.jsx index fedd288c1..a44584c4a 100644 --- a/src/forge/Branch/Select.jsx +++ b/src/forge/Branch/Select.jsx @@ -1,116 +1,36 @@ import React , { useState , useEffect } from 'react'; -import { Popover , Input , Spin } from 'antd'; +import { Popover , Dropdown , Input , Spin } from 'antd'; import './branch.scss'; import { getBranch , getTag } from '../GetData/getData'; +import SelectOverlay from './SelectOverlay'; export default (({ projectsId , branch , owner , changeBranch , branchList , tagflag = true })=>{ const [ showValue , setShowValue ] = useState(branch); - const [ inputValue , setInputValue] = useState(undefined); - const [ nav , setNav ] = useState(0); - const [ isSpin , setIsSpin ] = useState(true); - const [ flag , setFlag ] = useState(false); - - const [ data , setData ] = useState(undefined); - const [ datas , setDatas ] = useState(undefined); useEffect(()=>{ setShowValue(branch); },[branch]) - useEffect(()=>{ - document.body.addEventListener('click', e => { - let name = e.target.className; - let turn = name === "ant-input OptionsInput" || name === "navli active"|| name === "navli" || name === "padding10 bor-bottom-greyE"; - if(turn){ - return; - }else{ - setFlag(false); - } - }) - }) - - useEffect(()=>{ - if(branchList){ - setData(branchList); - setDatas(branchList); - setIsSpin(false); - } - },[branchList]) - - - async function getBranchs(id,owner){ - let result = await getBranch(id,owner); - setData(result); - setDatas(result); - setIsSpin(false); - } - async function getTags(id,owner){ - let result = await getTag(id,owner); - setData(result); - setDatas(result); - setIsSpin(false); - } - - function changeInputValue(e){ - setInputValue(e.target.value); - let filter = e.target.value ? data && data.length>0 && data.filter(item=>item.name.indexOf(e.target.value)>-1) : data; - setDatas(filter); - } - - function changeNav(nav){ - setNav(nav); - setIsSpin(true); - if(nav === 0){ - getBranchs(projectsId,owner); - }else{ - getTags(projectsId,owner); - } - } - function chooseitem(value){ - // setShowValue(value); - changeBranch(value); - } - - const menu = ( -
-
- -
    -
  • changeNav(0)}>分支列表
    • - { tagflag &&
  • changeNav(1)}>标签列表
    • } -
-
- -
    - { - datas && datas.length>0 ? - datas.map((item,key)=>{ - return( -
  • chooseitem(item.name)}>{item.name}
    • - ) - }): -

    暂无{inputValue}{nav === 0 ?"分支":"标签"}~

    - } -
- -
+ ); return( - setFlag(!flag)} overlayClassName="branch-tagBox-list"> +
{/* {nav === 0 ?"分支":"标签"} */} - + {showValue} - +
- + ) }) \ No newline at end of file diff --git a/src/forge/Branch/SelectOverlay.jsx b/src/forge/Branch/SelectOverlay.jsx new file mode 100644 index 000000000..d536d1c99 --- /dev/null +++ b/src/forge/Branch/SelectOverlay.jsx @@ -0,0 +1,84 @@ +import React , { useState , useEffect } from 'react'; +import { Input , Spin , Menu } from 'antd'; +import { getBranch , getTag } from '../GetData/getData'; + +function SelectOverlay({ changeBranch , tagflag , branchList , projectsId , owner }) { + const [ inputValue , setInputValue] = useState(undefined); + const [ nav , setNav ] = useState(0); + const [ isSpin , setIsSpin ] = useState(true); + + const [ data , setData ] = useState(undefined); + const [ datas , setDatas ] = useState(undefined); + const [ keys ,setKeys] = useState("branch"); + + useEffect(()=>{ + if(branchList){ + setData(branchList); + setDatas(branchList); + setIsSpin(false); + } + },[branchList]) + + async function getBranchs(id,owner){ + let result = await getBranch(id,owner); + setData(result); + setDatas(result); + setIsSpin(false); + } + async function getTags(id,owner){ + let result = await getTag(id,owner); + setData(result); + setDatas(result); + setIsSpin(false); + } + function chooseitem(value){ + changeBranch(value); + } + function changeInputValue(e){ + setInputValue(e.target.value); + let filter = e.target.value ? data && data.length>0 && data.filter(item=>item.name.indexOf(e.target.value)>-1) : data; + setDatas(filter); + } + + function changeNav(e){ + setKeys(e.key); + setIsSpin(true); + if(e.key === "branch"){ + getBranchs(projectsId,owner); + }else{ + getTags(projectsId,owner); + } + } + + return( +
+
+ } + placeholder="请输入分支或标签名称搜索" + autocomplete="off" className="OptionsInput" + value={inputValue} + onChange={changeInputValue} + /> +
+ + 分支 + { tagflag && 标签 } + + +
    + { + datas && datas.length>0 ? + datas.map((item,key)=>{ + return( +
  • chooseitem(item.name)}>{item.name}
    • + ) + }): +

    暂无{inputValue}{nav === 0 ?"分支":"标签"}~

    + } +
+ +
+ ) +} +export default SelectOverlay; \ No newline at end of file diff --git a/src/forge/Branch/branch.scss b/src/forge/Branch/branch.scss index 0c7e136a8..dd9c7b14e 100644 --- a/src/forge/Branch/branch.scss +++ b/src/forge/Branch/branch.scss @@ -27,10 +27,11 @@ overflow-y: auto; } .OptionsUl li{ - height: 35px; - line-height: 35px; + height: 30px; + line-height: 30px; cursor: pointer; - padding:0px 10px; + padding:0px 20px; + margin:5px 0px; } .OptionsUl li:hover{ background-color: #F0F0F0; @@ -45,38 +46,49 @@ width: 100%; } .branch-tagBox{ - border:1px solid #eee; + border:1px solid #D0D0D0; border-radius: 3px; height: 40px; display: flex; align-items: center; cursor: pointer; - min-width: 140px; + min-width: 104px; } -.branch-tagBox-list .ant-popover-arrow{ - display: none; +.branch-tagBox:hover{ + background-color: #F3F4F6; } -.branch-tagBox-list.ant-popover.ant-popover-placement-bottom{ - padding-top:0px; +.branch-tagBox-list{ + background: #FFFFFF; + box-shadow: 0px 4px 8px 2px rgba(212, 212, 212, 0.5); + border-radius: 4px; + .ant-popover-arrow{ + display: none; + } + &.ant-popover.ant-popover-placement-bottom{ + padding-top:0px; + } + .branch-tagBox .ant-dropdown-link{ + display: block; + flex:1; + max-width: 105px; + } + .ant-popover-inner-content{ + padding:0px; + } } -.branch-tagBox .ant-dropdown-link{ - display: block; - flex:1; -} -.branch-tagBox-list .ant-popover-inner-content{ - padding:0px; -} -.navUl{ - display: flex; - justify-content: space-between; - align-items: center; - margin-top: 5px; -} -.navUl li{ - cursor: pointer; -} -.navUl li.active{ - color:#5091FF; +.overlayBranch{ + width: 325px; + .navUl{ + margin-top: 8px; + height: 30px; + line-height: 30px; + li{ + height: 30px; + line-height: 30px; + padding:0px 5px; + margin-left: 20px!important; + } + } } .listTips{ padding:20px 0px; diff --git a/src/forge/Component/Releases.jsx b/src/forge/Component/Releases.jsx index bf8caebd4..ae7948067 100644 --- a/src/forge/Component/Releases.jsx +++ b/src/forge/Component/Releases.jsx @@ -7,14 +7,12 @@ function Releases({owner,projectsId,releaseVersions , baseOperate , projectType} return(
- 发行版 + 发行版 { releaseVersions && releaseVersions.total_count > 0 && {releaseVersions.total_count}} - { (releaseVersions && releaseVersions.total_count > 0) || projectType ===2 ? - 全部 - : - baseOperate && 新建 - } + {/* { + baseOperate && projectType !==2 && 新建 + } */} { releaseVersions && releaseVersions.total_count>0 ? @@ -32,7 +30,10 @@ function Releases({owner,projectsId,releaseVersions , baseOperate , projectType} ) }) - :"" + : +
+ 您暂未发布任何版本{baseOperate && projectType !==2 && 创建新版本} +
}
diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index e2dbc49d1..6769528a6 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -378,7 +378,7 @@ function CoderDepot(props){ } { fileOperate && - + } @@ -492,7 +492,7 @@ function CoderDepot(props){ inviteCode &&
- +
} { diff --git a/src/forge/Main/CoderDepotCatalogue.jsx b/src/forge/Main/CoderDepotCatalogue.jsx index 3aa5ccc82..ad2847693 100644 --- a/src/forge/Main/CoderDepotCatalogue.jsx +++ b/src/forge/Main/CoderDepotCatalogue.jsx @@ -4,8 +4,8 @@ import { truncateCommitId } from '../common/util'; const typeIco = { "submodule":"icon-file-submodule font-17", - "file":'icon-wenjia font-15', - "dir":"icon-wenjianjia1 font-15" + "file":'icon-wenjian5 font-15', + "dir":"icon-wenjianjia3 font-15" } function CoderDepotCatalogue({item , goToSubRoot , owner , projectsId }){ @@ -13,7 +13,7 @@ function CoderDepotCatalogue({item , goToSubRoot , owner , projectsId }){
  • goToSubRoot(item.path,item.type,item.name)} className={item.type === "submodule" && "submoduleStyle"}> - {item.name} + {item.name} diff --git a/src/forge/Main/CoderDepotReadme.jsx b/src/forge/Main/CoderDepotReadme.jsx index 1c54663d4..526e28d59 100644 --- a/src/forge/Main/CoderDepotReadme.jsx +++ b/src/forge/Main/CoderDepotReadme.jsx @@ -3,6 +3,8 @@ import RenderHtml from '../../components/render-html'; import { AlignCenter } from '../Component/layout'; import { Dropdown , Menu , Spin } from 'antd'; import { Link } from 'react-router-dom'; + +import ReadmeCatelogue from './sub/ReadmeCatelogue'; const $ = window.$; function CoderDepotReadme({ operate , history , readme , ChangeFile }){ @@ -23,34 +25,25 @@ function CoderDepotReadme({ operate , history , readme , ChangeFile }){ const anchor = el.id; const level = el.tagName.replace("H", ""); const href = `#${anchor}`; - return { href:`${path}${href}`,text:el.textContent , level:level } + return { href:`${href}`,text:el.textContent , level:level } }); setMenuList(items); },[content]) function menu(){ if(menuList && menuList.length > 0){ - let hash = history.location.hash; return( - - { - menuList.map((item,key)=>{ - return( - -1 ?"active":""}>{item.text} - ) - }) - } - + ) }else{ return } } return( -
    +
    - + 目录 @@ -61,7 +54,7 @@ function CoderDepotReadme({ operate , history , readme , ChangeFile }){ { operate ? ChangeFile(readme && readme.path, false)}> - + :"" } diff --git a/src/forge/Main/CoderRootBranch.js b/src/forge/Main/CoderRootBranch.js index 3f71d6920..4982414a2 100644 --- a/src/forge/Main/CoderRootBranch.js +++ b/src/forge/Main/CoderRootBranch.js @@ -4,7 +4,7 @@ import { Dropdown , Menu , Icon , Tooltip , Spin } from 'antd'; import { truncateCommitId } from '../common/util'; import { getBranch } from '../GetData/getData'; import Nodata from '../Nodata'; -import './list.css'; +import './list.scss'; function turnbar(str){ if(str && str.length>0 && str.indexOf("/")>-1){ diff --git a/src/forge/Main/CoderRootFileDetail.js b/src/forge/Main/CoderRootFileDetail.js index fb17098bc..d5a9670c6 100644 --- a/src/forge/Main/CoderRootFileDetail.js +++ b/src/forge/Main/CoderRootFileDetail.js @@ -1,6 +1,6 @@ import React, { Component } from "react"; import { Popconfirm , Select } from "antd"; -import "./list.css"; +import "./list.scss"; import axios from "axios"; import Meditor from "../Newfile/m_editor"; import RenderHtml from "../../components/render-html"; diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index b3262f880..0ddc57067 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -3,8 +3,9 @@ import { Spin, Tooltip, Button } from 'antd'; import { Link, Route, Switch } from 'react-router-dom'; import { Content, AlignTop } from '../Component/layout'; import DetailBanner from './sub/DetailBanner'; +import { numFormat } from 'educoder'; import '../css/index.scss' -import './list.css'; +import './list.scss'; import Loadable from 'react-loadable'; import Loading from '../../Loading'; diff --git a/src/forge/Main/Index.js b/src/forge/Main/Index.js index a08c3d3bc..afe108172 100644 --- a/src/forge/Main/Index.js +++ b/src/forge/Main/Index.js @@ -5,7 +5,7 @@ import { getImageUrl } from 'educoder'; import "slick-carousel/slick/slick.css"; import "slick-carousel/slick/slick-theme.css"; import '../css/index.scss' -import './list.css'; +import './list.scss'; import './Index.scss'; import ListItem from './IndexItem' import axios from 'axios'; diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss index cb05f1cf2..c97185e75 100644 --- a/src/forge/Main/Index.scss +++ b/src/forge/Main/Index.scss @@ -129,13 +129,14 @@ } .infoCount{ display: inline-block; - padding:0px 5px; - height: 16px; - line-height: 16px; - background-color: #eee; - color:#999; + width: 24px; + text-align: center; + height: 24px; + line-height: 24px; + background-color:rgba(153, 153, 153, 0.13);; + color:#666; border-radius: 12px; - margin-left: 10px; + margin-left: 6px; font-size: 12px; } .attrPerson{ @@ -195,16 +196,14 @@ } .listtable{ margin-top: 20px; - border:1px solid #d9d9d9; - border-radius: 4px; .listtablehead{ display: flex; justify-content: space-between; align-items: flex-start; border-bottom: 1px solid #d9d9d9; - padding:7px 20px; + padding:13px 20px; border-radius: 4px 4px 0px 0px; - background-color: #FAFBFC; + border: 1px solid rgba(42, 97, 255, 0.23); .ellipsistxt{ margin-top: 6px; #ptxt{ @@ -239,20 +238,25 @@ margin-left: 8px; cursor: pointer; border-radius: 2px; - background-color: #c1c1c1; + height: 16px; + background: rgba(153, 153, 153, 0.2); + border-radius: 2px; padding:0px 4px; height: 14px; line-height: 14px; margin-top: 9px; i{ font-size: 15px!important; - color: #fff; + color: #333; height: 14px; line-height: 14px; } } } .listtablebody{ + border-radius:0px 0px 4px 4px ; + border: 1px solid #D0D0D0; + border-top: none; li.listtablepath{ a{color: #40a9ff;} p{ @@ -260,12 +264,15 @@ } } & > li{ - height: 42px; + height: 44px; display: flex; justify-content: space-between; align-items: center; border-bottom: 1px solid #d9d9d9; padding:0px 20px 0px 24px; + &:hover{ + background-color: #F3F4F6; + } & > span:first-child{ width: 30%; overflow: hidden; @@ -327,25 +334,6 @@ } } -.menuslist{ - max-height: 200px; - overflow-y: auto; - padding:10px 15px; - border-radius: 4px; - .ant-dropdown-menu-item{ - border-radius: 8px; - text-align: left!important; - a{ - width: 350px; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - } - } - .ant-dropdown-menu-item.active{ - background-color: #e6f7ff; - } -} .catelogue{ border:1px solid rgb(211, 211, 211); font-size: 15px; diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js index 2265ac20d..d2b2c0975 100644 --- a/src/forge/Main/IndexItem.js +++ b/src/forge/Main/IndexItem.js @@ -5,7 +5,7 @@ import { AlignCenter } from '../Component/layout'; import { Link } from 'react-router-dom'; import '../css/index.scss'; import Nodata from '../Nodata'; -import './list.css'; +import './list.scss'; import img_parise from '../Images/parise.png'; class IndexItem extends Component { diff --git a/src/forge/Main/list.css b/src/forge/Main/list.scss similarity index 90% rename from src/forge/Main/list.css rename to src/forge/Main/list.scss index 43df25ca3..5eaa7992b 100644 --- a/src/forge/Main/list.css +++ b/src/forge/Main/list.scss @@ -218,9 +218,9 @@ } /* -----------详情------------ */ .detailHeader-wrapper{ - background-color:#FAFBFC; - /* background: url(../Images/forgeBanner.jpg) no-repeat center; */ - /* background-size:cover; */ + background-color:#FBFCFF; + border-bottom:1px solid #e2e2e2; + /* box-shadow: 0px 2px 11px 0px#D0D0D0; */ } .headerMenu-wrapper{ font-size: 16px; @@ -232,7 +232,7 @@ text-align: center; height: 40px; line-height: 28px; - margin-right: 40px; + padding:0px 20px; } .headerMenu-wrapper li a{ color: #666; @@ -241,34 +241,44 @@ margin-right: 8px; } .headerMenu-wrapper li a > span.num{ - height: 28px; - line-height: 29px; - margin-left: 8px; + line-height: 24px; + margin-left: 5px; + margin-top: 2px; font-size: 12px; - color: #2878FF; float: right; + color: #666!important; + background-color: rgba(153, 153, 153, 0.13);; + border-radius: 50%; + width: 24px; + height: 24px; +} +.headerMenu-wrapper li.active a,.headerMenu-wrapper li.active a i{ + color: #2A61FF!important; } .headerMenu-wrapper li.active::after{ position: absolute; bottom:0px; height:2px; - background-color: #5091FF; + background-color: #2A61FF; content:''; left: 0px; width:100%; } .detail_tag_btn{ - height:26px; - line-height: 26px; + height:34px; + line-height: 32px; border-radius:5px; - border:1px solid #f1f1f1; + border:1px solid #D0D0D0; display: flex; align-items: center; margin-left: 30px; padding:0px; - background-color: transparent; + background-color:#FAFBFC; box-shadow: none; } +.detail_tag_btn:hover{ + background-color: #F3F4F6; +} .ant-tooltip { max-width: fit-content!important; } @@ -280,11 +290,12 @@ margin-right: 10px; } .detail_tag_btn_count{ - padding:0px 10px; + width: 42px; + text-align: center; background: #fff; border-radius: 0px 4px 4px 0px; - font-size: 12px; height:100%; + border-left: 1px solid #D0D0D0; } .files-md{ padding:20px; @@ -499,7 +510,7 @@ } .addFile a{ display: block; - background-color: rgb(76, 172, 255,0.8); + background-color: rgba(76, 172, 255,0.8); color: #fff; cursor: pointer; height: 32px; @@ -514,7 +525,7 @@ border-left: 1px solid rgba(247, 247, 247, 0.3); } .addFile a:active{ - background-color: rgb(76, 172, 255,1); + background-color: rgba(76, 172, 255,1); } @@ -567,14 +578,28 @@ border-bottom: 1px solid #d9d9d9; border-radius: 4px 4px 0px 0px; } +.readBox{ + border:none; + &.commonBox .commonBox-info{ + border:1px solid #D0D0D0; + border-top: none; + border-radius: 0px 0px 4px 4px; + padding:20px 38px; + } +} .commonBox .commonBox-title.boxTitle{ display: flex; justify-content: space-between; + height: 65px; + line-height: 65px; + background: #FAFCFF; + border-radius: 4px 4px 0px 0px; + border: 1px solid rgba(42, 97, 255, 0.23); } .synchronism{ display: block; - height: 26px; - line-height: 26px; + height: 34px; + line-height: 34px; padding:0px 15px; color: #fff!important; background-color: #28BD6C; @@ -583,10 +608,16 @@ .files_info{ cursor: pointer; } -.commonBox .commonBox-info{ - padding:20px 15px; +.commonBox { + .commonBox-info{ + padding:20px 15px; + } +} +.commonBox-title-read{ + vertical-align: middle; + color: #666; + font-size: 14px; } -.commonBox-title-read{vertical-align: middle;color: #666;} @media screen and (max-width: 370px){ .p-r-tags,.p-r-btn{ @@ -732,4 +763,13 @@ a.color-grey-ccc:hover{ text-align: center; display: flex; justify-content: center; +} +.depotNum{ + color: #666!important; + span:last-child{ + color: #333; + } + &:hover span:last-child{ + color: #2A61FF; + } } \ No newline at end of file diff --git a/src/forge/Main/sub/DetailBanner.jsx b/src/forge/Main/sub/DetailBanner.jsx index abce4003a..cdfd253d7 100644 --- a/src/forge/Main/sub/DetailBanner.jsx +++ b/src/forge/Main/sub/DetailBanner.jsx @@ -1,6 +1,7 @@ import React, { useEffect, useState } from 'react'; import { Skeleton , Tooltip} from 'antd'; import { Link } from 'react-router-dom'; +import { numFormat } from 'educoder'; function DetailBanner({ history,list , owner , projectsId , isManager , url , pathname , state , urlFlag , projectDetail , platform ,open_devops }){ const [ menuName , setMenuName ] = useState(undefined); @@ -50,7 +51,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa 易修 - {projectDetail && projectDetail.issues_count ? {projectDetail.issues_count} : ""} + {projectDetail && projectDetail.issues_count ? {numFormat(projectDetail.issues_count)} : ""}
    • @@ -61,7 +62,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa 合并请求 - {projectDetail && projectDetail.pull_requests_count ? {projectDetail.pull_requests_count} : ""} + {projectDetail && projectDetail.pull_requests_count ? {numFormat(projectDetail.pull_requests_count)} : ""} :"" } @@ -101,7 +102,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa 里程碑 - {projectDetail && projectDetail.versions_count ? {projectDetail.versions_count} :""} + {projectDetail && projectDetail.versions_count ? {numFormat(projectDetail.versions_count)} :""} } diff --git a/src/forge/Main/sub/Invite.jsx b/src/forge/Main/sub/Invite.jsx index 61fb40cfc..201cee6dd 100644 --- a/src/forge/Main/sub/Invite.jsx +++ b/src/forge/Main/sub/Invite.jsx @@ -6,7 +6,7 @@ function Invite({code,className}) { return(
    - 邀请码 + 邀请码
    可以通过邀请码邀请成员加入项目
    点击复制邀请码。

    } className="ml8 font-16" inputId="devitecode"/> diff --git a/src/forge/Main/sub/ReadmeCatelogue.jsx b/src/forge/Main/sub/ReadmeCatelogue.jsx new file mode 100644 index 000000000..64eb90bab --- /dev/null +++ b/src/forge/Main/sub/ReadmeCatelogue.jsx @@ -0,0 +1,57 @@ +import React , {useState } from 'react'; +import { Anchor , Input } from 'antd'; +import './sub.scss'; + +const { Link } = Anchor; +const { Search } = Input; + +function ReadmeCatelogue({ menuList }) { + const [ goHref , setGoHref ] = useState(""); + const [ value , setValue ] = useState(""); + const [ menu , setMenu] = useState(menuList); + + + function onChange(link){ + setGoHref(link); + }; + + function changeValue(e) { + setValue(e.target.value); + if(e.target.value){ + let m = menu.filter(i=>i.text.indexOf(e.target.value)>-1); + setMenu(m); + }else{ + setMenu(menuList); + } + } + return( +
    +
    + }/> +
    + { + menu && menu.length>0? +
    + + { + menu.map((item,key)=>{ + return( +
    + +
    + ) + }) + } +     +
    + :"" + } + +
    + ) +} +export default ReadmeCatelogue; \ No newline at end of file diff --git a/src/forge/Main/sub/sub.scss b/src/forge/Main/sub/sub.scss index aa8739710..d4db6208c 100644 --- a/src/forge/Main/sub/sub.scss +++ b/src/forge/Main/sub/sub.scss @@ -24,7 +24,47 @@ } } -.detailsCode{ - display: flex; - justify-content: space-between; +.menuslist{ + z-index: 100; + width: 297px; + background: #FFFFFF; + box-shadow: 0px 4px 8px 2px rgba(212, 212, 212, 0.5); + border-radius: 4px; + .searchBox{ + padding:15px; + border-bottom: 1px solid #eee; + } + .anchorBox{ + max-height: 255px; + overflow-y: auto; + } + .ant-anchor-wrapper{ + margin-left: 0px; + padding:5px 15px; + .items{ + border-radius: 4px; + margin-bottom: 5px; + cursor: pointer; + .ant-anchor-link-title{ + color: #333333!important; + } + &:hover{ + background-color: #F3F4F6; + } + &.active{ + background-color: #2A61FF; + .ant-anchor-link-title{ + color: #fff!important; + } + } + } + .ant-anchor-link{ + padding:0px; + height: 30px; + line-height: 30px; + } + .ant-anchor-ink::before{ + background-color: #fff; + } + } } \ No newline at end of file diff --git a/src/forge/Team/Setting/TeamSettingCommon.jsx b/src/forge/Team/Setting/TeamSettingCommon.jsx index 5bab8f53f..499a00c20 100644 --- a/src/forge/Team/Setting/TeamSettingCommon.jsx +++ b/src/forge/Team/Setting/TeamSettingCommon.jsx @@ -1,5 +1,5 @@ import React, { forwardRef , useCallback , useEffect, useState } from 'react'; -import { Form , Input , Radio ,Checkbox , Divider , Button } from 'antd'; +import { Form , Input , Radio ,Checkbox , Divider , Button , InputNumber } from 'antd'; import { WhiteBack , FlexAJ } from '../../Component/layout'; import Title from '../../Component/Title'; import styled from 'styled-components'; @@ -31,7 +31,8 @@ export default Form.create()( useEffect(()=>{ if(organizeDetail){ setFieldsValue({ - ...organizeDetail + ...organizeDetail, + max_repo_creation:organizeDetail.max_repo_creation===-1 ? "":organizeDetail.max_repo_creation }) setImage(organizeDetail.avatar_url); setDescNum(organizeDetail.description ? organizeDetail.description.length : 0); @@ -39,10 +40,10 @@ export default Form.create()( },[organizeDetail]) const helper = useCallback( - (label, name, rules, widget , isRequired , flag ) => ( + (label, name, rules, widget , isRequired , flag , help ) => (
    {label} - + {getFieldDecorator(name, { rules, validateFirst: true , valuePropName:flag ? "checked":"value" })(widget)}
    @@ -175,7 +176,8 @@ export default Form.create()( '最大仓库数：', "max_repo_creation", [], - + ,false,false, + "当输入栏为空时，默认数量无限制" )}

    选择头像:

    diff --git a/src/forge/css/index.scss b/src/forge/css/index.scss index 00e46b6f8..0264c73ce 100644 --- a/src/forge/css/index.scss +++ b/src/forge/css/index.scss @@ -11,7 +11,10 @@ ul,ol,dl{ font-size: 22px; font-weight: normal; line-height: 30px; - max-width: 850px; + max-width: 700px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; .projectN{ word-break: break-all; } diff --git a/src/modules/tpm/challengesnew/tpm-md-editor.js b/src/modules/tpm/challengesnew/tpm-md-editor.js index ad25fa9c4..01a9a3759 100644 --- a/src/modules/tpm/challengesnew/tpm-md-editor.js +++ b/src/modules/tpm/challengesnew/tpm-md-editor.js @@ -8,7 +8,7 @@ import './css/TPMchallengesnew.css'; import 'codemirror/lib/codemirror.css'; const $ = window.$ -const mdIcons = ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "link", "|", "inline-latex", "latex", '|', "image", "table", '|', "line-break", "watch", "clear"]; +const mdIcons = ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "link", "|", "inline-latex", "latex", '|', "image", "table", '|', "line-break", "watch", "clear","fullScreen"]; const NULL_CH = '▁'; @@ -134,6 +134,7 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla }, toolbarIconsClass: { "line-break": "fa-minus", + "fullScreen":"iconfont icon-fangdaicon font-14" }, toolbarCustomIcons: { "inline-latex": "", @@ -150,6 +151,10 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla } cm.replaceSelection(NULL_CH) }, + "fullScreen":function(cm,icon,cursor,selection){ + icon.addClass("none"); + console.log(cm,icon) + }, "inline-latex": function (cm, icon, cursor, selection) { cm.replaceSelection("$$" + selection + "$$"); cm.setCursor(cursor.line, cursor.ch + 2); @@ -164,7 +169,8 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla lang: { toolbar: { "latex": "多行公式", - "line-break": "换行" + "line-break": "换行", + "fullScreen":"开启全屏" } }, onload: function () { @@ -229,7 +235,7 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla if (resizeBarEl.current) { let el = resizeBarEl.current let dragging = false - let startY = 0 + let startY = 0 function onMouseDown(e) { dragging = true startY = e.pageY From cbfb73d1cb35e1a82c4994770224a87db53447e6 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Thu, 12 Aug 2021 15:24:45 +0800 Subject: [PATCH 04/48] =?UTF-8?q?=E5=90=8C=E4=B8=8A-=E7=BB=86=E8=8A=82?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Main/CoderDepot.jsx | 32 ++++++++++++------------ src/forge/Main/CoderDepotReadme.jsx | 2 +- src/forge/Main/Index.scss | 38 ++++++++++++++++++++++------- 3 files changed, 46 insertions(+), 26 deletions(-) diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index 6769528a6..ba215553c 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -1,6 +1,6 @@ import React , { useEffect , useState } from 'react'; import { WhiteBack , Box , LongWidth , ShortWidth , Gap , AlignCenter , FlexAJ } from '../Component/layout'; -import { Dropdown , Menu , Divider , Spin, Button } from 'antd'; +import { Dropdown , Menu , Divider , Spin, Button , Typography } from 'antd'; import { getImageUrl } from "educoder"; import { Link } from 'react-router-dom'; import CloneAddress from '../Branch/CloneAddress'; @@ -24,7 +24,7 @@ import CheckProfile from '../Component/ProfileModal/Profile'; /** * projectDetail.type:0是托管项目，1是镜像项目，2是同步镜像项目(为2时不支持在线创建、在线上传、在线修改、在线删除、创建合并请求等功能) */ - + const { Paragraph } = Typography; function turnbar(str){ if(str && str.length>0 && str.indexOf("/")>-1){ return str.replaceAll('/','%2F'); @@ -467,25 +467,25 @@ function CoderDepot(props){ {desc &&

    {desc}

    } { website && -

    - - {website} -

    +
    + + {website} +
    } -

    - - README.md -

    -

    - +

    + + README.md +
    +
    + {projectDetail && projectDetail.size} -

    +
    { projectDetail && projectDetail.license_name && -

    +

    - {projectDetail.license_name} -

    + {projectDetail.license_name} +
    }
    { diff --git a/src/forge/Main/CoderDepotReadme.jsx b/src/forge/Main/CoderDepotReadme.jsx index 526e28d59..59a687ddc 100644 --- a/src/forge/Main/CoderDepotReadme.jsx +++ b/src/forge/Main/CoderDepotReadme.jsx @@ -45,7 +45,7 @@ function CoderDepotReadme({ operate , history , readme , ChangeFile }){ - + 目录 diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss index c97185e75..61f67c545 100644 --- a/src/forge/Main/Index.scss +++ b/src/forge/Main/Index.scss @@ -204,6 +204,7 @@ padding:13px 20px; border-radius: 4px 4px 0px 0px; border: 1px solid rgba(42, 97, 255, 0.23); + background-color: #FAFCFF; .ellipsistxt{ margin-top: 6px; #ptxt{ @@ -226,12 +227,12 @@ overflow: hidden; position: relative; padding-right:8px; - &::after{ - position: absolute; - right: 0px; - bottom: 0px; - content:"..."; - } + // &::after{ + // position: absolute; + // right: 0px; + // bottom: 0px; + // content:"..."; + // } } } .ellipsis{ @@ -335,17 +336,22 @@ } .catelogue{ - border:1px solid rgb(211, 211, 211); + cursor: pointer; + background: #FAFBFC; + border-radius: 4px; + border: 1px solid #D0D0D0; font-size: 15px; font-weight: normal; - border-radius: 5px; - margin-right: 10px; + margin-right: 12px; padding:0px 10px; height: 30px; line-height: 30px; color: #666!important; display: flex; align-items: center; + &:hover{ + background-color: #F3F4F6; + } span{ margin-top: 1px; } @@ -358,4 +364,18 @@ &:hover{ color: #05101a; } +} +.pinfos{ + i,a{color: #666;} + &:hover i,&:hover a{ + color: #2A61FF; + } +} +.graph{ + flex:1; + margin:0px 12px; + .ant-typography{ + white-space: pre-wrap; + margin-bottom: 0px; + } } \ No newline at end of file From 984856a29c6513df979576702c8dbcedd6430d8c Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Thu, 12 Aug 2021 17:36:37 +0800 Subject: [PATCH 05/48] md fullscreen --- src/modules/tpm/challengesnew/tpm-md-editor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/tpm/challengesnew/tpm-md-editor.js b/src/modules/tpm/challengesnew/tpm-md-editor.js index 01a9a3759..e1c06eda7 100644 --- a/src/modules/tpm/challengesnew/tpm-md-editor.js +++ b/src/modules/tpm/challengesnew/tpm-md-editor.js @@ -8,7 +8,7 @@ import './css/TPMchallengesnew.css'; import 'codemirror/lib/codemirror.css'; const $ = window.$ -const mdIcons = ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "link", "|", "inline-latex", "latex", '|', "image", "table", '|', "line-break", "watch", "clear","fullScreen"]; +const mdIcons = ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "link", "|", "inline-latex", "latex", '|', "image", "table", '|', "line-break", "watch", "clear"]; const NULL_CH = '▁'; From 37f608cdb84d2df5b434760f4465fa5b172bd1fe Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 13 Aug 2021 17:12:56 +0800 Subject: [PATCH 06/48] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BA=93-=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Branch/CloneAddress.js | 2 +- src/forge/Branch/branch.scss | 3 +- src/forge/Component/Component.scss | 82 +++++++++++++--- src/forge/Component/Contributors.jsx | 29 +++--- src/forge/Component/LanguagePower.jsx | 2 +- src/forge/Component/Releases.jsx | 3 +- src/forge/Main/CoderDepot.jsx | 18 ++-- src/forge/Main/CoderDepotCatalogue.jsx | 2 +- src/forge/Main/CoderDepotReadme.jsx | 44 +++++---- src/forge/Main/Detail.js | 12 +++ src/forge/Main/Index.scss | 79 +++++++++++---- src/forge/Main/list.scss | 128 +++++++++++++------------ src/forge/Main/sub/DetailBanner.jsx | 2 +- src/forge/Main/sub/ReadmeCatelogue.jsx | 10 +- src/forge/Main/sub/sub.scss | 5 +- src/forge/css/index.scss | 2 +- 16 files changed, 268 insertions(+), 155 deletions(-) diff --git a/src/forge/Branch/CloneAddress.js b/src/forge/Branch/CloneAddress.js index e936bb705..c2e6dd746 100644 --- a/src/forge/Branch/CloneAddress.js +++ b/src/forge/Branch/CloneAddress.js @@ -7,7 +7,7 @@ function CloneAddress({http_url , ssh_url , zip_url , tar_url}) { const [ key , setKey ] = useState("HTTP"); return (
    -
    +
    {setKey(e.key)}}>HTTP {setKey(e.key)}}>SSH diff --git a/src/forge/Branch/branch.scss b/src/forge/Branch/branch.scss index dd9c7b14e..74f52e545 100644 --- a/src/forge/Branch/branch.scss +++ b/src/forge/Branch/branch.scss @@ -48,7 +48,7 @@ .branch-tagBox{ border:1px solid #D0D0D0; border-radius: 3px; - height: 40px; + height: 36px; display: flex; align-items: center; cursor: pointer; @@ -98,6 +98,7 @@ .urlMenu{ line-height: 30px; margin-bottom: 10px; + padding:15px 20px 0px 20px; border-bottom: none; li.ant-menu-item{ height: 30px; diff --git a/src/forge/Component/Component.scss b/src/forge/Component/Component.scss index 3a94c3751..627304e15 100644 --- a/src/forge/Component/Component.scss +++ b/src/forge/Component/Component.scss @@ -113,7 +113,14 @@ li.ant-menu-item{ z-index: 10000; } .laterest{ - color: #05690d; + background-color: #EF3131; + color: #fff; + font-size: 12px; + margin-left: 10px; + padding:0px 5px; + border-radius: 2px; + height: 18px; + line-height: 18px; } @media screen and (max-width: 1800px){ @@ -157,39 +164,88 @@ li.ant-menu-item{ } .menuPanels{ - width: 240px; - height: 180px; + width: 295px; + .leftline{ + position: relative; + color: #666; + height: 16px; + &::before{ + position: absolute; + left: -10px; + top:3px; + height: 12px; + width: 1px; + background-color: #666666; + content: ""; + } + } + .ant-btn{ + height: 36px; + line-height: 34px; + width: 83px; + text-align: center; + padding:0px ; + font-weight: 500; + font-size: 14px; + &.currentBtn{ + cursor: default; + color: #333; + &:hover{ + color: #333; + border-color: #d0d0d0; + } + } + } + .ant-btn-default{ + color: #333; + border-color: #d0d0d0; + &:hover{ + background: #F3F4F6; + } + } + .ant-btn-primary{ + color: #fff; + background-color: #2A61FF; + } + .focusPanelHeadInfo{ + padding:14px 16px; + border-bottom: 1px solid #eee; + } .ant-popover-content,.ant-popover-inner{ height: 100%; width: 100%; } + .ant-popover-inner-content{ + padding:0px; + } } .halfs{ margin-top: 24px; padding:24px 0px 0px 0px; border-top: 1px solid #e8e8e8; - .attrPerson{ - padding-bottom: 24px; - } +} +.aboutSubTitle{ + display: flex; + align-items: center; } .menuinfos{ - padding:15px 0px; + padding:10px 20px; &>a{ display: flex; flex-direction: column; align-items: center; - border-right: 1px solid #eee; flex: 1; & >span:first-child{ - font-size: 18px; - font-weight: 400; + font-size: 16px; + font-weight: 500; color: #333; + line-height: 22px; } & >span:last-child{ color: #666; - } - &:last-child{ - border-right: none; + font-weight: 400; + line-height: 20px; + margin-top: 6px; } } } diff --git a/src/forge/Component/Contributors.jsx b/src/forge/Component/Contributors.jsx index 2f67b3ab5..f878f672d 100644 --- a/src/forge/Component/Contributors.jsx +++ b/src/forge/Component/Contributors.jsx @@ -1,13 +1,13 @@ import React, { useEffect, useState } from 'react'; import { AlignCenter , FlexAJ } from '../Component/layout'; import { Link } from 'react-router-dom'; -import { Popover , Spin } from 'antd'; +import { Popover , Spin , Button } from 'antd'; import { getImageUrl } from 'educoder'; import './Component.scss'; import { getUser } from '../GetData/getData'; import axios from 'axios'; -function Contributors({contributors,owner,projectsId}){ +function Contributors({contributors,owner,projectsId,currentLogin}){ const [ menuList ,setMenuList ]= useState([]); const [ list , setList ]= useState(undefined); const [ total , setTotal ]= useState(0); @@ -73,19 +73,18 @@ function Contributors({contributors,owner,projectsId}){ 关注数 - { - data.organizations && data.organizations.length > 0 ? - - 所属组织： -
    - {renderArray(data.organizations)} -
    -     - :"" - } - { - data.location && 所在地址:{data.location} - } +
    + { + currentLogin && (currentLogin === data.login) + ? + + : + data.is_watch ? + + : + + } +
    ) setMenu(ele); diff --git a/src/forge/Component/LanguagePower.jsx b/src/forge/Component/LanguagePower.jsx index 3197309c4..8d3e361b5 100644 --- a/src/forge/Component/LanguagePower.jsx +++ b/src/forge/Component/LanguagePower.jsx @@ -25,7 +25,7 @@ function LanguagePower({languages}){ } return(
    -

    开发语言

    +

    开发语言

    { array && array.map((item,key)=>{ diff --git a/src/forge/Component/Releases.jsx b/src/forge/Component/Releases.jsx index ae7948067..4a689f5ff 100644 --- a/src/forge/Component/Releases.jsx +++ b/src/forge/Component/Releases.jsx @@ -19,13 +19,12 @@ function Releases({owner,projectsId,releaseVersions , baseOperate , projectType} releaseVersions.list.map((item,key)=>{ return( key === 0 && -

    {item.name} 最新

    -

    {item.created_at}

    +

    {item.created_at}

     ) diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index ba215553c..787236019 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -321,7 +321,7 @@ function CoderDepot(props){ list = {mainFlag ? dirInfo : undefined} />
    setVisible(true)}> - + 目录
    @@ -334,7 +334,7 @@ function CoderDepot(props){
    -
    +
    { props && props.platform ? - + { baseOperate && ((projectDetail.type !== 2 && pullsFlag) || issuesFlag )&&
    @@ -379,12 +379,12 @@ function CoderDepot(props){ } { fileOperate && - + } - + @@ -464,7 +464,7 @@ function CoderDepot(props){ setOpenModal(true)} className="iconfont icon-anquanshezhi color-grey-9 font-15"> } - {desc &&

    {desc}

    } + {desc &&

    {desc}

    } { website &&
    @@ -473,7 +473,7 @@ function CoderDepot(props){
    }
    - + README.md
    @@ -483,7 +483,7 @@ function CoderDepot(props){ { projectDetail && projectDetail.license_name &&
    - + {projectDetail.license_name}
    } @@ -499,7 +499,7 @@ function CoderDepot(props){ lesson_url &&
    -

    实践课程

    +

    实践课程

    {lesson_url}
    } diff --git a/src/forge/Main/CoderDepotCatalogue.jsx b/src/forge/Main/CoderDepotCatalogue.jsx index ad2847693..ff2b576b8 100644 --- a/src/forge/Main/CoderDepotCatalogue.jsx +++ b/src/forge/Main/CoderDepotCatalogue.jsx @@ -13,7 +13,7 @@ function CoderDepotCatalogue({item , goToSubRoot , owner , projectsId }){
  • goToSubRoot(item.path,item.type,item.name)} className={item.type === "submodule" && "submoduleStyle"}> - {item.name} + {item.name} diff --git a/src/forge/Main/CoderDepotReadme.jsx b/src/forge/Main/CoderDepotReadme.jsx index 59a687ddc..e5f6cbc4e 100644 --- a/src/forge/Main/CoderDepotReadme.jsx +++ b/src/forge/Main/CoderDepotReadme.jsx @@ -1,8 +1,7 @@ import React, { useEffect, useState } from 'react'; import RenderHtml from '../../components/render-html'; import { AlignCenter } from '../Component/layout'; -import { Dropdown , Menu , Spin } from 'antd'; -import { Link } from 'react-router-dom'; +import { Dropdown , Anchor , Spin } from 'antd'; import ReadmeCatelogue from './sub/ReadmeCatelogue'; const $ = window.$; @@ -33,32 +32,35 @@ function CoderDepotReadme({ operate , history , readme , ChangeFile }){ function menu(){ if(menuList && menuList.length > 0){ return( - + ) }else{ return } } + return(
    -
    - - - - - 目录 - - - README.md - - { - operate ? - ChangeFile(readme && readme.path, false)}> - - - :"" - } -
    + +
    + + + + + 目录 + + + README.md + + { + operate ? + ChangeFile(readme && readme.path, false)}> + + + :"" + } +
    +     { content &&
    diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index 0ddc57067..bc104ff66 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -557,6 +557,18 @@ class Detail extends Component { }
    +
    + { + projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ? + this.textFunc(projectDetail.forked_from_project_id,projectDetail.fork_info) + :"" + } + { + projectDetail && projectDetail.type && projectDetail.type !== 0 ? + 镜像自 {projectDetail.mirror_url} + :"" + } +
    { firstSync ? "" : img{ - margin-right: 8px; -} -.headerMenu-wrapper li a > span.num{ - line-height: 24px; - margin-left: 5px; - margin-top: 2px; - font-size: 12px; - float: right; - color: #666!important; - background-color: rgba(153, 153, 153, 0.13);; - border-radius: 50%; - width: 24px; - height: 24px; -} -.headerMenu-wrapper li.active a,.headerMenu-wrapper li.active a i{ - color: #2A61FF!important; -} -.headerMenu-wrapper li.active::after{ - position: absolute; - bottom:0px; - height:2px; - background-color: #2A61FF; - content:''; - left: 0px; - width:100%; + cursor: pointer; + li{ + font-size: 14px; + position: relative; + text-align: center; + height: 40px; + line-height: 28px; + padding:0px 20px; + & > a{ + color: #666; + &> img{ + margin-right: 8px; + } + &> span.num{ + line-height: 24px; + margin-left: 5px; + margin-top: 2px; + font-size: 12px; + float: right; + color: #666!important; + background-color: rgba(153, 153, 153, 0.13);; + border-radius: 50%; + width: 24px; + height: 24px; + } + } + &.active a,&.active a i{ + color: #2A61FF!important; + } + &.active::after,&:hover::after{ + position: absolute; + bottom:0px; + height:2px; + background-color: #2A61FF; + content:''; + left: 0px; + width:100%; + } + &:hover::after{ + background-color: rgba(153, 153, 153, 0.2);; + } + } } .detail_tag_btn{ height:34px; @@ -271,32 +274,36 @@ border:1px solid #D0D0D0; display: flex; align-items: center; - margin-left: 30px; + margin-left: 10px; padding:0px; background-color:#FAFBFC; box-shadow: none; -} -.detail_tag_btn:hover{ - background-color: #F3F4F6; + &:hover{ + background-color: #F3F4F6; + } + .detail_tag_btn_name{ + padding:0px 18px; + min-width: 82px; + text-align: center; + &:hover>span{ + color: #333!important; + } + img{ + margin-right: 10px; + } + } + .detail_tag_btn_count{ + width: 42px; + text-align: center; + background: #fff; + border-radius: 0px 4px 4px 0px; + height:100%; + border-left: 1px solid #D0D0D0; + } } .ant-tooltip { max-width: fit-content!important; } -.detail_tag_btn_name{ - padding:0px 10px; - color: #666!important; -} -.detail_tag_btn_name img{ - margin-right: 10px; -} -.detail_tag_btn_count{ - width: 42px; - text-align: center; - background: #fff; - border-radius: 0px 4px 4px 0px; - height:100%; - border-left: 1px solid #D0D0D0; -} .files-md{ padding:20px; } @@ -347,6 +354,7 @@ .gitAddressClone{ + margin:0px 20px 14px 20px!important; display: flex; height: 40px; align-items: center; @@ -658,9 +666,7 @@ .item:last-child{ border-bottom:none; } -.gitAddressClone{ - margin: 0 !important; -} + .item_title small{ font-weight: 400; margin-left: 10px; diff --git a/src/forge/Main/sub/DetailBanner.jsx b/src/forge/Main/sub/DetailBanner.jsx index cdfd253d7..1dfec5328 100644 --- a/src/forge/Main/sub/DetailBanner.jsx +++ b/src/forge/Main/sub/DetailBanner.jsx @@ -18,7 +18,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa } },[list]); return( -
    +
    { menuName && projectDetail ?
      diff --git a/src/forge/Main/sub/ReadmeCatelogue.jsx b/src/forge/Main/sub/ReadmeCatelogue.jsx index 64eb90bab..d1e018bb6 100644 --- a/src/forge/Main/sub/ReadmeCatelogue.jsx +++ b/src/forge/Main/sub/ReadmeCatelogue.jsx @@ -1,11 +1,11 @@ -import React , {useState } from 'react'; +import React , { useState , useEffect } from 'react'; import { Anchor , Input } from 'antd'; import './sub.scss'; +import { Base64 } from 'js-base64'; const { Link } = Anchor; -const { Search } = Input; -function ReadmeCatelogue({ menuList }) { +function ReadmeCatelogue({ menuList , hash }) { const [ goHref , setGoHref ] = useState(""); const [ value , setValue ] = useState(""); const [ menu , setMenu] = useState(menuList); @@ -18,7 +18,7 @@ function ReadmeCatelogue({ menuList }) { function changeValue(e) { setValue(e.target.value); if(e.target.value){ - let m = menu.filter(i=>i.text.indexOf(e.target.value)>-1); + let m = menuList.filter(i=>i.text.indexOf(e.target.value)>-1); setMenu(m); }else{ setMenu(menuList); @@ -41,7 +41,7 @@ function ReadmeCatelogue({ menuList }) { menu.map((item,key)=>{ return(
      - +
      ) }) diff --git a/src/forge/Main/sub/sub.scss b/src/forge/Main/sub/sub.scss index d4db6208c..4e6a3d8ac 100644 --- a/src/forge/Main/sub/sub.scss +++ b/src/forge/Main/sub/sub.scss @@ -34,13 +34,10 @@ padding:15px; border-bottom: 1px solid #eee; } - .anchorBox{ - max-height: 255px; - overflow-y: auto; - } .ant-anchor-wrapper{ margin-left: 0px; padding:5px 15px; + max-height: 255px!important; .items{ border-radius: 4px; margin-bottom: 5px; diff --git a/src/forge/css/index.scss b/src/forge/css/index.scss index 0264c73ce..e1986728e 100644 --- a/src/forge/css/index.scss +++ b/src/forge/css/index.scss @@ -11,7 +11,7 @@ ul,ol,dl{ font-size: 22px; font-weight: normal; line-height: 30px; - max-width: 700px; + max-width: 690px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; From 2882289267bdfa44e7bfdbe328706ff27abf3df3 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Mon, 23 Aug 2021 10:08:04 +0800 Subject: [PATCH 07/48] =?UTF-8?q?=E9=87=8C=E7=A8=8B=E7=A2=91-=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E5=88=86=E9=A1=B5=E9=9C=80=E8=A6=81=E5=B8=A6=E4=B8=8A?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Order/Milepost.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/forge/Order/Milepost.js b/src/forge/Order/Milepost.js index 5f6efeeb9..55c4b7d7d 100644 --- a/src/forge/Order/Milepost.js +++ b/src/forge/Order/Milepost.js @@ -13,7 +13,7 @@ class Milepost extends Component { super(props); this.state = { data: undefined, - limit: 15, + limit: 3, page: 1, order_type: undefined, //新建标签区域是否显示 none 隐藏 block 显示 @@ -122,8 +122,8 @@ class Milepost extends Component { this.setState({ page }) - - this.getList(page); + const { status } = this.state; + this.getList( page , status ); } // 排序 @@ -260,7 +260,7 @@ class Milepost extends Component { { data && data.versions_count > limit ?
      - +
      : "" }
    From dcef7e7872a2d84eb68d74ec1001dc29deed3950 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Mon, 23 Aug 2021 10:15:32 +0800 Subject: [PATCH 08/48] reset --- src/forge/Order/Milepost.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/forge/Order/Milepost.js b/src/forge/Order/Milepost.js index 55c4b7d7d..48fc286ba 100644 --- a/src/forge/Order/Milepost.js +++ b/src/forge/Order/Milepost.js @@ -13,7 +13,7 @@ class Milepost extends Component { super(props); this.state = { data: undefined, - limit: 3, + limit: 15, page: 1, order_type: undefined, //新建标签区域是否显示 none 隐藏 block 显示 @@ -119,6 +119,7 @@ class Milepost extends Component { } ChangePage = (page) => { + document.body.scrollIntoView(); this.setState({ page }) From 478b080d451464b9cd5a20fd75e05060dd6071a2 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Mon, 23 Aug 2021 14:43:09 +0800 Subject: [PATCH 09/48] =?UTF-8?q?issue=2049808=20:tab=E9=A1=B5=E9=BC=A0?= =?UTF-8?q?=E6=A0=87=E6=82=AC=E5=81=9C=E8=A7=84=E8=8C=83=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Main/list.scss | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/forge/Main/list.scss b/src/forge/Main/list.scss index b4a966b23..c5d011c54 100644 --- a/src/forge/Main/list.scss +++ b/src/forge/Main/list.scss @@ -226,13 +226,15 @@ flex-direction: row; cursor: pointer; li{ - font-size: 14px; position: relative; text-align: center; - height: 40px; - line-height: 28px; - padding:0px 20px; + padding:0px; & > a{ + font-size: 14px; + height: 40px; + line-height: 28px; + padding:0px 20px; + display: block; color: #666; &> img{ margin-right: 8px; @@ -257,13 +259,13 @@ position: absolute; bottom:0px; height:2px; - background-color: #2A61FF; + background-color:rgba(153, 153, 153, 0.2); content:''; left: 0px; width:100%; } - &:hover::after{ - background-color: rgba(153, 153, 153, 0.2);; + &.active::after{ + background-color: #2A61FF; } } } From fbe5da101497ea9966b15db6d7aefa0a09fed801 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Thu, 6 May 2021 10:56:09 +0800 Subject: [PATCH 10/48] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=89=80=E6=9C=89?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=9A=84marginbottom=E4=B8=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/edu-purge.css | 1 + 1 file changed, 1 insertion(+) diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css index 3e3750775..9dafcdd0c 100644 --- a/public/css/edu-purge.css +++ b/public/css/edu-purge.css @@ -1307,6 +1307,7 @@ td, span { margin: 0; padding: 0; + margin-bottom: 0px!important; } table, From d5652fba18a0e34879f717e233da00bb3edefc08 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Thu, 6 May 2021 14:59:54 +0800 Subject: [PATCH 11/48] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E9=A1=B9=E7=9B=AE-maxl?= =?UTF-8?q?ength?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 69d6155f2..628e5a3b0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4885,7 +4885,7 @@ }, "dom-closest": { "version": "0.2.0", - "resolved": "https://registry.npmjs.org/dom-closest/-/dom-closest-0.2.0.tgz", + "resolved": "https://registry.npm.taobao.org/dom-closest/download/dom-closest-0.2.0.tgz", "integrity": "sha1-69n5HRvyLo1vR3h2u80+yQIWwM8=", "requires": { "dom-matches": ">=1.0.1" @@ -4929,7 +4929,7 @@ }, "dom-matches": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/dom-matches/-/dom-matches-2.0.0.tgz", + "resolved": "https://registry.npm.taobao.org/dom-matches/download/dom-matches-2.0.0.tgz", "integrity": "sha1-0nKLQWqHUzmA6wibhI0lPPI6dYw=" }, "dom-scroll-into-view": { @@ -5187,7 +5187,7 @@ }, "enquire.js": { "version": "2.1.6", - "resolved": "https://registry.npmjs.org/enquire.js/-/enquire.js-2.1.6.tgz", + "resolved": "https://registry.npm.taobao.org/enquire.js/download/enquire.js-2.1.6.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fenquire.js%2Fdownload%2Fenquire.js-2.1.6.tgz", "integrity": "sha1-PoeAybi4NQhMP2DhZtvDwqPImBQ=" }, "entities": { @@ -5706,7 +5706,7 @@ }, "eventlistener": { "version": "0.0.1", - "resolved": "https://registry.npmjs.org/eventlistener/-/eventlistener-0.0.1.tgz", + "resolved": "https://registry.npm.taobao.org/eventlistener/download/eventlistener-0.0.1.tgz", "integrity": "sha1-7Suqu4UiJ68rz4iRUscsY8pTLrg=" }, "events": { @@ -8040,7 +8040,7 @@ }, "hammerjs": { "version": "2.0.8", - "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz", + "resolved": "https://registry.npm.taobao.org/hammerjs/download/hammerjs-2.0.8.tgz", "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE=" }, "handle-thing": { @@ -8881,7 +8881,7 @@ }, "immutable": { "version": "3.7.6", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.7.6.tgz", + "resolved": "https://registry.npm.taobao.org/immutable/download/immutable-3.7.6.tgz", "integrity": "sha1-E7TTyxK++hVIKib+Gy665kAHHks=" }, "import-fresh": { @@ -10486,7 +10486,7 @@ }, "lodash.throttle": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz", + "resolved": "https://registry.npm.taobao.org/lodash.throttle/download/lodash.throttle-4.1.1.tgz", "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=" }, "lodash.uniq": { From 194f6af412258c1c2c2e07ac131e19d3d08406e4 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Thu, 6 May 2021 17:12:42 +0800 Subject: [PATCH 12/48] merge develop --- src/forge/Divert/DivertModal.jsx | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/forge/Divert/DivertModal.jsx b/src/forge/Divert/DivertModal.jsx index acf881175..d4c1f2014 100644 --- a/src/forge/Divert/DivertModal.jsx +++ b/src/forge/Divert/DivertModal.jsx @@ -46,14 +46,11 @@ function DivertModal({form , visible , onSuccess , onCancel,owner,repo}){ Axios.post(url,{ ...values }).then(result=>{ - if(result){ - if(result.data.status === 0){ - onSuccess(result.data && result.data.owner); - }else{ - onSuccess(); - } + if(result && result.data.id){ + onSuccess(result.data && result.data.owner); + }else{ + onSuccess(); } - }).catch(error=>{}) } }) From 6e849aa80031d012759fd1901f2ca85b754873e7 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Sat, 8 May 2021 17:28:14 +0800 Subject: [PATCH 13/48] install babel-polyfill --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index b58b501df..a78351cba 100644 --- a/package.json +++ b/package.json @@ -193,6 +193,7 @@ "babel-core": "^6.26.0", "babel-plugin-import": "^1.13.0", "babel-plugin-transform-runtime": "^6.23.0", + "babel-polyfill": "^6.26.0", "babel-preset-es2015": "^6.24.1", "babel-preset-react": "^6.24.1", "babel-preset-stage-2": "^6.24.1", From 9d4893eb4931c6742ed3ab02d6ad5018be1966b2 Mon Sep 17 00:00:00 2001 From: hc1913847458 <1422588487@qq.com> Date: Wed, 4 Aug 2021 14:42:08 +0800 Subject: [PATCH 14/48] =?UTF-8?q?=E9=99=90=E5=88=B6=E5=AD=97=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Main/sub/UpdateDescModal.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forge/Main/sub/UpdateDescModal.jsx b/src/forge/Main/sub/UpdateDescModal.jsx index 5039123a4..63e14fcd6 100644 --- a/src/forge/Main/sub/UpdateDescModal.jsx +++ b/src/forge/Main/sub/UpdateDescModal.jsx @@ -53,7 +53,7 @@ function UpdateDescModal({form , visible , onCancel , onOk,desc,website,lesson_u {getFieldDecorator("lesson_url",{ rules:[] })( - + )} From 53fa18907dab24fe1bd2fd0050995b87c8906b13 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Mon, 9 Aug 2021 10:36:15 +0800 Subject: [PATCH 15/48] =?UTF-8?q?=E4=BB=A3=E7=A0=81style?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Main/sub/UpdateDescModal.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forge/Main/sub/UpdateDescModal.jsx b/src/forge/Main/sub/UpdateDescModal.jsx index 63e14fcd6..b0291f347 100644 --- a/src/forge/Main/sub/UpdateDescModal.jsx +++ b/src/forge/Main/sub/UpdateDescModal.jsx @@ -53,7 +53,7 @@ function UpdateDescModal({form , visible , onCancel , onOk,desc,website,lesson_u {getFieldDecorator("lesson_url",{ rules:[] })( - + )} From da657e559bb78762a7afdef7eb68b8c066c20ab6 Mon Sep 17 00:00:00 2001 From: hc1913847458 <1422588487@qq.com> Date: Mon, 30 Aug 2021 16:06:02 +0800 Subject: [PATCH 16/48] save files --- src/forge/Team/Group/GroupForm.jsx | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/forge/Team/Group/GroupForm.jsx b/src/forge/Team/Group/GroupForm.jsx index dad9b64b9..94825905f 100644 --- a/src/forge/Team/Group/GroupForm.jsx +++ b/src/forge/Team/Group/GroupForm.jsx @@ -34,13 +34,6 @@ export default Form.create()( const { getFieldDecorator, validateFields, setFieldsValue } = form; const { OIdentifier, groupId } = match.params; - useEffect(()=>{ - setFieldsValue({ - authorize:"read", - includes_all_project:0 - }) - },[]) - useEffect(() => { if (GroupDetail) { setOnwers(GroupDetail.authorize === "owner"); From 09e9f01f7e3f7c0692e4321201aae7dbeed26e45 Mon Sep 17 00:00:00 2001 From: hc1913847458 <1422588487@qq.com> Date: Mon, 30 Aug 2021 18:11:38 +0800 Subject: [PATCH 17/48] save files --- src/forge/Main/Detail.js | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index bc104ff66..0ddc57067 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -557,18 +557,6 @@ class Detail extends Component { }
    -
    - { - projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ? - this.textFunc(projectDetail.forked_from_project_id,projectDetail.fork_info) - :"" - } - { - projectDetail && projectDetail.type && projectDetail.type !== 0 ? - 镜像自 {projectDetail.mirror_url} - :"" - } -
    { firstSync ? "" : Date: Tue, 31 Aug 2021 11:23:05 +0800 Subject: [PATCH 18/48] issue --- src/forge/Notice/UndoEvent.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forge/Notice/UndoEvent.jsx b/src/forge/Notice/UndoEvent.jsx index 18cb6d4a3..919f712ca 100644 --- a/src/forge/Notice/UndoEvent.jsx +++ b/src/forge/Notice/UndoEvent.jsx @@ -61,7 +61,7 @@ function UndoEvent(props){ return(
    -
    +
    { list && list.length > 0 ?
      From b26f300832ce77decc702d67532d87ddc6eee7c8 Mon Sep 17 00:00:00 2001 From: hc1913847458 <1422588487@qq.com> Date: Thu, 2 Sep 2021 10:38:59 +0800 Subject: [PATCH 19/48] issue --- .idea/workspace.xml | 11 + src/forge/Branch/branch.css | 136 +++++ src/forge/Branch/branch.css.map | 1 + src/forge/Main/CoderDepotReadme.jsx | 4 +- src/forge/Main/list.css | 911 ++++++++++++++++++++++++++++ src/forge/Main/list.css.map | 1 + src/forge/Main/list.scss | 3 + 7 files changed, 1066 insertions(+), 1 deletion(-) create mode 100644 src/forge/Branch/branch.css create mode 100644 src/forge/Branch/branch.css.map create mode 100644 src/forge/Main/list.css create mode 100644 src/forge/Main/list.css.map diff --git a/.idea/workspace.xml b/.idea/workspace.xml index aed6ebd49..0d780dd4f 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -344,6 +344,17 @@ +<<<<<<< HEAD +======= + + +<<<<<<< HEAD + + +======= + +>>>>>>> 3a27fbd47bf8b9e73dad8b02d43bf52d6b5b5e8a +>>>>>>> issue diff --git a/src/forge/Branch/branch.css b/src/forge/Branch/branch.css new file mode 100644 index 000000000..1c243d9b8 --- /dev/null +++ b/src/forge/Branch/branch.css @@ -0,0 +1,136 @@ +.branchDropdown { + border: 1px solid #eee; + border-radius: 4px; + display: flex; + justify-content: center; + height: 40px; + line-height: 40px; + min-width: 220px; +} + +.branchDropdown .ant-dropdown-trigger { + width: 100%; + padding: 0px 15px; + display: flex; + justify-content: space-between; + align-items: center; + cursor: pointer; +} + +.branchOptions { + width: 220px; + box-shadow: 0px 0px 3px 1px rgba(134, 134, 134, 0.4); + border-radius: 3px; + background: #fff; + max-height: 300px; +} + +.OptionsUl { + max-height: 220px; + overflow-y: auto; +} + +.OptionsUl li { + height: 30px; + line-height: 30px; + cursor: pointer; + padding: 0px 20px; + margin: 5px 0px; +} + +.OptionsUl li:hover { + background-color: #F0F0F0; +} + +.OptionsUl li a { + display: block; +} + +.OptionsInput { + height: 32px; + padding-left: 4px; + line-height: 32px; + width: 100%; +} + +.branch-tagBox { + border: 1px solid #D0D0D0; + border-radius: 3px; + height: 36px; + display: flex; + align-items: center; + cursor: pointer; + min-width: 104px; +} + +.branch-tagBox:hover { + background-color: #F3F4F6; +} + +.branch-tagBox-list { + background: #FFFFFF; + box-shadow: 0px 4px 8px 2px rgba(212, 212, 212, 0.5); + border-radius: 4px; +} +.branch-tagBox-list .ant-popover-arrow { + display: none; +} +.branch-tagBox-list.ant-popover.ant-popover-placement-bottom { + padding-top: 0px; +} +.branch-tagBox-list .branch-tagBox .ant-dropdown-link { + display: block; + flex: 1; + max-width: 105px; +} +.branch-tagBox-list .ant-popover-inner-content { + padding: 0px; +} + +.overlayBranch { + width: 325px; +} +.overlayBranch .navUl { + margin-top: 8px; + height: 30px; + line-height: 30px; +} +.overlayBranch .navUl li { + height: 30px; + line-height: 30px; + padding: 0px 5px; + margin-left: 20px !important; +} + +.listTips { + padding: 20px 0px; + text-align: center; +} + +.urlMenu { + line-height: 30px; + margin-bottom: 10px; + padding: 15px 20px 0px 20px; + border-bottom: none; +} +.urlMenu li.ant-menu-item { + height: 30px; + line-height: 30px; + padding: 0px 5px; + margin-right: 20px !important; +} +.urlMenu li.ant-menu-item.ant-menu-item-selected, .urlMenu li.ant-menu-item.ant-menu-item-active { + color: #333; +} +.urlMenu li.ant-menu-item.ant-menu-item-selected { + border-color: #1890ff !important; +} +.urlMenu li.ant-menu-item.ant-menu-item-active { + border-color: transparent; +} + +.copytool { + margin: 0px 10px; +} + +/*# sourceMappingURL=branch.css.map */ diff --git a/src/forge/Branch/branch.css.map b/src/forge/Branch/branch.css.map new file mode 100644 index 000000000..6dd42dad1 --- /dev/null +++ b/src/forge/Branch/branch.css.map @@ -0,0 +1 @@ +{"version":3,"sourceRoot":"","sources":["branch.scss"],"names":[],"mappings":"AAAA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACG;;;AAEH;EACE;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;EACE;EACA;EACA;;AAEF;EACE;;;AAGJ;EACE;;AACA;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;;AAIN;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;EACE;;;AAIN;EACE","file":"branch.css"} \ No newline at end of file diff --git a/src/forge/Main/CoderDepotReadme.jsx b/src/forge/Main/CoderDepotReadme.jsx index e5f6cbc4e..8ba58eb5b 100644 --- a/src/forge/Main/CoderDepotReadme.jsx +++ b/src/forge/Main/CoderDepotReadme.jsx @@ -50,7 +50,9 @@ function CoderDepotReadme({ operate , history , readme , ChangeFile }){ 目录 - README.md + + README.md + { operate ? diff --git a/src/forge/Main/list.css b/src/forge/Main/list.css new file mode 100644 index 000000000..f84886d5c --- /dev/null +++ b/src/forge/Main/list.css @@ -0,0 +1,911 @@ +@charset "UTF-8"; +.lineH2 { + line-height: 2; +} + +.t_project_banner { + /* height: 260px; + background: url(../Images/banner_list.jpg) no-repeat center; */ + background-color: #050d34; +} + +.ProjectListIndex { + width: 1200px; + margin: 20px auto; + display: flex; + align-items: flex-start; + flex-wrap: wrap; +} + +.list-left { + width: 26%; + padding-right: 20px; + box-sizing: border-box; + margin-bottom: 20px; +} + +.list-left > div { + border: 1px solid #eee; +} + +.list-left > div.bgcF { + border: none; +} + +.list-right { + width: 74%; + background: #fff; + padding: 10px; + border: 1px solid #eee; +} + +/* 首页列表的新建和排序的下拉列表 */ +.ant-menu-inline, .ant-menu-vertical, .ant-menu-vertical-left { + border-right: none !important; +} + +.ant-menu-vertical > .ant-menu-item { + margin: 0px !important; + height: 35px; + line-height: 35px; + border-bottom: 1px solid #eee; + font-size: 14px !important; +} + +.ant-menu-vertical > .ant-menu-item:last-child { + border-bottom: none; +} + +.list-r-operation { + display: flex; + justify-content: space-between; + flex-wrap: wrap; + align-items: center; + padding: 25px 30px; + border-bottom: 1px solid #E0E0E0; +} + +.list-r-Search { + width: 400px; +} + +.padding0-25 { + padding: 0px 25px; +} + +.list-r-Search .ant-btn-lg { + height: 38px; +} + +.list-r-Search .ant-input-group-addon { + border: none !important; +} + +.list-r-Search .ant-input-search-button { + height: 40px !important; +} + +.createBtn { + border-radius: 4px; + margin-left: 20px; + display: inline-block; + padding: 3px 15px; + background-color: #4CACFF; + color: #fff !important; +} + +/* 列表 */ +.project-list { + padding: 0px 30px; +} + +.border-top-grey { + border-top: 1px solid #eeeeee; +} + +.p-r-Item:last-child { + border-bottom: none !important; +} + +.p-r-Item { + display: flex; + border-bottom: 1px solid #eeeeee; + padding: 22px 0px; + justify-content: flex-start; +} + +.boxShandow { + box-shadow: 0px 2px 20px 10px rgba(0, 0, 0, 0.03); +} + +.p-r-photo { + width: 60px; + height: 60px; + border-radius: 50%; + margin-right: 22px; + margin-top: 8px; +} + +.p-r-Infos { + flex: 1; + width: 0; +} + +.p-r-name { + display: flex; + justify-content: space-between; + align-items: center; +} + +.p-r-name > p { + flex: 1; + width: 0; +} + +.p-r-btn { + display: flex; + align-items: center; +} + +.p-r-btn > span { + height: 35px; + line-height: 35px; + border: 1px solid #f4f4f4; + border-radius: 5px; + display: block; + margin-left: 20px; + background-color: #fff; + display: flex; +} + +.p-r-btn > span > a { + display: flex; + align-items: center; + padding: 0px 12px; + background: #ececec; +} + +.p-r-btn > span > a:active { + background: #f4f4f4; +} + +.p-r-btn > span > span { + padding: 0px 8px; +} + +.p-r-tags { + display: flex; + opacity: 1; +} + +.p-r-tags.large > span { + height: 30px; + line-height: 30px; + font-size: 14px; +} + +.p-r-tags > span { + margin-left: 15px; + padding: 0px 10px; + border-radius: 15px; + background: #EBF4FE; + color: #333; + height: 24px; + line-height: 24px; + display: block; + font-size: 12px; + display: flex; +} + +.p-r-tags > span.pariseTag { + background: #FFF3DC; +} + +.p-r-tags.large > span > label { + padding: 0px 12px; +} + +.p-r-tags > span > label { + padding: 0px 8px; +} + +.p-r-tags.large > span > span { + padding: 0px 6px; +} + +.pariseImg { + width: 14px; + height: 12px; + margin-top: 6px; + margin-right: 3px; +} + +.p-r-tags > span > span { + display: block; + background: #fff; + border-left: #efefef; + padding: 0px 4px; + border-radius: 0px 4px 4px 0px; + color: #999; +} + +.p-r-content { + margin-top: 10px; + color: #666; + display: flex; +} + +.p-r-detail > span { + margin-right: 22px; + color: #888; +} + +.p-r-detail > span > label { + color: #999; +} + +.p-r-about { + display: flex; + justify-content: space-between; + flex-wrap: nowrap; + margin-top: 8px; + color: #666; +} + +.spincontent { + height: 400px; +} + +.spinstyle .ant-spin-text { + margin-top: 30px; + color: #888; +} + +/* -----------详情------------ */ +.detailHeader-wrapper { + background-color: #FBFCFF; + border-bottom: 1px solid #e2e2e2; +} + +.headerMenu-wrapper { + display: flex; + flex-direction: row; + cursor: pointer; +} +.headerMenu-wrapper li { + position: relative; + text-align: center; + padding: 0px; +} +.headerMenu-wrapper li > a { + font-size: 14px; + height: 40px; + line-height: 28px; + padding: 0px 20px; + display: block; + color: #666; +} +.headerMenu-wrapper li > a > img { + margin-right: 8px; +} +.headerMenu-wrapper li > a > span.num { + line-height: 24px; + margin-left: 5px; + margin-top: 2px; + font-size: 12px; + float: right; + color: #666 !important; + background-color: rgba(153, 153, 153, 0.13); + border-radius: 50%; + width: 24px; + height: 24px; +} +.headerMenu-wrapper li.active a, .headerMenu-wrapper li.active a i { + color: #466AFF !important; +} +.headerMenu-wrapper li.active::after, .headerMenu-wrapper li:hover::after { + position: absolute; + bottom: 0px; + height: 2px; + background-color: rgba(153, 153, 153, 0.2); + content: ""; + left: 0px; + width: 100%; +} +.headerMenu-wrapper li.active::after { + background-color: #466AFF; +} + +.detail_tag_btn { + height: 34px; + line-height: 32px; + border-radius: 5px; + border: 1px solid #D0D0D0; + display: flex; + align-items: center; + margin-left: 10px; + padding: 0px; + background-color: #FAFBFC; + box-shadow: none; +} +.detail_tag_btn:hover { + background-color: #F3F4F6; +} +.detail_tag_btn .detail_tag_btn_name { + padding: 0px 18px; + min-width: 82px; + text-align: center; +} +.detail_tag_btn .detail_tag_btn_name:hover > span { + color: #333 !important; +} +.detail_tag_btn .detail_tag_btn_name img { + margin-right: 10px; +} +.detail_tag_btn .detail_tag_btn_count { + width: 42px; + text-align: center; + background: #fff; + border-radius: 0px 4px 4px 0px; + height: 100%; + border-left: 1px solid #D0D0D0; +} + +.ant-tooltip { + max-width: fit-content !important; +} + +.files-md { + padding: 20px; +} + +/* 详情-代码 */ +.branch-wrapper { + border: 1px solid #eee; + border-radius: 4px; + display: flex; + align-items: center; + height: 60px; + padding: 0px 30px; + width: 1200px; + margin: 0px auto; + background-color: #fff; + margin-top: 20px; + justify-content: space-between; +} + +.branch-wrapper > a > i { + color: #5091FF; + margin-right: 5px; + cursor: default; +} + +.branch-wrapper a { + display: flex; + align-items: center; + justify-content: center; + text-align: center; + height: 30px; + line-height: 30px; + cursor: pointer; + font-size: 16px; + color: #333333; +} + +.branch-wrapper a > span { + position: relative; + min-height: 20px; + display: block; +} + +.branch-wrapper a.active > span::after { + position: absolute; + content: ""; + bottom: -5px; + width: 30px; + height: 3px; + left: 0px; + background-color: #5091FF; +} + +.gitAddressClone { + margin: 0px 20px 14px 20px !important; + display: flex; + height: 40px; + align-items: center; + border-radius: 4px; + border: 1px solid #eee; + background: #fff; + margin-left: 20px; + position: relative; +} + +.gitAddressClone > span { + display: flex; + line-height: 40px; + height: 40px; + padding: 0px 12px; + cursor: pointer; + align-items: center; +} + +.addressTips { + position: absolute; + font-size: 12px; + color: #FF6E21; + top: -34px; + left: 30px; + background-color: #fff; + border: 1px solid #FE881D; + padding: 0px 5px; + height: 28px; + line-height: 28px; +} + +.addressTips > span { + position: relative; + display: block; +} + +.addressTips > span::before { + box-sizing: content-box; + width: 0px; + height: 0px; + position: absolute; + top: 25px; + left: 50%; + margin-left: -4px; + padding: 0; + border-top: 8px solid #FFFFFF; + border-bottom: 8px solid transparent; + border-left: 8px solid transparent; + border-right: 8px solid transparent; + display: block; + content: ""; + z-index: 12; +} + +.addressTips > span::after { + box-sizing: content-box; + width: 0px; + height: 0px; + position: absolute; + top: 26px; + left: 50%; + margin-left: -4px; + padding: 0; + border-top: 8px solid #FE881D; + border-bottom: 8px solid transparent; + border-left: 8px solid transparent; + border-right: 8px solid transparent; + display: block; + content: ""; + z-index: 11; +} + +.gitAddressClone > span.addressType { + color: #4CACFF; +} + +.gitAddressClone > span:last-child { + border-right: none; +} + +.gitAddressClone > input { + border: none; + outline: none; + padding: 0px 8px; + height: 40px; + line-height: 40px; + border-radius: 0px; + border: 1px solid #eee; + flex: 1; +} + +.wrap-commit-table .ant-table-small > .ant-table-content > .ant-table-body { + margin: 0px; +} + +.wrap-commit-table .ant-table-title { + background-color: #f1f8ff; + padding: 13px 16px !important; +} + +.commitKey { + cursor: pointer; + border: 1px solid #FD7700; + background-color: #FFF3DC; + color: #FD7700 !important; + padding: 0px 12px; + height: 20px; + line-height: 20px; + margin-left: 15px; + border-radius: 18px; + max-width: 100%; +} + +/* 分支 */ +.branchTitle { + padding: 8px 10px; + color: #333; + font-size: 16px; + border-bottom: 1px solid #d9d9d9; +} + +.branchUl li { + display: flex; + flex-wrap: wrap; + align-items: flex-end; + justify-content: space-between; + padding: 20px 0px; + border-bottom: 1px solid #eee; +} + +.branchUl li:last-child { + border-bottom: none; +} + +.operationBtn { + border: 1px solid #f4f4f4; + border-radius: 3px; + padding: 0px 6px; + background-color: #fff; + color: #666 !important; + display: inline-block; +} + +.messages { + max-width: 700px; +} + +.leftPoint { + margin-left: 20px; + position: relative; +} + +.leftPoint::before { + position: absolute; + left: -10px; + top: 8px; + border-radius: 50%; + width: 4px; + height: 4px; + background-color: #dadada; + content: ""; +} + +/* 文件目录、文件内容 */ +.subFileName { + position: relative; + margin-left: 15px; + height: 22px; +} + +.subFileName::before { + position: absolute; + content: "/"; + left: -10px; + top: 0px; + color: #999; + height: 22px; + line-height: 22px; +} + +.addFile { + display: flex; +} + +.addFile a { + display: block; + background-color: rgba(76, 172, 255, 0.8); + color: #fff; + cursor: pointer; + height: 32px; + line-height: 32px; + padding: 0px 10px; +} + +.addFile a:first-child { + border-radius: 4px; +} + +.addFile a:last-child { + /* border-radius: 0px 4px 4px 0px; */ + border-left: 1px solid rgba(247, 247, 247, 0.3); +} + +.addFile a:active { + background-color: #4cacff; +} + +@media screen and (max-width: 750px) { + .list-r-Search { + flex: 1; + } + + .list-left, .list-right { + width: 100%; + padding: 0px; + } +} +@media screen and (max-width: 400px) { + .list-r-Search { + width: 100%; + } + + .headerMenu-wrapper { + flex-direction: column; + width: 100%; + } + + .headerMenu-wrapper li { + width: 100%; + } + + .gitAddressClone { + width: 100%; + margin-left: 0px; + } + + .gitAddressClone > span { + padding: 0px; + } + + .messages { + max-width: 100%; + } +} +.commonBox { + border: 1px solid #ddd; + margin-top: 30px; + border-radius: 4px; +} + +.commonBox .commonBox-title { + padding: 0px 20px; + box-sizing: border-box; + font-size: 16px; + background: #FAFBFC; + /* F1F8FF */ + font-weight: bold; + height: 45px; + line-height: 45px; + border-bottom: 1px solid #d9d9d9; + border-radius: 4px 4px 0px 0px; +} + +.readBox { + border: none; +} +.readBox.commonBox .commonBox-info { + border: 1px solid #D0D0D0; + border-top: none; + border-radius: 0px 0px 4px 4px; + padding: 20px 38px; +} + +.commonBox .commonBox-title.boxTitle { + display: flex; + justify-content: space-between; + height: 55px; + line-height: 55px; + background: #FAFCFF; + border-radius: 4px 4px 0px 0px; + border: 1px solid rgba(42, 97, 255, 0.23); +} + +.synchronism { + display: block; + height: 34px; + line-height: 34px; + padding: 0px 15px; + color: #fff !important; + background-color: #28BD6C; + border-radius: 4px; +} + +.files_info { + cursor: pointer; +} + +.commonBox .commonBox-info { + padding: 20px 15px; +} + +.commonBox-title-read { + vertical-align: middle; + color: #000; + font-size: 14px; +} +.commonBox-title-read:hover { + color: #466AFF; +} + +@media screen and (max-width: 370px) { + .p-r-tags, .p-r-btn { + opacity: 0; + display: none; + } + + .p-r-about { + flex-wrap: wrap; + } + + .commitKey { + margin-right: 0px; + } + + .list-r-Search { + width: 100%; + } +} +.null_data_box { + width: 100%; + border: 1px solid #d4d4d5; + border-radius: 3px; +} + +.title { + font-weight: bold; + background: #f4f4f4; + padding: 10px 15px; + box-sizing: border-box; + border-bottom: 1px solid #d4d4d5; +} + +.item_title { + font-size: 18px; + font-weight: bold; + margin-bottom: 15px; +} + +.item { + padding: 15px; + border-bottom: 1px solid #dededf; +} + +.item:last-child { + border-bottom: none; +} + +.item_title small { + font-weight: 400; + margin-left: 10px; +} + +.item_title small a { + color: #4183c6; +} + +.Markdown { + background: #f7f7f7; + padding: 10px 20px; +} + +.item .gitAddressClone input:focus { + border: 1px solid #2185d0; +} + +.content-file { + margin-top: 8px; +} + +.content-file .CodeMirror { + background-color: #f7f7f7; + border: 1px solid #e4e4e4; + border-radius: 4px; + height: auto; +} + +.content-file.edit .CodeMirror { + background-color: #fff; +} + +.content-file .CodeMirror .CodeMirror-scroll { + min-height: 450px; +} + +.text-center { + text-align: center; +} + +.fork-css { + position: absolute; + left: 0; + top: 50px; + width: 100%; +} + +.color-grey-ccc { + color: #ccc !important; +} + +a.color-grey-ccc:hover { + color: #4cacff !important; +} + +.pull-right { + float: right; +} + +.commitList { + padding: 0px 30px; + min-height: 400px; +} + +.commitList > div { + border-bottom: 1px solid #EEEEEE; + padding: 16px 0px; +} + +.commitList > div:last-child { + border-bottom: none; +} + +/* 标签列表 */ +.div_table { + border: 1px solid #eee; + border-radius: 2px; +} + +.ul_thead { + padding: 0px 30px; + box-sizing: border-box; + background: #FAFAFA; + border-bottom: 1px solid #eee; + height: 50px; + line-height: 50px; +} + +.ul_tbody { + padding: 0px 30px; +} + +.ul_thead li, .ul_tbody li { + display: flex; + align-items: center; + text-align: left; +} + +.ul_tbody li { + padding: 18px 0px; + border-bottom: 1px solid #eee; +} + +.ul_tbody li:last-child { + border-bottom: none; +} + +.ul_thead li > span, .ul_tbody li > span { + width: 20%; + padding-right: 20px; +} + +.ul_thead li > span:nth-child(2), .ul_tbody li > span:nth-child(2) { + flex: 1; +} + +.ul_tbody_third { + display: flex; + flex-direction: column; + align-items: flex-start; + justify-content: left; +} + +.ul_tbody_forth { + text-align: center; + display: flex; + justify-content: center; +} + +.depotNum { + color: #666 !important; +} +.depotNum span:last-child { + color: #333; +} +.depotNum:hover span:last-child { + color: #2A61FF; +} + +/*# sourceMappingURL=list.css.map */ diff --git a/src/forge/Main/list.css.map b/src/forge/Main/list.css.map new file mode 100644 index 000000000..8c8094b90 --- /dev/null +++ b/src/forge/Main/list.css.map @@ -0,0 +1 @@ +{"version":3,"sourceRoot":"","sources":["list.scss"],"names":[],"mappings":";AACA;EAAQ;;;AACR;AACE;AAAA;EAEA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;;;AAIF;AACA;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAIF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EAAsC;;;AACtC;EAAwC;;;AACxC;EACE;EACA;EACA;EACA;EACA;EACA;;;AAIF;AACA;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;;;AAEF;AACA;EACE;EACA;;;AAEF;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;;;AAIN;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;EACA;EACA;;AACA;EACE;;AAEF;EACE;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACE;;;AAEF;EACE;;;AAEF;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAIF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EAAkB;EAAmB;;;AACrC;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;AACA;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;AACA;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;AACE;EACA;;;AAEF;EACE;;;AAKF;EACE;IACE;;;EAEF;IACE;IACA;;;AAIJ;EACE;IACE;;;EAEF;IACE;IACA;;;EAEF;IACE;;;EAEF;IACE;IACA;;;EAEF;IACE;;;EAEF;IACE;;;AAGJ;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;AAAoB;EACpB;EACA;EACA;EACA;EACA;;;AAEF;EACE;;AACA;EACE;EACA;EACA;EACA;;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAGA;EACE;;;AAGJ;EACE;EACA;EACA;;AACA;EACE;;;AAIJ;EACE;IACE;IACA;;;EAEF;IACE;;;EAEF;IACE;;;EAEF;IACE;;;AAGJ;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACA;;;AAEA;EAAc;;;AAEd;EACE;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EAAa;;;AACb;EACE;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EAAY;;;AAEZ;EACE;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;;;AAIF;AACA;EACE;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;;AACA;EACE;;AAEF;EACE","file":"list.css"} \ No newline at end of file diff --git a/src/forge/Main/list.scss b/src/forge/Main/list.scss index c5d011c54..810140715 100644 --- a/src/forge/Main/list.scss +++ b/src/forge/Main/list.scss @@ -627,6 +627,9 @@ vertical-align: middle; color: #666; font-size: 14px; + &:hover{ + color: #466AFF; + } } @media screen and (max-width: 370px){ From 97e6a5d5f221cc9c34e48d7ab1c2188fa897ba7d Mon Sep 17 00:00:00 2001 From: hc1913847458 <1422588487@qq.com> Date: Thu, 2 Sep 2021 10:02:54 +0800 Subject: [PATCH 20/48] issue --- .idea/workspace.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 0d780dd4f..96bd043e4 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,8 +4,17 @@
    ) } @@ -392,7 +392,13 @@ class Index extends Component {
    { current_user && current_user.login && - + 新建 diff --git a/src/forge/New/Index.js b/src/forge/New/Index.js index 50859e302..222782efd 100644 --- a/src/forge/New/Index.js +++ b/src/forge/New/Index.js @@ -155,7 +155,7 @@ class Index extends Component { if (mirror_status === 2 && sessionStorage.newProjectValue) { Modal.warning({ title: '警告', - content: '镜像项目创建失败！请按操作规范重新创建项目！', + content: '项目导入失败！请按操作规范重新创建项目！', }); let newProjectValue = JSON.parse(sessionStorage.newProjectValue); if (newProjectValue) { @@ -195,13 +195,16 @@ class Index extends Component { subMitFrom = () => { this.props.form.validateFieldsAndScroll((err, values) => { - console.log(err); + console.log(values); if (!err) { this.setState({ isSpin: true }) const { projectsType } = this.props.match.params; - const { project_language_id, project_category_id, license_id, ignore_id , owners_id , owners_name } = this.state; + const { + project_language_id, project_category_id, license_id, ignore_id , owners_id , + ignoreFlag,licenseFlag,categoreFlag,languageFlag + } = this.state; const decoderPass = Base64.encode(values.password); const url = (projectsType && projectsType === "mirror") ? "/projects/migrate.json" : "/projects.json"; // 新建项目的时候，暂存数据，如果失败，返回的时候可以重新赋值 @@ -209,10 +212,10 @@ class Index extends Component { axios.post(url, { ...values, auth_password:decoderPass, - project_language_id, - project_category_id, - license_id, - ignore_id, + project_language_id:languageFlag ? project_language_id : undefined, + project_category_id:categoreFlag ? project_category_id : undefined, + license_id:licenseFlag ? license_id : undefined, + ignore_id:ignoreFlag ? ignore_id : undefined, user_id:owners_id }).then((result) => { if (result && result.data.id) { @@ -339,7 +342,7 @@ class Index extends Component { projectsType && projectsType === "mirror" && @@ -358,12 +361,14 @@ class Index extends Component { projectsType && projectsType === "mirror" &&

    - 需要授权验证 - 如果导入项目为私有仓库，则必须填写相应平台正确的用户名和密码

    + 需要授权验证 + 如果导入项目为私有仓库，则必须填写相应平台正确的用户名和密码 +

    { mirrorCheck &&
    用户名 + + )}
    @@ -545,7 +550,7 @@ class Index extends Component { > {getFieldDecorator('project_category', { rules: [{ - required: categoreFlag, message: '请选择大类别', + required: categoreFlag, message: '请选择项目类别', }, { validator: (rule, value, callback) => this.checkId(rule, value, callback, CategoryList, '项目类别') }], @@ -592,7 +597,7 @@ class Index extends Component { 注： 为必填项，否则为选填
    - + 取消
    diff --git a/src/forge/Team/List.jsx b/src/forge/Team/List.jsx index 5eebfc385..ea23ab079 100644 --- a/src/forge/Team/List.jsx +++ b/src/forge/Team/List.jsx @@ -61,14 +61,14 @@ function List(props){
    • ) const menu_new=( - - +
      +
    • {props.history.push(`/projects/deposit/new/${OIdentifier}`)}}>新建项目 - - +
      • +
    • {props.history.push(`/projects/mirror/new/${OIdentifier}`)}}>导入项目 - -
    + + ) return( @@ -81,7 +81,7 @@ function List(props){

    { organizeDetail && organizeDetail.can_create_project ? - + + 新建项目 :""} diff --git a/src/forge/css/index.scss b/src/forge/css/index.scss index 00e46b6f8..a28b4d0a8 100644 --- a/src/forge/css/index.scss +++ b/src/forge/css/index.scss @@ -270,4 +270,16 @@ form{ background-color: #DF0002!important; border-color: #DF0002; color: #fff; +} +.newPopUl{ + li{ + height: 30px; + line-height: 30px; + border-bottom: 1px solid #eee; + min-width: 78px; + text-align: center; + &:last-child{ + border-bottom: none; + } + } } \ No newline at end of file diff --git a/src/forge/users/InfosUser.js b/src/forge/users/InfosUser.js index d6f30ee89..bcfd75ffc 100644 --- a/src/forge/users/InfosUser.js +++ b/src/forge/users/InfosUser.js @@ -114,14 +114,14 @@ class InfosUser extends Component { ); newItem =()=> ( -

    - +
      +
    • {this.props.history.push('/projects/deposit/new')}} >新建项目 - - +
      • +
    • {this.props.history.push('/projects/mirror/new')}}>导入项目 - -
    + + ); @@ -192,6 +192,7 @@ class InfosUser extends Component { trigger={["hover"]} placement="bottom" className="mr50" + overlayClassName="newPopUl" > From 828de5d7708227038b2c09d19cc2678080f1caa5 Mon Sep 17 00:00:00 2001 From: caishi Date: Fri, 10 Sep 2021 15:10:39 +0800 Subject: [PATCH 46/48] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9C=81=E7=95=A5=E6=95=88=E6=9E=9C=E6=B2=A1=E6=9C=89=E7=94=9F?= =?UTF-8?q?=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/users/Team-item.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forge/users/Team-item.jsx b/src/forge/users/Team-item.jsx index a88304099..5efdbe22c 100644 --- a/src/forge/users/Team-item.jsx +++ b/src/forge/users/Team-item.jsx @@ -6,7 +6,7 @@ function TeamItem({item,history}){
    {history.push(`/${item.name}`)}} style={{cursor:"pointer"}}>
    - {item.nickname} + {item.nickname}
    {item.description}
    From 0ffa5e0caeda8c55ccaf73c213436b1b552314e3 Mon Sep 17 00:00:00 2001 From: caishi Date: Fri, 10 Sep 2021 18:13:45 +0800 Subject: [PATCH 47/48] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E9=A1=B5=E9=9D=A2-?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AF=86=E7=A0=81=E4=B8=8D=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=A1=AB=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/New/Index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/forge/New/Index.js b/src/forge/New/Index.js index 222782efd..832f0a1a4 100644 --- a/src/forge/New/Index.js +++ b/src/forge/New/Index.js @@ -155,7 +155,7 @@ class Index extends Component { if (mirror_status === 2 && sessionStorage.newProjectValue) { Modal.warning({ title: '警告', - content: '项目导入失败！请按操作规范重新创建项目！', + content: '项目导入失败！请按操作规范重新导入项目！', }); let newProjectValue = JSON.parse(sessionStorage.newProjectValue); if (newProjectValue) { @@ -386,7 +386,7 @@ class Index extends Component { {getFieldDecorator('password', { rules: [], })( - + )}
    From 8c0757c942ad74bd55f350ee51c247b75baaf67b Mon Sep 17 00:00:00 2001 From: caishi Date: Fri, 10 Sep 2021 18:20:33 +0800 Subject: [PATCH 48/48] =?UTF-8?q?=E5=8A=A0=E7=B2=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Component/Component.scss | 5 ++++- src/forge/Main/Index.scss | 8 +++++++- src/forge/Main/list.scss | 4 +++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/forge/Component/Component.scss b/src/forge/Component/Component.scss index 0845a109e..30a62005c 100644 --- a/src/forge/Component/Component.scss +++ b/src/forge/Component/Component.scss @@ -220,7 +220,10 @@ li.ant-menu-item{ .ant-btn-primary{ color: #fff; background-color: #466AFF; - border-color: #466AFF; + border:none; + &:hover{ + background-color: rgba(70,106,255,0.85); + } } .focusPanelHeadInfo{ padding:14px 16px; diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss index 0062d79ae..1158c38e6 100644 --- a/src/forge/Main/Index.scss +++ b/src/forge/Main/Index.scss @@ -20,6 +20,9 @@ span{ margin-left: 4px; color: #333!important; + &:last-child{ + font-weight: 500; + } } &:hover span,&:hover i{ color: #466AFF!important; @@ -143,7 +146,10 @@ .ant-btn-primary{ color: #fff; background-color: #466AFF; - border-color: #466AFF; + border: none; + &:hover{ + background-color: rgba(70,106,255,0.85); + } } } } diff --git a/src/forge/Main/list.scss b/src/forge/Main/list.scss index 90dd697a5..72c3437e9 100644 --- a/src/forge/Main/list.scss +++ b/src/forge/Main/list.scss @@ -237,7 +237,6 @@ line-height: 24px; display: block; color: #000!important; - font-weight: 500; &> span.num{ line-height: 24px; margin-left: 5px; @@ -260,6 +259,9 @@ left: 0px; width:100%; } + &.active span{ + font-weight: 500; + } &.active a::after{ background-color: #466AFF; }