Merge pull request #10690 from ulleo/dev

fix(X-Pack): [数据填报]修复编辑表单设置绑定数据源后，可能会读取不到选项列表问题

core/backend/src/main/java/io/dataease/controller/datafill/DataFillController.java

@@ -228,9 +228,9 @@ public class DataFillController {
     }
 
     @ApiIgnore
-    @PostMapping("/form/{optionDatasource}/{optionTable}/{optionColumn}/options/{optionOrder}")
-    public List<ExtTableField.Option> listColumnData(@PathVariable String optionDatasource, @PathVariable String optionTable, @PathVariable String optionColumn, @PathVariable String optionOrder) throws Exception {
-        return dataFillDataService.listColumnData(optionDatasource, optionTable, optionColumn, optionOrder);
+    @PostMapping("/form/{optionDatasource}/options")
+    public List<ExtTableField.Option> listColumnData(@PathVariable String optionDatasource, @RequestBody DatasourceOptionsRequest request) throws Exception {
+        return dataFillDataService.listColumnData(optionDatasource, request.getOptionTable(), request.getOptionColumn(), request.getOptionOrder());
     }
 
 }

core/backend/src/main/java/io/dataease/controller/request/datafill/DatasourceOptionsRequest.java

@@ -0,0 +1,11 @@
+package io.dataease.controller.request.datafill;
+
+import lombok.Getter;
+
+@Getter
+public class DatasourceOptionsRequest {
+
+    private String optionTable;
+    private String optionColumn;
+    private String optionOrder;
+}

core/frontend/src/views/dataFilling/form/dataFilling.js

@@ -171,8 +171,13 @@ export function userFillFormData(userTaskId, data) {
 
 export function getTableColumnData(optionDatasource, optionTable, optionColumn, optionOrder) {
   return request({
-    url: `dataFilling/form/${optionDatasource}/${optionTable}/${optionColumn}/options/${optionOrder}`,
+    url: `dataFilling/form/${optionDatasource}/options`,
     method: 'post',
-    loading: true
+    loading: true,
+    data: {
+      optionTable: optionTable,
+      optionColumn: optionColumn,
+      optionOrder: optionOrder
+    }
   })
 }