diff --git a/src/forge/Information/Pages/headerPageZone1.jsx b/src/forge/Information/Pages/headerPageZone1.jsx
index dc46b6508..c1893c61c 100644
--- a/src/forge/Information/Pages/headerPageZone1.jsx
+++ b/src/forge/Information/Pages/headerPageZone1.jsx
@@ -16,12 +16,12 @@ import ra from '../img/ra.png'
import title from '../img/title.png'
import { Link } from 'react-router-dom';
import shijian from '../img/shijian.png';
-import axios from 'axios';
import Nodata from '../../Nodata';
import Projects from '../Component/projects';
import Contributor from '../Component/contributor';
import Partner from '../Component/partner';
import '../indexZone1.scss'
+import { getProjectsLists, getPartnerList, getHomePageList, gethomePageDocList } from '../api'
function HeaderPage(props){
const [ projectList , setProjectList ] = useState(undefined);
@@ -65,13 +65,12 @@ function HeaderPage(props){
getProjectList();
getNewsList();
getPersonList();
- getPartnerList();
+ getPartner();
}
},[id])
function getPersonList(){
- const url = `${httpUrl}/zone/open/${id}/member/homePageList`;
- axios.get(url).then(result=>{
+ getHomePageList(id).then(result=>{
if(result){
setPersonList(result.data.rows);
}
@@ -79,19 +78,14 @@ function HeaderPage(props){
}
function getNewsList(){
- const url = `${httpUrl}/cms/doc/open/zone/${id}/homePageDocList`;
- axios.get(url).then(result=>{
+ gethomePageDocList(id).then(result=>{
if(result){
setNewsList(result.data.rows);
}
}).catch(error=>{})
}
-
function getProjectList(){
- const url = `${httpUrl}/zone/open/${id}/project/list`;
- axios.get(url,{params:{
- isHomepage:1
- }}).then(result=>{
+ getProjectsLists(id,{ isHomepage:1 }).then(result=>{
if(result){
if (result.data.rows.length < 3) {
setProjectList(result.data.rows)
@@ -99,12 +93,11 @@ function HeaderPage(props){
setProjectList([...result.data.rows, {}]);
}
}
- }).catch(console.error())
+ }).catch(error=>{})
}
- function getPartnerList(){
- const url = `${httpUrl}/zone/open/${id}/partners/list`;
- axios.get(url).then(result=>{
+ function getPartner(){
+ getPartnerList(id).then(result => {
if(result){
const array = result.data.rows;
const newArray = [];
@@ -119,7 +112,7 @@ function HeaderPage(props){
}
setParterList(newArray);
}
- }).catch(error=>{})
+ })
}
return(
diff --git a/src/forge/Information/api.js b/src/forge/Information/api.js
index fb4daeb67..cf6b9e548 100644
--- a/src/forge/Information/api.js
+++ b/src/forge/Information/api.js
@@ -46,6 +46,13 @@ export function getAllList(id,params){
})
}
+export function getPartnerList(id){
+ return fetch({
+ url:`/zone/open/${id}/partners/list`,
+ method: 'get',
+ })
+}
+
/**领域资讯 */
export function getNewsAllList(id,params){
return fetch({
@@ -83,6 +90,7 @@ export function delNewsMyList(id){
/**开源项目 */
export function getProjectsLists(id,params){
+ console.log('==========================project/list==================================')
return fetch({
url:`/zone/open/${id}/project/list`,
method: 'get',
diff --git a/src/forge/Information/fetch.js b/src/forge/Information/fetch.js
index 29cc15d28..9d09ac6d5 100644
--- a/src/forge/Information/fetch.js
+++ b/src/forge/Information/fetch.js
@@ -6,10 +6,19 @@ function beforeFetch(actionUrl){
axios.defaults.withCredentials = true;
}
- const service = axios.create({
+ const config = {
baseURL: actionUrl,
timeout: 1800000, // 请求超时时间
- });
+ }
+ if (deptId) {
+ // 用于权限区分
+ config.headers = {
+ 'Dept-Id': deptId
+ }
+ }
+ console.log(config);
+
+ const service = axios.create(config);
service.interceptors.response.use(
response => {
@@ -38,6 +47,8 @@ function beforeFetch(actionUrl){
}
let settings = localStorage.chromesetting&&JSON.parse(localStorage.chromesetting);
let actionUrl = settings && settings.common.zone +'/api';
+const deptId = sessionStorage.getItem('deptId')
+console.log(deptId)
const service = beforeFetch(actionUrl);
export const httpUrl = actionUrl;
diff --git a/src/forge/Information/index.jsx b/src/forge/Information/index.jsx
index 599fdbd01..b4172ede6 100644
--- a/src/forge/Information/index.jsx
+++ b/src/forge/Information/index.jsx
@@ -119,7 +119,7 @@ function Index(props){
return
}
let data = result.data.data;
- if (data.template) {
+ if (data && data.template) {
setTemp( data.template )
}
setData(data);
@@ -129,6 +129,8 @@ function Index(props){
getAdminUrl(data.id);
getRole(data.id)
}
+ // 存储deptId，所有专区接口header带上
+ sessionStorage.setItem('deptId', data.deptId)
setSeoMeta(`${data.name},`, data.name, data.subTitle, `/zone/${deptId}`)
}
}).catch(console.error())
From 3f342b826dfc59418c86ef57a0d5242251317a69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E5=BF=83=E5=AE=87?=
Date: Thu, 11 Jan 2024 15:50:29 +0800
Subject: [PATCH 05/50] =?UTF-8?q?=E9=89=B4=E6=9D=83=E4=BD=93=E7=B3=BB?=
=?UTF-8?q?=E9=87=8D=E6=9E=84=20cont.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Information/Pages/headerPage.jsx | 1 -
src/forge/Information/api.js | 1 -
src/forge/Information/fetch.js | 20 ++++++++++----------
3 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/forge/Information/Pages/headerPage.jsx b/src/forge/Information/Pages/headerPage.jsx
index 756bd47b9..11711d107 100644
--- a/src/forge/Information/Pages/headerPage.jsx
+++ b/src/forge/Information/Pages/headerPage.jsx
@@ -27,7 +27,6 @@ function HeaderPage(props){
function getPersonList(){
getHomePageList(id).then(result=>{
- console.log(123124125);
if(result){
setPersonList(result.data.rows);
}
diff --git a/src/forge/Information/api.js b/src/forge/Information/api.js
index cf6b9e548..c9cc48673 100644
--- a/src/forge/Information/api.js
+++ b/src/forge/Information/api.js
@@ -90,7 +90,6 @@ export function delNewsMyList(id){
/**开源项目 */
export function getProjectsLists(id,params){
- console.log('==========================project/list==================================')
return fetch({
url:`/zone/open/${id}/project/list`,
method: 'get',
diff --git a/src/forge/Information/fetch.js b/src/forge/Information/fetch.js
index 9d09ac6d5..f74c1faef 100644
--- a/src/forge/Information/fetch.js
+++ b/src/forge/Information/fetch.js
@@ -5,21 +5,23 @@ function beforeFetch(actionUrl){
if (window.location.href.indexOf('localhost') < 0) {
axios.defaults.withCredentials = true;
}
-
const config = {
baseURL: actionUrl,
timeout: 1800000, // 请求超时时间
}
- if (deptId) {
- // 用于权限区分
- config.headers = {
- 'Dept-Id': deptId
- }
- }
- console.log(config);
const service = axios.create(config);
+ service.interceptors.request.use(request => {
+ let deptId = sessionStorage.getItem('deptId')
+
+ if (deptId) {
+ // 用于权限区分
+ request.headers['Dept-Id'] = deptId
+ }
+ return request
+ })
+
service.interceptors.response.use(
response => {
const res = response||{};
@@ -47,8 +49,6 @@ function beforeFetch(actionUrl){
}
let settings = localStorage.chromesetting&&JSON.parse(localStorage.chromesetting);
let actionUrl = settings && settings.common.zone +'/api';
-const deptId = sessionStorage.getItem('deptId')
-console.log(deptId)
const service = beforeFetch(actionUrl);
export const httpUrl = actionUrl;
From 181c80005d18e0a77ec9919fe4a4cb3553984a10 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 12 Jan 2024 08:37:03 +0800
Subject: [PATCH 06/50] issue #4110 #4073
---
src/forge/Team/New.jsx | 10 ++++++---
src/forge/users/Echart/Calendar.jsx | 32 ++++++++++++++++++++++++++++-
2 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/src/forge/Team/New.jsx b/src/forge/Team/New.jsx
index db4bf1451..c2b5775c4 100644
--- a/src/forge/Team/New.jsx
+++ b/src/forge/Team/New.jsx
@@ -68,8 +68,12 @@ export default Form.create()(
if(!value){
callback();
}
- if(value && !value.match(/^[a-zA-Z0-9][a-zA-Z0-9_-]{3,19}$/)){
- callback("只能使用以字母、数字开头，包含字母、数字、下划线、横杠等，长度4到20个字符");
+ let reg = /^[a-zA-Z0-9]+([-_.][a-zA-Z0-9]+)*$/
+ if(value && !value.match(reg)){
+ callback("只能以数字或字母开头，仅支持横杠、下划线、点三种符号，不允许符号连续排列，长度4-50个字符");
+ }
+ if(value && (value.length<4 || value.length>50)){
+ callback("只能以数字或字母开头，仅支持横杠、下划线、点三种符号，不允许符号连续排列，长度4-50个字符12");
}
callback();
}
@@ -90,7 +94,7 @@ export default Form.create()(
],
)}
{helper(
diff --git a/src/forge/users/Echart/Calendar.jsx b/src/forge/users/Echart/Calendar.jsx
index c7daad665..8aafa0c32 100644
--- a/src/forge/users/Echart/Calendar.jsx
+++ b/src/forge/users/Echart/Calendar.jsx
@@ -90,6 +90,26 @@ function Calendar({ userLogin , time , chooseTime }) {
}
function Init(data,max,flag) {
+ let piecesList = [];
+ let number = 1;
+ if(max>500){
+ number = 6;
+ }else if(max<=500 && max>200){
+ number = 5;
+ }else if(max<=200 && max>100){
+ number = 4;
+ }else if(max<=100 && max>=30){
+ number = 3;
+ }else if(max<30 && max>=10){
+ number = 2;
+ }else{
+ number = 1;
+ }
+ for(var i=number;i>0;i--){
+ let gt = {gt: parseInt(max/number*(i-1)+1,0), lte: parseInt(max/number*i,0)};
+ piecesList.push(gt);
+ }
+
var huan_val = document.getElementById("Calendar");
var myEcharts = echarts.init(huan_val);
let option = {
@@ -111,7 +131,17 @@ function Calendar({ userLogin , time , chooseTime }) {
inRange:{
color:flag ? ['#fafafa', '#216e39'] :['#fff','#fff']
},
- show:flag
+ show:flag,
+ pieces: [
+ // {gt: parseInt(max/5*4,0), lte: max},
+ // {gt: parseInt(max/5*3,0), lte: parseInt(max/5*4,0)},
+ // {gt: parseInt(max/5*2,0), lte: parseInt(max/5*3,0)},
+ // {gt: parseInt(max/5*1,0), lte: parseInt(max/5*2,0)},
+ // {gt: 1, lte: parseInt(max/5*1,0)},
+ ...piecesList,
+ {max: 1,label:"0"}
+ ],
+ itemGap:25
},
calendar: {
top: 50,
From 8e22504b8f643e2659233ba45b1f80ce24297d64 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Sat, 13 Jan 2024 09:59:14 +0800
Subject: [PATCH 07/50] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=A4=B4=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Component/Component.scss | 2 +-
src/forge/Team/Index.scss | 15 +++++
src/forge/Team/New.jsx | 49 +++++++++++----
src/forge/Team/Setting/TeamSettingCommon.jsx | 27 +++++++--
src/forge/Team/images/white.jpg | Bin 0 -> 2993 bytes
src/forge/users/Avatar/Index.jsx | 59 +++++++++++--------
src/forge/users/Avatar/Index.scss | 16 ++++-
7 files changed, 122 insertions(+), 46 deletions(-)
create mode 100644 src/forge/Team/images/white.jpg
diff --git a/src/forge/Component/Component.scss b/src/forge/Component/Component.scss
index 5c461c941..92c973d24 100644
--- a/src/forge/Component/Component.scss
+++ b/src/forge/Component/Component.scss
@@ -23,7 +23,7 @@ li.ant-menu-item{
border:1px solid #eee;
.img{
margin-right: 20px;
- width: 190px;
+ max-width: 190px;
height: 90px;
border:1px solid rgba(238,238,238,1);
display: flex;
diff --git a/src/forge/Team/Index.scss b/src/forge/Team/Index.scss
index 5b21e05d7..4e1f5f672 100644
--- a/src/forge/Team/Index.scss
+++ b/src/forge/Team/Index.scss
@@ -561,4 +561,19 @@
align-items: center;
justify-content: center;
}
+}
+
+.plusCard{
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ width: 104px;
+ height: 104px;
+ margin-bottom: 8px;
+ text-align: center;
+ vertical-align: top;
+ background-color: #fafafa;
+ border: 1px dashed #d9d9d9;
+ border-radius: 4px;
+ cursor: pointer;
}
\ No newline at end of file
diff --git a/src/forge/Team/New.jsx b/src/forge/Team/New.jsx
index c2b5775c4..5ec95b5e8 100644
--- a/src/forge/Team/New.jsx
+++ b/src/forge/Team/New.jsx
@@ -1,22 +1,26 @@
import React,{ forwardRef , useCallback , useEffect, useState } from 'react';
import './Index.scss';
-import { Form , Input , Radio , Checkbox , Button } from "antd";
-import UploadImage from './Component/UploadImage';
+import { Form , Input , Icon , Checkbox , Button } from "antd";
+// import UploadImage from './Component/UploadImage';
+import AvatarModal from '../users/Avatar/Index';
import axios from 'axios';
+
+
const port = window.location.port;
const hostname = window.location.hostname;
export default Form.create()(
forwardRef(({ form , showNotification , history, showNpsModal })=>{
const [ image , setImage ] = useState(undefined);
const [ imageFlag , setImageFlag] = useState(false);
+ const [ imageVisible , setIamgeVisible ] = useState(false);
const [ descNum ,setDescNum ] = useState(0);
const { getFieldDecorator, validateFields , setFieldsValue } = form;
- const radioStyle = {
- display: 'block',
- height: '30px',
- lineHeight: '30px',
- }
+ // const radioStyle = {
+ // display: 'block',
+ // height: '30px',
+ // lineHeight: '30px',
+ // }
const helper = useCallback(
(label, name, rules, widget, isRequired = true) => (
@@ -78,8 +82,17 @@ export default Form.create()(
callback();
}
+ function saveImgFunc(imgUrl){
+ setImage(imgUrl);
+ setIamgeVisible(false);
+ }
+
return(
+ {
+ imageVisible &&
+
{setIamgeVisible(false)}} saveFunc={saveImgFunc}/>
+ }