owl-cli 6.181.0 → 6.183.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -18,11 +18,13 @@
|
|
|
18
18
|
var taskInfoId = params.taskInfoId;
|
|
19
19
|
|
|
20
20
|
var taskInfo = @projectCodeService.getExportTaskInfo(taskInfoId);
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
taskInfo.downloadUrl =
|
|
21
|
+
|
|
22
|
+
if(taskInfo){
|
|
23
|
+
taskInfo.downloadUrl = taskInfo.fileUrl;
|
|
24
24
|
}
|
|
25
25
|
|
|
26
|
+
|
|
27
|
+
|
|
26
28
|
var ret = {
|
|
27
29
|
state:"ok",
|
|
28
30
|
taskInfo:taskInfo
|
|
@@ -798,19 +798,21 @@ var @projectCodeService = (function (pigeon) {
|
|
|
798
798
|
params:JSON.stringify(env.params),
|
|
799
799
|
taskId:null
|
|
800
800
|
}
|
|
801
|
+
taskInfo.taskId = '';
|
|
802
|
+
|
|
803
|
+
owl_task_infoService.add(taskInfo);
|
|
801
804
|
//这个key如果不多加一个export,会把原有的单据数据覆盖
|
|
802
805
|
// var taskInfoId = objPrefix + '_export_' + pigeon.getId()
|
|
803
806
|
var taskId = JobsService.submitExportTask('@projectCode', 'tasks/export.jsx', {
|
|
804
807
|
query: query,
|
|
805
|
-
env: env
|
|
808
|
+
env: env,
|
|
809
|
+
taskInfoId:taskInfo.id
|
|
806
810
|
}, now)
|
|
807
|
-
taskInfo.taskId = '' + taskId
|
|
808
|
-
// taskInfo.id = taskInfoId
|
|
809
|
-
// var key = pigeon.getRKey(taskInfo.submitTime, 13)
|
|
810
|
-
// pigeon.addToList(f.getExportRunningList(), key, taskInfoId)
|
|
811
|
-
// pigeon.saveObject(taskInfoId, taskInfo)
|
|
812
|
-
owl_task_infoService.add(taskInfo);
|
|
813
811
|
|
|
812
|
+
|
|
813
|
+
taskInfo = owl_task_infoService.get(taskInfo.id);
|
|
814
|
+
taskInfo.taskId = "" + taskId;
|
|
815
|
+
owl_task_infoService.update(taskInfo);
|
|
814
816
|
return taskInfo.id
|
|
815
817
|
},
|
|
816
818
|
|