zhuchaowe/maxkb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: bug

Browse Source
This commit is contained in:
wangdan-fit2cloud 2025-06-16 20:33:38 +08:00
parent fcba4c376f
commit 721f9384ce
15 changed files with 21 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui/src/api/type/model.ts
View File

@ -54,7 +54,6 @@ interface Model {
model_type: string model_type: string
user_id: string user_id: string
username: string username: string
permission_type: 'PUBLIC' | 'PRIVATE'
/** /**
* 基础模型 * 基础模型
*/ */

4
ui/src/components/model-select/index.vue
View File

@ -19,9 +19,9 @@
class="model-icon mr-8" class="model-icon mr-8"
></span> ></span>
<span>{{ item.name }}</span> <span>{{ item.name }}</span>
<el-tag v-if="item.permission_type === 'PUBLIC'" type="info" class="info-tag ml-8 mt-4"> <!-- <el-tag v-if="item.permission_type === 'PUBLIC'" type="info" class="info-tag ml-8 mt-4">
{{ $t('common.public') }} {{ $t('common.public') }}
</el-tag> </el-tag> -->
</div> </div>
<el-icon class="check-icon" v-if="item.id === modelValue"> <el-icon class="check-icon" v-if="item.id === modelValue">
<Check /> <Check />

4
ui/src/locales/lang/zh-Hant/views/tool.ts
View File

@ -30,10 +30,6 @@ export default {
label: '描述', label: '描述',
placeholder: '請輸入工具的描述', placeholder: '請輸入工具的描述',
}, },
permission_type: {
label: '權限',
requiredMessage: '請選擇',
},
paramName: { paramName: {
label: '參數名', label: '參數名',
placeholder: '請輸入參數名', placeholder: '請輸入參數名',

1
ui/src/views/application/component/AddKnowledgeDialog.vue
View File

@ -54,6 +54,7 @@
:data="item" :data="item"
v-model="checkList" v-model="checkList"
@change="changeHandle" @change="changeHandle"
v-if="item.resource_type !== 'folder'"
> >
<span class="ellipsis cursor ml-12" :title="item.name"> {{ item.name }}</span> <span class="ellipsis cursor ml-12" :title="item.name"> {{ item.name }}</span>
</CardCheckbox> </CardCheckbox>

35
ui/src/views/model/component/CreateModelDialog.vue
View File

@ -56,31 +56,6 @@
:placeholder="$t('views.model.modelForm.modeName.placeholder')" :placeholder="$t('views.model.modelForm.modeName.placeholder')"
/> />
</el-form-item> </el-form-item>
<el-form-item prop="permission_type" :rules="base_form_data_rule.permission_type">
<template #label>
<span>{{ $t('views.model.modelForm.permissionType.label') }}</span>
</template>
<el-radio-group v-model="base_form_data.permission_type" class="card__radio">
<el-row :gutter="16">
<template v-for="(value, key) of PermissionType" :key="key">
<el-col :span="12">
<el-card
shadow="never"
class="mb-16"
:class="base_form_data.permission_type === key ? 'active' : ''"
>
<el-radio :value="key" size="large">
<p class="mb-4">{{ $t(value) }}</p>
<el-text type="info">
{{ $t(PermissionDesc[key]) }}
</el-text>
</el-radio>
</el-card>
</el-col>
</template>
</el-row>
</el-radio-group>
</el-form-item>
<el-form-item prop="model_type" :rules="base_form_data_rule.model_type"> <el-form-item prop="model_type" :rules="base_form_data_rule.model_type">
<template #label> <template #label>
<div class="flex align-center" style="display: inline-flex"> <div class="flex align-center" style="display: inline-flex">
@ -294,11 +269,6 @@ const base_form_data_rule = ref<FormRules>({
trigger: 'blur', trigger: 'blur',
message: t('views.model.modelForm.modeName.requiredMessage'), message: t('views.model.modelForm.modeName.requiredMessage'),
}, },
permission_type: {
required: true,
trigger: 'change',
message: t('views.model.modelForm.permissionType.requiredMessage'),
},
model_type: { model_type: {
required: true, required: true,
trigger: 'change', trigger: 'change',
@ -313,11 +283,10 @@ const base_form_data_rule = ref<FormRules>({
const base_form_data = ref<{ const base_form_data = ref<{
name: string name: string
permission_type: string
model_type: string model_type: string
model_name: string model_name: string
model_params_form: any model_params_form: any
}>({ name: '', model_type: '', model_name: '', permission_type: 'PRIVATE', model_params_form: [] }) }>({ name: '', model_type: '', model_name: '', model_params_form: [] })
const credential_form_data = ref<Dict<any>>({}) const credential_form_data = ref<Dict<any>>({})
@ -328,7 +297,6 @@ const form_data = computed({
name: base_form_data.value.name, name: base_form_data.value.name,
model_type: base_form_data.value.model_type, model_type: base_form_data.value.model_type,
model_name: base_form_data.value.model_name, model_name: base_form_data.value.model_name,
permission_type: base_form_data.value.permission_type,
model_params_form: base_form_data.value.model_params_form, model_params_form: base_form_data.value.model_params_form,
} }
}, },
@ -397,7 +365,6 @@ const close = () => {
name: '', name: '',
model_type: '', model_type: '',
model_name: '', model_name: '',
permission_type: 'PRIVATE',
model_params_form: [], model_params_form: [],
} }
credential_form_data.value = {} credential_form_data.value = {}

32
ui/src/views/model/component/EditModel.vue
View File

@ -48,32 +48,6 @@
:placeholder="$t('views.model.modelForm.modeName.placeholder')" :placeholder="$t('views.model.modelForm.modeName.placeholder')"
/> />
</el-form-item> </el-form-item>
<el-form-item prop="permission_type" :rules="base_form_data_rule.permission_type">
<template #label>
<span>{{ $t('views.model.modelForm.permissionType.label') }}</span>
</template>
<el-radio-group v-model="base_form_data.permission_type" class="card__radio">
<el-row :gutter="16">
<template v-for="(value, key) of PermissionType" :key="key">
<el-col :span="12">
<el-card
shadow="never"
class="mb-16"
:class="base_form_data.permission_type === key ? 'active' : ''"
>
<el-radio :value="key" size="large">
<p class="mb-4">{{ $t(value) }}</p>
<el-text type="info">
{{ $t(PermissionDesc[key]) }}
</el-text>
</el-radio>
</el-card>
</el-col>
</template>
</el-row>
</el-radio-group>
</el-form-item>
<el-form-item prop="model_type" :rules="base_form_data_rule.model_type"> <el-form-item prop="model_type" :rules="base_form_data_rule.model_type">
<template #label> <template #label>
<span>{{ $t('views.model.modelForm.model_type.label') }}</span> <span>{{ $t('views.model.modelForm.model_type.label') }}</span>
@ -190,11 +164,10 @@ const base_form_data_rule = ref<FormRules>({
const base_form_data = ref<{ const base_form_data = ref<{
name: string name: string
permission_type: string
model_type: string model_type: string
model_name: string model_name: string
}>({name: '', model_type: '', model_name: '', permission_type: 'PRIVATE'}) }>({name: '', model_type: '', model_name: ''})
const credential_form_data = ref<Dict<any>>({}) const credential_form_data = ref<Dict<any>>({})
@ -246,7 +219,6 @@ const open = (provider: Provider, model: Model) => {
base_form_data.value = { base_form_data.value = {
name: model.name, name: model.name,
permission_type: model.permission_type,
model_type: model.model_type, model_type: model.model_type,
model_name: model.model_name, model_name: model.model_name,
} }
@ -257,7 +229,7 @@ const open = (provider: Provider, model: Model) => {
} }
const close = () => { const close = () => {
base_form_data.value = {name: '', model_type: '', model_name: '', permission_type: ''} base_form_data.value = {name: '', model_type: '', model_name: ''}
dynamicsFormRef.value?.ruleFormRef?.resetFields() dynamicsFormRef.value?.ruleFormRef?.resetFields()
credential_form_data.value = {} credential_form_data.value = {}
model_form_field.value = [] model_form_field.value = []

18
ui/src/views/model/index.vue
View File

@ -23,10 +23,6 @@
@change="search_type_change" @change="search_type_change"
> >
<el-option :label="$t('common.creator')" value="create_user" /> <el-option :label="$t('common.creator')" value="create_user" />
<el-option
:label="$t('views.model.modelForm.permissionType.label')"
value="permission_type"
/>
<el-option :label="$t('views.model.modelForm.model_type.label')" value="model_type" /> <el-option :label="$t('views.model.modelForm.model_type.label')" value="model_type" />
<el-option :label="$t('views.model.modelForm.modeName.label')" value="name" /> <el-option :label="$t('views.model.modelForm.modeName.label')" value="name" />
</el-select> </el-select>
@ -47,16 +43,6 @@
> >
<el-option v-for="u in user_options" :key="u.id" :value="u.id" :label="u.username" /> <el-option v-for="u in user_options" :key="u.id" :value="u.id" :label="u.username" />
</el-select> </el-select>
<el-select
v-else-if="search_type === 'permission_type'"
v-model="model_search_form.permission_type"
clearable
@change="list_model"
style="width: 220px"
>
<el-option :label="$t('common.public')" value="PUBLIC" />
<el-option :label="$t('common.private')" value="PRIVATE" />
</el-select>
<el-select <el-select
v-else-if="search_type === 'model_type'" v-else-if="search_type === 'model_type'"
v-model="model_search_form.model_type" v-model="model_search_form.model_type"
@ -142,12 +128,10 @@ const search_type = ref('name')
const model_search_form = ref<{ const model_search_form = ref<{
name: string name: string
create_user: string create_user: string
permission_type: string
model_type: string model_type: string
}>({ }>({
name: '', name: '',
create_user: '', create_user: '',
permission_type: '',
model_type: '', model_type: '',
}) })
const user_options = ref<any[]>([]) const user_options = ref<any[]>([])
@ -200,7 +184,7 @@ const list_model = () => {
} }
const search_type_change = () => { const search_type_change = () => {
model_search_form.value = { name: '', create_user: '', permission_type: '', model_type: '' } model_search_form.value = { name: '', create_user: '', model_type: '' }
} }
onMounted(() => { onMounted(() => {

20
ui/src/views/shared/model-shared/SharedWorkspace.vue
View File

@ -14,10 +14,7 @@
@change="search_type_change" @change="search_type_change"
> >
<el-option :label="$t('common.creator')" value="create_user" /> <el-option :label="$t('common.creator')" value="create_user" />
<el-option
:label="$t('views.model.modelForm.permissionType.label')"
value="permission_type"
/>
<el-option <el-option
:label="$t('views.model.modelForm.model_type.label')" :label="$t('views.model.modelForm.model_type.label')"
value="model_type" value="model_type"
@ -46,16 +43,7 @@
:label="u.username" :label="u.username"
/> />
</el-select> </el-select>
<el-select
v-else-if="search_type === 'permission_type'"
v-model="model_search_form.permission_type"
clearable
@change="list_model"
style="width: 220px"
>
<el-option :label="$t('common.public')" value="PUBLIC" />
<el-option :label="$t('common.private')" value="PRIVATE" />
</el-select>
<el-select <el-select
v-else-if="search_type === 'model_type'" v-else-if="search_type === 'model_type'"
v-model="model_search_form.model_type" v-model="model_search_form.model_type"
@ -141,12 +129,10 @@ const search_type = ref('name')
const model_search_form = ref<{ const model_search_form = ref<{
name: string name: string
create_user: string create_user: string
permission_type: string
model_type: string model_type: string
}>({ }>({
name: '', name: '',
create_user: '', create_user: '',
permission_type: '',
model_type: '', model_type: '',
}) })
const user_options = ref<any[]>([]) const user_options = ref<any[]>([])
@ -199,7 +185,7 @@ const list_model = () => {
} }
const search_type_change = () => { const search_type_change = () => {
model_search_form.value = { name: '', create_user: '', permission_type: '', model_type: '' } model_search_form.value = { name: '', create_user: '', model_type: '' }
} }
onMounted(() => { onMounted(() => {

36
ui/src/views/shared/model-shared/component/CreateModelDialog.vue
View File

@ -56,31 +56,7 @@
:placeholder="$t('views.model.modelForm.modeName.placeholder')" :placeholder="$t('views.model.modelForm.modeName.placeholder')"
/> />
</el-form-item> </el-form-item>
<el-form-item prop="permission_type" :rules="base_form_data_rule.permission_type">
<template #label>
<span>{{ $t('views.model.modelForm.permissionType.label') }}</span>
</template>
<el-radio-group v-model="base_form_data.permission_type" class="card__radio">
<el-row :gutter="16">
<template v-for="(value, key) of PermissionType" :key="key">
<el-col :span="12">
<el-card
shadow="never"
class="mb-16"
:class="base_form_data.permission_type === key ? 'active' : ''"
>
<el-radio :value="key" size="large">
<p class="mb-4">{{ $t(value) }}</p>
<el-text type="info">
{{ $t(PermissionDesc[key]) }}
</el-text>
</el-radio>
</el-card>
</el-col>
</template>
</el-row>
</el-radio-group>
</el-form-item>
<el-form-item prop="model_type" :rules="base_form_data_rule.model_type"> <el-form-item prop="model_type" :rules="base_form_data_rule.model_type">
<template #label> <template #label>
<div class="flex align-center" style="display: inline-flex"> <div class="flex align-center" style="display: inline-flex">
@ -294,11 +270,6 @@ const base_form_data_rule = ref<FormRules>({
trigger: 'blur', trigger: 'blur',
message: t('views.model.modelForm.modeName.requiredMessage'), message: t('views.model.modelForm.modeName.requiredMessage'),
}, },
permission_type: {
required: true,
trigger: 'change',
message: t('views.model.modelForm.permissionType.requiredMessage'),
},
model_type: { model_type: {
required: true, required: true,
trigger: 'change', trigger: 'change',
@ -313,11 +284,10 @@ const base_form_data_rule = ref<FormRules>({
const base_form_data = ref<{ const base_form_data = ref<{
name: string name: string
permission_type: string
model_type: string model_type: string
model_name: string model_name: string
model_params_form: any model_params_form: any
}>({ name: '', model_type: '', model_name: '', permission_type: 'PRIVATE', model_params_form: [] }) }>({ name: '', model_type: '', model_name: '', model_params_form: [] })
const credential_form_data = ref<Dict<any>>({}) const credential_form_data = ref<Dict<any>>({})
@ -328,7 +298,6 @@ const form_data = computed({
name: base_form_data.value.name, name: base_form_data.value.name,
model_type: base_form_data.value.model_type, model_type: base_form_data.value.model_type,
model_name: base_form_data.value.model_name, model_name: base_form_data.value.model_name,
permission_type: base_form_data.value.permission_type,
model_params_form: base_form_data.value.model_params_form, model_params_form: base_form_data.value.model_params_form,
} }
}, },
@ -397,7 +366,6 @@ const close = () => {
name: '', name: '',
model_type: '', model_type: '',
model_name: '', model_name: '',
permission_type: 'PRIVATE',
model_params_form: [], model_params_form: [],
} }
credential_form_data.value = {} credential_form_data.value = {}

32
ui/src/views/shared/model-shared/component/EditModel.vue
View File

@ -48,32 +48,6 @@
:placeholder="$t('views.model.modelForm.modeName.placeholder')" :placeholder="$t('views.model.modelForm.modeName.placeholder')"
/> />
</el-form-item> </el-form-item>
<el-form-item prop="permission_type" :rules="base_form_data_rule.permission_type">
<template #label>
<span>{{ $t('views.model.modelForm.permissionType.label') }}</span>
</template>
<el-radio-group v-model="base_form_data.permission_type" class="card__radio">
<el-row :gutter="16">
<template v-for="(value, key) of PermissionType" :key="key">
<el-col :span="12">
<el-card
shadow="never"
class="mb-16"
:class="base_form_data.permission_type === key ? 'active' : ''"
>
<el-radio :value="key" size="large">
<p class="mb-4">{{ $t(value) }}</p>
<el-text type="info">
{{ $t(PermissionDesc[key]) }}
</el-text>
</el-radio>
</el-card>
</el-col>
</template>
</el-row>
</el-radio-group>
</el-form-item>
<el-form-item prop="model_type" :rules="base_form_data_rule.model_type"> <el-form-item prop="model_type" :rules="base_form_data_rule.model_type">
<template #label> <template #label>
<span>{{ $t('views.model.modelForm.model_type.label') }}</span> <span>{{ $t('views.model.modelForm.model_type.label') }}</span>
@ -190,11 +164,10 @@ const base_form_data_rule = ref<FormRules>({
const base_form_data = ref<{ const base_form_data = ref<{
name: string name: string
permission_type: string
model_type: string model_type: string
model_name: string model_name: string
}>({name: '', model_type: '', model_name: '', permission_type: 'PRIVATE'}) }>({name: '', model_type: '', model_name: ''})
const credential_form_data = ref<Dict<any>>({}) const credential_form_data = ref<Dict<any>>({})
@ -246,7 +219,6 @@ const open = (provider: Provider, model: Model) => {
base_form_data.value = { base_form_data.value = {
name: model.name, name: model.name,
permission_type: model.permission_type,
model_type: model.model_type, model_type: model.model_type,
model_name: model.model_name, model_name: model.model_name,
} }
@ -257,7 +229,7 @@ const open = (provider: Provider, model: Model) => {
} }
const close = () => { const close = () => {
base_form_data.value = {name: '', model_type: '', model_name: '', permission_type: ''} base_form_data.value = {name: '', model_type: '', model_name: ''}
dynamicsFormRef.value?.ruleFormRef?.resetFields() dynamicsFormRef.value?.ruleFormRef?.resetFields()
credential_form_data.value = {} credential_form_data.value = {}
model_form_field.value = [] model_form_field.value = []

20
ui/src/views/shared/model-shared/index.vue
View File

@ -31,10 +31,7 @@
@change="search_type_change" @change="search_type_change"
> >
<el-option :label="$t('common.creator')" value="create_user" /> <el-option :label="$t('common.creator')" value="create_user" />
<el-option
:label="$t('views.model.modelForm.permissionType.label')"
value="permission_type"
/>
<el-option <el-option
:label="$t('views.model.modelForm.model_type.label')" :label="$t('views.model.modelForm.model_type.label')"
value="model_type" value="model_type"
@ -63,16 +60,7 @@
:label="u.username" :label="u.username"
/> />
</el-select> </el-select>
<el-select
v-else-if="search_type === 'permission_type'"
v-model="model_search_form.permission_type"
clearable
@change="list_model"
style="width: 220px"
>
<el-option :label="$t('common.public')" value="PUBLIC" />
<el-option :label="$t('common.private')" value="PRIVATE" />
</el-select>
<el-select <el-select
v-else-if="search_type === 'model_type'" v-else-if="search_type === 'model_type'"
v-model="model_search_form.model_type" v-model="model_search_form.model_type"
@ -160,12 +148,10 @@ const search_type = ref('name')
const model_search_form = ref<{ const model_search_form = ref<{
name: string name: string
create_user: string create_user: string
permission_type: string
model_type: string model_type: string
}>({ }>({
name: '', name: '',
create_user: '', create_user: '',
permission_type: '',
model_type: '', model_type: '',
}) })
const user_options = ref<any[]>([]) const user_options = ref<any[]>([])
@ -218,7 +204,7 @@ const list_model = () => {
} }
const search_type_change = () => { const search_type_change = () => {
model_search_form.value = { name: '', create_user: '', permission_type: '', model_type: '' } model_search_form.value = { name: '', create_user: '', model_type: '' }
} }
onMounted(() => { onMounted(() => {

2
ui/src/views/shared/tool-shared/SharedWorkspace.vue
View File

@ -177,7 +177,7 @@ function openCreateDialog(data?: any) {
} }
ToolDrawertitle.value = data ? t('views.tool.editTool') : t('views.tool.createTool') ToolDrawertitle.value = data ? t('views.tool.editTool') : t('views.tool.createTool')
if (data) { if (data) {
if (data?.permission_type !== 'PUBLIC' || canEdit(data)) { if (canEdit(data)) {
ToolApi.getToolById(data?.id, changeStateloading).then((res) => { ToolApi.getToolById(data?.id, changeStateloading).then((res) => {
ToolFormDrawerRef.value.open(res.data) ToolFormDrawerRef.value.open(res.data)
}) })

2
ui/src/views/shared/tool-shared/index.vue
View File

@ -255,7 +255,7 @@ function openCreateDialog(data?: any) {
} }
ToolDrawertitle.value = data ? t('views.tool.editTool') : t('views.tool.createTool') ToolDrawertitle.value = data ? t('views.tool.editTool') : t('views.tool.createTool')
if (data) { if (data) {
if (data?.permission_type !== 'PUBLIC' || canEdit(data)) { if (canEdit(data)) {
ToolApi.getToolById(data?.id, changeStateloading).then((res) => { ToolApi.getToolById(data?.id, changeStateloading).then((res) => {
ToolFormDrawerRef.value.open(res.data) ToolFormDrawerRef.value.open(res.data)
}) })

2
ui/src/views/tool/index.vue
View File

@ -245,7 +245,7 @@ function openCreateDialog(data?: any) {
} }
ToolDrawertitle.value = data ? t('views.tool.editTool') : t('views.tool.createTool') ToolDrawertitle.value = data ? t('views.tool.editTool') : t('views.tool.createTool')
if (data) { if (data) {
if (data?.permission_type !== 'PUBLIC' || canEdit(data)) { if (canEdit(data)) {
ToolApi.getToolById(data?.id, changeStateloading).then((res) => { ToolApi.getToolById(data?.id, changeStateloading).then((res) => {
ToolFormDrawerRef.value.open(res.data) ToolFormDrawerRef.value.open(res.data)
}) })

2
ui/vite.config.ts
View File

@ -16,7 +16,7 @@ export default defineConfig(({ mode }) => {
const prefix = process.env.VITE_DYNAMIC_PREFIX || ENV.VITE_BASE_PATH const prefix = process.env.VITE_DYNAMIC_PREFIX || ENV.VITE_BASE_PATH
const proxyConf: Record<string, string | ProxyOptions> = {} const proxyConf: Record<string, string | ProxyOptions> = {}
proxyConf['/api'] = { proxyConf['/api'] = {
target: 'http://127.0.0.1:8080', target: 'http://43.166.1.146:8080',
changeOrigin: true, changeOrigin: true,
rewrite: (path: string) => path.replace(ENV.VITE_BASE_PATH, '/'), rewrite: (path: string) => path.replace(ENV.VITE_BASE_PATH, '/'),
} }