Merge pull request #671 from xinnan-tech/web-api-model

Web api model

main/manager-web/src/components/AddModelDialog.vue

@@ -1,13 +1,5 @@
 <template>
-  <el-dialog
-      :visible.sync="visible"
-      width="975px"
-      center
-      custom-class="custom-dialog"
-      :show-close="false"
-      class="center-dialog"
-
-  >
+  <el-dialog :visible.sync="visible" width="975px" center custom-class="custom-dialog" :show-close="false" class="center-dialog">
     <div style="margin: 0 18px; text-align: left; padding: 10px; border-radius: 10px;">
       <div style="font-size: 30px; color: #3d4566; margin-top: -10px; margin-bottom: 10px; text-align: center;">
         添加模型
@@ -34,51 +26,28 @@
       </div>
 
       <div style="height: 2px; background: #e9e9e9; margin-bottom: 22px;"></div>
-
       <el-form :model="formData" label-width="100px" label-position="left" class="custom-form">
-        <!-- 第一行：模型名称和模型编码 -->
         <div style="display: flex; gap: 20px; margin-bottom: 0;">
           <el-form-item label="模型名称" prop="modelName" style="flex: 1;">
-            <el-input
-                v-model="formData.modelName"
-                placeholder="请输入模型名称"
-                class="custom-input-bg"
-            ></el-input>
+            <el-input v-model="formData.modelName" placeholder="请输入模型名称" class="custom-input-bg"></el-input>
           </el-form-item>
           <el-form-item label="模型编码" prop="modelCode" style="flex: 1;">
-            <el-input
-                v-model="formData.modelCode"
-                placeholder="请输入模型编码"
-                class="custom-input-bg"
-            ></el-input>
+            <el-input v-model="formData.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="formData.supplier"
-                placeholder="请选择"
-                class="custom-select custom-input-bg"
-                style="width: 100%;"
-            >
-              <el-option label="硅基流动" value="硅基流动"></el-option>
-              <el-option label="智脑科技" value="智脑科技"></el-option>
-              <el-option label="云智科技" value="云智科技"></el-option>
-              <el-option label="其他" value="其他"></el-option>
+            <el-select v-model="formData.supplier" 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>
           </el-form-item>
           <el-form-item label="排序号" prop="sortOrder" style="flex: 1;">
-            <el-input
-                v-model="formData.sort"
-                placeholder="请输入排序号"
-                class="custom-input-bg"
-            ></el-input>
+            <el-input v-model="formData.sort" placeholder="请输入排序号" class="custom-input-bg"></el-input>
           </el-form-item>
         </div>
 
-        <!-- 文档地址 -->
+
         <el-form-item label="文档地址" prop="docLink" style="margin-bottom: 27px;">
           <el-input
               v-model="formData.docLink"
@@ -87,7 +56,6 @@
           ></el-input>
         </el-form-item>
 
-        <!-- 备注 -->
         <el-form-item label="备注" prop="remark" class="prop-remark">
           <el-input
               v-model="formData.remark"
@@ -99,48 +67,27 @@
         </el-form-item>
       </el-form>
 
-      <!-- 调用信息部分 -->
       <div style="font-size: 20px; font-weight: bold; color: #3d4566; margin-bottom: 15px;">调用信息</div>
       <div style="height: 2px; background: #e9e9e9; margin-bottom: 15px;"></div>
 
       <el-form :model="formData" label-width="100px" label-position="left" class="custom-form">
-        <!-- 第一行：模型名称和接口地址 -->
         <div style="display: flex; gap: 10px; margin-bottom: 15px;">
           <el-form-item label="模型名称" prop="param1" style="flex: 0.5; margin-bottom: 0;">
-            <el-input
-                v-model="formData.configJson.param1"
-                placeholder="请输入model_name"
-                class="custom-input-bg"
-            ></el-input>
+            <el-input v-model="formData.configJson.param1" placeholder="请输入model_name" class="custom-input-bg"></el-input>
           </el-form-item>
           <el-form-item label="接口地址" prop="param2" style="flex: 1; margin-bottom: 0;">
-            <el-input
-                v-model="formData.configJson.param2"
-                placeholder="请输入base_url"
-                class="custom-input-bg"
-            ></el-input>
+            <el-input v-model="formData.configJson.param2" placeholder="请输入base_url" class="custom-input-bg"></el-input>
           </el-form-item>
         </div>
 
-        <!-- 秘钥信息 -->
         <el-form-item label="秘钥信息" prop="apiKey">
-          <el-input
-              v-model="formData.configJson.apiKey"
-              placeholder="请输入api_key"
-              show-password
-              class="custom-input-bg"
-          ></el-input>
+          <el-input v-model="formData.configJson.apiKey" placeholder="请输入api_key" show-password class="custom-input-bg"></el-input>
         </el-form-item>
       </el-form>
     </div>
 
-    <!-- 保存按钮 -->
     <div style="display: flex;justify-content: center;">
-      <el-button
-          type="primary"
-          @click="confirm"
-          class="save-btn"
-      >
+      <el-button type="primary" @click="confirm" class="save-btn">
         保存
       </el-button>
     </div>
@@ -148,6 +95,7 @@
 </template>
 
 <script>
+import model from '@/apis/module/model'
 export default {
   name: 'AddModelDialog',
   props: {
@@ -156,6 +104,8 @@ export default {
   },
   data() {
     return {
+      providers: [],
+      providersLoaded: false,
       formData: {
         modelName: '',
         modelCode: '',
@@ -174,6 +124,18 @@ export default {
     }
   },
   methods: {
+    loadProviders() {
+      if (this.providersLoaded)
+        return
+
+      model.getModelProviders(this.modelType, (data) => {
+        this.providers = data.map(item => ({
+          label: item.name,
+          value: item.providerCode
+        }))
+        this.providersLoaded = true
+      })
+    },
     confirm() {
       if (!this.formData.modelName || !this.formData.modelCode || !this.formData.supplier ||
           !this.formData.configJson.param1 || !this.formData.configJson.param2 || !this.formData.configJson.apiKey) {
@@ -183,7 +145,8 @@ export default {
 
       this.$emit('confirm', {
         ...this.formData,
-        provideType: this.formData.supplier
+        provideType: this.formData.supplier,
+        configJson: this.formData.configJson
       });
       this.$emit('update:visible', false);
       this.resetForm();
@@ -204,6 +167,9 @@ export default {
           apiKey: ''
         }
       };
+      // 重置加载状态
+      this.providers = [];
+      this.providersLoaded = false;
     },
     handleClose() {
       this.resetForm();
@@ -297,7 +263,7 @@ export default {
 }
 
 .custom-form .el-form-item {
-  margin-bottom: 20px; /* 统一设置所有表单项的间距 */
+  margin-bottom: 20px;
 }
 
 .custom-form .el-form-item__label {
@@ -312,13 +278,12 @@ export default {
   margin-top: -4px;
 }
 
-/* 修改placeholder颜色 */
 .custom-input-bg .el-input__inner::-webkit-input-placeholder,
 .custom-input-bg .el-textarea__inner::-webkit-input-placeholder {
   color: #9c9f9e;
 }
 
-/* 输入框背景色 */
+
 .custom-input-bg .el-input__inner,
 .custom-input-bg .el-textarea__inner {
   background-color: #f6f8fc;
@@ -342,13 +307,12 @@ export default {
 }
 
 
-/* 修改开关样式 */
 .custom-switch .el-switch__core {
   border-radius: 20px;
   height: 23px;
   background-color: #c0ccda;
   width: 35px;
-  padding: 0 20px; /* 调整左右内边距 */
+  padding: 0 20px;
 }
 
 .custom-switch .el-switch__core:after {
@@ -363,7 +327,7 @@ export default {
 .custom-switch.is-checked .el-switch__core {
   border-color: #b5bcf0;
   background-color: #cfd7fa;
-  padding: 0 20px; /* 确保启用状态也有相同的间隔 */
+  padding: 0 20px;
 }
 
 .custom-switch.is-checked .el-switch__core:after {
@@ -373,14 +337,12 @@ export default {
 }
 
 
-/* 调整flex布局的gap */
 [style*="display: flex"] {
-  gap: 20px; /* 扩大flex项间距 */
+  gap: 20px;
 }
 
-/* 调整输入框高度 */
 .custom-input-bg .el-input__inner {
-  height: 32px; /* 固定输入框高度 */
+  height: 32px;
 }
 
 

main/manager-web/src/components/ModelEditDialog.vue

@@ -1,92 +1,101 @@
 <template>
-  <el-dialog :visible.sync="dialogVisible" width="800px" center>
-    <el-form :model="form" ref="form" label-width="70px">
-      <el-row :gutter="20" class="form-row">
-        <el-col :span="12">
-          <el-form-item label="模型编码">
-            <el-input v-model="form.code" placeholder="请输入内容" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="模型名称">
-            <el-input v-model="form.name" placeholder="请输入内容" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <!-- 供应商 -->
-      <el-row :gutter="20" class="form-row">
-        <el-col :span="12">
-          <el-form-item label="供应器">
-            <el-select v-model="form.supplier" placeholder="请选择">
-              <el-option label="openai" value="openai" />
-              <el-option label="dify" value="dify" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-           <el-form-item>
-            <div style="display: flex; align-items: center;">
-              <span class="el-form-item__label" style="width: 70px;">设成默认</span>
-              <el-switch v-model="form.isDefault" style="margin-right: 20px;" />
-              <span class="el-form-item__label" style="width: 70px;">是否启用</span>
-              <el-switch v-model="form.isEnable" />
-            </div>
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <!-- 文档 -->
-      <el-row :gutter="20" class="form-row">
-        <el-col :span="12">
-          <el-form-item label="文档地址">
-            <el-input v-model="form.docUrl" placeholder="请输入内容" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="排序号">
-            <el-input-number v-model="form.sort" :min="1" :max="999" controls-position="right" placeholder="123"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <!-- 备注 -->
-      <el-form-item label="备注" class="form-row">
-        <el-input type="textarea" v-model="form.remark" :rows="2" placeholder="请输入"
-        />
-      </el-form-item>
-
-      <div class="vertical-fields">
-        <el-form-item label="接口地址">
-          <el-input v-model="form.apiUrl" placeholder="请输入base_url" />
-        </el-form-item>
-        <el-form-item label="模型名称">
-          <el-input v-model="form.modelName" placeholder="请输入model_name" />
-        </el-form-item>
-        <el-form-item label="密钥信息">
-          <el-input v-model="form.apiKey" placeholder="请输入api_key" show-password/>
-        </el-form-item>
+  <el-dialog :visible.sync="dialogVisible" width="975px" center custom-class="custom-dialog" :show-close="false" class="center-dialog">
+    <div style="margin: 0 18px; text-align: left; padding: 10px; border-radius: 10px;">
+      <div style="font-size: 30px; color: #3d4566; margin-top: -10px; margin-bottom: 10px; text-align: center;">
+        修改模型
       </div>
-    </el-form>
 
-    <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="handleSave">保存</el-button>
-      <el-button @click="dialogVisible = false">关闭</el-button>
+      <button class="custom-close-btn" @click="dialogVisible = false">
+        ×
+      </button>
+
+      <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 10px;">
+        <div style="font-size: 20px; font-weight: bold; color: #3d4566;">模型信息</div>
+        <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>
+          </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>
+          </div>
+        </div>
+      </div>
+
+      <div style="height: 2px; background: #e9e9e9; margin-bottom: 22px;"></div>
+
+      <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-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-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" style="width: 100%;" @focus="loadProviders" filterable>
+              <el-option v-for="item in providers" :key="item.value" :label="item.label" :value="item.value"/>
+              </el-select>
+          </el-form-item>
+          <el-form-item label="排序号" prop="sort" style="flex: 1;">
+            <el-input v-model="form.sort" placeholder="请输入排序号" class="custom-input-bg"></el-input>
+          </el-form-item>
+        </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-form-item>
+
+        <el-form-item label="备注" prop="remark" class="prop-remark">
+          <el-input v-model="form.remark" type="textarea" :rows="3" placeholder="请输入模型备注" class="custom-input-bg"></el-input>
+        </el-form-item>
+      </el-form>
+
+      <div style="font-size: 20px; font-weight: bold; color: #3d4566; margin-bottom: 15px;">调用信息</div>
+      <div style="height: 2px; background: #e9e9e9; margin-bottom: 15px;"></div>
+
+      <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-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>
+          </el-form-item>
+        </div>
+
+        <el-form-item label="秘钥信息" prop="apiKey">
+          <el-input v-model="form.apiKey" placeholder="请输入api_key" show-password class="custom-input-bg"></el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <div style="display: flex;justify-content: center;">
+      <el-button type="primary" @click="handleSave" class="save-btn">
+        保存
+      </el-button>
     </div>
   </el-dialog>
 </template>
 
 <script>
+import model from '@/apis/module/model'
 export default {
   name: "ModelConfigDialog",
   props: {
     visible: { type: Boolean, default: false },
-    configData: { type: Object, default: () => ({}) }
+    configData: { type: Object, default: () => ({}) },
+    modelType: { type: String, required: true }
   },
   data() {
     return {
       dialogVisible: this.visible,
+      providers: [],
+      providersLoaded: false,
       form: {
         code: "",
         name: "",
@@ -103,57 +112,213 @@ export default {
     };
   },
   watch: {
+    modelType() {
+      this.resetProviders()
+    },
     dialogVisible(val) {
       this.$emit('update:visible', val);
+      if (!val) {
+        this.form = {
+          code: "",
+          name: "",
+          supplier: "",
+        };
+      }
     },
     visible(val) {
       this.dialogVisible = val;
-      if (val) this.form = { ...this.form, ...this.configData };
-    }
+      if (val) {
+        this.form = JSON.parse(JSON.stringify({
+          ...this.form,
+          ...this.configData
+        }));
+        this.resetProviders();
+      }
+    },
   },
   methods: {
+    resetProviders() {
+      this.providers = []
+      this.providersLoaded = false
+    },
     handleSave() {
       this.$emit("submit", this.form);
       this.dialogVisible = false;
-    }
+    },
+
+    loadProviders() {
+      if (this.providersLoaded) return
+
+      model.getModelProviders(this.modelType, (data) => {
+        this.providers = data.map(item => ({
+          label: item.name,
+          value: item.providerCode
+        }))
+        this.providersLoaded = true
+      })
+    },
   }
 };
 </script>
 
 <style scoped>
-.dialog-footer {
-  margin-top: -30px;
-  text-align: center;
-}
-.el-form-item {
-  margin-bottom: 18px;
-}
-.el-input-number {
-  width: 100%;
-}
-.form-row {
-  margin-bottom: 12px;
+.custom-dialog {
+  position: relative;
+  border-radius: 20px;
+  overflow: hidden;
+  background: white;
+  padding-bottom: 17px;
 }
 
-.vertical-fields {
-  margin-top: 8px;
+.custom-dialog .el-dialog__header {
+  padding: 0;
+  border-bottom: none;
 }
 
-.dialog-footer {
-  margin-top: -10px;
-  text-align: center;
+.center-dialog {
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
-.el-input-number {
+
+.center-dialog .el-dialog {
+  margin: 4% 0 auto !important;
+  display: flex;
+  flex-direction: column;
+}
+
+.custom-close-btn {
+  position: absolute;
+  top: 20px;
+  right: 20px;
+  width: 35px;
+  height: 35px;
+  border-radius: 50%;
+  border: 2px solid #cfcfcf;
+  background: none;
+  font-size: 30px;
+  font-weight: lighter;
+  color: #cfcfcf;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 1;
+  padding: 0;
+  outline: none;
+}
+
+.custom-close-btn:hover {
+  color: #409EFF;
+  border-color: #409EFF;
+}
+
+.custom-select .el-input__suffix {
+  background: #e6e8ea;
+  right: 6px;
+  width: 20px;
+  height: 20px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  top: 9px;
+}
+
+.custom-select .el-input__suffix-inner {
+  display: flex;
+  align-items: center;
+  justify-content: center;
   width: 100%;
 }
 
-.el-input__inner {
-  height: 36px;
-  line-height: 36px;
+.custom-select .el-icon-arrow-up:before {
+  content: "";
+  display: inline-block;
+  width: 0;
+  height: 0;
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+  border-top: 7px solid #c0c4cc;
+  position: relative;
+  top: -2px;
+  transform: rotate(180deg);
 }
 
-.el-form-item__label {
-  text-align: left;
-  padding-right: 10px;
+.custom-form .el-form-item {
+  margin-bottom: 20px;
+}
+
+.custom-form .el-form-item__label {
+  color: #3d4566;
+  font-weight: normal;
+  text-align: right;
+  padding-right: 20px;
+}
+
+.custom-form .el-form-item.prop-remark .el-form-item__label {
+  margin-top: -4px;
+}
+
+.custom-input-bg .el-input__inner::-webkit-input-placeholder,
+.custom-input-bg .el-textarea__inner::-webkit-input-placeholder {
+  color: #9c9f9e;
+}
+
+.custom-input-bg .el-input__inner,
+.custom-input-bg .el-textarea__inner {
+  background-color: #f6f8fc;
+}
+
+.save-btn {
+  background: #e6f0fd;
+  color: #237ff4;
+  border: 1px solid #b3d1ff;
+  width: 150px;
+  height: 40px;
+  font-size: 16px;
+  transition: all 0.3s ease;
+}
+
+.save-btn:hover {
+  background: linear-gradient(to right, #237ff4, #9c40d5);
+  color: white;
+  border: none;
+}
+
+.custom-switch .el-switch__core {
+  border-radius: 20px;
+  height: 23px;
+  background-color: #c0ccda;
+  width: 35px;
+  padding: 0 20px;
+}
+
+.custom-switch .el-switch__core:after {
+  width: 15px;
+  height: 15px;
+  background-color: white;
+  top: 3px;
+  left: 4px;
+  transition: all .3s;
+}
+
+.custom-switch.is-checked .el-switch__core {
+  border-color: #b5bcf0;
+  background-color: #cfd7fa;
+  padding: 0 20px;
+}
+
+.custom-switch.is-checked .el-switch__core:after {
+  left: 100%;
+  margin-left: -18px;
+  background-color: #1b47ee;
+}
+
+[style*="display: flex"] {
+  gap: 20px;
+}
+
+.custom-input-bg .el-input__inner {
+  height: 32px;
 }
 </style>