From 721f9384cef83965263e7c0341ef9c4d59786c06 Mon Sep 17 00:00:00 2001
From: wangdan-fit2cloud <dan.wang@fit2cloud.com>
Date: Mon, 16 Jun 2025 20:33:38 +0800
Subject: [PATCH] fix: bug

---
 ui/src/api/type/model.ts                      |  1 -
 ui/src/components/model-select/index.vue      |  4 +--
 ui/src/locales/lang/zh-Hant/views/tool.ts     |  4 ---
 .../component/AddKnowledgeDialog.vue          |  1 +
 .../model/component/CreateModelDialog.vue     | 35 +-----------------
 ui/src/views/model/component/EditModel.vue    | 32 ++---------------
 ui/src/views/model/index.vue                  | 18 +---------
 .../shared/model-shared/SharedWorkspace.vue   | 20 ++---------
 .../component/CreateModelDialog.vue           | 36 ++-----------------
 .../model-shared/component/EditModel.vue      | 32 ++---------------
 ui/src/views/shared/model-shared/index.vue    | 20 ++---------
 .../shared/tool-shared/SharedWorkspace.vue    |  2 +-
 ui/src/views/shared/tool-shared/index.vue     |  2 +-
 ui/src/views/tool/index.vue                   |  2 +-
 ui/vite.config.ts                             |  2 +-
 15 files changed, 21 insertions(+), 190 deletions(-)

diff --git a/ui/src/api/type/model.ts b/ui/src/api/type/model.ts
index b912cae90..da9bf3a4e 100644
--- a/ui/src/api/type/model.ts
+++ b/ui/src/api/type/model.ts
@@ -54,7 +54,6 @@ interface Model {
   model_type: string
   user_id: string
   username: string
-  permission_type: 'PUBLIC' | 'PRIVATE'
   /**
    * 基础模型
    */
diff --git a/ui/src/components/model-select/index.vue b/ui/src/components/model-select/index.vue
index 664ca9930..483bbf62d 100644
--- a/ui/src/components/model-select/index.vue
+++ b/ui/src/components/model-select/index.vue
@@ -19,9 +19,9 @@
               class="model-icon mr-8"
             ></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') }}
-            </el-tag>
+            </el-tag> -->
           </div>
           <el-icon class="check-icon" v-if="item.id === modelValue">
             <Check />
diff --git a/ui/src/locales/lang/zh-Hant/views/tool.ts b/ui/src/locales/lang/zh-Hant/views/tool.ts
index 50c30823c..52c8f7f0c 100644
--- a/ui/src/locales/lang/zh-Hant/views/tool.ts
+++ b/ui/src/locales/lang/zh-Hant/views/tool.ts
@@ -30,10 +30,6 @@ export default {
       label: '描述',
       placeholder: '請輸入工具的描述',
     },
-    permission_type: {
-      label: '權限',
-      requiredMessage: '請選擇',
-    },
     paramName: {
       label: '參數名',
       placeholder: '請輸入參數名',
diff --git a/ui/src/views/application/component/AddKnowledgeDialog.vue b/ui/src/views/application/component/AddKnowledgeDialog.vue
index 895611381..0302e96d2 100644
--- a/ui/src/views/application/component/AddKnowledgeDialog.vue
+++ b/ui/src/views/application/component/AddKnowledgeDialog.vue
@@ -54,6 +54,7 @@
                 :data="item"
                 v-model="checkList"
                 @change="changeHandle"
+                v-if="item.resource_type !== 'folder'"
               >
                 <span class="ellipsis cursor ml-12" :title="item.name"> {{ item.name }}</span>
               </CardCheckbox>
diff --git a/ui/src/views/model/component/CreateModelDialog.vue b/ui/src/views/model/component/CreateModelDialog.vue
index cc9ec1d24..a28f537a3 100644
--- a/ui/src/views/model/component/CreateModelDialog.vue
+++ b/ui/src/views/model/component/CreateModelDialog.vue
@@ -56,31 +56,6 @@
                 :placeholder="$t('views.model.modelForm.modeName.placeholder')"
               />
             </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">
               <template #label>
                 <div class="flex align-center" style="display: inline-flex">
@@ -294,11 +269,6 @@ const base_form_data_rule = ref<FormRules>({
     trigger: 'blur',
     message: t('views.model.modelForm.modeName.requiredMessage'),
   },
-  permission_type: {
-    required: true,
-    trigger: 'change',
-    message: t('views.model.modelForm.permissionType.requiredMessage'),
-  },
   model_type: {
     required: true,
     trigger: 'change',
@@ -313,11 +283,10 @@ const base_form_data_rule = ref<FormRules>({
 
 const base_form_data = ref<{
   name: string
-  permission_type: string
   model_type: string
   model_name: string
   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>>({})
 
@@ -328,7 +297,6 @@ const form_data = computed({
       name: base_form_data.value.name,
       model_type: base_form_data.value.model_type,
       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,
     }
   },
@@ -397,7 +365,6 @@ const close = () => {
     name: '',
     model_type: '',
     model_name: '',
-    permission_type: 'PRIVATE',
     model_params_form: [],
   }
   credential_form_data.value = {}
diff --git a/ui/src/views/model/component/EditModel.vue b/ui/src/views/model/component/EditModel.vue
index bfa1186d4..f19a8f474 100644
--- a/ui/src/views/model/component/EditModel.vue
+++ b/ui/src/views/model/component/EditModel.vue
@@ -48,32 +48,6 @@
             :placeholder="$t('views.model.modelForm.modeName.placeholder')"
           />
         </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">
           <template #label>
             <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<{
   name: string
-  permission_type: string
   model_type: string
 
   model_name: string
-}>({name: '', model_type: '', model_name: '', permission_type: 'PRIVATE'})
+}>({name: '', model_type: '', model_name: ''})
 
 const credential_form_data = ref<Dict<any>>({})
 
@@ -246,7 +219,6 @@ const open = (provider: Provider, model: Model) => {
 
     base_form_data.value = {
       name: model.name,
-      permission_type: model.permission_type,
       model_type: model.model_type,
       model_name: model.model_name,
     }
@@ -257,7 +229,7 @@ const open = (provider: Provider, model: Model) => {
 }
 
 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()
   credential_form_data.value = {}
   model_form_field.value = []
diff --git a/ui/src/views/model/index.vue b/ui/src/views/model/index.vue
index b1d8b8fe8..f700fd7e7 100644
--- a/ui/src/views/model/index.vue
+++ b/ui/src/views/model/index.vue
@@ -23,10 +23,6 @@
               @change="search_type_change"
             >
               <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.modeName.label')" value="name" />
             </el-select>
@@ -47,16 +43,6 @@
             >
               <el-option v-for="u in user_options" :key="u.id" :value="u.id" :label="u.username" />
             </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
               v-else-if="search_type === 'model_type'"
               v-model="model_search_form.model_type"
@@ -142,12 +128,10 @@ const search_type = ref('name')
 const model_search_form = ref<{
   name: string
   create_user: string
-  permission_type: string
   model_type: string
 }>({
   name: '',
   create_user: '',
-  permission_type: '',
   model_type: '',
 })
 const user_options = ref<any[]>([])
@@ -200,7 +184,7 @@ const list_model = () => {
 }
 
 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(() => {
diff --git a/ui/src/views/shared/model-shared/SharedWorkspace.vue b/ui/src/views/shared/model-shared/SharedWorkspace.vue
index c54fd9c8f..79535805d 100644
--- a/ui/src/views/shared/model-shared/SharedWorkspace.vue
+++ b/ui/src/views/shared/model-shared/SharedWorkspace.vue
@@ -14,10 +14,7 @@
                 @change="search_type_change"
               >
                 <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"
@@ -46,16 +43,7 @@
                   :label="u.username"
                 />
               </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
                 v-else-if="search_type === 'model_type'"
                 v-model="model_search_form.model_type"
@@ -141,12 +129,10 @@ const search_type = ref('name')
 const model_search_form = ref<{
   name: string
   create_user: string
-  permission_type: string
   model_type: string
 }>({
   name: '',
   create_user: '',
-  permission_type: '',
   model_type: '',
 })
 const user_options = ref<any[]>([])
@@ -199,7 +185,7 @@ const list_model = () => {
 }
 
 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(() => {
diff --git a/ui/src/views/shared/model-shared/component/CreateModelDialog.vue b/ui/src/views/shared/model-shared/component/CreateModelDialog.vue
index eed974274..9954988de 100644
--- a/ui/src/views/shared/model-shared/component/CreateModelDialog.vue
+++ b/ui/src/views/shared/model-shared/component/CreateModelDialog.vue
@@ -56,31 +56,7 @@
                 :placeholder="$t('views.model.modelForm.modeName.placeholder')"
               />
             </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">
               <template #label>
                 <div class="flex align-center" style="display: inline-flex">
@@ -294,11 +270,6 @@ const base_form_data_rule = ref<FormRules>({
     trigger: 'blur',
     message: t('views.model.modelForm.modeName.requiredMessage'),
   },
-  permission_type: {
-    required: true,
-    trigger: 'change',
-    message: t('views.model.modelForm.permissionType.requiredMessage'),
-  },
   model_type: {
     required: true,
     trigger: 'change',
@@ -313,11 +284,10 @@ const base_form_data_rule = ref<FormRules>({
 
 const base_form_data = ref<{
   name: string
-  permission_type: string
   model_type: string
   model_name: string
   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>>({})
 
@@ -328,7 +298,6 @@ const form_data = computed({
       name: base_form_data.value.name,
       model_type: base_form_data.value.model_type,
       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,
     }
   },
@@ -397,7 +366,6 @@ const close = () => {
     name: '',
     model_type: '',
     model_name: '',
-    permission_type: 'PRIVATE',
     model_params_form: [],
   }
   credential_form_data.value = {}
diff --git a/ui/src/views/shared/model-shared/component/EditModel.vue b/ui/src/views/shared/model-shared/component/EditModel.vue
index 8c5e3f061..55aacec7e 100644
--- a/ui/src/views/shared/model-shared/component/EditModel.vue
+++ b/ui/src/views/shared/model-shared/component/EditModel.vue
@@ -48,32 +48,6 @@
             :placeholder="$t('views.model.modelForm.modeName.placeholder')"
           />
         </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">
           <template #label>
             <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<{
   name: string
-  permission_type: string
   model_type: string
 
   model_name: string
-}>({name: '', model_type: '', model_name: '', permission_type: 'PRIVATE'})
+}>({name: '', model_type: '', model_name: ''})
 
 const credential_form_data = ref<Dict<any>>({})
 
@@ -246,7 +219,6 @@ const open = (provider: Provider, model: Model) => {
 
     base_form_data.value = {
       name: model.name,
-      permission_type: model.permission_type,
       model_type: model.model_type,
       model_name: model.model_name,
     }
@@ -257,7 +229,7 @@ const open = (provider: Provider, model: Model) => {
 }
 
 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()
   credential_form_data.value = {}
   model_form_field.value = []
diff --git a/ui/src/views/shared/model-shared/index.vue b/ui/src/views/shared/model-shared/index.vue
index 582515ba6..93b0d534c 100644
--- a/ui/src/views/shared/model-shared/index.vue
+++ b/ui/src/views/shared/model-shared/index.vue
@@ -31,10 +31,7 @@
                 @change="search_type_change"
               >
                 <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"
@@ -63,16 +60,7 @@
                   :label="u.username"
                 />
               </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
                 v-else-if="search_type === 'model_type'"
                 v-model="model_search_form.model_type"
@@ -160,12 +148,10 @@ const search_type = ref('name')
 const model_search_form = ref<{
   name: string
   create_user: string
-  permission_type: string
   model_type: string
 }>({
   name: '',
   create_user: '',
-  permission_type: '',
   model_type: '',
 })
 const user_options = ref<any[]>([])
@@ -218,7 +204,7 @@ const list_model = () => {
 }
 
 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(() => {
diff --git a/ui/src/views/shared/tool-shared/SharedWorkspace.vue b/ui/src/views/shared/tool-shared/SharedWorkspace.vue
index c9fd5aa2b..a88c703ce 100644
--- a/ui/src/views/shared/tool-shared/SharedWorkspace.vue
+++ b/ui/src/views/shared/tool-shared/SharedWorkspace.vue
@@ -177,7 +177,7 @@ function openCreateDialog(data?: any) {
   }
   ToolDrawertitle.value = data ? t('views.tool.editTool') : t('views.tool.createTool')
   if (data) {
-    if (data?.permission_type !== 'PUBLIC' || canEdit(data)) {
+    if (canEdit(data)) {
       ToolApi.getToolById(data?.id, changeStateloading).then((res) => {
         ToolFormDrawerRef.value.open(res.data)
       })
diff --git a/ui/src/views/shared/tool-shared/index.vue b/ui/src/views/shared/tool-shared/index.vue
index 4c52dc9d1..751d2edb5 100644
--- a/ui/src/views/shared/tool-shared/index.vue
+++ b/ui/src/views/shared/tool-shared/index.vue
@@ -255,7 +255,7 @@ function openCreateDialog(data?: any) {
   }
   ToolDrawertitle.value = data ? t('views.tool.editTool') : t('views.tool.createTool')
   if (data) {
-    if (data?.permission_type !== 'PUBLIC' || canEdit(data)) {
+    if (canEdit(data)) {
       ToolApi.getToolById(data?.id, changeStateloading).then((res) => {
         ToolFormDrawerRef.value.open(res.data)
       })
diff --git a/ui/src/views/tool/index.vue b/ui/src/views/tool/index.vue
index cb63193b2..7f2d5e49b 100644
--- a/ui/src/views/tool/index.vue
+++ b/ui/src/views/tool/index.vue
@@ -245,7 +245,7 @@ function openCreateDialog(data?: any) {
   }
   ToolDrawertitle.value = data ? t('views.tool.editTool') : t('views.tool.createTool')
   if (data) {
-    if (data?.permission_type !== 'PUBLIC' || canEdit(data)) {
+    if (canEdit(data)) {
       ToolApi.getToolById(data?.id, changeStateloading).then((res) => {
         ToolFormDrawerRef.value.open(res.data)
       })
diff --git a/ui/vite.config.ts b/ui/vite.config.ts
index 931f24539..369afc6c0 100644
--- a/ui/vite.config.ts
+++ b/ui/vite.config.ts
@@ -16,7 +16,7 @@ export default defineConfig(({ mode }) => {
   const prefix = process.env.VITE_DYNAMIC_PREFIX || ENV.VITE_BASE_PATH
   const proxyConf: Record<string, string | ProxyOptions> = {}
   proxyConf['/api'] = {
-    target: 'http://127.0.0.1:8080',
+    target: 'http://43.166.1.146:8080',
     changeOrigin: true,
     rewrite: (path: string) => path.replace(ENV.VITE_BASE_PATH, '/'),
   }