From 1df2a60691b53697cca351f93a44bf7bd84350f1 Mon Sep 17 00:00:00 2001 From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com> Date: Thu, 29 Sep 2022 16:49:58 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20db=20api=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E9=80=89=E5=9B=BE=E6=A0=87=E6=9B=B4=E6=8D=A2?= =?UTF-8?q?=20=E6=95=B0=E6=8D=AE=E6=BA=90=E6=BB=9A=E5=8A=A8=E6=9D=A1?= =?UTF-8?q?=E5=8E=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/TreeSelector/index.vue | 2 +- frontend/src/icons/svg/Checkbox.svg | 4 ++ frontend/src/icons/svg/scene.svg | 4 +- frontend/src/styles/index.scss | 9 ++++ .../TreeSelector/ChartMoveSelector.vue | 2 +- .../TreeSelector/GroupMoveSelector.vue | 2 +- .../chart/components/TreeSelector/index.vue | 2 +- frontend/src/views/dataset/add/AddApi.vue | 3 +- frontend/src/views/dataset/add/AddDB.vue | 3 +- frontend/src/views/dataset/add/AddExcel.vue | 45 +++++++++++++++---- .../dataset/common/DatasetGroupSelector.vue | 2 +- .../common/DatasetGroupSelectorTree.vue | 2 +- .../src/views/dataset/common/datasetTree.vue | 2 +- .../src/views/dataset/group/CreatDsGroup.vue | 2 +- frontend/src/views/dataset/group/Group.vue | 44 +++++++++--------- .../views/dataset/group/GroupMoveSelector.vue | 2 +- .../appTemplate/component/TemplateList.vue | 2 +- .../panel/template/component/TemplateList.vue | 2 +- .../src/views/system/datasource/DsTree.vue | 8 ++-- .../src/views/system/task/TableSelector.vue | 2 +- frontend/src/views/system/task/filterUser.vue | 2 +- .../views/system/task/filterUserRecord.vue | 2 +- 22 files changed, 96 insertions(+), 52 deletions(-) create mode 100644 frontend/src/icons/svg/Checkbox.svg diff --git a/frontend/src/components/TreeSelector/index.vue b/frontend/src/components/TreeSelector/index.vue index 72ec3b7e72..8634a12ecf 100644 --- a/frontend/src/components/TreeSelector/index.vue +++ b/frontend/src/components/TreeSelector/index.vue @@ -10,7 +10,7 @@ - + {{ data.name }} diff --git a/frontend/src/icons/svg/Checkbox.svg b/frontend/src/icons/svg/Checkbox.svg new file mode 100644 index 0000000000..0645e22a52 --- /dev/null +++ b/frontend/src/icons/svg/Checkbox.svg @@ -0,0 +1,4 @@ + + + + diff --git a/frontend/src/icons/svg/scene.svg b/frontend/src/icons/svg/scene.svg index 9efbd48adc..037555dfc0 100644 --- a/frontend/src/icons/svg/scene.svg +++ b/frontend/src/icons/svg/scene.svg @@ -1,3 +1,3 @@ - - + + diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss index fa4d359aa5..ccc4c58cd5 100644 --- a/frontend/src/styles/index.scss +++ b/frontend/src/styles/index.scss @@ -1243,6 +1243,15 @@ div:focus { mix-blend-mode: normal; border-bottom: 1px solid var(--deComBorderColor50, rgba(187, 191, 196, 0.5)); + .text-overflow { + max-width: 300px; + display: inline-block; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + flex: none; + } + .el-drawer__close-btn { position: absolute; right: 24px; diff --git a/frontend/src/views/chart/components/TreeSelector/ChartMoveSelector.vue b/frontend/src/views/chart/components/TreeSelector/ChartMoveSelector.vue index 445c225fa0..80be74c912 100644 --- a/frontend/src/views/chart/components/TreeSelector/ChartMoveSelector.vue +++ b/frontend/src/views/chart/components/TreeSelector/ChartMoveSelector.vue @@ -10,7 +10,7 @@ - + {{ data.name }} diff --git a/frontend/src/views/chart/components/TreeSelector/GroupMoveSelector.vue b/frontend/src/views/chart/components/TreeSelector/GroupMoveSelector.vue index e5af73edc7..9b1b269f08 100644 --- a/frontend/src/views/chart/components/TreeSelector/GroupMoveSelector.vue +++ b/frontend/src/views/chart/components/TreeSelector/GroupMoveSelector.vue @@ -10,7 +10,7 @@ - + {{ data.name }} diff --git a/frontend/src/views/chart/components/TreeSelector/index.vue b/frontend/src/views/chart/components/TreeSelector/index.vue index 7ce66af1e4..6f31542b9f 100644 --- a/frontend/src/views/chart/components/TreeSelector/index.vue +++ b/frontend/src/views/chart/components/TreeSelector/index.vue @@ -10,7 +10,7 @@ - + {{ data.name }} diff --git a/frontend/src/views/dataset/add/AddApi.vue b/frontend/src/views/dataset/add/AddApi.vue index 218ec5e87d..99bea076f4 100644 --- a/frontend/src/views/dataset/add/AddApi.vue +++ b/frontend/src/views/dataset/add/AddApi.vue @@ -53,7 +53,8 @@ class="item" @click="setActiveName(t)" > - + + {{ showTableNameWithComment(t) }} diff --git a/frontend/src/views/dataset/add/AddDB.vue b/frontend/src/views/dataset/add/AddDB.vue index d7c9be3e9e..886604a82d 100644 --- a/frontend/src/views/dataset/add/AddDB.vue +++ b/frontend/src/views/dataset/add/AddDB.vue @@ -54,7 +54,8 @@ class="item" @click="setActiveName(t)" > - + + {{ showTableNameWithComment(t) }} diff --git a/frontend/src/views/dataset/add/AddExcel.vue b/frontend/src/views/dataset/add/AddExcel.vue index 10aafa2aca..d24901d0bc 100644 --- a/frontend/src/views/dataset/add/AddExcel.vue +++ b/frontend/src/views/dataset/add/AddExcel.vue @@ -53,10 +53,18 @@ @node-click="handleNodeClick" @check-change="handleCheckChange" > - + {{ data.excelLable }} @@ -83,11 +91,23 @@ @change="changeDatasetName" />
- {{ $t('deDataset.already_exists') }} + {{ + $t( + sheetObj.nameExsit + ? 'deDataset.already_exists' + : sheetObj.overLength + ? 'dataset.char_can_not_more_50' + : 'dataset.pls_input_name' + ) + }}
@@ -320,11 +340,18 @@ export default { .forEach((ele, index) => { if (checkList.includes(ele.datasetName)) { this.nameExsitValidator(ele, checkList) + this.nameLengthValidator(ele) } else { this.$set(ele, 'nameExsit', false) + this.$set(ele, 'empty', false) + this.$set(ele, 'overLength', false) } }) }, + nameLengthValidator(ele) { + this.$set(ele, 'empty', !ele.datasetName.length) + this.$set(ele, 'overLength', ele.datasetName.length > 50) + }, handleNodeClick(data) { if (data.sheet) { this.sheetObj = data @@ -506,10 +533,12 @@ export default { cb: () => { table.mergeSheet = true this.loading = true - post('/dataset/table/update', table).then((response) => { - this.openMessageSuccess('deDataset.set_saved_successfully') - this.cancel(response.data) - }).finally(() => { + post('/dataset/table/update', table) + .then((response) => { + this.openMessageSuccess('deDataset.set_saved_successfully') + this.cancel(response.data) + }) + .finally(() => { this.loading = false }) }, diff --git a/frontend/src/views/dataset/common/DatasetGroupSelector.vue b/frontend/src/views/dataset/common/DatasetGroupSelector.vue index b901296ec0..30d9cddaf5 100644 --- a/frontend/src/views/dataset/common/DatasetGroupSelector.vue +++ b/frontend/src/views/dataset/common/DatasetGroupSelector.vue @@ -44,7 +44,7 @@ - + - + - + - + - - + + {{ $t('dataset.rename') }} @@ -267,10 +265,8 @@ - - + + {{ $t('dataset.rename') }} @@ -278,9 +274,7 @@ {{ $t('dataset.move_to') }} - + {{ $t('dataset.delete') }} @@ -355,13 +349,18 @@ + +
{{ @@ -912,10 +916,7 @@ export default { moveTo(data) { this.moveGroup = true - this.moveDialogTitle = - this.$t('dataset.m1') + - (data.name.length > 10 ? data.name.substr(0, 10) + '...' : data.name) + - this.$t('dataset.m2') + this.moveDialogTitle = data.name }, closeMoveGroup() { this.moveGroup = false @@ -943,10 +944,7 @@ export default { moveToDs(data) { this.moveDs = true - this.moveDialogTitle = - this.$t('dataset.m1') + - (data.name.length > 10 ? data.name.substr(0, 10) + '...' : data.name) + - this.$t('dataset.m2') + this.moveDialogTitle = data.name }, closeMoveDs() { this.moveDs = false diff --git a/frontend/src/views/dataset/group/GroupMoveSelector.vue b/frontend/src/views/dataset/group/GroupMoveSelector.vue index 6fa91b49c1..b839fad807 100644 --- a/frontend/src/views/dataset/group/GroupMoveSelector.vue +++ b/frontend/src/views/dataset/group/GroupMoveSelector.vue @@ -21,7 +21,7 @@ - + - + {{ ele.name }} - + {{ ele.name }} - + @@ -718,9 +718,11 @@ export default { }