Skip to content

Commit 721f938

Browse files
wangdan-fit2cloudwangdan-fit2cloud
committed
fix: bug
1 parent fcba4c3 commit 721f938

File tree

15 files changed

+21
-190
lines changed

15 files changed

+21
-190
lines changed

‎ui/src/api/type/model.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ interface Model {
5454
model_type: string
5555
user_id: string
5656
username: string
57-
permission_type: 'PUBLIC' | 'PRIVATE'
5857
/**
5958
* 基础模型
6059
*/

‎ui/src/components/model-select/index.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
class="model-icon mr-8"
2020
></span>
2121
<span>{{ item.name }}</span>
22-
<el-tag v-if="item.permission_type === 'PUBLIC'" type="info" class="info-tag ml-8 mt-4">
22+
<!-- <el-tag v-if="item.permission_type === 'PUBLIC'" type="info" class="info-tag ml-8 mt-4">
2323
{{ $t('common.public') }}
24-
</el-tag>
24+
</el-tag> -->
2525
</div>
2626
<el-icon class="check-icon" v-if="item.id === modelValue">
2727
<Check />

‎ui/src/locales/lang/zh-Hant/views/tool.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ export default {
3030
label: '描述',
3131
placeholder: '請輸入工具的描述',
3232
},
33-
permission_type: {
34-
label: '權限',
35-
requiredMessage: '請選擇',
36-
},
3733
paramName: {
3834
label: '參數名',
3935
placeholder: '請輸入參數名',

‎ui/src/views/application/component/AddKnowledgeDialog.vue‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
:data="item"
5555
v-model="checkList"
5656
@change="changeHandle"
57+
v-if="item.resource_type !== 'folder'"
5758
>
5859
<span class="ellipsis cursor ml-12" :title="item.name"> {{ item.name }}</span>
5960
</CardCheckbox>

‎ui/src/views/model/component/CreateModelDialog.vue‎

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -56,31 +56,6 @@
5656
:placeholder="$t('views.model.modelForm.modeName.placeholder')"
5757
/>
5858
</el-form-item>
59-
<el-form-item prop="permission_type" :rules="base_form_data_rule.permission_type">
60-
<template #label>
61-
<span>{{ $t('views.model.modelForm.permissionType.label') }}</span>
62-
</template>
63-
<el-radio-group v-model="base_form_data.permission_type" class="card__radio">
64-
<el-row :gutter="16">
65-
<template v-for="(value, key) of PermissionType" :key="key">
66-
<el-col :span="12">
67-
<el-card
68-
shadow="never"
69-
class="mb-16"
70-
:class="base_form_data.permission_type === key ? 'active' : ''"
71-
>
72-
<el-radio :value="key" size="large">
73-
<p class="mb-4">{{ $t(value) }}</p>
74-
<el-text type="info">
75-
{{ $t(PermissionDesc[key]) }}
76-
</el-text>
77-
</el-radio>
78-
</el-card>
79-
</el-col>
80-
</template>
81-
</el-row>
82-
</el-radio-group>
83-
</el-form-item>
8459
<el-form-item prop="model_type" :rules="base_form_data_rule.model_type">
8560
<template #label>
8661
<div class="flex align-center" style="display: inline-flex">
@@ -294,11 +269,6 @@ const base_form_data_rule = ref<FormRules>({
294269
trigger: 'blur',
295270
message: t('views.model.modelForm.modeName.requiredMessage'),
296271
},
297-
permission_type: {
298-
required: true,
299-
trigger: 'change',
300-
message: t('views.model.modelForm.permissionType.requiredMessage'),
301-
},
302272
model_type: {
303273
required: true,
304274
trigger: 'change',
@@ -313,11 +283,10 @@ const base_form_data_rule = ref<FormRules>({
313283
314284
const base_form_data = ref<{
315285
name: string
316-
permission_type: string
317286
model_type: string
318287
model_name: string
319288
model_params_form: any
320-
}>({ name: '', model_type: '', model_name: '', permission_type: 'PRIVATE', model_params_form: [] })
289+
}>({ name: '', model_type: '', model_name: '', model_params_form: [] })
321290
322291
const credential_form_data = ref<Dict<any>>({})
323292
@@ -328,7 +297,6 @@ const form_data = computed({
328297
name: base_form_data.value.name,
329298
model_type: base_form_data.value.model_type,
330299
model_name: base_form_data.value.model_name,
331-
permission_type: base_form_data.value.permission_type,
332300
model_params_form: base_form_data.value.model_params_form,
333301
}
334302
},
@@ -397,7 +365,6 @@ const close = () => {
397365
name: '',
398366
model_type: '',
399367
model_name: '',
400-
permission_type: 'PRIVATE',
401368
model_params_form: [],
402369
}
403370
credential_form_data.value = {}

‎ui/src/views/model/component/EditModel.vue‎

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -48,32 +48,6 @@
4848
:placeholder="$t('views.model.modelForm.modeName.placeholder')"
4949
/>
5050
</el-form-item>
51-
<el-form-item prop="permission_type" :rules="base_form_data_rule.permission_type">
52-
<template #label>
53-
<span>{{ $t('views.model.modelForm.permissionType.label') }}</span>
54-
</template>
55-
56-
<el-radio-group v-model="base_form_data.permission_type" class="card__radio">
57-
<el-row :gutter="16">
58-
<template v-for="(value, key) of PermissionType" :key="key">
59-
<el-col :span="12">
60-
<el-card
61-
shadow="never"
62-
class="mb-16"
63-
:class="base_form_data.permission_type === key ? 'active' : ''"
64-
>
65-
<el-radio :value="key" size="large">
66-
<p class="mb-4">{{ $t(value) }}</p>
67-
<el-text type="info">
68-
{{ $t(PermissionDesc[key]) }}
69-
</el-text>
70-
</el-radio>
71-
</el-card>
72-
</el-col>
73-
</template>
74-
</el-row>
75-
</el-radio-group>
76-
</el-form-item>
7751
<el-form-item prop="model_type" :rules="base_form_data_rule.model_type">
7852
<template #label>
7953
<span>{{ $t('views.model.modelForm.model_type.label') }}</span>
@@ -190,11 +164,10 @@ const base_form_data_rule = ref<FormRules>({
190164
191165
const base_form_data = ref<{
192166
name: string
193-
permission_type: string
194167
model_type: string
195168
196169
model_name: string
197-
}>({name: '', model_type: '', model_name: '', permission_type: 'PRIVATE'})
170+
}>({name: '', model_type: '', model_name: ''})
198171
199172
const credential_form_data = ref<Dict<any>>({})
200173
@@ -246,7 +219,6 @@ const open = (provider: Provider, model: Model) => {
246219
247220
base_form_data.value = {
248221
name: model.name,
249-
permission_type: model.permission_type,
250222
model_type: model.model_type,
251223
model_name: model.model_name,
252224
}
@@ -257,7 +229,7 @@ const open = (provider: Provider, model: Model) => {
257229
}
258230
259231
const close = () => {
260-
base_form_data.value = {name: '', model_type: '', model_name: '', permission_type: ''}
232+
base_form_data.value = {name: '', model_type: '', model_name: ''}
261233
dynamicsFormRef.value?.ruleFormRef?.resetFields()
262234
credential_form_data.value = {}
263235
model_form_field.value = []

‎ui/src/views/model/index.vue‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@
2323
@change="search_type_change"
2424
>
2525
<el-option :label="$t('common.creator')" value="create_user" />
26-
<el-option
27-
:label="$t('views.model.modelForm.permissionType.label')"
28-
value="permission_type"
29-
/>
3026
<el-option :label="$t('views.model.modelForm.model_type.label')" value="model_type" />
3127
<el-option :label="$t('views.model.modelForm.modeName.label')" value="name" />
3228
</el-select>
@@ -47,16 +43,6 @@
4743
>
4844
<el-option v-for="u in user_options" :key="u.id" :value="u.id" :label="u.username" />
4945
</el-select>
50-
<el-select
51-
v-else-if="search_type === 'permission_type'"
52-
v-model="model_search_form.permission_type"
53-
clearable
54-
@change="list_model"
55-
style="width: 220px"
56-
>
57-
<el-option :label="$t('common.public')" value="PUBLIC" />
58-
<el-option :label="$t('common.private')" value="PRIVATE" />
59-
</el-select>
6046
<el-select
6147
v-else-if="search_type === 'model_type'"
6248
v-model="model_search_form.model_type"
@@ -142,12 +128,10 @@ const search_type = ref('name')
142128
const model_search_form = ref<{
143129
name: string
144130
create_user: string
145-
permission_type: string
146131
model_type: string
147132
}>({
148133
name: '',
149134
create_user: '',
150-
permission_type: '',
151135
model_type: '',
152136
})
153137
const user_options = ref<any[]>([])
@@ -200,7 +184,7 @@ const list_model = () => {
200184
}
201185
202186
const search_type_change = () => {
203-
model_search_form.value = { name: '', create_user: '', permission_type: '', model_type: '' }
187+
model_search_form.value = { name: '', create_user: '', model_type: '' }
204188
}
205189
206190
onMounted(() => {

‎ui/src/views/shared/model-shared/SharedWorkspace.vue‎

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414
@change="search_type_change"
1515
>
1616
<el-option :label="$t('common.creator')" value="create_user" />
17-
<el-option
18-
:label="$t('views.model.modelForm.permissionType.label')"
19-
value="permission_type"
20-
/>
17+
2118
<el-option
2219
:label="$t('views.model.modelForm.model_type.label')"
2320
value="model_type"
@@ -46,16 +43,7 @@
4643
:label="u.username"
4744
/>
4845
</el-select>
49-
<el-select
50-
v-else-if="search_type === 'permission_type'"
51-
v-model="model_search_form.permission_type"
52-
clearable
53-
@change="list_model"
54-
style="width: 220px"
55-
>
56-
<el-option :label="$t('common.public')" value="PUBLIC" />
57-
<el-option :label="$t('common.private')" value="PRIVATE" />
58-
</el-select>
46+
5947
<el-select
6048
v-else-if="search_type === 'model_type'"
6149
v-model="model_search_form.model_type"
@@ -141,12 +129,10 @@ const search_type = ref('name')
141129
const model_search_form = ref<{
142130
name: string
143131
create_user: string
144-
permission_type: string
145132
model_type: string
146133
}>({
147134
name: '',
148135
create_user: '',
149-
permission_type: '',
150136
model_type: '',
151137
})
152138
const user_options = ref<any[]>([])
@@ -199,7 +185,7 @@ const list_model = () => {
199185
}
200186
201187
const search_type_change = () => {
202-
model_search_form.value = { name: '', create_user: '', permission_type: '', model_type: '' }
188+
model_search_form.value = { name: '', create_user: '', model_type: '' }
203189
}
204190
205191
onMounted(() => {

‎ui/src/views/shared/model-shared/component/CreateModelDialog.vue‎

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -56,31 +56,7 @@
5656
:placeholder="$t('views.model.modelForm.modeName.placeholder')"
5757
/>
5858
</el-form-item>
59-
<el-form-item prop="permission_type" :rules="base_form_data_rule.permission_type">
60-
<template #label>
61-
<span>{{ $t('views.model.modelForm.permissionType.label') }}</span>
62-
</template>
63-
<el-radio-group v-model="base_form_data.permission_type" class="card__radio">
64-
<el-row :gutter="16">
65-
<template v-for="(value, key) of PermissionType" :key="key">
66-
<el-col :span="12">
67-
<el-card
68-
shadow="never"
69-
class="mb-16"
70-
:class="base_form_data.permission_type === key ? 'active' : ''"
71-
>
72-
<el-radio :value="key" size="large">
73-
<p class="mb-4">{{ $t(value) }}</p>
74-
<el-text type="info">
75-
{{ $t(PermissionDesc[key]) }}
76-
</el-text>
77-
</el-radio>
78-
</el-card>
79-
</el-col>
80-
</template>
81-
</el-row>
82-
</el-radio-group>
83-
</el-form-item>
59+
8460
<el-form-item prop="model_type" :rules="base_form_data_rule.model_type">
8561
<template #label>
8662
<div class="flex align-center" style="display: inline-flex">
@@ -294,11 +270,6 @@ const base_form_data_rule = ref<FormRules>({
294270
trigger: 'blur',
295271
message: t('views.model.modelForm.modeName.requiredMessage'),
296272
},
297-
permission_type: {
298-
required: true,
299-
trigger: 'change',
300-
message: t('views.model.modelForm.permissionType.requiredMessage'),
301-
},
302273
model_type: {
303274
required: true,
304275
trigger: 'change',
@@ -313,11 +284,10 @@ const base_form_data_rule = ref<FormRules>({
313284
314285
const base_form_data = ref<{
315286
name: string
316-
permission_type: string
317287
model_type: string
318288
model_name: string
319289
model_params_form: any
320-
}>({ name: '', model_type: '', model_name: '', permission_type: 'PRIVATE', model_params_form: [] })
290+
}>({ name: '', model_type: '', model_name: '', model_params_form: [] })
321291
322292
const credential_form_data = ref<Dict<any>>({})
323293
@@ -328,7 +298,6 @@ const form_data = computed({
328298
name: base_form_data.value.name,
329299
model_type: base_form_data.value.model_type,
330300
model_name: base_form_data.value.model_name,
331-
permission_type: base_form_data.value.permission_type,
332301
model_params_form: base_form_data.value.model_params_form,
333302
}
334303
},
@@ -397,7 +366,6 @@ const close = () => {
397366
name: '',
398367
model_type: '',
399368
model_name: '',
400-
permission_type: 'PRIVATE',
401369
model_params_form: [],
402370
}
403371
credential_form_data.value = {}

0 commit comments

Comments
 (0)