替换为测试用例上传组件

static/src/js/app/admin/contest/editProblem.js

@@ -1,4 +1,5 @@
-require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagEditor", "validator", "editorComponent"],
+require(["jquery", "avalon", "editor", "uploader", "bsAlert",
+        "csrfToken", "tagEditor", "validator", "editorComponent", "testCaseUploader"],
     function ($, avalon, editor, uploader, bsAlert, csrfTokenHeader) {
 
         avalon.ready(function () {

static/src/js/app/admin/problem/addProblem.js

@@ -1,11 +1,12 @@
-require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagEditor", "validator", "jqueryUI", "editorComponent"],
+require(["jquery", "avalon", "editor", "uploader", "bsAlert",
+        "csrfToken", "tagEditor", "validator", "jqueryUI", "editorComponent", "testCaseUploader"],
     function ($, avalon, editor, uploader, bsAlert, csrfTokenHeader) {
         avalon.ready(function () {
 
             $("#add-problem-form").validator()
                 .on('submit', function (e) {
                     if (!e.isDefaultPrevented()) {
-                        if (vm.testCaseId == "") {
+                        if (!avalon.vmodels.testCaseUploader.uploaded) {
                             bsAlert("你还没有上传测试数据!");
                             return false;
                         }
@@ -39,7 +40,7 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE
                             time_limit: vm.timeLimit,
                             memory_limit: vm.memoryLimit,
                             samples: [],
-                            test_case_id: vm.testCaseId,
+                            test_case_id: avalon.vmodels.testCaseUploader.testCaseId,
                             hint: avalon.vmodels.problemHintEditor.content,
                             source: vm.source,
                             visible: vm.visible,
@@ -139,29 +140,6 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE
                     }
                 });
 
-            var testCaseUploader = uploader("#testCaseFile", "/api/admin/test_case_upload/",
-                function (file, response) {
-                    if (response.code) {
-                        vm.uploadProgress = 0;
-                        bsAlert(response.data);
-                    }
-                    else {
-                        vm.testCaseId = response.data.test_case_id;
-                        vm.uploadSuccess = true;
-                        vm.testCaseList = [];
-                        for (var key in response.data.file_list) {
-                            vm.testCaseList.push({
-                                input: response.data.file_list[key].input_name,
-                                output: response.data.file_list[key].output_name
-                            })
-                        }
-                        bsAlert("测试数据添加成功！共添加" + vm.testCaseList.length + "组测试数据");
-                    }
-                },
-                function (file, percentage) {
-                    vm.uploadProgress = parseInt(percentage * 100);
-                });
-
             var tagAutoCompleteList = [];
 
             $.ajax({

static/src/js/app/admin/problem/editProblem.js

@@ -1,4 +1,5 @@
-require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagEditor", "validator", "jqueryUI", "editorComponent"],
+require(["jquery", "avalon", "editor", "uploader", "bsAlert",
+        "csrfToken", "tagEditor", "validator", "jqueryUI", "editorComponent", "testCaseUploader"],
     function ($, avalon, editor, uploader, bsAlert, csrfTokenHeader) {
 
         avalon.ready(function () {
@@ -6,7 +7,7 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE
             $("#edit-problem-form").validator()
                 .on('submit', function (e) {
                     if (!e.isDefaultPrevented()) {
-                        if (vm.testCaseId == "") {
+                        if (!avalon.vmodels.testCaseUploader.uploaded) {
                             bsAlert("你还没有上传测试数据!");
                             return false;
                         }
@@ -40,7 +41,7 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE
                             time_limit: vm.timeLimit,
                             memory_limit: vm.memoryLimit,
                             samples: [],
-                            test_case_id: vm.testCaseId,
+                            test_case_id: avalon.vmodels.testCaseUploader.testCaseId,
                             hint: avalon.vmodels.problemHintEditor.content,
                             source: vm.source,
                             visible: vm.visible,
@@ -127,29 +128,6 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE
                         avalon.vmodels.admin.template_url = "template/problem/problem_list.html";
                     }
                 });
-            var testCaseUploader = uploader("#testCaseFile", "/api/admin/test_case_upload/",
-                function (file, response) {
-                    if (response.code) {
-                        vm.uploadProgress = 0;
-                        bsAlert(response.data);
-                    }
-                    else {
-                        vm.testCaseId = response.data.test_case_id;
-                        vm.uploadSuccess = true;
-                        vm.testCaseList = [];
-                        for(var key in response.data.file_list){
-                            vm.testCaseList.push({
-                                input: response.data.file_list[key].input_name,
-                                output: response.data.file_list[key].output_name
-                            })
-                        }
-                        bsAlert("测试数据添加成功！共添加" + vm.testCaseList.length + "组测试数据");
-                    }
-                },
-                function (file, percentage) {
-                    vm.uploadProgress = parseInt(percentage * 100);
-                }
-            );
 
             $.ajax({
                 url: "/api/admin/problem/?problem_id=" + avalon.vmodels.admin.problemId,
@@ -178,7 +156,7 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE
                         vm.difficulty = problem.difficulty;
                         vm.inputDescription = problem.input_description;
                         vm.outputDescription = problem.output_description;
-                        vm.testCaseId = problem.test_case_id;
+                        avalon.vmodels.testCaseUploader.setTestCase(problem.test_case_id);
                         vm.source = problem.source;
                         var problemTags = problem.tags;
                         $.ajax({

static/src/js/config.js

@@ -27,6 +27,7 @@ var require = {
         // ------ admin web 组件 ----------
         pager: "components/pager",
         editorComponent: "components/editorComponent",
+        testCaseUploader: "components/testCaseUploader",
 
 
         // ------ 下面写的都不要直接用，而是使用上面的封装版本 ------

template/src/admin/contest/edit_problem.html

@@ -96,29 +96,7 @@
                 </div>
             </div>
         </div>
-        <div class="col-md-12"><br>
+        <ms:testcaseuploader $id="testCaseUploader"></ms:testcaseuploader>
-            <label>测试数据<span ms-if="uploadSuccess">（当前已上传，继续上传将覆盖原有测试用例）</span></label><br>
-            <small class="text-info">请将所有测试用例打包在一个文件中上传，所有文件要在压缩包的根目录，且输入输出文件名要以从1开始连续数字标识要对应例如：<br>
-                1.in 1.out 2.in 2.out
-            </small>
-            <table class="table table-striped" ms-visible="uploadSuccess">
-                <tr>
-                    <td>编号</td>
-                    <td>输入文件名</td>
-                    <td>输出文件名</td>
-                </tr>
-                <tr ms-repeat="testCaseList">
-                    <td>{{ $index + 1 }}</td>
-                    <td>{{ el.input }}</td>
-                    <td>{{ el.output }}</td>
-                </tr>
-            </table>
-        </div>
-        <div class="col-md-12">
-            <div class="form-group">
-                <div id="testCaseFile">选择文件</div>
-            </div>
-        </div>
         <div class="form-group col-md-12">
             <label>提示</label>
             <ms:editor $id="contestProblemHintEditor" config="contestProblemHintEditor"></ms:editor>

template/src/admin/problem/add_problem.html

@@ -99,30 +99,7 @@
                 </div>
             </div>
         </div>
-        <div class="col-md-12"><br>
+        <ms:testcaseuploader $id="testCaseUploader"></ms:testcaseuploader>
-            <label>测试数据</label><br>
-            <small class="text-info">请将所有测试用例打包在一个文件中上传，所有文件要在压缩包的根目录，且输入输出文件名要以从1开始连续数字标识要对应例如：<br>
-                1.in 1.out 2.in 2.out
-            </small>
-            <p>上传进度<span ms-text="uploadProgress"></span>%</p>
-            <table class="table table-striped" ms-visible="uploadSuccess">
-                <tr>
-                    <td>编号</td>
-                    <td>输入文件名</td>
-                    <td>输出文件名</td>
-                </tr>
-                <tr ms-repeat="testCaseList">
-                    <td>{{$index + 1}}</td>
-                    <td>{{ el.input }}</td>
-                    <td>{{ el.output }}</td>
-                </tr>
-            </table>
-        </div>
-        <div class="col-md-12">
-            <div class="form-group">
-                <div id="testCaseFile">选择文件</div>
-            </div>
-        </div>
         <div class="form-group col-md-12">
             <label>提示</label>
             <ms:editor $id="problemHintEditor" config="problemHintEditor"></ms:editor>

template/src/admin/problem/edit_problem.html

@@ -105,30 +105,7 @@
                 </div>
             </div>
         </div>
-        <div class="col-md-12"><br>
+        <ms:testcaseuploader $id="testCaseUploader"></ms:testcaseuploader>
-            <label>测试数据(当前已上传，继续上传将覆盖原有测试用例)</label><br>
-            <small class="text-info">请将所有测试用例打包在一个文件中上传，所有文件要在压缩包的根目录，且输入输出文件名要以从1开始连续数字标识要对应例如：<br>
-                1.in 1.out 2.in 2.out
-            </small>
-            <p>上传进度<span ms-text="uploadProgress"></span>%</p>
-            <table class="table table-striped" ms-visible="uploadSuccess">
-                <tr>
-                    <td>编号</td>
-                    <td>输入文件名</td>
-                    <td>输出文件名</td>
-                </tr>
-                <tr ms-repeat="testCaseList">
-                    <td>{{ $index + 1 }}</td>
-                    <td>{{ el.input }}</td>
-                    <td>{{ el.output }}</td>
-                </tr>
-            </table>
-        </div>
-        <div class="col-md-12">
-            <div class="form-group">
-                <div id="testCaseFile">选择文件</div>
-            </div>
-        </div>
         <div class="form-group col-md-12">
             <label>提示</label>
             <ms:editor $id="problemHintEditor" config="problemHintEditor"></ms:editor>