From 6b3ca627c4334a761c149dda2cdd3ba4261a321b Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 29 Nov 2019 11:41:56 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E8=B0=83=E8=AF=95=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/users/shixun_service.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/services/users/shixun_service.rb b/app/services/users/shixun_service.rb
index 9460d3a88..da64abd5f 100644
--- a/app/services/users/shixun_service.rb
+++ b/app/services/users/shixun_service.rb
@@ -43,6 +43,7 @@ class Users::ShixunService
     # 只有自己或者管理员才有过滤筛选及查看全部状态下实训功能
     Rails.logger.info("self_or_admin?: #{self_or_admin?}")
     Rails.logger.info("user: #{user.id}")
+    Rails.logger.info("User.current.id : #{User.current.id }")
     if self_or_admin?
       relations = relations.where.not(status: -1)
       status_filter(relations)

From c3b5126d8a27def4df8e22ea88920b03e7bdde17 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 29 Nov 2019 11:45:32 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/users/shixun_service.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/services/users/shixun_service.rb b/app/services/users/shixun_service.rb
index da64abd5f..ffe51ff92 100644
--- a/app/services/users/shixun_service.rb
+++ b/app/services/users/shixun_service.rb
@@ -44,6 +44,7 @@ class Users::ShixunService
     Rails.logger.info("self_or_admin?: #{self_or_admin?}")
     Rails.logger.info("user: #{user.id}")
     Rails.logger.info("User.current.id : #{User.current.id }")
+    Rails.logger.info("relations : #{relations.map(&:id) }")
     if self_or_admin?
       relations = relations.where.not(status: -1)
       status_filter(relations)
@@ -72,6 +73,8 @@ class Users::ShixunService
              when 'published' then 2
              when 'closed'    then 3
              end
+    Rails.logger.info("######status: #{status}")
+    Rails.logger.info("######relations: #{relations.map(&:id}")
     relations = relations.where(status: status) if status
     relations
   end

From 6c7d88248b9b76ca6cac7c528058222d576f6d4d Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 29 Nov 2019 11:45:52 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/users/shixun_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/users/shixun_service.rb b/app/services/users/shixun_service.rb
index ffe51ff92..999cc435a 100644
--- a/app/services/users/shixun_service.rb
+++ b/app/services/users/shixun_service.rb
@@ -74,7 +74,7 @@ class Users::ShixunService
              when 'closed'    then 3
              end
     Rails.logger.info("######status: #{status}")
-    Rails.logger.info("######relations: #{relations.map(&:id}")
+    Rails.logger.info("######relations: #{relations.map(&:id)}")
     relations = relations.where(status: status) if status
     relations
   end

From 43e70b8063e002acb4618908d067ee59a1ec3558 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 29 Nov 2019 11:52:23 +0800
Subject: [PATCH 4/9] 1

---
 app/services/users/shixun_service.rb | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/services/users/shixun_service.rb b/app/services/users/shixun_service.rb
index 999cc435a..aeaac6a2c 100644
--- a/app/services/users/shixun_service.rb
+++ b/app/services/users/shixun_service.rb
@@ -41,10 +41,6 @@ class Users::ShixunService
 
   def user_policy_filter(relations)
     # 只有自己或者管理员才有过滤筛选及查看全部状态下实训功能
-    Rails.logger.info("self_or_admin?: #{self_or_admin?}")
-    Rails.logger.info("user: #{user.id}")
-    Rails.logger.info("User.current.id : #{User.current.id }")
-    Rails.logger.info("relations : #{relations.map(&:id) }")
     if self_or_admin?
       relations = relations.where.not(status: -1)
       status_filter(relations)
@@ -73,8 +69,6 @@ class Users::ShixunService
              when 'published' then 2
              when 'closed'    then 3
              end
-    Rails.logger.info("######status: #{status}")
-    Rails.logger.info("######relations: #{relations.map(&:id)}")
     relations = relations.where(status: status) if status
     relations
   end

From e802b89aa45eccd9a5fa34e8833131e586bbd22d Mon Sep 17 00:00:00 2001
From: tangjiang <465264938@qq.com>
Date: Fri, 29 Nov 2019 18:03:34 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20quill=20=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=99=A8=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/developer/quillEditor/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/developer/quillEditor/index.js b/public/react/src/modules/developer/quillEditor/index.js
index da8fda7d1..57fd9f2a4 100644
--- a/public/react/src/modules/developer/quillEditor/index.js
+++ b/public/react/src/modules/developer/quillEditor/index.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-25 09:46:03
  * @LastEditors: tangjiang
- * @LastEditTime: 2019-11-29 14:45:27
+ * @LastEditTime: 2019-11-29 15:04:12
  */
 import 'quill/dist/quill.core.css';
 import 'quill/dist/quill.bubble.css';

From 62ba1af749500f8075db7a724d3b563d91ef6c5d Mon Sep 17 00:00:00 2001
From: tangjiang <465264938@qq.com>
Date: Fri, 29 Nov 2019 18:04:28 +0800
Subject: [PATCH 6/9] update editor config

---
 .../modules/page/component/TPICodeMirror.js   | 16 ++++++++---
 .../modules/page/component/TPICodeSetting.js  | 25 +++++++++++++++--
 .../page/component/monaco/TPIMonaco.css       |  4 +--
 .../page/component/monaco/TPIMonaco.js        | 27 +++++++++++++------
 4 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/public/react/src/modules/page/component/TPICodeMirror.js b/public/react/src/modules/page/component/TPICodeMirror.js
index 86f705478..9bfb714d4 100644
--- a/public/react/src/modules/page/component/TPICodeMirror.js
+++ b/public/react/src/modules/page/component/TPICodeMirror.js
@@ -33,13 +33,15 @@ function getModeByMirrorName(mirror_name) {
     return mode;
 }
 const _extraKeys = {"Alt-/": "autocomplete"};
-function createCMOptions(mirror_name) {
+function createCMOptions(mirror_name, theme) {
     let mode = getModeByMirrorName(mirror_name)
 
     let cmOptions = {
         lineNumbers: true,
         mode: mode,
-        theme: "railscasts",
+        // theme: "railscasts",
+        // theme: "vs-dark",
+        theme: theme,
         indentUnit:4,
         matchBrackets: true,
         autoRefresh: true,
@@ -97,6 +99,7 @@ class TPICodeMirror extends Component {
 		super(props)
 		this.state = {
             cmFontSize: fromStore('cmFontSize', 16),
+            cmCodeMode: fromStore('cmCodeMode', 'vs-dark'),
             autoCompleteSwitch: fromStore('autoCompleteSwitch', true),
 		}
 	}
@@ -114,7 +117,7 @@ class TPICodeMirror extends Component {
         } 
     }
 	componentDidMount() {
-        let cmOptions = createCMOptions(this.props.mirror_name)
+        let cmOptions = createCMOptions(this.props.mirror_name, this.state.cmCodeMode)
         extend_editor = window.CodeMirror.fromTextArea(window.$('#extend-challenge-file-edit')[0]
         	, cmOptions);
 
@@ -241,6 +244,12 @@ class TPICodeMirror extends Component {
         this.setState({ cmFontSize: value });
     } 
 
+    onCodeModeChange = (value) => {
+        toStore('cmCodeMode', value);
+        this.setState({ cmCodeMode: value });
+        window.monaco.editor.setTheme(value);
+    }
+
 	render() {
 		const { repositoryCode, showSettingDrawer, settingDrawerOpen } = this.props;
 		const { cmFontSize } = this.state;
@@ -259,6 +268,7 @@ class TPICodeMirror extends Component {
                 >
                     <TPICodeSetting {...this.props} {...this.state} 
                         onFontSizeChange={this.onFontSizeChange}
+                        onCodeModeChange={this.onCodeModeChange}
                         onAutoCompleteSwitchChange={this.onAutoCompleteSwitchChange}
                          ></TPICodeSetting>
                 </Drawer>
diff --git a/public/react/src/modules/page/component/TPICodeSetting.js b/public/react/src/modules/page/component/TPICodeSetting.js
index 51a9f390c..7f7e66698 100644
--- a/public/react/src/modules/page/component/TPICodeSetting.js
+++ b/public/react/src/modules/page/component/TPICodeSetting.js
@@ -18,12 +18,13 @@ class TPICodeSetting extends Component {
 
 	render() {
 		const { autoCompleteSwitch, onAutoCompleteSwitchChange, onFontSizeChange 
-			, cmFontSize,
+			, cmFontSize, cmCodeMode,
+			onCodeModeChange,
 			shixun } = this.props;
 		const task_pass = shixun.task_pass
 		const forbid_copy = shixun.forbid_copy
 		const test_set_permission = shixun.test_set_permission
-		
+		console.log('==========', cmCodeMode);
 	    return (
     	  	<div className="ide-settings--content">
 			  	<style>{`
@@ -54,6 +55,25 @@ class TPICodeSetting extends Component {
 	    	  				</div>
 	    	  			</div>
 	    	  		</div>*/}
+							<div className="-layout-h -center -justify-between">
+								<div className="ide-settings--item-key">显示模式</div>
+								<div className="ide-settings--item-value">
+									<div className="select -view-flat -value">
+	    	  					<div className="-layout-v -start">
+	    	  						<div className="select--wrapper -layout-h -center -justify" >
+													<Select 
+														style={{ width: '120px' }}
+														value={cmCodeMode}
+														onChange={onCodeModeChange}
+													>
+														<Option value={'vs'}>白色背景</Option>
+														<Option value={'vs-dark'}>黑色背景</Option>
+							          	</Select>
+	    	  						</div>
+	    	  					</div>
+	    	  				</div>
+								</div>
+							</div>
 	    	  		<div className="-layout-h -center -justify-between">
 	    	  			<div className="ide-settings--item-key">字体大小</div>
 	    	  			<div className="ide-settings--item-value">
@@ -61,6 +81,7 @@ class TPICodeSetting extends Component {
 	    	  					<div className="-layout-v -start">
 	    	  						<div className="select--wrapper -layout-h -center -justify" >
 							          	<Select
+														style={{ width: '120px' }}
 							          		value={cmFontSize}
 							          		onChange={onFontSizeChange}>
 	    	  								<Option value={12}>12px</Option>
diff --git a/public/react/src/modules/page/component/monaco/TPIMonaco.css b/public/react/src/modules/page/component/monaco/TPIMonaco.css
index d940ed9af..75fe4ae8a 100644
--- a/public/react/src/modules/page/component/monaco/TPIMonaco.css
+++ b/public/react/src/modules/page/component/monaco/TPIMonaco.css
@@ -93,7 +93,7 @@
 .monaco-editor .monaco-editor-hover code { background-color: rgba(10, 10, 10, 0.4); }
 .monaco-editor .goto-definition-link { color: #4e94ce !important; }
 
-.mtk1 { color: #d4d4d4 !important; }
+/* .mtk1 { color: #d4d4d4 !important; }
 .mtk2 { color: #1e1e1e !important; }
 .mtk3 { color: #cc6666 !important; }
 .mtk4 { color: #9cdcfe !important; }
@@ -116,7 +116,7 @@
 .mtk21 { color: #4f76ac !important; }
 .mtk22 { color: #3dc9b0 !important; }
 .mtk23 { color: #74b0df !important; }
-.mtk24 { color: #4864aa !important; }
+.mtk24 { color: #4864aa !important; } */
 .mtki { font-style: italic; }
 .mtkb { font-weight: bold; }
 .mtku { text-decoration: underline; text-underline-position: under; }
diff --git a/public/react/src/modules/page/component/monaco/TPIMonaco.js b/public/react/src/modules/page/component/monaco/TPIMonaco.js
index 59cb5ce35..a5bd96e16 100644
--- a/public/react/src/modules/page/component/monaco/TPIMonaco.js
+++ b/public/react/src/modules/page/component/monaco/TPIMonaco.js
@@ -17,10 +17,11 @@ import * as monaco from 'monaco-editor'
 
 import { fromStore, toStore } from 'educoder'
 import './TPIMonacoConfig'
+import { isThisSecond } from 'date-fns';
 
 // https://microsoft.github.io/monaco-editor/playground.html#customizing-the-appearence-exposed-colors
 monaco.editor.defineTheme('myCoolTheme', {
-      base: 'vs-dark',
+      base: 'vs', // vs、vs-dark、hc-black
       inherit: true,
       rules: [       
         { token: 'green', background: 'FF0000', foreground: '00FF00', fontStyle: 'italic'},
@@ -213,11 +214,13 @@ class TPIMonaco extends Component {
         loadMonacoResouce();
 		this.state = {
             cmFontSize: fromStore('cmFontSize', 16),
+            cmCodeMode: fromStore('cmCodeMode', 'vs-dark'),
             autoCompleteSwitch: fromStore('autoCompleteSwitch', true),
-		}
+        }
 	}
     
 	componentDidUpdate(prevProps, prevState, snapshot) {
+        console.log('++++++++++++++', prevState, this.state);
         const { mirror_name } = this.props
         const editor_monaco = this.editor_monaco;
         if (editor_monaco && !_.isEqual(prevProps.mirror_name, mirror_name)) {
@@ -243,7 +246,6 @@ class TPIMonaco extends Component {
                 editor_monaco.setValue(this.props.repositoryCode)
             }
             // 代码没变也需要layout，可能从命令行自动切回了代码tab
-            editor_monaco.layout();
 
             // Clears the editor's undo history.
             // TODO
@@ -290,11 +292,12 @@ class TPIMonaco extends Component {
                 language: lang,
                 // language: 'css',
 
-                // theme: "vs-dark",
-                theme: "myCoolTheme",
+                // theme: "vs",
+                theme: this.state.cmCodeMode,
+                // theme: 'myCoolTheme',
                 insertSpaces: false,
-                fontSize: this.state.cmFontSize
-                
+                fontSize: this.state.cmFontSize,
+                // theme: this.state.cdCodeMode
             });
 
             window.editor_monaco = editor;
@@ -368,10 +371,17 @@ class TPIMonaco extends Component {
     }
     onFontSizeChange = (value) => {
         toStore('cmFontSize', value)
+        this.setState({ cmFontSize: value });
         this.editor_monaco.updateOptions({fontSize: value})
+    }
 
-        this.setState({ cmFontSize: value });
+    onCodeModeChange = (value) => {
+        toStore('cmCodeMode', value);
+        this.setState({ cmCodeMode: value });
+        window.monaco.editor.setTheme(value);
     }
+
+
     onAutoCompleteSwitchChange = () => {
 
     }
@@ -393,6 +403,7 @@ class TPIMonaco extends Component {
                 >
                     <TPICodeSetting {...this.props} {...this.state} 
                         onFontSizeChange={this.onFontSizeChange}
+                        onCodeModeChange={this.onCodeModeChange}
                         onAutoCompleteSwitchChange={this.onAutoCompleteSwitchChange}
                          ></TPICodeSetting>
                 </Drawer>

From 6c52dad3209c9eb201e44ea741d01e75c13af1d3 Mon Sep 17 00:00:00 2001
From: tangjiang <465264938@qq.com>
Date: Fri, 29 Nov 2019 18:09:01 +0800
Subject: [PATCH 7/9] delete console.log

---
 public/react/src/modules/page/component/TPICodeSetting.js   | 1 -
 public/react/src/modules/page/component/monaco/TPIMonaco.js | 1 -
 2 files changed, 2 deletions(-)

diff --git a/public/react/src/modules/page/component/TPICodeSetting.js b/public/react/src/modules/page/component/TPICodeSetting.js
index 7f7e66698..10ed976ae 100644
--- a/public/react/src/modules/page/component/TPICodeSetting.js
+++ b/public/react/src/modules/page/component/TPICodeSetting.js
@@ -24,7 +24,6 @@ class TPICodeSetting extends Component {
 		const task_pass = shixun.task_pass
 		const forbid_copy = shixun.forbid_copy
 		const test_set_permission = shixun.test_set_permission
-		console.log('==========', cmCodeMode);
 	    return (
     	  	<div className="ide-settings--content">
 			  	<style>{`
diff --git a/public/react/src/modules/page/component/monaco/TPIMonaco.js b/public/react/src/modules/page/component/monaco/TPIMonaco.js
index a5bd96e16..519125f93 100644
--- a/public/react/src/modules/page/component/monaco/TPIMonaco.js
+++ b/public/react/src/modules/page/component/monaco/TPIMonaco.js
@@ -220,7 +220,6 @@ class TPIMonaco extends Component {
 	}
     
 	componentDidUpdate(prevProps, prevState, snapshot) {
-        console.log('++++++++++++++', prevState, this.state);
         const { mirror_name } = this.props
         const editor_monaco = this.editor_monaco;
         if (editor_monaco && !_.isEqual(prevProps.mirror_name, mirror_name)) {

From 7f2795a5a8f596009d9478316a602f3a05c7f84a Mon Sep 17 00:00:00 2001
From: tangjiang <465264938@qq.com>
Date: Fri, 29 Nov 2019 19:50:39 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/developer/DeveloperHome.js    | 142 ++++++++++--------
 public/react/src/modules/developer/index.scss |   4 +
 .../modules/developer/studentStudy/index.js   |  11 +-
 public/react/src/redux/actions/index.js       |   4 +-
 public/react/src/redux/actions/ojForUser.js   |  33 ++--
 public/react/src/redux/actions/ojForm.js      |   4 +-
 6 files changed, 114 insertions(+), 84 deletions(-)

diff --git a/public/react/src/modules/developer/DeveloperHome.js b/public/react/src/modules/developer/DeveloperHome.js
index 9746fe4cc..646e21704 100644
--- a/public/react/src/modules/developer/DeveloperHome.js
+++ b/public/react/src/modules/developer/DeveloperHome.js
@@ -15,6 +15,7 @@ import actions from '../../redux/actions';
 import MultipTags from './components/multiptags';
 import { Link } from 'react-router-dom';
 import CONST from '../../constants';
+import { withRouter } from 'react-router';
 
 const {tagBackground, diffText} = CONST;
 const { Search } = Input;
@@ -96,66 +97,67 @@ const testMaps = {
   }
 }
 
-/**
- * 表格列
- */
-const options = {
-  title: '操作',
-  key: 'action',
-  fixed: 'right',
-  width: 100,
-  render: (text, record) => (
-    <span>
-      <Button type="primary">
-        <Link to={`/problems/${record.identifier}/edit`}>编辑</Link>
-      </Button>
-    </span>
-  ),
-}
-const columns = [
-  {
-    title: '标题',
-    dataIndex: 'name',
-    render: (name, record) => <Link style={{ color: '#459be5' }} to={`/myproblems/${record.identifier}`}>{name}</Link>
-  },
-  {
-    title: '分类',
-    dataIndex: 'category',
-    width: '20%',
-    align: 'center',
-    render: (category) => <span>{category ? testMaps['category'][+category] : '-'}</span>
-  },
-  {
-    title: '难度',
-    dataIndex: 'difficult',
-    align: 'center',
-    width: '15%',
-    render: (difficult) => {
-      if (difficult) {
-        return <Tag color={tagBackground[+difficult]}>{diffText[+difficult]}</Tag>
-      } else {
-        return '-';
+class DeveloperHome extends React.PureComponent {
+  /**
+   * 表格列
+   */
+  options = {
+    title: '操作',
+    key: 'action',
+    fixed: 'right',
+    width: 100,
+    render: (text, record) => (
+      <span>
+        <Button type="primary">
+          <Link to={`/problems/${record.identifier}/edit`}>编辑</Link>
+        </Button>
+      </span>
+    ),
+  }
+
+  columns = [
+    {
+      title: '标题',
+      dataIndex: 'name',
+      render: (name, record) => <Button type="link" onClick={() => this.handleNameClick(record)} className={'oj_item_name'}>{name}</Button>
+    },
+    {
+      title: '分类',
+      dataIndex: 'category',
+      width: '20%',
+      align: 'center',
+      render: (category) => <span>{category ? testMaps['category'][+category] : '-'}</span>
+    },
+    {
+      title: '难度',
+      dataIndex: 'difficult',
+      align: 'center',
+      width: '15%',
+      render: (difficult) => {
+        if (difficult) {
+          return <Tag color={tagBackground[+difficult]}>{diffText[+difficult]}</Tag>
+        } else {
+          return '-';
+        }
       }
-    }
-  },
-  {
-    title: '热度',
-    dataIndex: 'hack_user_lastest_codes_count',
-    sorter: true,
-    align: 'center',
-    width: '10%'
-  },
-  {
-    title: '通过率',
-    dataIndex: 'passed_rate',
-    sorter: true,
-    align:'right',
-    width: '10%',
-    render: val => <span>{`${val}%`}</span>
-  },
-];
+    },
+    {
+      title: '热度',
+      dataIndex: 'hack_user_lastest_codes_count',
+      sorter: true,
+      align: 'center',
+      width: '10%'
+    },
+    {
+      title: '通过率',
+      dataIndex: 'passed_rate',
+      sorter: true,
+      align:'right',
+      width: '10%',
+      render: val => <span>{`${val}%`}</span>
+    },
+  ];
 
-class DeveloperHome extends React.PureComponent {
   state = {
     data: [],
     loading: false,
@@ -170,7 +172,7 @@ class DeveloperHome extends React.PureComponent {
       page: 1, // 当前页数
       limit: 10 // 每页显示条件
     },
-    columns: columns,
+    columns: this.columns,
     searchInfo: []
   };
 
@@ -179,7 +181,7 @@ class DeveloperHome extends React.PureComponent {
     const { isMySource } = this.props;
     if (isMySource) {
       this.handleFilterSearch({come_from: 'mine'});
-      let _columns = columns.concat([options]);
+      let _columns = this.columns.concat([this.options]);
       this.setState({
         columns: _columns
       });
@@ -309,13 +311,13 @@ class DeveloperHome extends React.PureComponent {
     this.handleFilterSearch({come_from: item.key === 'all' ? '' : item.key});
     
     if (item.key !== 'all') {
-      let _columns = columns.concat([options]);
+      let _columns = this.columns.concat([this.options]);
       this.setState({
         columns: _columns
       });
     } else {
       this.setState({
-        columns: columns
+        columns: this.columns
       })
     }
   }
@@ -333,10 +335,19 @@ class DeveloperHome extends React.PureComponent {
     });
     if (info.type === 'come_from' && info.key === 'mine') {
       this.setState({
-        columns: columns
+        columns: this.columns
       });
     }
   }
+
+  // 点击name
+
+  handleNameClick = (record) => {
+    console.log('name has click', record);
+    // 先调用start接口获取返回的 identifier, 再跳转到开启编辑
+    this.props.startProgramQuestion(record.identifier, this.props);
+  }
+
   render () {
     // const { testReducer, handleClick } = this.props;
     const { 
@@ -453,10 +464,11 @@ const mapDispatchToProps = (dispatch) => ({
   handleClick: () => dispatch(actions.toggleTodo()),
   fetchOJList: (params) => dispatch(actions.getOJList(params)),
   changePaginationInfo: (obj) => dispatch(actions.changePaginationInfo(obj)),
+  startProgramQuestion: (id, props) => dispatch(actions.startProgramQuestion(id, props))
 });
 
-export default connect(
+export default withRouter(connect(
   mapStateToProps,
   mapDispatchToProps
-)(DeveloperHome);
+)(DeveloperHome));
 // export default DeveloperHome;
diff --git a/public/react/src/modules/developer/index.scss b/public/react/src/modules/developer/index.scss
index 6b10550b1..8c9b141b0 100644
--- a/public/react/src/modules/developer/index.scss
+++ b/public/react/src/modules/developer/index.scss
@@ -72,4 +72,8 @@
       color: #fff;
     }
   }
+  .oj_item_name{
+    color: #459be5;
+    cursor: pointer;
+  }
 }
diff --git a/public/react/src/modules/developer/studentStudy/index.js b/public/react/src/modules/developer/studentStudy/index.js
index e0eccf444..f7fb90cbd 100644
--- a/public/react/src/modules/developer/studentStudy/index.js
+++ b/public/react/src/modules/developer/studentStudy/index.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-23 10:53:19
  * @LastEditors: tangjiang
- * @LastEditTime: 2019-11-29 08:56:18
+ * @LastEditTime: 2019-11-29 19:15:25
  */
 import './index.scss';
 import React, { useEffect } from 'react';
@@ -20,9 +20,10 @@ import actions from '../../../redux/actions';
 const StudentStudy = (props) => {
 
   useEffect(() => {
-    const { match: { params }, startProgramQuestion } = props;
+    const { match: { params }, getUserProgramDetail } = props;
     let { id } = params;
-    startProgramQuestion(id);
+    // startProgramQuestion(id);
+    getUserProgramDetail(id);
   }, []);
   return (
     <div className={'student_study_warp'}>
@@ -61,7 +62,9 @@ const mapStateToProps = (state) => ({});
 
 const mapDispatchToProps = (dispatch) => ({
   // 调用开启编辑
-  startProgramQuestion: (id) => dispatch(actions.startProgramQuestion(id))
+  // startProgramQuestion: (id) => dispatch(actions.startProgramQuestion(id))
+  // 调用编程题详情
+  getUserProgramDetail: (id) => dispatch(actions.getUserProgramDetail(id))
 });
 
 export default connect(
diff --git a/public/react/src/redux/actions/index.js b/public/react/src/redux/actions/index.js
index 7294b5f90..23b111618 100644
--- a/public/react/src/redux/actions/index.js
+++ b/public/react/src/redux/actions/index.js
@@ -36,6 +36,7 @@ import {
   saveUserInputCode,
   changeUserCodeTab,
   submitUserCode,
+  getUserProgramDetail
   // isUpdateCodeCtx
 } from './ojForUser';
 
@@ -79,6 +80,7 @@ export default {
   changeSubmitLoadingStatus,
   submitUserCode,
   changePublishLoadingStatus,
-  isMyPublish
+  isMyPublish,
+  getUserProgramDetail
   // isUpdateCodeCtx
 }
\ No newline at end of file
diff --git a/public/react/src/redux/actions/ojForUser.js b/public/react/src/redux/actions/ojForUser.js
index 9173dc0a1..96132d935 100644
--- a/public/react/src/redux/actions/ojForUser.js
+++ b/public/react/src/redux/actions/ojForUser.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-27 13:42:11
  * @LastEditors: tangjiang
- * @LastEditTime: 2019-11-29 12:03:51
+ * @LastEditTime: 2019-11-29 19:37:24
  */
 import types from "./actionTypes";
 import { Base64 } from 'js-base64';
@@ -19,7 +19,7 @@ import {
 } from "../../services/ojService";
 
 // 进入编程页面时，首先调用开启编程题接口
-export const startProgramQuestion = (id) => {
+export const startProgramQuestion = (id, props) => {
   return (dispatch) => {
     fetchStartProgram(id).then(res => {
       const { status, data } = res;
@@ -29,21 +29,30 @@ export const startProgramQuestion = (id) => {
           type: types.SAVE_USER_PROGRAM_ID,
           payload: identifier
         });
-        // 调用用户编程详情接口
-        fetchUserProgramDetail(identifier).then(res => {
-          const { status, data = {} } = res;
-          if (status === 200) {
-            dispatch({
-              type: types.USER_PROGRAM_DETAIL,
-              payload: data
-            });
-          }
-        })
+        // 跳转至开启编程
+        props.history.push(`/myproblems/${identifier}.json`);
+        // Redirect.to
       }
     })
   }
 }
 
+// 获取用户编程题详情
+export const getUserProgramDetail = (identifier) => {
+  // 调用用户编程详情接口
+  fetchUserProgramDetail(identifier).then(res => {
+    return (dispatch) => {
+      const { status, data = {} } = res;
+      if (status === 200) {
+        dispatch({
+          type: types.USER_PROGRAM_DETAIL,
+          payload: data
+        });
+      }
+    }
+  });
+}
+
 /**
  * @description 更新代码
  * @param {*} identifier 
diff --git a/public/react/src/redux/actions/ojForm.js b/public/react/src/redux/actions/ojForm.js
index f7bf44506..e88dffc05 100644
--- a/public/react/src/redux/actions/ojForm.js
+++ b/public/react/src/redux/actions/ojForm.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-20 16:35:46
  * @LastEditors: tangjiang
- * @LastEditTime: 2019-11-28 21:21:56
+ * @LastEditTime: 2019-11-29 18:55:43
  */
 import types from './actionTypes';
 import CONST from '../../constants';
@@ -204,7 +204,7 @@ export const validateOjForm = (props, type) => {
           payload: true
         });
         setTimeout(() => {
-          props.history.push('/developer');
+          props.history.push('/problems');
         }, 1000);
       }
 

From 7448e29bcc2e7c1efb3496f8c6c70ae5edfb401d Mon Sep 17 00:00:00 2001
From: tangjiang <465264938@qq.com>
Date: Fri, 29 Nov 2019 20:09:04 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/developer/studentStudy/index.js      |  2 +-
 public/react/src/redux/actions/ojForUser.js          | 12 ++++++------
 public/react/src/redux/reducers/ojForUserReducer.js  |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/public/react/src/modules/developer/studentStudy/index.js b/public/react/src/modules/developer/studentStudy/index.js
index f7fb90cbd..d3c11df91 100644
--- a/public/react/src/modules/developer/studentStudy/index.js
+++ b/public/react/src/modules/developer/studentStudy/index.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-23 10:53:19
  * @LastEditors: tangjiang
- * @LastEditTime: 2019-11-29 19:15:25
+ * @LastEditTime: 2019-11-29 20:00:34
  */
 import './index.scss';
 import React, { useEffect } from 'react';
diff --git a/public/react/src/redux/actions/ojForUser.js b/public/react/src/redux/actions/ojForUser.js
index 96132d935..66c0503e3 100644
--- a/public/react/src/redux/actions/ojForUser.js
+++ b/public/react/src/redux/actions/ojForUser.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-27 13:42:11
  * @LastEditors: tangjiang
- * @LastEditTime: 2019-11-29 19:37:24
+ * @LastEditTime: 2019-11-29 20:07:09
  */
 import types from "./actionTypes";
 import { Base64 } from 'js-base64';
@@ -30,7 +30,7 @@ export const startProgramQuestion = (id, props) => {
           payload: identifier
         });
         // 跳转至开启编程
-        props.history.push(`/myproblems/${identifier}.json`);
+        props.history.push(`/myproblems/${identifier}`);
         // Redirect.to
       }
     })
@@ -40,8 +40,8 @@ export const startProgramQuestion = (id, props) => {
 // 获取用户编程题详情
 export const getUserProgramDetail = (identifier) => {
   // 调用用户编程详情接口
-  fetchUserProgramDetail(identifier).then(res => {
-    return (dispatch) => {
+  return (dispatch) => {
+    fetchUserProgramDetail(identifier).then(res => {
       const { status, data = {} } = res;
       if (status === 200) {
         dispatch({
@@ -49,8 +49,8 @@ export const getUserProgramDetail = (identifier) => {
           payload: data
         });
       }
-    }
-  });
+    });
+  }
 }
 
 /**
diff --git a/public/react/src/redux/reducers/ojForUserReducer.js b/public/react/src/redux/reducers/ojForUserReducer.js
index 63ed6ed34..a15d7d4a7 100644
--- a/public/react/src/redux/reducers/ojForUserReducer.js
+++ b/public/react/src/redux/reducers/ojForUserReducer.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-27 13:41:48
  * @LastEditors: tangjiang
- * @LastEditTime: 2019-11-28 17:34:13
+ * @LastEditTime: 2019-11-29 20:07:57
  */
 import types from "../actions/actionTypes";
 import { Base64 } from 'js-base64';