Merge remote-tracking branch 'origin/v1.8' into v1.8

backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskLogController.java

@@ -39,12 +39,6 @@ public class DataSetTableTaskLogController {
         return dataSetTableTaskLogService.save(datasetTableTaskLog);
     }
 
-//    @ApiOperation("删除")
-//    @PostMapping("delete/{id}")
-//    public void delete(@PathVariable String id) {
-//        dataSetTableTaskLogService.delete(id);
-//    }
-
     @RequiresPermissions("task:read")
     @ApiOperation("分页查询")
     @PostMapping("list/{type}/{goPage}/{pageSize}")
@@ -53,4 +47,12 @@ public class DataSetTableTaskLogController {
         return PageUtils.setPageInfo(page, dataSetTableTaskLogService.listTaskLog(request, type));
     }
 
+    @RequiresPermissions("data:read")
+    @ApiOperation("分页查询")
+    @PostMapping("listForDataset/{type}/{goPage}/{pageSize}")
+    public Pager<List<DataSetTaskLogDTO>> listForDataset(@RequestBody BaseGridRequest request, @PathVariable String type, @PathVariable int goPage, @PathVariable int pageSize) {
+        Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
+        return PageUtils.setPageInfo(page, dataSetTableTaskLogService.listTaskLog(request, type));
+    }
+
 }

frontend/src/views/dataset/data/UpdateInfo.vue

@@ -683,7 +683,7 @@ export default {
     },
     listTaskLog(loading = true) {
       const params = { 'conditions': [{ 'field': 'dataset_table_task_log.table_id', 'operator': 'eq', 'value': this.table.id }], 'orders': [] }
-      post('/dataset/taskLog/list/' + this.table.type + '/' + this.page.currentPage + '/' + this.page.pageSize, params, loading).then(response => {
+      post('/dataset/taskLog/listForDataset/' + this.table.type + '/' + this.page.currentPage + '/' + this.page.pageSize, params, loading).then(response => {
         this.taskLogData = response.data.listObject
         this.page.total = response.data.itemCount
         this.taskLogLastRequestComplete = true