From 6191f2a87c9a59694cba3f38c1ba04cb2144267a Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Tue, 2 Jul 2024 11:43:19 +0800
Subject: [PATCH] =?UTF-8?q?fix(X-Pack):=20[=E6=95=B0=E6=8D=AE=E5=A1=AB?=
 =?UTF-8?q?=E6=8A=A5]=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E8=AE=BE=E7=BD=AE=E7=BB=91=E5=AE=9A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E5=90=8E=EF=BC=8C=E5=8F=AF=E8=83=BD=E4=BC=9A=E8=AF=BB?=
 =?UTF-8?q?=E5=8F=96=E4=B8=8D=E5=88=B0=E9=80=89=E9=A1=B9=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/datafill/DataFillController.java       |  6 +++---
 .../request/datafill/DatasourceOptionsRequest.java    | 11 +++++++++++
 .../src/views/dataFilling/form/dataFilling.js         |  9 +++++++--
 3 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 core/backend/src/main/java/io/dataease/controller/request/datafill/DatasourceOptionsRequest.java

diff --git a/core/backend/src/main/java/io/dataease/controller/datafill/DataFillController.java b/core/backend/src/main/java/io/dataease/controller/datafill/DataFillController.java
index d5654631a5..b1a438057b 100644
--- a/core/backend/src/main/java/io/dataease/controller/datafill/DataFillController.java
+++ b/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());
     }
 
 }
diff --git a/core/backend/src/main/java/io/dataease/controller/request/datafill/DatasourceOptionsRequest.java b/core/backend/src/main/java/io/dataease/controller/request/datafill/DatasourceOptionsRequest.java
new file mode 100644
index 0000000000..ff0fd4a157
--- /dev/null
+++ b/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;
+}
diff --git a/core/frontend/src/views/dataFilling/form/dataFilling.js b/core/frontend/src/views/dataFilling/form/dataFilling.js
index baa8e85498..1d956c613a 100644
--- a/core/frontend/src/views/dataFilling/form/dataFilling.js
+++ b/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
+    }
   })
 }