Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/hack_user_lastest_codes_controller.rb

@@ -72,8 +72,8 @@ class HackUserLastestCodesController < ApplicationController
   def record_detail
     @hack_user = HackUserCode.find params[:id]
     set = HackSet.find_by(id: @hack_user.error_test_set_id)
-    @pass_set_count = set ? set.position - 1 : 0
     @set_count = @hack_user.hack.hack_sets.count
+    @pass_set_count = set ? set.position - 1 : (@hack_user.status == 0 ? @set_count : 0)
     @my_hack = @hack_user.hack_user_lastest_code
   end
 
@@ -134,6 +134,7 @@ class HackUserLastestCodesController < ApplicationController
         end
     testCases = Base64.encode64(test_sets.to_json)
     #codeFileContent = Base64.urlsafe_encode64(@my_hack.code)
+    Rails.logger.info("##########code_#{@my_hack.identifier}: #{@my_hack.code}")
     debug_params = {execMode: exec_mode,
                     tpiID: @my_hack.identifier,
                     testCases: testCases,

public/react/config/webpack.config.prod.js

@@ -326,8 +326,8 @@ module.exports = {
 					comments: false
 				},
 				compress: {
-					drop_debugger: false,
-					drop_console: false
+					drop_debugger: true,
+					drop_console: true
 				}
 			}
 		}),

public/react/src/modules/developer/components/initTabCtx/index.js

@@ -1,7 +1,7 @@
 /*
  * @Description: 自定义测试化用例
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-11-27 19:46:14
  * @LastEditors  : tangjiang
  * @LastEditTime : 2019-12-26 20:07:35
@@ -50,11 +50,8 @@ function InitTabCtx (props, ref) {
         >
           {
             getFieldDecorator('input', {
-              rules: [
-                { required: true, message: '输入值不能为空'}
-              ],
               initialValue: inputValue
-            })(<TextArea 
+            })(<TextArea
                 className="input_textarea_style"
                 rows={8}
                 placeholder="请填写测试用例的输入值，点击“调试代码”"

public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/AddTestDemo.js

@@ -147,7 +147,7 @@ const AddTestDemo = (props) => {
 
   return (
     <Collapse className={'collapse_area'} activeKey={isOpen?'1':''} onChange={() => handleChangeCollapse()}>
-      <Panel header={`测试用例${props.index + 1}`} extra={genExtra()} key="1">
+      <Panel header={`测试用例${props.index + 1}`} extra={props.index===0?false:genExtra()} key="1">
         <Form>
           <FormItem
             label={<span className={'label_text'}>输入</span>}

public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js

@@ -85,6 +85,25 @@ class EditTab extends React.Component {
     // this.props.getQuestion({
     //   source: 'question'
     // });
+    const obj = { // 测试用例参数
+      input: '',
+      output: '',
+      position: 1,
+      isAdd: true // 新增的测试用例
+    }
+    const validateObj = { // 测试用例验证参数
+      input: {
+        validateStatus: '',
+        errMsg: ''
+      },
+      output: {
+        validateStatus: '',
+        errMsg: ''
+      }
+    }
+
+    // this.scrollRef.current.scrollTo(1000);
+   this.props.addTestCase({testCase: obj, tcValidate: validateObj});
   }
 
   // componentDidUpdate (nextProp) {
@@ -171,7 +190,7 @@ class EditTab extends React.Component {
 
   render () {
     const { showAdd } = this.state;
- 
+
     const {
       ojForm,
       ojFormValidate,
@@ -359,7 +378,7 @@ class EditTab extends React.Component {
       const obj = Object.assign({}, values, {sub_discipline_id})
       tagDisciplines(obj);
     }
-    
+
     return (
       <div className={'editor_area'} id="textCase">
         <Form className={'editor_form'}>