From 00865441172e9f3f721ee701c14d0bb4fc392a2f Mon Sep 17 00:00:00 2001 From: ulleo Date: Wed, 10 Sep 2025 17:42:35 +0800 Subject: [PATCH] =?UTF-8?q?feat(X-Pack):=20[=E6=95=B0=E6=8D=AE=E5=A1=AB?= =?UTF-8?q?=E6=8A=A5]=E5=86=85=E7=BD=AE=E6=95=B0=E6=8D=AE=E6=BA=90?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=94=AF=E6=8C=81=E6=95=B0=E6=8D=AE=E5=A1=AB?= =?UTF-8?q?=E6=8A=A5=E5=8A=9F=E8=83=BD=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/auto/entity/CoreDeEngine.java | 18 ++++++++++++++++-- .../dao/auto/mapper/CoreDeEngineMapper.java | 4 ++-- .../resources/db/desktop/V2.10.13__ddl.sql | 2 ++ .../resources/db/migration/V2.10.13__ddl.sql | 2 ++ .../main/resources/i18n/core_en_US.properties | 3 ++- .../main/resources/i18n/core_zh_CN.properties | 3 ++- .../main/resources/i18n/core_zh_TW.properties | 3 ++- .../system/parameter/engine/EngineEdit.vue | 12 ++++++++++-- .../parameter/engine/EngineInfoTemplate.vue | 10 ++++++++++ 9 files changed, 48 insertions(+), 9 deletions(-) create mode 100644 core/core-backend/src/main/resources/db/desktop/V2.10.13__ddl.sql create mode 100644 core/core-backend/src/main/resources/db/migration/V2.10.13__ddl.sql diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/entity/CoreDeEngine.java b/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/entity/CoreDeEngine.java index 44f6c0655a..dd487826f5 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/entity/CoreDeEngine.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/entity/CoreDeEngine.java @@ -7,11 +7,11 @@ import java.io.Serializable; /** *

- * + * 数据引擎 *

* * @author fit2cloud - * @since 2023-04-18 + * @since 2025-09-10 */ @TableName("core_de_engine") public class CoreDeEngine implements Serializable { @@ -64,6 +64,11 @@ public class CoreDeEngine implements Serializable { */ private String status; + /** + * 启用数据填报功能 + */ + private Boolean enableDataFill; + public Long getId() { return id; } @@ -136,6 +141,14 @@ public class CoreDeEngine implements Serializable { this.status = status; } + public Boolean getEnableDataFill() { + return enableDataFill; + } + + public void setEnableDataFill(Boolean enableDataFill) { + this.enableDataFill = enableDataFill; + } + @Override public String toString() { return "CoreDeEngine{" + @@ -148,6 +161,7 @@ public class CoreDeEngine implements Serializable { ", updateTime = " + updateTime + ", createBy = " + createBy + ", status = " + status + + ", enableDataFill = " + enableDataFill + "}"; } } diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/mapper/CoreDeEngineMapper.java b/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/mapper/CoreDeEngineMapper.java index f619c3f61d..5da6deb486 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/mapper/CoreDeEngineMapper.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/mapper/CoreDeEngineMapper.java @@ -6,11 +6,11 @@ import org.apache.ibatis.annotations.Mapper; /** *

- * Mapper 接口 + * 数据引擎 Mapper 接口 *

* * @author fit2cloud - * @since 2023-04-18 + * @since 2025-09-10 */ @Mapper public interface CoreDeEngineMapper extends BaseMapper { diff --git a/core/core-backend/src/main/resources/db/desktop/V2.10.13__ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.10.13__ddl.sql new file mode 100644 index 0000000000..9060b1aab2 --- /dev/null +++ b/core/core-backend/src/main/resources/db/desktop/V2.10.13__ddl.sql @@ -0,0 +1,2 @@ +alter table `core_de_engine` + add `enable_data_fill` tinyint default 1 null comment '启用数据填报功能'; diff --git a/core/core-backend/src/main/resources/db/migration/V2.10.13__ddl.sql b/core/core-backend/src/main/resources/db/migration/V2.10.13__ddl.sql new file mode 100644 index 0000000000..9060b1aab2 --- /dev/null +++ b/core/core-backend/src/main/resources/db/migration/V2.10.13__ddl.sql @@ -0,0 +1,2 @@ +alter table `core_de_engine` + add `enable_data_fill` tinyint default 1 null comment '启用数据填报功能'; diff --git a/core/core-backend/src/main/resources/i18n/core_en_US.properties b/core/core-backend/src/main/resources/i18n/core_en_US.properties index f762cef03e..4e33e92a69 100644 --- a/core/core-backend/src/main/resources/i18n/core_en_US.properties +++ b/core/core-backend/src/main/resources/i18n/core_en_US.properties @@ -98,6 +98,7 @@ i18n_df_end=End i18n_df_datasource_not_found=No data source found i18n_df_datasource_does_not_enable_data_filling=This data source has not enabled data reporting configuration i18n_df_builtin_datasource=Built-in database +i18n_df_default=Default i18n_df_folder_required=Folder is required i18n_df_form_not_exists=Form does not exist i18n_df_name_can_not_empty=Name cannot be empty @@ -211,4 +212,4 @@ i18n_invalid_address=Invalid address! i18n_unsupported_protocol=Unsupported protocol! i18n_excel_error_first_row=Empty cells are not allowed in the middle of the first row! i18n_app_error_no_api=Currently, API and Lark data sources are not supported. -i18n_resource_not_exists=Resource does not exist or has been deleted... \ No newline at end of file +i18n_resource_not_exists=Resource does not exist or has been deleted... diff --git a/core/core-backend/src/main/resources/i18n/core_zh_CN.properties b/core/core-backend/src/main/resources/i18n/core_zh_CN.properties index 822cb63418..47349dbc19 100644 --- a/core/core-backend/src/main/resources/i18n/core_zh_CN.properties +++ b/core/core-backend/src/main/resources/i18n/core_zh_CN.properties @@ -97,6 +97,7 @@ i18n_df_end=\u7ED3\u675F i18n_df_datasource_not_found=\u6CA1\u6709\u627E\u5230\u6570\u636E\u6E90 i18n_df_datasource_does_not_enable_data_filling=\u8BE5\u6570\u636E\u6E90\u6CA1\u6709\u542F\u7528\u6570\u636E\u586B\u62A5\u914D\u7F6E i18n_df_builtin_datasource=\u5185\u5EFA\u6570\u636E\u5E93 +i18n_df_default=\u9ED8\u8BA4 i18n_df_folder_required=\u76EE\u5F55\u5FC5\u9009 i18n_df_form_not_exists=\u8868\u5355\u4E0D\u5B58\u5728 i18n_df_name_can_not_empty=\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A @@ -210,4 +211,4 @@ i18n_invalid_address=\u65E0\u6548\u7684\u5730\u5740\uFF01 i18n_unsupported_protocol=\u4E0D\u652F\u6301\u7684\u534F\u8BAE\uFF01 i18n_excel_error_first_row=\u9996\u884C\u884C\u4E2D\u4E0D\u5141\u8BB8\u6709\u7A7A\u5355\u5143\u683C\uFF01 i18n_app_error_no_api=\u5F53\u524D\u4E0D\u652F\u6301API\u548C\u98DE\u4E66\u6570\u636E\u6E90 -i18n_resource_not_exists=\u8d44\u6e90\u4e0d\u5b58\u5728\u6216\u5df2\u7ecf\u88ab\u5220\u9664... \ No newline at end of file +i18n_resource_not_exists=\u8D44\u6E90\u4E0D\u5B58\u5728\u6216\u5DF2\u7ECF\u88AB\u5220\u9664... diff --git a/core/core-backend/src/main/resources/i18n/core_zh_TW.properties b/core/core-backend/src/main/resources/i18n/core_zh_TW.properties index 02781e7604..e5b19bd2ea 100644 --- a/core/core-backend/src/main/resources/i18n/core_zh_TW.properties +++ b/core/core-backend/src/main/resources/i18n/core_zh_TW.properties @@ -97,6 +97,7 @@ i18n_df_end=\u7D50\u675F i18n_df_datasource_not_found=\u6C92\u6709\u627E\u5230\u6578\u64DA\u6E90 i18n_df_datasource_does_not_enable_data_filling=\u8A72\u6578\u64DA\u6E90\u6C92\u6709\u555F\u7528\u6578\u64DA\u586B\u5831\u914D\u7F6E i18n_df_builtin_datasource=\u5167\u5EFA\u6578\u64DA\u5EAB +i18n_df_default=\u9ED8\u8A8D i18n_df_folder_required=\u76EE\u9304\u5FC5\u9078 i18n_df_form_not_exists=\u8868\u55AE\u4E0D\u5B58\u5728 i18n_df_name_can_not_empty=\u540D\u7A31\u4E0D\u80FD\u70BA\u7A7A @@ -210,4 +211,4 @@ i18n_invalid_address=\u7121\u6548\u7684\u5730\u5740\uFF01 i18n_unsupported_protocol=\u4E0D\u652F\u63F4\u7684\u5354\u8B70\uFF01 i18n_excel_error_first_row=\u9996\u884C\u884C\u4E2D\u4E0D\u5141\u8A31\u6709\u7A7A\u5132\u5B58\u683C\uFF01 i18n_app_error_no_api=\u7576\u524D\u4E0D\u652F\u63F4API\u548C\u98DB\u66F8\u6578\u64DA\u6E90 -i18n_resource_not_exists=\u8cc7\u6e90\u4e0d\u5b58\u5728\u6216\u5df2\u7d93\u88ab\u522a\u9664... \ No newline at end of file +i18n_resource_not_exists=\u8CC7\u6E90\u4E0D\u5B58\u5728\u6216\u5DF2\u7D93\u88AB\u522A\u9664... diff --git a/core/core-frontend/src/views/system/parameter/engine/EngineEdit.vue b/core/core-frontend/src/views/system/parameter/engine/EngineEdit.vue index 5f5bf51612..4f7967faaf 100644 --- a/core/core-frontend/src/views/system/parameter/engine/EngineEdit.vue +++ b/core/core-frontend/src/views/system/parameter/engine/EngineEdit.vue @@ -12,6 +12,7 @@ import { CustomPassword } from '@/components/custom-password' import { Base64 } from 'js-base64' import { querySymmetricKey } from '@/api/login' import { symmetricDecrypt } from '@/utils/encryption' +import { XpackComponent } from '@/components/plugin' const { t } = useI18n() const dialogVisible = ref(false) const loadingInstance = ref(null) @@ -175,7 +176,8 @@ const edit = () => { fileName, size, description, - lastSyncTime + lastSyncTime, + enableDataFill } = res.data if (configuration) { configuration = JSON.parse(symmetricDecrypt(configuration, response.data)) @@ -193,7 +195,8 @@ const edit = () => { type, configuration, syncSetting, - lastSyncTime + lastSyncTime, + enableDataFill }) }) .finally(() => { @@ -436,6 +439,11 @@ defineExpose({ + +