diff --git a/frontend/src/views/ds/DatasourceForm.vue b/frontend/src/views/ds/DatasourceForm.vue index cecdbd9a..d2564ebe 100644 --- a/frontend/src/views/ds/DatasourceForm.vue +++ b/frontend/src/views/ds/DatasourceForm.vue @@ -74,14 +74,14 @@ const rules = reactive({ host: [ { required: true, - message: t('datasource.please_enter') + t('common.empty') + t('ds.form.port'), + message: t('datasource.please_enter') + t('common.empty') + t('ds.form.host'), trigger: 'blur', }, ], port: [ { required: true, - message: t('datasource.please_enter') + t('common.empty') + t('ds.form.host'), + message: t('datasource.please_enter') + t('common.empty') + t('ds.form.port'), trigger: 'blur', }, ], @@ -97,7 +97,7 @@ const rules = reactive({ dbSchema: [ { required: true, - message: t('datasource.please_enter') + t('common.empty') + t('ds.form.schema'), + message: t('datasource.please_enter') + t('common.empty') + 'Schema', trigger: 'blur', }, ], @@ -605,16 +605,10 @@ defineExpose({ " /> - + Get Schema diff --git a/frontend/src/views/system/embedded/DsCard.vue b/frontend/src/views/system/embedded/DsCard.vue index a3eff0ae..acec32e2 100644 --- a/frontend/src/views/system/embedded/DsCard.vue +++ b/frontend/src/views/system/embedded/DsCard.vue @@ -67,13 +67,13 @@ const handlePublic = () => {
- + {{ $t('embedded.set_to_public') }} - + {{ $t('embedded.set_to_private') }} diff --git a/frontend/src/views/system/embedded/index.vue b/frontend/src/views/system/embedded/index.vue index 7f7a6bf0..59c25781 100644 --- a/frontend/src/views/system/embedded/index.vue +++ b/frontend/src/views/system/embedded/index.vue @@ -99,6 +99,9 @@ const handleAddEmbedded = (val: any) => { const getDsList = () => { datasourceApi.list().then((res: any) => { dsListOptions.value = res || [] + if (!currentEmbedded.id) { + dsForm.private_list = dsListOptions.value.map((ele) => ele.id) + } }) } const handleBaseEmbedded = (row: any) => { @@ -645,6 +648,7 @@ const copyCode = () => { { .popover-item { height: 98px; display: flex; - padding-left: 12px; + padding-left: 8px; padding-right: 8px; position: relative; border-radius: 4px; cursor: pointer; + padding-top: 8px; &:hover { background: #1f23291a; } diff --git a/frontend/src/views/system/model/Card.vue b/frontend/src/views/system/model/Card.vue index 274a4af6..37a4814a 100644 --- a/frontend/src/views/system/model/Card.vue +++ b/frontend/src/views/system/model/Card.vue @@ -42,7 +42,7 @@ const handleDel = () => {
- {{ name }} + {{ name }} {{ $t('model.default_model') }}
@@ -90,6 +90,7 @@ const handleDel = () => { font-weight: 500; font-size: 16px; line-height: 24px; + max-width: 280px; } .default { margin-left: auto; diff --git a/frontend/src/views/system/model/Model.vue b/frontend/src/views/system/model/Model.vue index dcba676c..2f4e4b9b 100644 --- a/frontend/src/views/system/model/Model.vue +++ b/frontend/src/views/system/model/Model.vue @@ -191,7 +191,7 @@ const submit = (item: any) => { search() ElMessage({ type: 'success', - message: 'Add completed', + message: t('workspace.add_successfully'), }) }) return @@ -368,6 +368,7 @@ const submit = (item: any) => { display: flex; flex-wrap: wrap; max-height: calc(100% - 40px); + overflow-y: auto; } } @@ -389,6 +390,8 @@ const submit = (item: any) => { .popover { .popover-content { padding: 4px; + max-height: 300px; + overflow-y: auto; } .popover-item { height: 32px; diff --git a/frontend/src/views/system/model/ModelForm.vue b/frontend/src/views/system/model/ModelForm.vue index 6c0e7b3b..763d77d5 100644 --- a/frontend/src/views/system/model/ModelForm.vue +++ b/frontend/src/views/system/model/ModelForm.vue @@ -133,9 +133,6 @@ const supplierChang = (supplier: any) => { const config = supplier.model_config[modelForm.model_type || 0] modelForm.api_domain = config.api_domain modelForm.base_model = '' - if (!modelForm.id) { - modelForm.name = supplier.name - } } const initForm = (item?: any) => { modelForm.id = '' diff --git a/frontend/src/views/system/user/User.vue b/frontend/src/views/system/user/User.vue index 5e204f6d..21408619 100644 --- a/frontend/src/views/system/user/User.vue +++ b/frontend/src/views/system/user/User.vue @@ -63,7 +63,7 @@
- + @@ -187,6 +187,7 @@ v-model="state.form.name" :placeholder="$t('datasource.please_enter') + $t('common.empty') + $t('user.name')" autocomplete="off" + maxlength="50" /> @@ -195,6 +196,7 @@ :disabled="!!state.form.id" :placeholder="$t('datasource.please_enter') + $t('common.empty') + $t('user.account')" autocomplete="off" + maxlength="50" /> diff --git a/frontend/src/views/system/workspace/AuthorizedWorkspaceDialog.vue b/frontend/src/views/system/workspace/AuthorizedWorkspaceDialog.vue index 99583478..3cafb46b 100644 --- a/frontend/src/views/system/workspace/AuthorizedWorkspaceDialog.vue +++ b/frontend/src/views/system/workspace/AuthorizedWorkspaceDialog.vue @@ -110,7 +110,9 @@ const loading = ref(false) const centerDialogVisible = ref(false) const workspaceWithKeywords = computed(() => { - return workspace.value.filter((ele: any) => (ele.name as string).includes(search.value)) + return workspace.value.filter((ele: any) => + (ele.name.toLowerCase() as string).includes(search.value.toLowerCase()) + ) }) const handleCheckAllChange = (val: CheckboxValueType) => { checkedWorkspace.value = val ? workspace.value : [] @@ -128,6 +130,7 @@ let oid: any = null const open = async (id: any) => { loading.value = true + search.value = '' oid = id checkedWorkspace.value = [] checkAll.value = false diff --git a/frontend/src/views/system/workspace/index.vue b/frontend/src/views/system/workspace/index.vue index 4583b6e3..a27db920 100644 --- a/frontend/src/views/system/workspace/index.vue +++ b/frontend/src/views/system/workspace/index.vue @@ -536,6 +536,7 @@ const handleCurrentChange = (val: number) => {