feat(X-Pack): [数据填报]单选和单选框组件支持增加额外关联字段查询展示功能

core/core-frontend/auto-imports.d.ts

@@ -4,5 +4,8 @@
 // Generated by unplugin-auto-import
 export {}
 declare global {
-
+  const ElForm: typeof import('element-plus-secondary/es')['ElForm']
+  const ElFormItem: typeof import('element-plus-secondary/es')['ElFormItem']
+  const ElInput: typeof import('element-plus-secondary/es')['ElInput']
+  const ElMessageBox: typeof import('element-plus-secondary/es')['ElMessageBox']
 }

core/core-frontend/src/locales/en.ts

@@ -4126,6 +4126,10 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     exporting: 'Backend export in progress, can go to',
     progress_to_download: 'Check progress and download',
     form: {
+      add_detail_columns: 'Add column details',
+      detail_columns: 'Column details',
+      display_name: 'Display Name',
+      show_more_detail: 'Show more',
       confirm_to_mark_as_complete: 'Confirm to mark as complete?',
       mobile_number_format_is_incorrect: 'Mobile number format is incorrect',
       email_format_is_incorrect: 'Email format is incorrect',

core/core-frontend/src/locales/tw.ts

@@ -4012,6 +4012,10 @@ export default {
     exporting: '後台導出中,可前往',
     progress_to_download: '查看進度，進行下載',
     form: {
+      add_detail_columns: '添加字段描述',
+      detail_columns: '字段描述',
+      display_name: '顯示名稱',
+      show_more_detail: '查看更多',
       confirm_to_mark_as_complete: '確認標記為完成?',
       mobile_number_format_is_incorrect: '手機號碼格式不正確',
       email_format_is_incorrect: '郵件格式不正確',

core/core-frontend/src/locales/zh-CN.ts

@@ -4016,6 +4016,10 @@ export default {
     exporting: '后台导出中,可前往',
     progress_to_download: '查看进度，进行下载',
     form: {
+      add_detail_columns: '添加字段描述',
+      detail_columns: '字段描述',
+      display_name: '显示名称',
+      show_more_detail: '查看更多',
       confirm_to_mark_as_complete: '确认标记为完成?',
       mobile_number_format_is_incorrect: '手机号码格式不正确',
       email_format_is_incorrect: '邮箱格式不正确',

sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/DataFillingApi.java

@@ -57,6 +57,9 @@ public interface DataFillingApi {
     @PostMapping("/form/{optionDatasource}/options")
     List<ColumnOption> listColumnData(@PathVariable("optionDatasource") Long optionDatasource, @RequestBody DatasourceOptionsRequest request) throws Exception;
 
+    @PostMapping("/form/{id}/extraDetails")
+    List<ExtraDetails> extraDetails(@PathVariable("id") Long formId, @RequestBody ExtraDetailsRequest request) throws Exception;
+
     @PostMapping("/form/{id}/tableData")
     DataFillFormTableDataResponse tableData(@PathVariable("id") Long id, @RequestBody DataFillFormTableDataRequest request) throws Exception;
 

sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/ExtraDetails.java

@@ -0,0 +1,25 @@
+package io.dataease.api.xpack.dataFilling.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+public class ExtraDetails implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -7249780247687230185L;
+
+    private String name;
+
+    private Object value;
+}

sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/ExtraDetailsRequest.java

@@ -0,0 +1,26 @@
+package io.dataease.api.xpack.dataFilling.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class ExtraDetailsRequest {
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long optionDatasource;
+    private String optionTable;
+    private String optionColumn;
+    private List<ExtraColumnItem> extraColumns;
+    private String value;
+
+    @Data
+    public static class ExtraColumnItem {
+        private String fieldName;
+        private String displayName;
+    }
+}

sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/provider/ExtDDLProvider.java

@@ -27,6 +27,8 @@ public abstract class ExtDDLProvider {
 
     public abstract String searchColumnData(String table, String column, String order);
 
+    public abstract String searchColumnRowDataOne(String table, List<TableField> searchFields, TableFieldWithValue tableFieldWithValue);
+
     public abstract String countSql(String table, String whereSql);
 
     public abstract String dropTableSql(String table);