From e96e31048e32d7552a7bedf1a514cf8e361366ff Mon Sep 17 00:00:00 2001 From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com> Date: Wed, 30 Nov 2022 13:41:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E6=BA=90=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/deCustomCm/DePager.vue | 4 +- frontend/src/views/dataset/data/FieldEdit.vue | 4 +- .../src/views/dataset/data/UpdateInfo.vue | 2 +- .../src/views/system/datasource/DsTree.vue | 112 +++++++++++------- .../src/views/system/task/DatasetTaskList.vue | 2 +- 5 files changed, 77 insertions(+), 47 deletions(-) diff --git a/frontend/src/components/deCustomCm/DePager.vue b/frontend/src/components/deCustomCm/DePager.vue index 1f852d3974..9908389f55 100644 --- a/frontend/src/components/deCustomCm/DePager.vue +++ b/frontend/src/components/deCustomCm/DePager.vue @@ -112,9 +112,9 @@ export default { } } - //eslint-disable-next-line + // eslint-disable-next-line this.showPrevMore = showPrevMore - //eslint-disable-next-line + // eslint-disable-next-line this.showNextMore = showNextMore return array diff --git a/frontend/src/views/dataset/data/FieldEdit.vue b/frontend/src/views/dataset/data/FieldEdit.vue index eb46831c15..07d9f4bd90 100644 --- a/frontend/src/views/dataset/data/FieldEdit.vue +++ b/frontend/src/views/dataset/data/FieldEdit.vue @@ -860,8 +860,8 @@ export default { item.dateFormat = item.dateFormatType } } - if(item.dateFormatType === 'custom' && !item.dateFormat){ - return; + if (item.dateFormatType === 'custom' && !item.dateFormat) { + return } post('/dataset/field/save', item) .then((response) => { diff --git a/frontend/src/views/dataset/data/UpdateInfo.vue b/frontend/src/views/dataset/data/UpdateInfo.vue index 731aafb176..f728a0bf28 100644 --- a/frontend/src/views/dataset/data/UpdateInfo.vue +++ b/frontend/src/views/dataset/data/UpdateInfo.vue @@ -861,7 +861,7 @@ export default { }, disableExec(task) { return ( - (task.status === 'Stopped' && task.rate !== 'SIMPLE') || task.status === 'Pending' || task.status ==='Exec' || !hasDataPermission('manage', task.privileges) + (task.status === 'Stopped' && task.rate !== 'SIMPLE') || task.status === 'Pending' || task.status === 'Exec' || !hasDataPermission('manage', task.privileges) ) }, disableDelete(task) { diff --git a/frontend/src/views/system/datasource/DsTree.vue b/frontend/src/views/system/datasource/DsTree.vue index 78d375e5a8..23c25f6675 100644 --- a/frontend/src/views/system/datasource/DsTree.vue +++ b/frontend/src/views/system/datasource/DsTree.vue @@ -255,15 +255,15 @@ v-dialogDrag :title="$t('datasource.create')" :visible.sync="dsTypeRelate" - width="1200px" + width="1005px" class="de-dialog-form none-scroll-bar" append-to-body > - - +
-
- +
{{ $t(`datasource.${nameMap[idx]}`) }}
+
- -

{{ db.name }}

-
+
+ + +

{{ db.name }}

+
+
+
@@ -329,11 +341,14 @@ export default { }, data() { return { - tabActive: 'all', + tabActive: 'RDBMS', + databaseList: [], currentNodeId: '', dsTypeRelate: false, expandedArray: [], tData: [], + nameMap: ['relational_database', 'non_relational_database', 'other'], + typeList: ['RDBMS', 'NORDBMS', 'OTHER'], treeLoading: false, dsTypes: [], dsTypesForDriver: [], @@ -386,15 +401,7 @@ export default { } }, computed: { - ...mapGetters(['user']), - databaseList() { - if (this.tabActive === 'all') { - return this.dsTypes - } - return this.dsTypes.filter( - (ele) => ele.databaseClassification === this.tabActive - ) - } + ...mapGetters(['user']) }, watch: { key(val) { @@ -406,6 +413,9 @@ export default { this.datasourceTypes() }, methods: { + handleClick() { + document.querySelector(`.${this.tabActive}`).scrollIntoView() + }, createDriveOrDs() { if (this.showView === 'Driver') { this.addDriver() @@ -478,11 +488,17 @@ export default { datasourceTypes() { listDatasourceType().then((res) => { this.dsTypes = res.data + const databaseList = [[], [], []] this.dsTypes.forEach((item) => { + const index = this.typeList.findIndex(ele => ele === item.databaseClassification) + if (index !== -1) { + databaseList[index].push(item) + } if (item.isJdbc) { this.dsTypesForDriver.push(item) } }) + this.databaseList = databaseList }) }, refreshType(datasource) { @@ -802,24 +818,38 @@ export default { width: 100%; max-height: 65vh; overflow-y: auto; - display: flex; - flex-wrap: wrap; - margin-top: -3px; + margin-top: 3px; position: relative; z-index: 10; + + .name { + margin: 16px 0; + font-family: PingFang SC; + font-size: 16px; + font-weight: 500; + line-height: 24px; + color: var(--deTextPrimary, #1F2329); + } + + .item-container { + display: flex; + width: 100%; + flex-wrap: wrap; + } + .db-card { - height: 193px; - width: 270px; + height: 141px; + width: 177.6px; display: flex; flex-wrap: wrap; background: #ffffff; border: 1px solid #dee0e3; border-radius: 4px; - margin-bottom: 24px; - margin-left: 22px; + margin-bottom: 16px; + margin-left: 16px; img { width: 100%; - height: 154.58px; + height: 102px; border-top-left-radius: 4px; border-top-right-radius: 4px; } diff --git a/frontend/src/views/system/task/DatasetTaskList.vue b/frontend/src/views/system/task/DatasetTaskList.vue index 8a2b8db19c..b48c86bbf4 100644 --- a/frontend/src/views/system/task/DatasetTaskList.vue +++ b/frontend/src/views/system/task/DatasetTaskList.vue @@ -634,7 +634,7 @@ export default { ) }, disableExec(task) { - return ((task.status === 'Stopped' && task.rate !== 'SIMPLE') || task.status === 'Pending' || task.status ==='Exec' || !hasDataPermission('manage', task.privileges)) + return ((task.status === 'Stopped' && task.rate !== 'SIMPLE') || task.status === 'Pending' || task.status === 'Exec' || !hasDataPermission('manage', task.privileges)) }, disableDelete(task) { return false