diff --git a/core/core-frontend/src/api/sync/syncTask.ts b/core/core-frontend/src/api/sync/syncTask.ts index 31462ef74c..c22b484bd3 100644 --- a/core/core-frontend/src/api/sync/syncTask.ts +++ b/core/core-frontend/src/api/sync/syncTask.ts @@ -26,6 +26,7 @@ export interface ISource { targetFieldTypeList?: string[] incrementCheckbox?: string incrementField?: string + esQuery?: string } export interface ITableField { diff --git a/core/core-frontend/src/locales/en-US.ts b/core/core-frontend/src/locales/en-US.ts index 2a4bf51ba9..a3f9f7bd48 100644 --- a/core/core-frontend/src/locales/en-US.ts +++ b/core/core-frontend/src/locales/en-US.ts @@ -3568,10 +3568,10 @@ export default { }, sync_datasource: { title: 'Data Connection Management', - source_ds: 'Source Datasource', - target_ds: 'Target Datasource', - add_source_ds: '@:common.add@:sync_datasource.source_ds', - add_target_ds: '@:common.add@:sync_datasource.target_ds', + source_ds: 'Source Data Source', + target_ds: 'Target Data Source', + add_source_ds: '@:common.add @:sync_datasource.source_ds', + add_target_ds: '@:common.add @:sync_datasource.target_ds', name: 'Name', desc: 'Description', type: 'Type', @@ -3721,7 +3721,7 @@ export default { status_running: 'Synchronizing', status_failed: 'Failed', status_stopped: 'Task stopped', - status_waiting: 'Waiting for synchronization', + status_waiting: 'Waiting for sync', status_done: 'Task ended', status_terminated: 'Terminated', status_connection_lost: 'Connection lost', @@ -3879,7 +3879,9 @@ export default { execute_log: 'Execution log', done: 'Done', connection_lost: 'Disconnected', - task_name: 'Task name' + task_name: 'Task name', + es_params_label: 'Query Parameters', + es_params_tip: 'Please follow the Elasticsearch query syntax' }, watermark: { support_params: 'Currently supported parameters:', diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index d76b610b6d..72335eac6d 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -3612,10 +3612,10 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr }, sync_datasource: { title: 'Data Connection Management', - source_ds: 'Source Datasource', - target_ds: 'Target Datasource', - add_source_ds: '@:common.add@:sync_datasource.source_ds', - add_target_ds: '@:common.add@:sync_datasource.target_ds', + source_ds: 'Source Data Source', + target_ds: 'Target Data Source', + add_source_ds: '@:common.add @:sync_datasource.source_ds', + add_target_ds: '@:common.add @:sync_datasource.target_ds', name: 'Name', desc: 'Description', type: 'Type', @@ -3765,7 +3765,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr status_running: 'Synchronizing', status_failed: 'Failed', status_stopped: 'Task stopped', - status_waiting: 'Waiting for synchronization', + status_waiting: 'Waiting for sync', status_done: 'Task ended', status_terminated: 'Terminated', status_connection_lost: 'Connection lost', @@ -3923,7 +3923,9 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr execute_log: 'Execution log', done: 'Done', connection_lost: 'Disconnected', - task_name: 'Task name' + task_name: 'Task name', + es_params_label: 'Query Parameters', + es_params_tip: 'Please follow the Elasticsearch query syntax' }, watermark: { support_params: 'Currently supported parameters:', diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index 9d1f66c61d..3a7f5282aa 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -3822,7 +3822,9 @@ export default { execute_log: '執行日誌', done: '完成', connection_lost: '連線斷開', - task_name: '任務名稱' + task_name: '任務名稱', + es_params_label: '查詢參數', + es_params_tip: '請遵循 Elasitcsearch 的查詢語法' }, watermark: { support_params: '目前支援的參數:', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index b322dfad6c..98b073c29e 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -3826,7 +3826,9 @@ export default { execute_log: '执行日志', done: '完成', connection_lost: '连接断开', - task_name: '任务名称' + task_name: '任务名称', + es_params_label: '查询参数', + es_params_tip: '请遵循 Elasitcsearch 的查询语法' }, watermark: { support_params: '当前支持的参数:', diff --git a/de-xpack b/de-xpack index 3c5217df4f..d9da998cd7 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 3c5217df4fcc4de827dfcd7d08697d9f4df68b3b +Subproject commit d9da998cd7164c6120a2ddf20c0a95a179f4b483 diff --git a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/Source.java b/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/Source.java index 6c7c908c17..5fba8e1746 100644 --- a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/Source.java +++ b/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/Source.java @@ -20,4 +20,5 @@ public class Source { private String tableExtract; private List fieldList; private String incrementField; + private String esQuery; }