Nigel
/
forgeplus-react
forked from Gitlink/forgeplus-react
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

上传合并蔡世修改

This commit is contained in:
何童崇 2021-09-16 17:09:15 +08:00
parent 44dc10ff8c a1c8440fe2
commit d7242f0fa1
22 changed files with 193 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
public/css/iconfont.css
View File

@ -1,8 +1,8 @@
@font-face {
font-family: "iconfont"; /* Project id 2340181 */
src: url('iconfont.woff2?t=1630894072659') format('woff2'),
url('iconfont.woff?t=1630894072659') format('woff'),
url('iconfont.ttf?t=1630894072659') format('truetype');
src: url('iconfont.woff2?t=1631773579834') format('woff2'),
url('iconfont.woff?t=1631773579834') format('woff'),
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";
}

2
public/css/iconfont.js
View File

File diff suppressed because one or more lines are too long

91
public/css/iconfont.json
View File

@ -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": "个人资料",

BIN
public/css/iconfont.ttf
View File

Binary file not shown.

BIN
public/css/iconfont.woff
View File

Binary file not shown.

BIN
public/css/iconfont.woff2
View File

Binary file not shown.

4
public/js/editormd/editormd.min.js vendored
View File

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

2
src/forge/Main/CoderRootTag.js
View File

@ -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>

2
src/forge/Merge/MessageCount.js
View File

@ -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

6
src/forge/Merge/merge.js
View File

@ -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"]}

13
src/forge/Merge/merge_form.js
View File

@ -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>
)}

2
src/forge/Order/Detail.js
View File

@ -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">

6
src/forge/Order/MilepostDetail.js
View File

@ -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>

2
src/forge/Order/Nav.js
View File

@ -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>
)

4
src/forge/Order/Tags.js
View File

@ -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>

8
src/forge/Order/order.js
View File

@ -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"]}

2
src/forge/Settings/Index.js
View File

@ -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>

28
src/forge/Settings/Setting.js
View File

@ -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,21 @@ class Setting extends Component {
</Form.Item>
<Form.Item label="项目类别">
{getFieldDecorator("project_category_id", {
rules: [
{
required: true,
message: "请选择大类别",
},
],
})(<Select>{CategoryList}</Select>)}
rules: [],
})(
<Select>
{CategoryList}
</Select>
)}
</Form.Item>
<Form.Item label="项目语言">
{getFieldDecorator("project_language_id", {
rules: [
{
required: true,
message: "请选择项目语言",
},
],
})(<Select>{LanguageList}</Select>)}
rules: [],
})(
<Select>
{LanguageList}
</Select>
)}
</Form.Item>
<Form.Item label="项目导航">
{getFieldDecorator("project_units", {

4
src/forge/Settings/Webhooks/New.jsx
View File

@ -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>

8
src/forge/Source/AddTag.jsx
View File

@ -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>

2
src/forge/Source/Index.jsx
View File

@ -141,7 +141,7 @@ function Index(props){
params:{id,tagName:tag}
}).then(result=>{
if(result && result.data){
props.showNotification("标签删除成功");
props.showNotification("标记删除成功");
setIsSpin(true);
getData();
}

2
src/forge/comments/comments.js
View File

@ -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 }}