From f75d44cd135104bd474cbc56c06e179eaa421149 Mon Sep 17 00:00:00 2001 From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com> Date: Fri, 22 Jul 2022 13:39:05 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20API=E6=95=B0=E6=8D=AE=E6=BA=90=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/en.js | 1 + frontend/src/lang/tw.js | 1 + frontend/src/lang/zh.js | 1 + .../system/datasource/DsConfiguration.vue | 1441 ++++++++++++----- frontend/src/views/system/user/userEditer.vue | 2 +- 5 files changed, 1018 insertions(+), 428 deletions(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 6cfe191bcb..90c8eb4b47 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1179,6 +1179,7 @@ export default { remark_bg_color: 'Background Fill' }, dataset: { + parse_filed: 'Parse Field', field_rename: 'Rename Field', params_work: 'Effective only when editing SQL', sql_variable_limit_1: '1、SQL variables can only be used in where conditions', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 7d8a88d4c5..0174d7d61e 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1178,6 +1178,7 @@ export default { remark_bg_color: '背景填充' }, dataset: { + parse_filed: '解析字段', field_rename: '字段重命名', params_work: '僅在編輯 sql 時生效', sql_variable_limit_1: '1、SQL變數只能在WHERE條件中使用', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index bb46e8a0a4..f6a75d3e85 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1180,6 +1180,7 @@ export default { remark_bg_color: '背景填充' }, dataset: { + parse_filed: '解析字段', field_rename: '字段重命名', params_work: '仅在编辑sql时生效', select_year: '选择年', diff --git a/frontend/src/views/system/datasource/DsConfiguration.vue b/frontend/src/views/system/datasource/DsConfiguration.vue index a63f32b8a6..deb9f97656 100644 --- a/frontend/src/views/system/datasource/DsConfiguration.vue +++ b/frontend/src/views/system/datasource/DsConfiguration.vue @@ -11,178 +11,135 @@ label-width="180px" label-position="right" > - + - - - - - - + + + + + + - - - - - - - - - -

{{ $t('datasource.base_info') }}

- - - - - - - - - - - - - -
-

{{ $t('datasource.req_param') }}

- - - - -
- -
-
- - -

{{ $t('datasource.column_info') }}

- - - - - - - - - - - - - - - -

{{ $t('dataset.data_preview') }}

- - - - - - -
-
- -
- - - + + - - + + - - + + - - {{ - $t('datasource.oracle_sid') - }} + + {{ $t("datasource.oracle_sid") }} - - {{ $t('datasource.oracle_service_name') }} + + {{ $t("datasource.oracle_service_name") }} - + - - + + - - + +

- {{ $t('datasource.kerbers_info') }} + {{ $t("datasource.kerbers_info") }}

- - + - + v-if=" + form.type !== 'es' && + form.type !== 'api' && + form.configuration.authMethod !== 'kerberos' + " + :label="$t('datasource.user_name')" + > + - - - - - - - - - - - - - - - - - + v-if=" + form.type !== 'es' && + form.type !== 'api' && + form.configuration.authMethod !== 'kerberos' + " + :label="$t('datasource.password')" + > + - {{ - $t('datasource.get_schema') - }} + v-if="form.type === 'es'" + :label="$t('datasource.user_name')" + > + + + + + + + + + + + + + + + + + {{ $t("datasource.get_schema") }} - - + v-if=" + form.type == 'oracle' || + form.type == 'sqlServer' || + form.type == 'pg' || + form.type == 'redshift' || + form.type == 'db2' + " + :label="$t('datasource.schema')" + > + + - - - + + + - - - + + + - + - - + + - - + + - - + + - - + + - + + + + + + + + + +
+ {{ $t("datasource.base_info") }} +
+ + + + + + + + + + + + +
+
+ {{ $t("datasource.req_param") }} +
+ + + + +
+
+
+ + +
+ {{ $t("datasource.column_info") }} +
+
+ + + + + + + + + + + + +
+ +
+ {{ $t("dataset.data_preview") }} +
+ + + + + + +
+
+
+ {{ $t("commons.cancel") }} + {{ $t("fu.steps.next") }} + + {{ + $t("fu.steps.prev") + }} + {{ + $t("commons.save") + }} +
+
+ \ No newline at end of file diff --git a/frontend/src/views/system/user/userEditer.vue b/frontend/src/views/system/user/userEditer.vue index d416887bb0..8dfe9bed70 100644 --- a/frontend/src/views/system/user/userEditer.vue +++ b/frontend/src/views/system/user/userEditer.vue @@ -502,11 +502,11 @@ export default { font-weight: 400; line-height: 22px; text-align: left; - color: #1f2329; } .pwd { margin: 0 8px; + color: #1f2329; } .btn-text {