NaiboWang-Alienware vor 2 Jahren
Ursprung
Commit
31bcb63daf

+ 11 - 1
ElectronJS/server.js

@@ -57,7 +57,17 @@ if(!fs.existsSync(path.join(getDir(), "execution_instances"))){
     fs.mkdirSync(path.join(getDir(), "execution_instances"));
 }
 if(!fs.existsSync(path.join(getDir(), "config.json"))){
-    fs.writeFileSync(path.join(getDir(), "config.json"), JSON.stringify({"webserver_address":"http://localhost","webserver_port":8074,"user_data_folder":"./user_data","absolute_user_data_folder":""}));
+    // Generate config.json
+    fs.writeFileSync(path.join(getDir(), "config.json"),
+        JSON.stringify({
+                "webserver_address": "http://localhost",
+                "webserver_port": 8074,
+                "user_data_folder": "./user_data",
+                "debug": false,
+                "mysql_config_path": "./mysql_config.json",
+                "absolute_user_data_folder": "D:\\Document\\Projects\\EasySpider\\ElectronJS\\user_data"
+            }
+        ));
 }
 
 exports.getDir = getDir;

+ 4 - 4
ElectronJS/src/index.html

@@ -95,7 +95,7 @@
                       style="margin-top: 15px; width: 300px;height:60px;padding-top:12px;color:white">Start Data Mode</a>
                 </p>
 
-                <a @click="step = 0" class="btn btn-outline-primary btn-lg"style="margin-top: 10px; width: 300px;height:45px;padding-top:5px">Go to Home Page</a>
+                <a @click="step = 0" class="btn btn-outline-primary btn-lg"style="margin-top: 10px; width: 322px;height:45px;padding-top:5px">Go to Home Page</a>
 
             </div>
             <div v-else-if="step == 2">
@@ -117,7 +117,7 @@
                       class="btn btn-primary btn-lg"
                       style="margin-top: 15px; width: 320px;height:60px;padding-top:12px;color:white">Start Design (Mobile)</a></p>
                 <p>
-                    <a @click="step = 0" class="btn btn-outline-primary btn-lg"style="margin-top: 10px; width: 320px;height:45px;padding-top:5px">Go to Home Page</a>
+                    <a @click="step = 0" class="btn btn-outline-primary btn-lg"style="margin-top: 10px; width: 322px;height:45px;padding-top:5px">Go to Home Page</a>
                 </p>
             </div>
         </div>
@@ -158,7 +158,7 @@
                       style="margin-top: 15px; width: 320px;height:60px;padding-top:12px;color:white">使用带用户信息浏览器设计</a>
                 </p>
                 <p>
-                    <a @click="step = 0" class="btn btn-outline-primary btn-lg"style="margin-top: 10px; width: 320px;height:45px;padding-top:5px">返回首页</a>
+                    <a @click="step = 0" class="btn btn-outline-primary btn-lg"style="margin-top: 10px; width: 322px;height:45px;padding-top:5px">返回首页</a>
                 </p>
 
             </div>
@@ -181,7 +181,7 @@
                       class="btn btn-primary btn-lg"
                       style="margin-top: 15px; width: 320px;height:60px;padding-top:12px;color:white">开始设计(手机模式)</a></p>
                 <p>
-                    <a @click="step = 0" class="btn btn-outline-primary btn-lg"style="margin-top: 10px; width: 320px;height:45px;padding-top:5px">返回首页</a>
+                    <a @click="step = 0" class="btn btn-outline-primary btn-lg"style="margin-top: 10px; width: 322px;height:45px;padding-top:5px">返回首页</a>
                 </p>
             </div>
 

+ 8 - 2
ElectronJS/src/taskGrid/invokeTask.html

@@ -51,7 +51,8 @@
 <div class="row" style="margin-top: 40px;">
 
     <div class="col-md-7" id="taskInfo" style="margin:0 auto" v-if="show">
-
+        <div id="tipCustom" class="alert alert-success alert-dismissible fade show" style="display: none; z-index: 1000">
+            {{tip | lang}}</div>
 
         <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
             <div class="modal-dialog modal-lg">
@@ -243,6 +244,7 @@
             task: {},
             show: false, //是否渲染
             ID: "",
+            tip: "The parameter values in the Excel file have been successfully imported into the corresponding field text box~Excel文件中的参数值已成功导入到对应字段文本框中",
             file:null,
             user_data_folder:"",
             fileUploadStatus: "Status: Waiting for upload~状态:等待上传",
@@ -304,9 +306,13 @@
                         let inputParameters = app.$data.task.inputParameters;
                         inputParameters.forEach(function (item, index) {
                             if(Object.keys(response).includes(item.name)){
-                                item.value = "\r\n".join(response[item.name]);
+                                item.value = response[item.name].join("\r\n");
                             }
                         });
+                        $("#tipCustom").slideDown(); //提示框
+                        setTimeout(function() {
+                            $("#tipCustom").slideUp();
+                        }, 3000);
                     },
                     error: function(err) {
                         app.$data.fileUploadStatus = "Status: Upload failed~状态:上传失败";

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
ElectronJS/tasks/112.json


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
ElectronJS/tasks/144.json


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
ElectronJS/tasks/145.json


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
ElectronJS/tasks/146.json


Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.