From 6cfb56e6ca239477144545d00c12fdac143bc8ac Mon Sep 17 00:00:00 2001
From: caishi <c_15243705227@sina.com>
Date: Thu, 16 Sep 2021 16:26:51 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=87=E7=AD=BE=20to=20=E6=A0=87?=
 =?UTF-8?q?=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Main/CoderRootTag.js      | 2 +-
 src/forge/Merge/merge.js            | 6 +++---
 src/forge/Merge/merge_form.js       | 6 +++---
 src/forge/Order/MilepostDetail.js   | 6 +++---
 src/forge/Order/Nav.js              | 2 +-
 src/forge/Order/Tags.js             | 4 ++--
 src/forge/Order/order.js            | 8 ++++----
 src/forge/Settings/Setting.js       | 2 --
 src/forge/Settings/Webhooks/New.jsx | 4 ++--
 src/forge/Source/AddTag.jsx         | 8 ++++----
 src/forge/Source/Index.jsx          | 2 +-
 src/forge/comments/comments.js      | 2 +-
 12 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/src/forge/Main/CoderRootTag.js b/src/forge/Main/CoderRootTag.js
index da1fa96d1..484836213 100644
--- a/src/forge/Main/CoderRootTag.js
+++ b/src/forge/Main/CoderRootTag.js
@@ -34,7 +34,7 @@ export default (( props, { projectDetail }) => {
             <div className="div_table">
               <ul className="ul_thead">
                 <li>
-                  <span className="flex1">标签名</span>
+                  <span className="flex1">标记名</span>
                   <span>提交信息</span>
                   <span className="ul_tbody_forth">下载</span>
                 </li>
diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js
index 1e1285e4e..399c9bd91 100644
--- a/src/forge/Merge/merge.js
+++ b/src/forge/Merge/merge.js
@@ -43,7 +43,7 @@ class merge extends Component {
       //设置选择高亮
       openselect: 1,
       closeselect: undefined,
-      issue_tag_ids: "标签",
+      issue_tag_ids: "标记",
       fixed_version_ids: "里程碑",
       assigned_to_ids: "审查人员",
       paix: "排序",
@@ -198,7 +198,7 @@ class merge extends Component {
     });
     this.setState({
       status_type: type,
-      issue_tag_ids: "标签",
+      issue_tag_ids: "标记",
       fixed_version_ids: "里程碑",
       assigned_to_ids: "审查人员",
       paix: "排序",
@@ -321,7 +321,7 @@ class merge extends Component {
                 className="topWrapperSelect"
                 overlay={this.renderMenu(
                   issue_chosen && issue_chosen.issue_tag,
-                  "标签",
+                  "标记",
                   "issue_tag_id"
                 )}
                 trigger={["click"]}
diff --git a/src/forge/Merge/merge_form.js b/src/forge/Merge/merge_form.js
index 5df9794bb..f7cb57c51 100644
--- a/src/forge/Merge/merge_form.js
+++ b/src/forge/Merge/merge_form.js
@@ -301,7 +301,7 @@ class MergeForm extends Component {
                       initialValue: assigned_to_id,
                     })(
                       <Select placeholder="未选择审查人员" showSearch>
-                        <Option key={0} value={""}>未选择审查人员</Option>
+                        {/* <Option key={0} value={""}>未选择审查人员</Option> */}
                         {this.renderSelect(members)}
                       </Select>
                     )}
@@ -316,7 +316,7 @@ class MergeForm extends Component {
                         }
                         showSearch
                       >
-                        <Option key={0} value={""}>{issue_versions && issue_versions.length > 0? "未选择里程碑": "请添加里程碑"}</Option>
+                        {/* <Option key={0} value={""}>{issue_versions && issue_versions.length > 0? "未选择里程碑": "请添加里程碑"}</Option> */}
                         {this.renderSelect(issue_versions)}
                       </Select>
                     )}
@@ -331,7 +331,7 @@ class MergeForm extends Component {
                         }
                         showSearch
                       >
-                        <Option key={0} value={""}>{issue_tags && issue_tags.length > 0 ? "未选择标记" : "请在仓库设置里添加标记"}</Option>
+                        {/* <Option key={0} value={""}>{issue_tags && issue_tags.length > 0 ? "未选择标记" : "请在仓库设置里添加标记"}</Option> */}
                         {this.renderSelect(issue_tags)}
                       </Select>
                     )}
diff --git a/src/forge/Order/MilepostDetail.js b/src/forge/Order/MilepostDetail.js
index c1c8bdd06..0f5d191e0 100644
--- a/src/forge/Order/MilepostDetail.js
+++ b/src/forge/Order/MilepostDetail.js
@@ -40,7 +40,7 @@ class MilepostDetail extends Component {
       issue_type: undefined,
       status_type: '1',
       //设置选择高亮
-      issue_tag_ids: '标签',
+      issue_tag_ids: '标记',
       tracker_ids: '类型',
       author_ids: '发布人',
       assigned_to_ids: '负责人',
@@ -194,7 +194,7 @@ class MilepostDetail extends Component {
       done_ratio : undefined,
       status_id: undefined,
       assigned_to_id: undefined,
-      issue_tag_ids: '标签',
+      issue_tag_ids: '标记',
       tracker_ids: '类型',
       author_ids: '发布人',
       assigned_to_ids: '负责人',
@@ -254,7 +254,7 @@ class MilepostDetail extends Component {
               </ul>
               <ul className="topWrapper_select">
                 <li>
-                  <Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.issue_tag, '标签', 'issue_tag_id')} trigger={['click']} placement="bottomCenter">
+                  <Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.issue_tag, '标记', 'issue_tag_id')} trigger={['click']} placement="bottomCenter">
                     <span>{this.state.issue_tag_ids}<Icon type="caret-down" className="ml5" /></span>
                   </Dropdown>
                 </li>
diff --git a/src/forge/Order/Nav.js b/src/forge/Order/Nav.js
index b5d196d61..3f5a20c59 100644
--- a/src/forge/Order/Nav.js
+++ b/src/forge/Order/Nav.js
@@ -7,7 +7,7 @@ class Nav extends Component{
     const { projectsId , owner } = this.props.match.params;
     return(
       <p className="topWrapper_nav">
-        <NavLink activeClassName="active" className="issue-type-button" to={`/${owner}/${projectsId}/issues/tags`}>标签</NavLink>
+        <NavLink activeClassName="active" className="issue-type-button" to={`/${owner}/${projectsId}/issues/tags`}>标记</NavLink>
         <NavLink activeClassName="active" className="issue-type-button" to={`/${owner}/${projectsId}/milestones`}>里程碑</NavLink>
       </p>
     )
diff --git a/src/forge/Order/Tags.js b/src/forge/Order/Tags.js
index 174891aa6..eeff8db28 100644
--- a/src/forge/Order/Tags.js
+++ b/src/forge/Order/Tags.js
@@ -324,11 +324,11 @@ class Tags extends Component {
             data && data.issue_tags && data.issue_tags.length > 0 ?
             <div>
               <div className="topWrapper">
-                <span>共{data && data.issue_tags_count}个标签</span>
+                <span>共{data && data.issue_tags_count}个标记</span>
                 <ul className="topWrapper_select">
                   <li>
                     <Dropdown className="topWrapperSelect" overlay={this.menu()} trigger={['click']} placement="bottomCenter">
-                      <span>标签<Icon type="caret-down" className="ml5" /></span>
+                      <span>标记<Icon type="caret-down" className="ml5" /></span>
                     </Dropdown>
                   </li>
                 </ul>
diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js
index 290bb03e3..7275c759a 100644
--- a/src/forge/Order/order.js
+++ b/src/forge/Order/order.js
@@ -39,7 +39,7 @@ class order extends Component {
       search_count: undefined,
       issue_type: undefined,
       status_type: "1", // 默认显示开启中的
-      issue_tag_ids: "标签",
+      issue_tag_ids: "标记",
       tracker_ids: "类型",
       author_ids: "发布人",
       assigned_to_ids: "负责人",
@@ -58,7 +58,7 @@ class order extends Component {
       select_params: {
         assigned_to_id: undefined, // 负责人
         author_id: undefined, // 发布人
-        issue_tag_id: undefined, // 标签
+        issue_tag_id: undefined, // 标记
         tracker_id: undefined, //类型
         done_ratio: undefined, // 完成度
         status_id: undefined, // 优先级
@@ -257,7 +257,7 @@ class order extends Component {
       author_id: undefined,
       assigned_to_id: undefined,
       status_type: type,
-      issue_tag_ids: "标签",
+      issue_tag_ids: "标记",
       tracker_ids: "类型",
       author_ids: "发布人",
       assigned_to_ids: "负责人",
@@ -677,7 +677,7 @@ class order extends Component {
                       className="topWrapperSelect"
                       overlay={this.renderMenu(
                         issue_chosen && issue_chosen.issue_tag,
-                        "标签",
+                        "标记",
                         "issue_tag_id"
                       )}
                       trigger={["click"]}
diff --git a/src/forge/Settings/Setting.js b/src/forge/Settings/Setting.js
index 01b5bcd6c..413152e51 100644
--- a/src/forge/Settings/Setting.js
+++ b/src/forge/Settings/Setting.js
@@ -298,7 +298,6 @@ class Setting extends Component {
                   rules: [],
                 })(
                   <Select>
-                    <Option key={0} value={""}>未选择项目类别</Option>
                     {CategoryList}
                   </Select>
                 )}
@@ -308,7 +307,6 @@ class Setting extends Component {
                   rules: [],
                 })(
                 <Select>
-                  <Option key={0} value={""}>未选择项目语言</Option>
                   {LanguageList}
                 </Select>
                   )}
diff --git a/src/forge/Settings/Webhooks/New.jsx b/src/forge/Settings/Webhooks/New.jsx
index d90934f04..22b3899d7 100644
--- a/src/forge/Settings/Webhooks/New.jsx
+++ b/src/forge/Settings/Webhooks/New.jsx
@@ -258,11 +258,11 @@ function New({ form , match , showNotification , history }) {
                 </span> */}
                 <span>
                   <Checkbox value="create">创建</Checkbox>
-                  <span>创建分支或标签</span>
+                  <span>创建分支或标记</span>
                 </span>
                 <span>
                   <Checkbox value="delete">删除</Checkbox>
-                  <span>删除分支或标签</span>
+                  <span>删除分支或标记</span>
                 </span>
               </div>
               <p className="color-grey-3 mt10 mb10">合并请求事件</p>
diff --git a/src/forge/Source/AddTag.jsx b/src/forge/Source/AddTag.jsx
index 8b94b5a60..8bcf35f88 100644
--- a/src/forge/Source/AddTag.jsx
+++ b/src/forge/Source/AddTag.jsx
@@ -21,7 +21,7 @@ function AddTag({form , visible , onCancel ,onOk}){
   };
   return(
     <Modal 
-      title={"新增标签"}
+      title={"新增标记"}
       closable={false}
       visible={visible}
       onCancel={onCancel}
@@ -32,11 +32,11 @@ function AddTag({form , visible , onCancel ,onOk}){
       centered
     >
       <Form {...layout}>
-        <Form.Item label="标签名">
+        <Form.Item label="标记名">
           {getFieldDecorator("tagName",{
-            rules:[{required:true,message:"请输入标签名"}]
+            rules:[{required:true,message:"请输入标记名"}]
           })(
-            <Input placeholder="请输入标签名" width="200px" autoComplete="off" />
+            <Input placeholder="请输入标记名" width="200px" autoComplete="off" />
           )}
         </Form.Item>
       </Form>
diff --git a/src/forge/Source/Index.jsx b/src/forge/Source/Index.jsx
index e158d7fba..1a57074ae 100644
--- a/src/forge/Source/Index.jsx
+++ b/src/forge/Source/Index.jsx
@@ -141,7 +141,7 @@ function Index(props){
       params:{id,tagName:tag}
     }).then(result=>{
       if(result && result.data){
-        props.showNotification("标签删除成功");
+        props.showNotification("标记删除成功");
         setIsSpin(true);
         getData();
       }
diff --git a/src/forge/comments/comments.js b/src/forge/comments/comments.js
index 7de4bdbd2..228f57cad 100644
--- a/src/forge/comments/comments.js
+++ b/src/forge/comments/comments.js
@@ -198,7 +198,7 @@ class comments extends Component {
             </span>
             <span>
               {item.value && item.value.length > 0 ? (
-                item.detail === "标签" ? (
+                (item.detail === "标签" || item.detail === "标记") ? (
                   <span
                     className="issue-tag-show"
                     style={{ background: item.value[0].color }}