From 78c963835cc32f56ded72ef39545cecef0d93630 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E5=BF=83=E5=AE=87?= <xyhuang29@outlook.com>
Date: Fri, 27 Oct 2023 08:54:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E4=BD=8E=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=EF=BC=8C=E6=9B=BF=E6=8D=A2replaceAl?=
 =?UTF-8?q?l?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/UrlTool.js                           | 12 ++++++------
 src/managements/jurisdiction/roles/index.jsx    |  2 +-
 src/managements/jurisdiction/userList/index.jsx |  6 +++---
 src/military/competition/myFocus/index.jsx      |  6 +++---
 src/military/task/taskAdmin/index.jsx           |  4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/common/UrlTool.js b/src/common/UrlTool.js
index 02e78ccbd..a9c08a5c3 100644
--- a/src/common/UrlTool.js
+++ b/src/common/UrlTool.js
@@ -280,13 +280,13 @@ export function turnbar(str){
 	let s = str;
   if(s && s.length>0){
 		if(s.indexOf("%")>-1){
-			s = s.replaceAll('%','_25');
+			s = s.replace(/%/g,'_25');
 		}
 		if(s.indexOf("#")>-1){
-			s = s.replaceAll('#','%23');
+			s = s.replace(/#/g,'%23');
 		}
 		if(s.indexOf("/")>-1){
-			s = s.replaceAll('/','%2F');
+			s = s.replace(/\//g,'%2F');
 		}
   }
   return s;
@@ -295,13 +295,13 @@ export function returnbar(str){
 	let s = str;
   if(s && s.length>0){
 		if(str.indexOf("_25")>-1){
-			s = s.replaceAll('_25','%');
+			s = s.replace(/_25/g,'%');
 		}
 		if(s.indexOf("%23")>-1){
-			s = s.replaceAll('%23','#');
+			s = s.replace(/%23/g,'#');
 		}
 		if(s.indexOf("%2F")>-1){
-			s = s.replaceAll('%2F','/');
+			s = s.replace(/%2F/g,'/');
 		}
   }
   return s;
diff --git a/src/managements/jurisdiction/roles/index.jsx b/src/managements/jurisdiction/roles/index.jsx
index 4b2fb375d..05ef51be4 100644
--- a/src/managements/jurisdiction/roles/index.jsx
+++ b/src/managements/jurisdiction/roles/index.jsx
@@ -63,7 +63,7 @@ export default Form.create()(({form}) => {
         title: '添加时间',
         dataIndex: 'createTime',
         render: (text, record) => {
-          text = text && text.replaceAll('-','/').substring(0,16);
+          text = text && text.replace(/-/g,'/').substring(0,16);
           return text || '--'
         }
       },
diff --git a/src/managements/jurisdiction/userList/index.jsx b/src/managements/jurisdiction/userList/index.jsx
index 21159a164..87d5201a2 100644
--- a/src/managements/jurisdiction/userList/index.jsx
+++ b/src/managements/jurisdiction/userList/index.jsx
@@ -42,7 +42,7 @@ export default Form.create()(({form}) => {
         title: '创建时间',
         dataIndex: 'createdOn',
         render: (text, record) => {
-          text = text && text.replaceAll('-','/').substring(0,16);
+          text = text && text.replace(/-/g,'/').substring(0,16);
           return text || '--'
         }
       },
@@ -50,7 +50,7 @@ export default Form.create()(({form}) => {
         title: '最后登录时间',
         dataIndex: 'lastLoginOn',
         render: (text, record) => {
-          text = text && text.replaceAll('-','/').substring(0,16);
+          text = text && text.replace(/-/g,'/').substring(0,16);
           return text || '--'
         }
       },
@@ -64,7 +64,7 @@ export default Form.create()(({form}) => {
             <Select
               mode="multiple"
               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) }}
               style={{ minWidth: 200 }}
               placeholder="请选择角色"
diff --git a/src/military/competition/myFocus/index.jsx b/src/military/competition/myFocus/index.jsx
index 5a239d297..4df6cdd9d 100644
--- a/src/military/competition/myFocus/index.jsx
+++ b/src/military/competition/myFocus/index.jsx
@@ -40,10 +40,10 @@ const MyFocusCompetitions = (props) => {
               }
           }
           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.replaceAll('line-height', '');
+          item.content = item.content.replace(/font-size/g, '');
+          item.content = item.content.replace(/line-height/g, '');
           })
           setList(res.data.data);
         }
diff --git a/src/military/task/taskAdmin/index.jsx b/src/military/task/taskAdmin/index.jsx
index 5ef8137ac..e3718d8b6 100644
--- a/src/military/task/taskAdmin/index.jsx
+++ b/src/military/task/taskAdmin/index.jsx
@@ -162,7 +162,7 @@ export default Form.create()(({ form, showNotification, match, history, state })
           <Popover content={
             <div className='taskPopover'>
               <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>
             </div>
           }>
@@ -179,7 +179,7 @@ export default Form.create()(({ form, showNotification, match, history, state })
         dataIndex: 'publishedAt',
         width: "8%",
         render: (text, record) => {
-          text = text && text.replaceAll('-', '/').substring(0, 16);
+          text = text && text.replace(/-/g, '/').substring(0, 16);
           return text || '--'
         }
       },