创客任务上传附件放开到150 #597

Merged
Eeeros merged 3 commits from Eeeros/forgeplus-react:pre_dev_military into pre_dev_military 2023-12-19 15:45:48 +08:00
7 changed files with 1432 additions and 1432 deletions

2832
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -280,13 +280,13 @@ export function turnbar(str){
let s = str; let s = str;
if(s && s.length>0){ if(s && s.length>0){
if(s.indexOf("%")>-1){ if(s.indexOf("%")>-1){
s = s.replaceAll('%','_25'); s = s.replace(/%/g,'_25');
} }
if(s.indexOf("#")>-1){ if(s.indexOf("#")>-1){
s = s.replaceAll('#','%23'); s = s.replace(/#/g,'%23');
} }
if(s.indexOf("/")>-1){ if(s.indexOf("/")>-1){
s = s.replaceAll('/','%2F'); s = s.replace(/\//g,'%2F');
} }
} }
return s; return s;
@ -295,13 +295,13 @@ export function returnbar(str){
let s = str; let s = str;
if(s && s.length>0){ if(s && s.length>0){
if(str.indexOf("_25")>-1){ if(str.indexOf("_25")>-1){
s = s.replaceAll('_25','%'); s = s.replace(/_25/g,'%');
} }
if(s.indexOf("%23")>-1){ if(s.indexOf("%23")>-1){
s = s.replaceAll('%23','#'); s = s.replace(/%23/g,'#');
} }
if(s.indexOf("%2F")>-1){ if(s.indexOf("%2F")>-1){
s = s.replaceAll('%2F','/'); s = s.replace(/%2F/g,'/');
} }
} }
return s; return s;

View File

@ -63,7 +63,7 @@ export default Form.create()(({form}) => {
title: '添加时间', title: '添加时间',
dataIndex: 'createTime', dataIndex: 'createTime',
render: (text, record) => { render: (text, record) => {
text = text && text.replaceAll('-','/').substring(0,16); text = text && text.replace(/-/g,'/').substring(0,16);
return text || '--' return text || '--'
} }
}, },

View File

@ -42,7 +42,7 @@ export default Form.create()(({form}) => {
title: '创建时间', title: '创建时间',
dataIndex: 'createdOn', dataIndex: 'createdOn',
render: (text, record) => { render: (text, record) => {
text = text && text.replaceAll('-','/').substring(0,16); text = text && text.replace(/-/g,'/').substring(0,16);
return text || '--' return text || '--'
} }
}, },
@ -50,7 +50,7 @@ export default Form.create()(({form}) => {
title: '最后登录时间', title: '最后登录时间',
dataIndex: 'lastLoginOn', dataIndex: 'lastLoginOn',
render: (text, record) => { render: (text, record) => {
text = text && text.replaceAll('-','/').substring(0,16); text = text && text.replace(/-/g,'/').substring(0,16);
return text || '--' return text || '--'
} }
}, },
@ -64,7 +64,7 @@ export default Form.create()(({form}) => {
<Select <Select
mode="multiple" mode="multiple"
className="column-select" className="column-select"
defaultValue={(text && text.substring(1, text.length-1).replaceAll(' ','').split(',')) || []} defaultValue={(text && text.substring(1, text.length-1).replace(/ /g,'').split(',')) || []}
onChange={(key) => { changeRole(key, record.id) }} onChange={(key) => { changeRole(key, record.id) }}
style={{ minWidth: 200 }} style={{ minWidth: 200 }}
placeholder="请选择角色" placeholder="请选择角色"

View File

@ -40,10 +40,10 @@ const MyFocusCompetitions = (props) => {
} }
} }
if(item.start_at && item.upload_date){ if(item.start_at && item.upload_date){
item.comTime = item.start_at.substring(0, 10).replaceAll('-', '.') + '-' + item.upload_date.substring(0, 10).replaceAll('-', '.') item.comTime = item.start_at.substring(0, 10).replace(/-/g, '.') + '-' + item.upload_date.substring(0, 10).replace(/-/g, '.')
} }
item.content = item.content.replaceAll('font-size', ''); item.content = item.content.replace(/font-size/g, '');
item.content = item.content.replaceAll('line-height', ''); item.content = item.content.replace(/line-height/g, '');
}) })
setList(res.data.data); setList(res.data.data);
} }

View File

@ -162,7 +162,7 @@ export default Form.create()(({ form, showNotification, match, history, state })
<Popover content={ <Popover content={
<div className='taskPopover'> <div className='taskPopover'>
<p><span>任务名称:</span>{text}</p> <p><span>任务名称:</span>{text}</p>
<p className='mt5'><span>截稿时间:</span>{record.collectingEndTime && record.collectingEndTime.replaceAll('-', '/').substring(0, 16) || '--'}</p> <p className='mt5'><span>截稿时间:</span>{record.collectingEndTime && record.collectingEndTime.replace(/-/g, '/').substring(0, 16) || '--'}</p>
<p className='mt5'><span>稿件数:</span>{record.papersCount || '--'}</p> <p className='mt5'><span>稿件数:</span>{record.papersCount || '--'}</p>
</div> </div>
}> }>
@ -179,7 +179,7 @@ export default Form.create()(({ form, showNotification, match, history, state })
dataIndex: 'publishedAt', dataIndex: 'publishedAt',
width: "8%", width: "8%",
render: (text, record) => { render: (text, record) => {
text = text && text.replaceAll('-', '/').substring(0, 16); text = text && text.replace(/-/g, '/').substring(0, 16);
return text || '--' return text || '--'
} }
}, },

View File

@ -432,7 +432,7 @@ export default Form.create()(forwardRef(({ current_user, form, showNotification,
<Upload <Upload
className="commentStyle" className="commentStyle"
load={UploadFunc} load={UploadFunc}
size={50} size={150}
showNotification={showNotification} showNotification={showNotification}
actionUrl={httpUrl} actionUrl={httpUrl}
fileList={fileList} fileList={fileList}