@@ -154,14 +154,19 @@
import { listApiDatasource, post, isKettleRunning } from '@/api/dataset/dataset'
import { dbPreview, engineMode } from '@/api/system/engine'
import cancelMix from './cancelMix'
+import msgCfm from '@/components/msgCfm/index'
export default {
name: 'AddApi',
- mixins: [cancelMix],
+ mixins: [cancelMix, msgCfm],
props: {
param: {
type: Object,
default: null
+ },
+ nameList: {
+ type: Array,
+ default: () => []
}
},
data() {
@@ -203,6 +208,10 @@ export default {
}
},
watch: {
+ checkTableList(val) {
+ this.validateName()
+ this.$emit('setTableNum', val.length)
+ },
dataSource(val) {
if (val) {
this.checkTableList = []
@@ -258,14 +267,6 @@ export default {
},
methods: {
nameExsitValidator(activeIndex) {
- if (
- !this.nameList ||
- this.nameList.length === 0 ||
- !this.checkDatasetName.includes(this.tableData[activeIndex].datasetName)
- ) {
- this.tableData[activeIndex].nameExsit = false
- return
- }
this.tableData[activeIndex].nameExsit =
this.nameList
.concat(this.checkDatasetName)
@@ -276,6 +277,8 @@ export default {
this.tableData.forEach((ele, index) => {
if (this.checkDatasetName.includes(ele.datasetName)) {
this.nameExsitValidator(index)
+ } else {
+ ele.nameExsit = false;
}
})
},
@@ -335,7 +338,7 @@ export default {
const tables = []
const mode = this.mode
const syncType = this.syncType
- this.checkTableList.forEach(function(name) {
+ this.checkTableList.forEach((name) => {
const datasetName = this.tableData.find(
(ele) => ele.name === name
).datasetName
diff --git a/frontend/src/views/dataset/add/AddExcel.vue b/frontend/src/views/dataset/add/AddExcel.vue
index c8f16b683b..85cbafbad8 100644
--- a/frontend/src/views/dataset/add/AddExcel.vue
+++ b/frontend/src/views/dataset/add/AddExcel.vue
@@ -215,7 +215,11 @@ export default {
nameList: {
type: Array,
default: () => []
- }
+ },
+ originName: {
+ type: String,
+ default: ''
+ },
},
data() {
return {
@@ -255,6 +259,11 @@ export default {
defaultCheckedKeys: []
}
},
+ computed: {
+ nameListCopy() {
+ return this.nameList.filter((ele) => ele !== this.originName)
+ }
+ },
mounted() {
window.onresize = () => {
this.calHeight()
@@ -285,8 +294,8 @@ export default {
this.validateName()
const labelList = this.$refs.tree
.getCheckedNodes()
- .map((ele) => ele.excelLable)
- const excelList = this.excelData.map((ele) => ele.excelLable)
+ .map((ele) => ele.id)
+ const excelList = this.excelData.map((ele) => ele.id)
this.$emit(
'setTableNum',
labelList.filter((ele) => !excelList.includes(ele)).length
@@ -296,7 +305,7 @@ export default {
this.$set(
ele,
'nameExsit',
- this.nameList
+ this.nameListCopy
.concat(checkList)
.filter((name) => name === ele.datasetName).length > 1
)
@@ -379,7 +388,7 @@ export default {
this.sheets = []
this.data = []
const datas = this.data
- this.$refs.plxTable.reloadData(datas)
+ this.$refs.plxTable?.reloadData(datas)
this.fileList = []
this.uploading = false
this.$message({
diff --git a/frontend/src/views/dataset/add/AddSQL.vue b/frontend/src/views/dataset/add/AddSQL.vue
index e1269f9168..9038868b73 100644
--- a/frontend/src/views/dataset/add/AddSQL.vue
+++ b/frontend/src/views/dataset/add/AddSQL.vue
@@ -106,7 +106,7 @@
class="el-icon-close"
>
-
+
{{ (showTable && dataTable) || selectedDatasource.name }}
@@ -122,7 +122,11 @@
{{
$t('deDataset.to_start_using')
}}
-
+
{{ ele.fieldName }}
@@ -376,7 +380,7 @@ import _ from 'lodash'
export default {
name: 'AddSQL',
components: { codemirror },
- mixins: [ msgCfm, cancelMix],
+ mixins: [msgCfm, cancelMix],
props: {
param: {
type: Object,
@@ -534,7 +538,15 @@ export default {
.removeEventListener('mousemove', this.caculateHeight)
},
caculateHeight(e) {
- this.sqlHeight = e.pageY - 56
+ if (e.pageY - 120 < 248) {
+ this.sqlHeight = 248
+ return
+ }
+ if (e.pageY - 120 > document.documentElement.clientHeight - 170) {
+ this.sqlHeight = document.documentElement.clientHeight - 170
+ return
+ }
+ this.sqlHeight = e.pageY - 120
},
kettleState() {
isKettleRunning().then((res) => {
@@ -558,13 +570,15 @@ export default {
}
}
this.tableLoading = true
- post('/datasource/getTables/' + this.dataSource, {}).then((response) => {
- this.tableData = response.data
- }).finally(() => {
- this.tableLoading = false
- })
+ post('/datasource/getTables/' + this.dataSource, {})
+ .then((response) => {
+ this.tableData = response.data
+ })
+ .finally(() => {
+ this.tableLoading = false
+ })
},
- calHeight: _.debounce(function() {
+ calHeight: _.debounce(function () {
const sqlHeight = Math.max(this.sqlHeight, 248)
const currentHeight = document.documentElement.clientHeight
this.height = currentHeight - sqlHeight - 56 - 54 - 36 - 64
@@ -717,6 +731,7 @@ export default {
saveVariable() {
this.variables = JSON.parse(JSON.stringify(this.variablesTmp)).concat()
this.showVariableMgm = false
+ this.openMessageSuccess('参数设置成功')
},
variableTypeChange(row) {
row.defaultValue = ''
@@ -852,6 +867,14 @@ export default {
align-items: center;
padding-left: 4px;
+ &.field {
+ color: var(--deTextPrimary, #1f2329);
+ }
+
+ &.field:hover {
+ background: none;
+ }
+
&:hover {
background: rgba(31, 35, 41, 0.1);
}
diff --git a/frontend/src/views/dataset/add/AddUnion.vue b/frontend/src/views/dataset/add/AddUnion.vue
index d5d860917c..2d4fffd52e 100644
--- a/frontend/src/views/dataset/add/AddUnion.vue
+++ b/frontend/src/views/dataset/add/AddUnion.vue
@@ -197,6 +197,14 @@ export default {
.removeEventListener('mousemove', this.caculateHeight)
},
caculateHeight(e) {
+ if (e.pageY - 56 < 298) {
+ this.unionHeight = 298
+ return
+ }
+ if (e.pageY - 56 > document.documentElement.clientHeight - 100) {
+ this.unionHeight = document.documentElement.clientHeight - 100
+ return
+ }
this.unionHeight = e.pageY - 56
},
save() {
diff --git a/frontend/src/views/dataset/common/DatasetDetail.vue b/frontend/src/views/dataset/common/DatasetDetail.vue
index 926359f1d0..877ac8d7d8 100644
--- a/frontend/src/views/dataset/common/DatasetDetail.vue
+++ b/frontend/src/views/dataset/common/DatasetDetail.vue
@@ -1,6 +1,9 @@
+
+ {{ $t('chart.datalist') }}
+
{{ $t('chart.datalist') + $t('desearchbutton.text') }}
@@ -28,6 +31,9 @@
+
+ {{ $t('dataset.datalist') }}
+
{{ $t('dataset.datalist') + $t('desearchbutton.text') }}
@@ -51,6 +57,7 @@
{{ $t('dataset.union_data') }}
+
Api
{{ $t('dataset.table') }}
@@ -81,6 +88,9 @@
+
+ {{ $t('datasource.datasource') }}
+
{{ $t('datasource.datasource') + $t('desearchbutton.text') }}
@@ -93,38 +103,8 @@
{{ $t('datasource.type') }}
-
- MySQL
-
-
- SQL Server
-
-
- Oracle
-
-
- Apache Hive
-
-
- PostgreSQL
-
-
- Elasticsearch
-
-
- MariaDB
-
-
- Doris
-
-
- ClickHouse
-
-
- AWS Redshift
-
-
- MongoDB
+
+ {{ detail.datasource.type }}
@@ -222,18 +202,26 @@ export default {
\ No newline at end of file
diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue
index 73e0212b3f..e14574edbc 100644
--- a/frontend/src/views/dataset/group/Group.vue
+++ b/frontend/src/views/dataset/group/Group.vue
@@ -167,15 +167,17 @@
+
{{ $t('dataset.rename') }}
-
+
+
{{ $t('dataset.move_to') }}
-
+
+
{{ $t('dataset.delete') }}
@@ -263,18 +265,19 @@
+
{{ $t('dataset.rename') }}
-
+
+
{{ $t('dataset.move_to') }}
+
{{ $t('dataset.delete') }}
@@ -297,6 +300,7 @@
class="de-form-item"
:model="groupForm"
:rules="groupFormRules"
+ :before-close="close"
@submit.native.prevent
@keypress.enter.native="saveGroup(groupForm)"
>
@@ -390,6 +394,9 @@
+
+
+
@@ -405,6 +412,7 @@ import {
alter
} from '@/api/dataset/dataset'
import GroupMoveSelector from './GroupMoveSelector'
+import CreatDsGroup from './CreatDsGroup'
import { queryAuthModel } from '@/api/authModel/authModel'
import { engineMode } from '@/api/system/engine'
import _ from 'lodash'
@@ -412,7 +420,7 @@ import msgCfm from '@/components/msgCfm/index'
export default {
name: 'Group',
- components: { GroupMoveSelector },
+ components: { GroupMoveSelector, CreatDsGroup },
mixins: [msgCfm],
props: {
saveStatus: {
@@ -616,7 +624,7 @@ export default {
this.add('group')
return
}
- this.dfsTdata(this.tData, param.id)
+ this.fileList = (param?.children || []).map((ele) => ele.label)
this.add(param.modelInnerType)
this.groupForm.pid = param.id
this.groupForm.level = param.level + 1
@@ -831,7 +839,7 @@ export default {
return
}
this.$store.dispatch('dataset/setSceneData', this.currGroup.id)
- if (!this.tData.length) {
+ if (!this.tData?.length) {
this.openMessageSuccess('deDataset.new_folder_first', 'error')
return
}
@@ -856,6 +864,11 @@ export default {
break
}
+ if (!param.id) {
+ this.$refs.CreatDsGroup.init(datasetType)
+ return
+ }
+
this.$router.push({
path: '/dataset-form',
query: {
@@ -863,6 +876,7 @@ export default {
sceneId: param.id
}
})
+
},
addData(name) {
this.$emit('switchComponent', { name: name, param: this.currGroup })
@@ -945,6 +959,7 @@ export default {
this.closeMoveDs()
this.expandedArray.push(newSceneId)
this.treeNode()
+ this.openMessageSuccess('移动成功')
})
},
targetDs(val) {
@@ -1013,7 +1028,7 @@ export default {