From 0e81a165e4c6320829a32560c32aa84ac7873ba6 Mon Sep 17 00:00:00 2001
From: CGD <3030332422@qq.com>
Date: Wed, 9 Apr 2025 14:08:05 +0800
Subject: [PATCH] =?UTF-8?q?update:=E4=BC=98=E5=8C=96=E4=BA=86=E2=80=9C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE=E2=80=9D=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=92=8C=E2=80=9C=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E2=80=9D?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=BA=86=E2=80=9C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE=E2=80=9D=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E9=9D=9E=E6=AD=A3=E5=B8=B8=E5=85=B3=E9=97=AD=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AF=B9=E8=AF=9D=E6=A1=86=E6=97=B6=EF=BC=8C=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E9=87=8D=E7=BD=AE=E5=AF=B9=E8=AF=9D=E6=A1=86?=
 =?UTF-8?q?=E7=9A=84=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/AddModelDialog.vue         |  23 +++-
 .../src/components/ModelEditDialog.vue        | 109 +++++++++++-------
 2 files changed, 84 insertions(+), 48 deletions(-)

diff --git a/main/manager-web/src/components/AddModelDialog.vue b/main/manager-web/src/components/AddModelDialog.vue
index 5c119da1..4e647381 100644
--- a/main/manager-web/src/components/AddModelDialog.vue
+++ b/main/manager-web/src/components/AddModelDialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="visible" width="975px" center custom-class="custom-dialog" :show-close="false"
+  <el-dialog :visible="dialogVisible" @update:visible="handleVisibleChange" 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;">
@@ -63,7 +63,7 @@
       <div style="font-size: 20px; font-weight: bold; color: #3d4566; margin-bottom: 15px;">调用信息</div>
       <div style="height: 2px; background: #e9e9e9; margin-bottom: 22px;"></div>
 
-      <el-form :model="formData.configJson" label-width="100px" label-position="left" class="custom-form">
+      <el-form :model="formData.configJson" label-width="auto" label-position="left" class="custom-form">
         <template v-for="(row, rowIndex) in chunkedCallInfoFields">
           <div :key="rowIndex" style="display: flex; gap: 20px; margin-bottom: 0;">
             <el-form-item
@@ -104,6 +104,7 @@ export default {
   data() {
     return {
       providers: [],
+      dialogVisible: false,
       providersLoaded: false,
       providerFields: [],
       currentProvider: null,
@@ -122,8 +123,11 @@ export default {
   },
   watch: {
     visible(val) {
+      this.dialogVisible = val;
       if(val) {
         this.initConfigJson();
+      } else {
+        this.resetForm();
       }
     },
     'formData.supplier'(newVal) {
@@ -171,6 +175,17 @@ export default {
       });
       this.formData.configJson = { ...defaultConfig };
     },
+    handleVisibleChange(val) {
+      this.dialogVisible = val;
+      this.$emit('update:visible', val);
+      if (!val) {
+        this.resetForm();
+      }
+    },
+
+    handleClose() {
+      this.$emit('update:visible', false);
+    },
     initDynamicConfig() {
       const newConfig = {};
       this.providerFields.forEach(field => {
@@ -223,10 +238,6 @@ export default {
       this.providerFields = [];
       this.currentProvider = null;
     },
-    handleClose() {
-      this.resetForm();
-      this.$emit('update:visible', false);
-    }
   }
 }
 </script>
diff --git a/main/manager-web/src/components/ModelEditDialog.vue b/main/manager-web/src/components/ModelEditDialog.vue
index dfffbda8..36249ae7 100644
--- a/main/manager-web/src/components/ModelEditDialog.vue
+++ b/main/manager-web/src/components/ModelEditDialog.vue
@@ -44,7 +44,7 @@
             </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-input v-model.number="form.sort" type="number" placeholder="请输入排序号" class="custom-input-bg"></el-input>
           </el-form-item>
         </div>
 
@@ -61,7 +61,7 @@
       <div style="font-size: 20px; font-weight: bold; color: #3d4566; margin-bottom: 15px;">调用信息</div>
       <div style="height: 2px; background: #e9e9e9; margin-bottom: 22px;"></div>
 
-      <el-form :model="form.configJson" ref="callInfoForm" label-width="100px" class="custom-form">
+      <el-form :model="form.configJson" ref="callInfoForm" label-width="auto" class="custom-form">
         <template v-for="(row, rowIndex) in chunkedCallInfoFields">
           <div :key="rowIndex" style="display: flex; gap: 20px; margin-bottom: 0;">
             <el-form-item
@@ -130,6 +130,9 @@ export default {
       dialogVisible: this.visible,
       providers: [],
       providersLoaded: false,
+      allProvidersData: null,
+      pendingProviderType: null,
+      pendingModelData: null,
       dynamicCallInfoFields: [],
       form: {
         id: "",
@@ -157,7 +160,8 @@ export default {
   },
   watch: {
     modelType() {
-      this.resetProviders()
+      this.resetProviders();
+      this.loadProviders();
     },
     dialogVisible(val) {
       this.$emit('update:visible', val);
@@ -169,12 +173,15 @@ export default {
     },
     visible(val) {
       this.dialogVisible = val;
+      if (val) {
+        this.loadProviders();
+      }
     },
     'form.configJson.type'(newVal) {
-    if (newVal) {
-      this.loadProviderFields(newVal);
+      if (newVal && this.providersLoaded) {
+        this.loadProviderFields(newVal);
+      }
     }
-  }
   },
   methods: {
     resetForm() {
@@ -187,7 +194,7 @@ export default {
         isEnabled: false,
         docLink: "",
         remark: "",
-        sort: 0,
+        sort: "",
         configJson: JSON.parse(JSON.stringify(DEFAULT_CONFIG_JSON))
       };
     },
@@ -195,42 +202,19 @@ export default {
       this.providers = [];
       this.providersLoaded = false;
     },
-    async loadModelData() {
+    loadModelData() {
       if (this.modelData.id) {
-        Api.model.getModelConfig(this.modelData.id, async ({ data }) => {
+        Api.model.getModelConfig(this.modelData.id, ({ data }) => {
           if (data.code === 0 && data.data) {
             const model = data.data;
+            this.pendingProviderType = model.configJson.type;
+            this.pendingModelData = model;
 
-            // 获取供应器字段配置
-            await this.loadProviderFields(model.configJson.type);
-
-            // 初始化configJson
-            let configJson = model.configJson || {};
-            this.dynamicCallInfoFields.forEach(field => {
-              if (!configJson.hasOwnProperty(field.prop)) {
-                configJson[field.prop] = '';
-              }
-            });
-
-            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,
-              configJson: {
-                ...JSON.parse(JSON.stringify(DEFAULT_CONFIG_JSON)),
-                ...configJson,
-                config: {
-                  ...DEFAULT_CONFIG_JSON.config,
-                  ...(configJson.config || {})
-                }
-              }
-            };
+            if (this.providersLoaded) {
+              this.loadProviderFields(model.configJson.type);
+            } else {
+              this.loadProviders();
+            }
           }
         });
       }
@@ -268,11 +252,17 @@ export default {
           value: item.providerCode
         }));
         this.providersLoaded = true;
+
+        this.allProvidersData = data;
+
+        if (this.pendingProviderType) {
+          this.loadProviderFields(this.pendingProviderType);
+        }
       });
     },
-    async loadProviderFields(providerCode) {
-      Api.model.getModelProviders(this.modelType, (data) => {
-        const provider = data.find(p => p.providerCode === providerCode);
+    loadProviderFields(providerCode) {
+      if (this.allProvidersData) {
+        const provider = this.allProvidersData.find(p => p.providerCode === providerCode);
         if (provider) {
           this.dynamicCallInfoFields = JSON.parse(provider.fields || '[]').map(f => ({
             label: f.label,
@@ -280,9 +270,44 @@ export default {
             type: f.type === 'password' ? 'password' : 'text',
             placeholder: `请输入${f.label}`
           }));
+
+          if (this.pendingModelData && this.pendingProviderType === providerCode) {
+            this.processModelData(this.pendingModelData);
+            this.pendingModelData = null;
+            this.pendingProviderType = null;
+          }
+        }
+      }
+    },
+    processModelData(model) {
+      let configJson = model.configJson || {};
+      this.dynamicCallInfoFields.forEach(field => {
+        if (!configJson.hasOwnProperty(field.prop)) {
+          configJson[field.prop] = '';
         }
       });
+
+      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: Number(model.sort) || 0,
+        configJson: {
+          ...JSON.parse(JSON.stringify(DEFAULT_CONFIG_JSON)),
+          ...configJson,
+          config: {
+            ...DEFAULT_CONFIG_JSON.config,
+            ...(configJson.config || {})
+          }
+        }
+      };
     }
+
   }
 };
 </script>