From 623bfe32f7de551a3bd169db56bd3d3445b0fd6a Mon Sep 17 00:00:00 2001
From: CGD <3030332422@qq.com>
Date: Mon, 7 Apr 2025 14:50:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E2=80=9C=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E9=85=8D=E7=BD=AE=E2=80=9D=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/manager-web/src/apis/module/model.js     |  50 +++--
 .../src/components/ModelEditDialog.vue        | 172 +++++++++++++-----
 2 files changed, 165 insertions(+), 57 deletions(-)

diff --git a/main/manager-web/src/apis/module/model.js b/main/manager-web/src/apis/module/model.js
index a78e71d0..54609551 100644
--- a/main/manager-web/src/apis/module/model.js
+++ b/main/manager-web/src/apis/module/model.js
@@ -74,23 +74,23 @@ export default {
         })
       }).send()
   },
-// 删除模型配置
-deleteModel(id, callback) {
-  RequestService.sendRequest()
-    .url(`${getServiceUrl()}/models/${id}`)
-    .method('DELETE')
-    .success((res) => {
-      RequestService.clearRequestTime()
-      callback(res)
-    })
-    .fail((err) => {
-      console.error('删除模型失败:', err)
-      this.$message.error(err.msg || '删除模型失败')
-      RequestService.reAjaxFun(() => {
-        this.deleteModel(id, callback)
+  // 删除模型配置
+  deleteModel(id, callback) {
+    RequestService.sendRequest()
+      .url(`${getServiceUrl()}/models/${id}`)
+      .method('DELETE')
+      .success((res) => {
+        RequestService.clearRequestTime()
+        callback(res)
       })
-    }).send()
-},
+      .fail((err) => {
+        console.error('删除模型失败:', err)
+        this.$message.error(err.msg || '删除模型失败')
+        RequestService.reAjaxFun(() => {
+          this.deleteModel(id, callback)
+        })
+      }).send()
+  },
   // 获取模型名称列表
   getModelNames(modelType, modelName, callback) {
     RequestService.sendRequest()
@@ -125,4 +125,22 @@ deleteModel(id, callback) {
         });
       }).send();
   },
+  // 获取单个模型配置
+  getModelConfig(id, callback) {
+    RequestService.sendRequest()
+      .url(`${getServiceUrl()}/models/${id}`)
+      .method('GET')
+      .success((res) => {
+        RequestService.clearRequestTime()
+        callback(res)
+      })
+      .fail((err) => {
+        console.error('获取模型配置失败:', err)
+        this.$message.error(err.msg || '获取模型配置失败')
+        RequestService.reAjaxFun(() => {
+          this.getModelConfig(id, callback)
+        })
+      }).send()
+  },
+
 }
diff --git a/main/manager-web/src/components/ModelEditDialog.vue b/main/manager-web/src/components/ModelEditDialog.vue
index 9e9aa185..594efb17 100644
--- a/main/manager-web/src/components/ModelEditDialog.vue
+++ b/main/manager-web/src/components/ModelEditDialog.vue
@@ -15,11 +15,11 @@
         <div style="display: flex; align-items: center; gap: 20px;">
           <div style="display: flex; align-items: center;">
             <span style="margin-right: 8px;">是否启用</span>
-            <el-switch v-model="form.isEnable" class="custom-switch"></el-switch>
+                <el-switch v-model="form.isEnabled" :active-value="1" :inactive-value="0" class="custom-switch"></el-switch>
           </div>
           <div style="display: flex; align-items: center;">
             <span style="margin-right: 8px;">设为默认</span>
-            <el-switch v-model="form.isDefault" class="custom-switch"></el-switch>
+                <el-switch v-model="form.isDefault" :active-value="1" :inactive-value="0" class="custom-switch"></el-switch>
           </div>
         </div>
       </div>
@@ -29,16 +29,16 @@
       <el-form :model="form" ref="form" label-width="100px" label-position="left" class="custom-form">
         <div style="display: flex; gap: 20px; margin-bottom: 0;">
           <el-form-item label="模型名称" prop="name" style="flex: 1;">
-            <el-input v-model="form.name" placeholder="请输入模型名称" class="custom-input-bg"></el-input>
+            <el-input v-model="form.modelName" placeholder="请输入模型名称" class="custom-input-bg"></el-input>
           </el-form-item>
           <el-form-item label="模型编码" prop="code" style="flex: 1;">
-            <el-input v-model="form.code" placeholder="请输入模型编码" class="custom-input-bg"></el-input>
+            <el-input v-model="form.modelCode" placeholder="请输入模型编码" class="custom-input-bg"></el-input>
           </el-form-item>
         </div>
 
         <div style="display: flex; gap: 20px; margin-bottom: 0;">
           <el-form-item label="供应器" prop="supplier" style="flex: 1;">
-            <el-select v-model="form.supplier" placeholder="请选择" class="custom-select custom-input-bg"
+            <el-select v-model="form.modelType" placeholder="请选择" class="custom-select custom-input-bg"
               style="width: 100%;" @focus="loadProviders" filterable>
               <el-option v-for="item in providers" :key="item.value" :label="item.label" :value="item.value" />
             </el-select>
@@ -49,7 +49,7 @@
         </div>
 
         <el-form-item label="文档地址" prop="docUrl" style="margin-bottom: 27px;">
-          <el-input v-model="form.docUrl" placeholder="请输入文档地址" class="custom-input-bg"></el-input>
+          <el-input v-model="form.docLink" placeholder="请输入文档地址" class="custom-input-bg"></el-input>
         </el-form-item>
 
         <el-form-item label="备注" prop="remark" class="prop-remark">
@@ -64,7 +64,7 @@
       <el-form :model="form" label-width="100px" label-position="left" class="custom-form">
         <div style="display: flex; gap: 10px; margin-bottom: 15px;">
           <el-form-item label="模型名称" prop="modelName" style="flex: 0.5; margin-bottom: 0;">
-            <el-input v-model="form.modelName" placeholder="请输入model_name" class="custom-input-bg"></el-input>
+            <el-input v-model="form.name" placeholder="请输入model_name" class="custom-input-bg"></el-input>
           </el-form-item>
           <el-form-item label="接口地址" prop="apiUrl" style="flex: 1; margin-bottom: 0;">
             <el-input v-model="form.apiUrl" placeholder="请输入base_url" class="custom-input-bg"></el-input>
@@ -87,11 +87,37 @@
 
 <script>
 import Api from '@/apis/api';
+
+const DEFAULT_CONFIG_JSON = {
+  provider: "",
+  type: "",
+  base_url: "",
+  model_name: "",
+  api_key: "",
+  raw: {},
+  config: {
+    keyComparator: {},
+    ignoreError: 0,
+    ignoreCase: 0,
+    dateFormat: "",
+    ignoreNullValue: false,
+    transientSupport: false,
+    stripTrailingZeros: false,
+    checkDuplicate: false,
+    order: false
+  },
+  empty: false
+};
+
 export default {
-  name: "ModelConfigDialog",
-  props: {
+  name: "ModelEditDialog",
+    props: {
     visible: { type: Boolean, default: false },
-    configData: { type: Object, default: () => ({}) },
+    modelData: {
+      type: Object,
+      default: () => ({}),
+      validator: value => typeof value === 'object' && !Array.isArray(value)
+    },
     modelType: { type: String, required: true }
   },
   data() {
@@ -100,17 +126,18 @@ export default {
       providers: [],
       providersLoaded: false,
       form: {
-        code: "",
-        name: "",
-        supplier: "",
-        isDefault: true,
-        isEnable: true,
-        docUrl: "",
-        sort: 123,
-        remark: "",
-        apiUrl: "",
+        id: "",
+        modelType: "",
+        modelCode: "",
         modelName: "",
-        apiKey: ""
+        isDefault: false,
+        isEnabled: false,
+        docLink: "",
+        remark: "",
+        sort: 0,
+        apiKey: "",
+        apiUrl: "",
+        configJson: JSON.parse(JSON.stringify(DEFAULT_CONFIG_JSON))
       }
     };
   },
@@ -121,45 +148,108 @@ export default {
     dialogVisible(val) {
       this.$emit('update:visible', val);
       if (!val) {
-        this.form = {
-          code: "",
-          name: "",
-          supplier: "",
-        };
+        this.resetForm();
+      } else if (val && this.modelData.id) {
+        this.loadModelData();
       }
     },
     visible(val) {
       this.dialogVisible = val;
-      if (val) {
-        this.form = JSON.parse(JSON.stringify({
-          ...this.form,
-          ...this.configData
-        }));
-        this.resetProviders();
-      }
-    },
+    }
   },
   methods: {
+    resetForm() {
+      this.form = {
+        id: "",
+        modelType: "",
+        modelCode: "",
+        modelName: "",
+        isDefault: false,
+        isEnabled: false,
+        docLink: "",
+        remark: "",
+        sort: 0,
+        apiKey: "",
+        apiUrl: "",
+        configJson: JSON.parse(JSON.stringify(DEFAULT_CONFIG_JSON))
+      };
+    },
     resetProviders() {
-      this.providers = []
-      this.providersLoaded = false
+      this.providers = [];
+      this.providersLoaded = false;
+    },
+    loadModelData() {
+      if (this.modelData.id) {
+        Api.model.getModelConfig(this.modelData.id, ({ data }) => {
+          if (data.code === 0 && data.data) {
+            const model = data.data;
+
+            this.loadProviders();
+
+            let configJson = model.configJson || {};
+            if (typeof configJson !== 'object' || Array.isArray(configJson)) {
+              console.warn('Invalid configJson format, using default');
+              configJson = {};
+            }
+
+            this.form = {
+              id: model.id || "",
+              modelType: model.modelType || "",
+              modelCode: model.modelCode || "",
+              modelName: model.modelName || "",
+              isDefault: model.isDefault || 0,
+              isEnabled: model.isEnabled || 0,
+              docLink: model.docLink || "",
+              remark: model.remark || "",
+              sort: model.sort || 0,
+              apiKey: configJson.api_key || "",
+              apiUrl: configJson.base_url || "",
+              name:configJson.model_name,
+              configJson: {
+                ...JSON.parse(JSON.stringify(DEFAULT_CONFIG_JSON)),
+                ...configJson,
+                config: {
+                  ...DEFAULT_CONFIG_JSON.config,
+                  ...(configJson.config || {})
+                }
+              }
+            };
+          }
+        });
+      }
     },
     handleSave() {
-      this.$emit("submit", this.form);
+      const formData = {
+        modelCode: this.form.code,
+        modelName: this.form.name,
+        supplier: this.form.supplier,
+        isDefault: this.form.isDefault ? 1 : 0,
+        isEnabled: this.form.isEnable ? 1 : 0,
+        docLink: this.form.docUrl,
+        sort: this.form.sort,
+        remark: this.form.remark,
+        configJson: {
+          provider: this.form.supplier,
+          modelName: this.form.modelName,
+          apiUrl: this.form.apiUrl,
+          apiKey: this.form.apiKey
+        }
+      };
+      this.$emit("save", formData);
       this.dialogVisible = false;
     },
-
     loadProviders() {
-      if (this.providersLoaded) return
+      if (this.providersLoaded) return;
 
       Api.model.getModelProviders(this.modelType, (data) => {
         this.providers = data.map(item => ({
           label: item.name,
           value: item.providerCode
-        }))
-        this.providersLoaded = true
-      })
+        }));
+        this.providersLoaded = true;
+      });
     },
+
   }
 };
 </script>