From 21a953eafb396e0cf9ec1e31c93ff5052386e7ef Mon Sep 17 00:00:00 2001 From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com> Date: Wed, 21 Sep 2022 11:55:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E6=BA=90=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=88=B7=E6=96=B0=E8=B7=AF=E7=94=B1=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=8C=81=E4=B9=85=E5=8C=96=20=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=B7=B3=E8=BD=AC=20bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/api/system/datasource.js | 9 +- frontend/src/lang/en.js | 2 +- frontend/src/views/dataset/add/AddApi.vue | 2 - frontend/src/views/dataset/add/AddDB.vue | 2 - frontend/src/views/dataset/add/AddExcel.vue | 25 +- frontend/src/views/dataset/add/AddSQL.vue | 22 +- frontend/src/views/dataset/add/AddUnion.vue | 10 - frontend/src/views/dataset/data/FieldEdit.vue | 78 +- .../src/views/dataset/data/UpdateInfo.vue | 70 +- frontend/src/views/dataset/data/ViewTable.vue | 3 +- frontend/src/views/dataset/form.vue | 11 +- frontend/src/views/dataset/group/Group.vue | 4 +- frontend/src/views/dataset/index.vue | 19 +- .../system/datasource/DsConfiguration.vue | 680 ++++++++------- .../src/views/system/datasource/DsForm.vue | 789 +++++++++--------- .../src/views/system/datasource/DsMain.vue | 320 +++---- .../src/views/system/datasource/DsTree.vue | 19 +- .../views/system/task/filterUserRecord.vue | 4 + frontend/src/views/system/task/form.vue | 8 +- 19 files changed, 969 insertions(+), 1108 deletions(-) diff --git a/frontend/src/api/system/datasource.js b/frontend/src/api/system/datasource.js index 8588a7fac0..647cb4445b 100644 --- a/frontend/src/api/system/datasource.js +++ b/frontend/src/api/system/datasource.js @@ -148,4 +148,11 @@ export function updateDriver(data) { }) } -export default { dsGrid, addDs, editDs, delDs, validateDs, listDatasource, getSchema } +export function getDatasourceDetail(id) { + return request({ + url: `/datasource/get/${id}`, + loading: true, + method: 'post', + }) +} +export default { getDatasourceDetail, dsGrid, addDs, editDs, delDs, validateDs, listDatasource, getSchema } diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index aba06b6985..5afe4982aa 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -520,7 +520,7 @@ export default { left_to_edit: 'Select the data table on the left to edit', cannot_be_duplicate: 'The dataset name cannot be duplicate', set_saved_successfully: 'Data set saved successfully', - to_start_using: 'Browse the contents of your database, tables, and columns. Select a database to start using.', + to_start_using: 'Browse the contents of your database, tables and columns. Choose a database to get started.', to_run_query: 'Click to run query', the_running_results: 'You can view the running results' }, diff --git a/frontend/src/views/dataset/add/AddApi.vue b/frontend/src/views/dataset/add/AddApi.vue index 6573acc53d..a7835741d1 100644 --- a/frontend/src/views/dataset/add/AddApi.vue +++ b/frontend/src/views/dataset/add/AddApi.vue @@ -32,7 +32,6 @@ clearable />
- -
diff --git a/frontend/src/views/dataset/add/AddDB.vue b/frontend/src/views/dataset/add/AddDB.vue index a28198e1d8..06d5c82607 100644 --- a/frontend/src/views/dataset/add/AddDB.vue +++ b/frontend/src/views/dataset/add/AddDB.vue @@ -33,7 +33,6 @@ clearable />
- -
diff --git a/frontend/src/views/dataset/add/AddExcel.vue b/frontend/src/views/dataset/add/AddExcel.vue index d3c7147383..53a47627d9 100644 --- a/frontend/src/views/dataset/add/AddExcel.vue +++ b/frontend/src/views/dataset/add/AddExcel.vue @@ -1,11 +1,5 @@ - - - - - - - - - +.de-center-dialog { + .el-dialog { + margin: 0 !important; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + } +} + \ No newline at end of file diff --git a/frontend/src/views/dataset/data/UpdateInfo.vue b/frontend/src/views/dataset/data/UpdateInfo.vue index 9578815e64..b04f9e1b77 100644 --- a/frontend/src/views/dataset/data/UpdateInfo.vue +++ b/frontend/src/views/dataset/data/UpdateInfo.vue @@ -185,15 +185,6 @@
- -
-
- +
+ {{ $t('dataset.cancel') }} + {{ + $t('dataset.confirm') + }}
@@ -707,11 +696,7 @@ export default { showConfig() { this.userDrawer = true this.listTaskLog() - // this.getIncrementalConfig() }, - // refreshLog() { - // this.listTaskLog(); - // }, showErrorMassage(massage) { this.show_error_massage = true this.error_massage = massage @@ -857,47 +842,6 @@ export default { this.initSearch(false) }) }, - // getIncrementalConfig() { - // post("/dataset/table/incrementalConfig", { tableId: this.table.id }).then( - // (response) => { - // this.incrementalConfig = response.data; - // if ( - // this.incrementalConfig.incrementalAdd.length === 0 && - // this.incrementalConfig.incrementalDelete.length === 0 - // ) { - // this.incrementalUpdateType = "incrementalAdd"; - // this.sql = ""; - // return; - // } - // if (this.incrementalConfig.incrementalAdd.length > 0) { - // this.incrementalUpdateType = "incrementalAdd"; - // this.sql = this.incrementalConfig.incrementalAdd; - // } else { - // this.incrementalUpdateType = "incrementalDelete"; - // this.sql = this.incrementalConfig.incrementalDelete; - // } - // } - // ); - // }, - // saveIncrementalConfig() { - // if (this.incrementalUpdateType === "incrementalAdd") { - // this.incrementalConfig.incrementalAdd = this.sql; - // } else { - // this.incrementalConfig.incrementalDelete = this.sql; - // } - // this.incrementalConfig.tableId = this.table.id; - // post( - // "/dataset/table/save/incrementalConfig", - // this.incrementalConfig - // ).then((response) => { - // this.$message({ - // message: this.$t("dataset.save_success"), - // type: "success", - // showClose: true, - // }); - // this.update_setting = false; - // }); - // }, saveTask(task) { this.$refs.taskForm.validate((valid) => { if (valid) { @@ -1203,7 +1147,7 @@ export default { .codemirror-cont { box-sizing: border-box; - width: 560px; + width: 100%; height: 200px; background: #ffffff; border: 1px solid #bbbfc4; diff --git a/frontend/src/views/dataset/data/ViewTable.vue b/frontend/src/views/dataset/data/ViewTable.vue index 6f1fce6145..16eac3aeb2 100644 --- a/frontend/src/views/dataset/data/ViewTable.vue +++ b/frontend/src/views/dataset/data/ViewTable.vue @@ -102,8 +102,7 @@ - { diff --git a/frontend/src/views/dataset/index.vue b/frontend/src/views/dataset/index.vue index 161ef94347..2aa38bba0c 100644 --- a/frontend/src/views/dataset/index.vue +++ b/frontend/src/views/dataset/index.vue @@ -5,16 +5,15 @@ - - - - + + + diff --git a/frontend/src/views/system/datasource/DsConfiguration.vue b/frontend/src/views/system/datasource/DsConfiguration.vue index 705f2e4e45..7738935aa2 100644 --- a/frontend/src/views/system/datasource/DsConfiguration.vue +++ b/frontend/src/views/system/datasource/DsConfiguration.vue @@ -11,81 +11,91 @@ > @@ -94,7 +104,11 @@ :label="$t('datasource.host')" prop="configuration.host" > - + - + {{ $t("datasource.oracle_sid") }} + >{{ $t('datasource.oracle_sid') }} - {{ $t("datasource.oracle_service_name") }} + {{ $t('datasource.oracle_service_name') }} @@ -164,7 +182,7 @@ >

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

@@ -183,7 +201,11 @@ " :label="$t('datasource.user_name')" > - + - + - + - + {{ $t("datasource.priority") + >{{ $t('datasource.priority') }} @@ -369,7 +403,7 @@ type="number" :min="0" > - + @@ -408,7 +442,7 @@ :rules="rule" >
- {{ $t("datasource.base_info") }} + {{ $t('datasource.base_info') }}
@@ -439,7 +473,7 @@
- {{ $t("datasource.req_param") }} + {{ $t('datasource.req_param') }}
@@ -462,7 +496,7 @@ :rules="rule" >
- {{ $t("datasource.column_info") }} + {{ $t('datasource.column_info') }}