Skip to content

Commit 8212a93

Browse files
committed
fix: bug fix
1 parent 7835678 commit 8212a93

File tree

9 files changed

+27
-21
lines changed

9 files changed

+27
-21
lines changed

frontend/src/views/ds/DatasourceForm.vue

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@ const rules = reactive<FormRules>({
7474
host: [
7575
{
7676
required: true,
77-
message: t('datasource.please_enter') + t('common.empty') + t('ds.form.port'),
77+
message: t('datasource.please_enter') + t('common.empty') + t('ds.form.host'),
7878
trigger: 'blur',
7979
},
8080
],
8181
port: [
8282
{
8383
required: true,
84-
message: t('datasource.please_enter') + t('common.empty') + t('ds.form.host'),
84+
message: t('datasource.please_enter') + t('common.empty') + t('ds.form.port'),
8585
trigger: 'blur',
8686
},
8787
],
@@ -97,7 +97,7 @@ const rules = reactive<FormRules>({
9797
dbSchema: [
9898
{
9999
required: true,
100-
message: t('datasource.please_enter') + t('common.empty') + t('ds.form.schema'),
100+
message: t('datasource.please_enter') + t('common.empty') + 'Schema',
101101
trigger: 'blur',
102102
},
103103
],
@@ -605,16 +605,10 @@ defineExpose({
605605
"
606606
/>
607607
</el-form-item>
608-
<el-form-item
609-
v-if="haveSchema.includes(form.type)"
610-
:label="t('ds.form.schema')"
611-
prop="dbSchema"
612-
>
608+
<el-form-item v-if="haveSchema.includes(form.type)" label="Schema" prop="dbSchema">
613609
<el-input
614610
v-model="form.dbSchema"
615-
:placeholder="
616-
$t('datasource.please_enter') + $t('common.empty') + t('ds.form.schema')
617-
"
611+
:placeholder="$t('datasource.please_enter') + $t('common.empty') + 'Schema'"
618612
/>
619613
<el-button v-if="false" link type="primary" :icon="Plus">Get Schema</el-button>
620614
</el-form-item>

frontend/src/views/system/embedded/DsCard.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@ const handlePublic = () => {
6767
<div click.stop class="methods">
6868
<el-button v-if="isPrivate" secondary @click.stop="handlePublic">
6969
<el-icon style="margin-right: 4px" size="16">
70-
<icon_personal_privacy_outlined></icon_personal_privacy_outlined>
70+
<icon_community_tab_outlined></icon_community_tab_outlined>
7171
</el-icon>
7272
{{ $t('embedded.set_to_public') }}
7373
</el-button>
7474
<el-button v-else secondary @click.stop="handlePrivate">
7575
<el-icon style="margin-right: 4px" size="16">
76-
<icon_community_tab_outlined></icon_community_tab_outlined>
76+
<icon_personal_privacy_outlined></icon_personal_privacy_outlined>
7777
</el-icon>
7878
{{ $t('embedded.set_to_private') }}
7979
</el-button>

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,9 @@ const handleAddEmbedded = (val: any) => {
9999
const getDsList = () => {
100100
datasourceApi.list().then((res: any) => {
101101
dsListOptions.value = res || []
102+
if (!currentEmbedded.id) {
103+
dsForm.private_list = dsListOptions.value.map((ele) => ele.id)
104+
}
102105
})
103106
}
104107
const handleBaseEmbedded = (row: any) => {
@@ -645,6 +648,7 @@ const copyCode = () => {
645648
<el-form-item prop="workspace" :label="t('user.workspace')">
646649
<el-select
647650
v-model="dsForm.oid"
651+
filterable
648652
:placeholder="
649653
$t('datasource.please_enter') + $t('common.empty') + $t('user.workspace')
650654
"
@@ -814,11 +818,12 @@ const copyCode = () => {
814818
.popover-item {
815819
height: 98px;
816820
display: flex;
817-
padding-left: 12px;
821+
padding-left: 8px;
818822
padding-right: 8px;
819823
position: relative;
820824
border-radius: 4px;
821825
cursor: pointer;
826+
padding-top: 8px;
822827
&:hover {
823828
background: #1f23291a;
824829
}

frontend/src/views/system/model/Card.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ const handleDel = () => {
4242
<div class="card">
4343
<div class="name-icon">
4444
<img :src="current_supplier?.icon" width="32px" height="32px" />
45-
<span class="name">{{ name }}</span>
45+
<span :title="name" class="name ellipsis">{{ name }}</span>
4646
<span v-if="isDefault" class="default">{{ $t('model.default_model') }}</span>
4747
</div>
4848
<div class="type-value">
@@ -90,6 +90,7 @@ const handleDel = () => {
9090
font-weight: 500;
9191
font-size: 16px;
9292
line-height: 24px;
93+
max-width: 280px;
9394
}
9495
.default {
9596
margin-left: auto;

frontend/src/views/system/model/Model.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ const submit = (item: any) => {
191191
search()
192192
ElMessage({
193193
type: 'success',
194-
message: 'Add completed',
194+
message: t('workspace.add_successfully'),
195195
})
196196
})
197197
return
@@ -368,6 +368,7 @@ const submit = (item: any) => {
368368
display: flex;
369369
flex-wrap: wrap;
370370
max-height: calc(100% - 40px);
371+
overflow-y: auto;
371372
}
372373
}
373374
</style>
@@ -389,6 +390,8 @@ const submit = (item: any) => {
389390
.popover {
390391
.popover-content {
391392
padding: 4px;
393+
max-height: 300px;
394+
overflow-y: auto;
392395
}
393396
.popover-item {
394397
height: 32px;

frontend/src/views/system/model/ModelForm.vue

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,6 @@ const supplierChang = (supplier: any) => {
133133
const config = supplier.model_config[modelForm.model_type || 0]
134134
modelForm.api_domain = config.api_domain
135135
modelForm.base_model = ''
136-
if (!modelForm.id) {
137-
modelForm.name = supplier.name
138-
}
139136
}
140137
const initForm = (item?: any) => {
141138
modelForm.id = ''

frontend/src/views/system/user/User.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
</div>
6464
</template>
6565
</el-table-column>
66-
<el-table-column prop="email" :label="$t('user.email')" width="280" />
66+
<el-table-column prop="email" show-overflow-tooltip :label="$t('user.email')" />
6767
<!-- <el-table-column prop="phone" :label="$t('user.phone_number')" width="280" /> -->
6868
<!-- <el-table-column prop="user_source" :label="$t('user.user_source')" width="280" /> -->
6969
<el-table-column prop="oid_list" :label="$t('user.workspace')" width="280">
@@ -187,6 +187,7 @@
187187
v-model="state.form.name"
188188
:placeholder="$t('datasource.please_enter') + $t('common.empty') + $t('user.name')"
189189
autocomplete="off"
190+
maxlength="50"
190191
/>
191192
</el-form-item>
192193
<el-form-item prop="account" :label="t('user.account')">
@@ -195,6 +196,7 @@
195196
:disabled="!!state.form.id"
196197
:placeholder="$t('datasource.please_enter') + $t('common.empty') + $t('user.account')"
197198
autocomplete="off"
199+
maxlength="50"
198200
/>
199201
</el-form-item>
200202
<el-form-item prop="email" :label="$t('user.email')">

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,9 @@ const loading = ref(false)
110110
const centerDialogVisible = ref(false)
111111
112112
const workspaceWithKeywords = computed(() => {
113-
return workspace.value.filter((ele: any) => (ele.name as string).includes(search.value))
113+
return workspace.value.filter((ele: any) =>
114+
(ele.name.toLowerCase() as string).includes(search.value.toLowerCase())
115+
)
114116
})
115117
const handleCheckAllChange = (val: CheckboxValueType) => {
116118
checkedWorkspace.value = val ? workspace.value : []
@@ -128,6 +130,7 @@ let oid: any = null
128130
129131
const open = async (id: any) => {
130132
loading.value = true
133+
search.value = ''
131134
oid = id
132135
checkedWorkspace.value = []
133136
checkAll.value = false

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -536,6 +536,7 @@ const handleCurrentChange = (val: number) => {
536536
<el-form-item prop="name" :label="t('workspace.workspace_name')">
537537
<el-input
538538
v-model="workspaceForm.name"
539+
maxlength="50"
539540
:placeholder="
540541
$t('datasource.please_enter') + $t('common.empty') + $t('workspace.workspace_name')
541542
"

0 commit comments

Comments
 (0)