同上-影响后端接口，暂不上线

public/css/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2340181 */
-  src: url('iconfont.woff2?t=1630632852475') format('woff2'),
+  src: url('iconfont.woff2?t=1631773579834') format('woff2'),
-       url('iconfont.woff?t=1630632852475') format('woff'),
+       url('iconfont.woff?t=1631773579834') format('woff'),
-       url('iconfont.ttf?t=1630632852475') format('truetype');
+       url('iconfont.ttf?t=1631773579834') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,58 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-xiangmubiaoqian:before {
+  content: "\e8da";
+}
+
+.icon-icon:before {
+  content: "\e8ce";
+}
+
+.icon-tar:before {
+  content: "\e8cf";
+}
+
+.icon-a-fuzhi2:before {
+  content: "\e8d0";
+}
+
+.icon-fujian1:before {
+  content: "\e8d1";
+}
+
+.icon-a-bianji1:before {
+  content: "\e8d2";
+}
+
+.icon-banbenicon:before {
+  content: "\e8d3";
+}
+
+.icon-shanchuicon2:before {
+  content: "\e8d4";
+}
+
+.icon-a-lajitong_icon3x:before {
+  content: "\e8d5";
+}
+
+.icon-xialaanniu2:before {
+  content: "\e8d6";
+}
+
+.icon-xiazai-icon:before {
+  content: "\e8d7";
+}
+
+.icon-master_icon1:before {
+  content: "\e8d8";
+}
+
+.icon-shangchuanicon:before {
+  content: "\e8d9";
+}
+
 .icon-gerenziliao1:before {
   content: "\e8c7";
 }

public/css/iconfont.json

@@ -5,6 +5,97 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "24378423",
+      "name": "项目标签",
+      "font_class": "xiangmubiaoqian",
+      "unicode": "e8da",
+      "unicode_decimal": 59610
+    },
+    {
+      "icon_id": "24368060",
+      "name": "icon",
+      "font_class": "icon",
+      "unicode": "e8ce",
+      "unicode_decimal": 59598
+    },
+    {
+      "icon_id": "24368061",
+      "name": "tar",
+      "font_class": "tar",
+      "unicode": "e8cf",
+      "unicode_decimal": 59599
+    },
+    {
+      "icon_id": "24289113",
+      "name": "复制 (2)",
+      "font_class": "a-fuzhi2",
+      "unicode": "e8d0",
+      "unicode_decimal": 59600
+    },
+    {
+      "icon_id": "24289114",
+      "name": "附件",
+      "font_class": "fujian1",
+      "unicode": "e8d1",
+      "unicode_decimal": 59601
+    },
+    {
+      "icon_id": "24289115",
+      "name": "编 辑",
+      "font_class": "a-bianji1",
+      "unicode": "e8d2",
+      "unicode_decimal": 59602
+    },
+    {
+      "icon_id": "24289116",
+      "name": "版本icon",
+      "font_class": "banbenicon",
+      "unicode": "e8d3",
+      "unicode_decimal": 59603
+    },
+    {
+      "icon_id": "24289117",
+      "name": "删除icon",
+      "font_class": "shanchuicon2",
+      "unicode": "e8d4",
+      "unicode_decimal": 59604
+    },
+    {
+      "icon_id": "24289118",
+      "name": "垃圾桶_icon@3x",
+      "font_class": "a-lajitong_icon3x",
+      "unicode": "e8d5",
+      "unicode_decimal": 59605
+    },
+    {
+      "icon_id": "24289119",
+      "name": "下拉按钮",
+      "font_class": "xialaanniu2",
+      "unicode": "e8d6",
+      "unicode_decimal": 59606
+    },
+    {
+      "icon_id": "24289120",
+      "name": "下载-icon",
+      "font_class": "xiazai-icon",
+      "unicode": "e8d7",
+      "unicode_decimal": 59607
+    },
+    {
+      "icon_id": "24289121",
+      "name": "master_icon",
+      "font_class": "master_icon1",
+      "unicode": "e8d8",
+      "unicode_decimal": 59608
+    },
+    {
+      "icon_id": "24289122",
+      "name": "上传icon",
+      "font_class": "shangchuanicon",
+      "unicode": "e8d9",
+      "unicode_decimal": 59609
+    },
     {
       "icon_id": "24059956",
       "name": "个人资料",

public/js/editormd/editormd.min.js

@@ -3321,7 +3321,7 @@
                     });
                     // " + editormd.urls.atLinkBase + "" + $2 + "
                     text = text.replace(atLinkReg, function ($1, $2) {
-                        return "<span title=\"&#64;" + $2 + "\" class=\"at-link\">" + $1 + "</span>";
+                        return "<span title=\"&#64;" + $2 + "\" class=\"at-link\"> " + $1 + " </span>";
                     }).replace(/_#_&#64;_#_/g, "@");
                 }
 

src/forge/Merge/MessageCount.js

@@ -424,7 +424,7 @@ class MessageCount extends Component {
                           </span>
                         </span>
                         <span className="ml25">
-                          <span className="color-grey-8">标签：</span>
+                          <span className="color-grey-8">标记：</span>
                           <span className="color-grey-3">
                             {data.issue.issue_tags &&
                             data.issue.issue_tags.length > 0

src/forge/Merge/merge_form.js

@@ -300,7 +300,8 @@ class MergeForm extends Component {
                     {getFieldDecorator("assigned_to_id", {
                       initialValue: assigned_to_id,
                     })(
-                      <Select placeholder="审查人员" showSearch>
+                      <Select placeholder="未选择审查人员" showSearch>
+                        <Option key={0} value={""}>未选择审查人员</Option>
                         {this.renderSelect(members)}
                       </Select>
                     )}
@@ -311,12 +312,11 @@ class MergeForm extends Component {
                     })(
                       <Select
                         placeholder={
-                          issue_versions && issue_versions.length > 0
+                          issue_versions && issue_versions.length > 0? "未选择里程碑": "请添加里程碑"
-                            ? "未选择里程碑"
-                            : "请添加里程碑"
                         }
                         showSearch
                       >
+                        <Option key={0} value={""}>{issue_versions && issue_versions.length > 0? "未选择里程碑": "请添加里程碑"}</Option>
                         {this.renderSelect(issue_versions)}
                       </Select>
                     )}
@@ -327,12 +327,11 @@ class MergeForm extends Component {
                     })(
                       <Select
                         placeholder={
-                          issue_tags && issue_tags.length > 0
+                          issue_tags && issue_tags.length > 0 ? "未选择标记" : "请在仓库设置里添加标记"
-                            ? "未选择标签"
-                            : "请在仓库设置里添加标记"
                         }
                         showSearch
                       >
+                        <Option key={0} value={""}>{issue_tags && issue_tags.length > 0 ? "未选择标记" : "请在仓库设置里添加标记"}</Option>
                         {this.renderSelect(issue_tags)}
                       </Select>
                     )}

src/forge/Order/Detail.js

@@ -315,7 +315,7 @@ class Detail extends Component {
                 </span>
               </p>
               <p className="grid-item-left pb15">
-                <span className="issue_detail_info">标签:</span>
+                <span className="issue_detail_info">标记:</span>
                 <span>
                   {data && data.issue_tags ? (
                     <span className="grid-item">

src/forge/Settings/Index.js

@@ -102,7 +102,7 @@ class Index extends Component {
             >
               <p>
                 <Link to={`/${owner}/${projectsId}/settings/labels`} className="w-100">
-                  <i className="iconfont icon-biaoqian3 font-18 mr10 color-grey-6"></i>
+                  <i className="iconfont icon-xiangmubiaoqian font-18 mr10 color-grey-6"></i>
                   项目标记
                 </Link>
               </p>

src/forge/Settings/Setting.js

@@ -262,7 +262,7 @@ class Setting extends Component {
                       message: "请输入项目名称",
                     },
                   ],
-                })(<Input placeholder="请输入项目名称" />)}
+                })(<Input placeholder="请输入项目名称" maxLength={"50"}/>)}
               </Form.Item>
               <div className="df" style={{ alignItems: "center" }}>
                 <span className="mr20 mb15 font-16">可见性</span>
@@ -295,23 +295,23 @@ class Setting extends Component {
               </Form.Item>
               <Form.Item label="项目类别">
                 {getFieldDecorator("project_category_id", {
-                  rules: [
+                  rules: [],
-                    {
+                })(
-                      required: true,
+                  <Select>
-                      message: "请选择大类别",
+                    <Option key={0} value={""}>未选择项目类别</Option>
-                    },
+                    {CategoryList}
-                  ],
+                  </Select>
-                })(<Select>{CategoryList}</Select>)}
+                )}
               </Form.Item>
               <Form.Item label="项目语言">
                 {getFieldDecorator("project_language_id", {
-                  rules: [
+                  rules: [],
-                    {
+                })(
-                      required: true,
+                <Select>
-                      message: "请选择项目语言",
+                  <Option key={0} value={""}>未选择项目语言</Option>
-                    },
+                  {LanguageList}
-                  ],
+                </Select>
-                })(<Select>{LanguageList}</Select>)}
+                  )}
               </Form.Item>
               <Form.Item label="项目导航">
                 {getFieldDecorator("project_units", {