Commit 9ef2efa9 authored by nick zheng's avatar nick zheng

Merge branch 'beta' into 'master'

Beta

See merge request !218
parents b86659b7 53cbee5b
...@@ -49,6 +49,13 @@ watch( ...@@ -49,6 +49,13 @@ watch(
async (newDBIds) => { async (newDBIds) => {
if (newDBIds?.length > 0) { if (newDBIds?.length > 0) {
await handleGetDatabaseListByIds() await handleGetDatabaseListByIds()
if (selectDatabaseList.value.length !== newDBIds.length) {
databaseConfig.value.ids = []
selectDatabaseList.value.forEach((databaseItem) => {
databaseConfig.value.ids.push(databaseItem.id)
})
}
databaseConfig.value.ids?.length && knowledgeConfigExpandedNames.value.push('database') databaseConfig.value.ids?.length && knowledgeConfigExpandedNames.value.push('database')
} }
}, },
......
...@@ -191,10 +191,11 @@ function handleCreateDatabase() { ...@@ -191,10 +191,11 @@ function handleCreateDatabase() {
:width="534" :width="534"
:confirm-btn-text="t('common_module.create')" :confirm-btn-text="t('common_module.create')"
:btn-loading="btnLoading" :btn-loading="btnLoading"
:content-style="{ padding: '0 12px 24px' }"
@confirm="handleCreateDatabase" @confirm="handleCreateDatabase"
> >
<template #content> <template #content>
<n-scrollbar ref="scrollbarRef" style="max-height: 550px"> <n-scrollbar ref="scrollbarRef" style="max-height: 550px" class="px-3">
<n-form ref="databaseFormRef" :model="databaseFormData" :rules="databaseFormRules"> <n-form ref="databaseFormRef" :model="databaseFormData" :rules="databaseFormRules">
<n-form-item :label="t('personal_space_module.database_module.creation_method')"> <n-form-item :label="t('personal_space_module.database_module.creation_method')">
<div <div
......
...@@ -141,10 +141,11 @@ function handleUpdateDatabase() { ...@@ -141,10 +141,11 @@ function handleUpdateDatabase() {
:title="t('personal_space_module.database_module.edit_database')" :title="t('personal_space_module.database_module.edit_database')"
:width="534" :width="534"
:btn-loading="btnLoading" :btn-loading="btnLoading"
:content-style="{ padding: '0 12px 24px' }"
@confirm="handleUpdateDatabase" @confirm="handleUpdateDatabase"
> >
<template #content> <template #content>
<n-scrollbar ref="scrollbarRef" style="max-height: 550px"> <n-scrollbar ref="scrollbarRef" style="max-height: 550px" class="px-3">
<n-form ref="databaseFormRef" :model="databaseFormData" :rules="databaseFormRules"> <n-form ref="databaseFormRef" :model="databaseFormData" :rules="databaseFormRules">
<n-form-item <n-form-item
path="title" path="title"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment