Skip to content

Commit 2966dc5

Browse files
committed
feat(workspace): workspace manage
1 parent 22f649f commit 2966dc5

File tree

6 files changed

+20
-7
lines changed

6 files changed

+20
-7
lines changed

frontend/src/i18n/en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
"actions": "Actions",
6666
"pieces_in_total": "Showing {ms} records out of {msg}",
6767
"test_connection": "Test Connection",
68+
"check": "check",
6869
"connection_success": "Connection Successful",
6970
"connection_failed": "Connection Failed, Please Check Configuration",
7071
"Search Datasource": "Search Datasource",

frontend/src/i18n/zh-CN.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
"pieces_in_total": "显示 {ms} 条数据,共 {msg} 条",
6666
"actions": "操作",
6767
"test_connection": "测试连接",
68+
"check": "校验",
6869
"connection_success": "连接成功",
6970
"connection_failed": "连接失败,请检查配置",
7071
"Search Datasource": "搜索数据源",

frontend/src/views/ds/DataTable.vue

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ const changeStatus = (row: any) => {
206206
:key="ele.table_name"
207207
class="model"
208208
:class="currentTable.table_name === ele.table_name && 'isActive'"
209+
:title="ele.table_name"
209210
@click="clickTable(ele)"
210211
>
211212
<el-icon size="16">
@@ -372,7 +373,7 @@ const changeStatus = (row: any) => {
372373
justify-content: space-between;
373374
padding: 8px;
374375
375-
.ed-icon:hover {
376+
.ed-icon {
376377
cursor: pointer;
377378
color: var(--ed-color-primary);
378379
}
@@ -392,11 +393,16 @@ const changeStatus = (row: any) => {
392393
padding-left: 8px;
393394
border-radius: 4px;
394395
cursor: pointer;
396+
395397
.name {
396398
margin-left: 8px;
397399
font-weight: 500;
398400
font-size: 14px;
399401
line-height: 22px;
402+
max-width: 80%;
403+
white-space: nowrap;
404+
overflow: hidden;
405+
text-overflow: ellipsis;
400406
}
401407
&:hover {
402408
background: #1f23291a;

frontend/src/views/ds/DatasourceForm.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -551,15 +551,15 @@ defineExpose({
551551
</div>
552552
<div class="draw-foot">
553553
<el-button @click="close">{{ t('common.cancel') }}</el-button>
554-
<el-button v-show="!isCreate && !isEditTable && form.type !== 'excel'" @click="check">
555-
{{ t('ds.test_connection') }}
554+
<el-button v-show="form.type !== 'excel'" @click="check">
555+
{{ t('ds.check') }}
556+
</el-button>
557+
<el-button v-show="activeStep !== 0 && isCreate" secondary @click="preview">
558+
{{ t('ds.previous') }}
556559
</el-button>
557560
<el-button v-show="activeStep === 1 && isCreate" type="primary" @click="next(dsFormRef)">
558561
{{ t('common.next') }}
559562
</el-button>
560-
<el-button v-show="activeStep === 2 && isCreate" @click="preview">
561-
{{ t('ds.previous') }}
562-
</el-button>
563563
<el-button
564564
v-show="activeStep === 2 || !isCreate"
565565
:loading="saveLoading"

frontend/src/views/ds/form.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
<div style="display: flex; justify-content: flex-end; margin-top: 20px">
136136
<el-button @click="close">{{ t('common.cancel') }}</el-button>
137137
<el-button v-show="!isCreate && !isEditTable && form.type !== 'excel'" @click="check">
138-
{{ t('ds.test_connection') }}
138+
{{ t('ds.check') }}
139139
</el-button>
140140
<el-button v-show="active === 0 && isCreate" type="primary" @click="next(dsFormRef)">
141141
{{ t('common.next') }}

frontend/src/views/system/workspace/index.vue

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,7 @@ const handleCurrentChange = (val: number) => {
276276
:key="ele.name"
277277
class="model"
278278
:class="currentTable.name === ele.name && 'isActive'"
279+
:title="ele.name"
279280
@click="clickTable(ele)"
280281
>
281282
<el-icon size="16">
@@ -609,6 +610,10 @@ const handleCurrentChange = (val: number) => {
609610
font-weight: 500;
610611
font-size: 14px;
611612
line-height: 22px;
613+
max-width: 80%;
614+
white-space: nowrap;
615+
overflow: hidden;
616+
text-overflow: ellipsis;
612617
}
613618
&:hover {
614619
background: #1f23291a;

0 commit comments

Comments
 (0)