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 />
@@ -260,15 +254,6 @@ export default { defaultCheckedKeys: [] } }, - watch: { - defaultCheckedKeys(val) { - const excelNum = this.excelData.map((ele) => ele.id) - this.$emit( - 'setTableNum', - val.filter((ele) => !excelNum.includes(ele)).length - ) - } - }, mounted() { window.onresize = () => { this.calHeight() @@ -297,7 +282,9 @@ export default { this.defaultCheckedKeys.splice(index, 1) } this.validateName() - this.$emit('setTableNum', this.defaultCheckedKeys.length) + const labelList = this.$refs.tree.getCheckedNodes().map(ele => ele.excelLable) + const excelList = this.excelData.map(ele => ele.excelLable); + this.$emit('setTableNum', labelList.filter(ele => !excelList.includes(ele)).length) }, nameExsitValidator(ele, checkList) { this.$set( @@ -309,7 +296,9 @@ export default { ) }, validateName() { - const checkList = this.$refs.tree.getCheckedNodes().map(ele => ele.datasetName) + const checkList = this.$refs.tree + .getCheckedNodes() + .map((ele) => ele.datasetName) this.excelData .reduce((pre, next) => pre.concat(next.sheets), []) .forEach((ele, index) => { @@ -343,7 +332,7 @@ export default { } } } - this.validateName(); + this.validateName() }, calHeight() { const that = this diff --git a/frontend/src/views/dataset/add/AddSQL.vue b/frontend/src/views/dataset/add/AddSQL.vue index ff1a4db8c1..39f9293e2c 100644 --- a/frontend/src/views/dataset/add/AddSQL.vue +++ b/frontend/src/views/dataset/add/AddSQL.vue @@ -1,14 +1,5 @@
- {{ $t("datasource.kerbers_info") }} + {{ $t('datasource.kerbers_info') }}
@@ -183,7 +201,11 @@ " :label="$t('datasource.user_name')" > -