From 7c9a26b55fc6e0d18f368c6db8299a70ac9707d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Mon, 9 Mar 2020 14:51:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/question/component/Contentpart.js | 50 +------------------
 .../modules/question/component/Listjihe.js    | 14 ++++--
 2 files changed, 12 insertions(+), 52 deletions(-)

diff --git a/public/react/src/modules/question/component/Contentpart.js b/public/react/src/modules/question/component/Contentpart.js
index 69a58bc97..24ec50293 100644
--- a/public/react/src/modules/question/component/Contentpart.js
+++ b/public/react/src/modules/question/component/Contentpart.js
@@ -232,39 +232,6 @@ class Contentpart extends Component {
 
 		}
 
-		const content = (
-			<div className="questiontypes" style={{
-				width: '93px',
-				height: '200px',
-			}}>
-				<p className="questiontype " onClick={() => this.props.setitem_types(null)}>全部</p>
-				<p className="questiontypeheng" ></p>
-				<p className="questiontype " onClick={() => this.props.setitem_types("SINGLE")}>单选题</p>
-				<p className="questiontypeheng" ></p>
-				<p className="questiontype " onClick={() => this.props.setitem_types("MULTIPLE")}>多选题</p>
-				<p className="questiontypeheng"></p>
-				<p className="questiontype " onClick={() => this.props.setitem_types("JUDGMENT")}>判断题</p>
-				<p className="questiontypeheng"></p>
-				<p className="questiontype " onClick={() => this.props.setitem_types("PROGRAM")}>编程题</p>
-				<p className="questiontypeheng"></p>
-
-			</div>
-		);
-		const contents = (
-			<div className="questiontypes" style={{
-				width: '93px',
-				height: '120px',
-			}}>
-				<p className="questiontype " onClick={() => this.props.setoj_status(null)}>全部</p>
-				<p className="questiontypeheng"></p>
-				<p className="questiontype " onClick={() => this.props.setoj_status(0)}>未发布</p>
-				<p className="questiontypeheng"></p>
-				<p className="questiontype " onClick={() => this.props.setoj_status(1)}>已发布</p>
-				<p className="questiontypeheng"></p>
-			</div>
-		);
-
-
 		// console.log("Contentpart.js");
 		// console.log(this.props.current_user.professional_certification);
 
@@ -381,22 +348,6 @@ class Contentpart extends Component {
 								:""
 							 }
 
-							 {item_type==="PROGRAM"?
-								 defaultActiveKey===0||defaultActiveKey==="0"?
-									<Popover getPopupContainer={trigger => trigger.parentNode}  placement="bottom" trigger="hover" content={contents}   onVisibleChange={()=>this.props.handleVisibleChange(true)}>
-										<div className=" sortinxdirection mr30">
-
-											<div className="subjecttit">
-												全部
-											</div>
-											<i className="iconfont icon-sanjiaoxing-down font-12 lg ml7 icondowncolor"></i>
-										</div>
-									</Popover>
-									:
-									"":""
-							 }
-
-
 							 {
 								this.props.Isitapopup&&this.props.Isitapopup==="true"?
 									<Search
@@ -455,6 +406,7 @@ class Contentpart extends Component {
 							: this.props.Contentdata.items.map((object, index) => {
 							return (
 								<Listjihe {...this.state} {...this.props}
+													defaultActiveKeys={defaultActiveKeys}
 													Datacountbool={this.props.Datacountbool}
 													Datacount={this.props.Datacount}
 													Isitapopup={this.props.Isitapopup}
diff --git a/public/react/src/modules/question/component/Listjihe.js b/public/react/src/modules/question/component/Listjihe.js
index da94ae000..36a83fbbf 100644
--- a/public/react/src/modules/question/component/Listjihe.js
+++ b/public/react/src/modules/question/component/Listjihe.js
@@ -358,9 +358,17 @@ class Listjihe extends Component {
 					</div>
 					{
 						items.item_type==="PROGRAM"?
-							<a onClick={()=>this.seturls(`/problems/${items.program_attr.identifier}/edit`)}  className="ml10 flex1 mt2">
-							<div  style={{wordBreak: "break-word",fontWeight:"bold"}} dangerouslySetInnerHTML={{__html: markdownToHTML(items&&items.name).replace(/▁/g, "▁▁▁")}}></div>
-							</a>
+							(
+								this.props.defaultActiveKeys&&this.props.defaultActiveKeys==="0"?
+									<a onClick={()=>this.seturls(`/problems/${items.program_attr.identifier}/edit`)}  className="ml10 flex1 mt2 xiaoshou">
+										<div  style={{wordBreak: "break-word",fontWeight:"bold"}} dangerouslySetInnerHTML={{__html: markdownToHTML(items&&items.name).replace(/▁/g, "▁▁▁")}}></div>
+									</a>
+									:
+									<p   className="ml10 flex1 mt2 xiaoshout">
+										<div  style={{wordBreak: "break-word",fontWeight:"bold"}} dangerouslySetInnerHTML={{__html: markdownToHTML(items&&items.name).replace(/▁/g, "▁▁▁")}}></div>
+									</p>
+							)
+
 						:
 							<div className="ml10 flex1 markdown-body mt2" style={{wordBreak: "break-word",fontWeight:"bold"}}>