Merge commit '96d7a993120d54f7d7c85528bbae6eacc6c82e10'

web/default/src/components/ChannelsTable.js

@@ -234,7 +234,7 @@ const ChannelsTable = () => {
       newChannels[realIdx].response_time = time * 1000;
       newChannels[realIdx].test_time = Date.now() / 1000;
       setChannels(newChannels);
-      showInfo(`通道 ${name} 测试成功，耗时 ${time.toFixed(2)} 秒。`);
+      showInfo(`渠道 ${name} 测试成功，耗时 ${time.toFixed(2)} 秒。`);
     } else {
       showError(message);
     }
@@ -244,7 +244,7 @@ const ChannelsTable = () => {
     const res = await API.get(`/api/channel/test?scope=${scope}`);
     const { success, message } = res.data;
     if (success) {
-      showInfo('已成功开始测试通道，请刷新页面查看结果。');
+      showInfo('已成功开始测试渠道，请刷新页面查看结果。');
     } else {
       showError(message);
     }
@@ -270,7 +270,7 @@ const ChannelsTable = () => {
       newChannels[realIdx].balance = balance;
       newChannels[realIdx].balance_updated_time = Date.now() / 1000;
       setChannels(newChannels);
-      showInfo(`通道 ${name} 余额更新成功！`);
+      showInfo(`渠道 ${name} 余额更新成功！`);
     } else {
       showError(message);
     }
@@ -281,7 +281,7 @@ const ChannelsTable = () => {
     const res = await API.get(`/api/channel/update_balance`);
     const { success, message } = res.data;
     if (success) {
-      showInfo('已更新完毕所有已启用通道余额！');
+      showInfo('已更新完毕所有已启用渠道余额！');
     } else {
       showError(message);
     }

web/default/src/components/OperationSetting.js

@@ -261,7 +261,7 @@ const OperationSetting = () => {
               value={inputs.ChannelDisableThreshold}
               type='number'
               min='0'
-              placeholder='单位秒，当运行通道全部测试时，超过此时间将自动禁用通道'
+              placeholder='单位秒，当运行渠道全部测试时，超过此时间将自动禁用渠道'
             />
             <Form.Input
               label='额度提醒阈值'
@@ -277,13 +277,13 @@ const OperationSetting = () => {
           <Form.Group inline>
             <Form.Checkbox
               checked={inputs.AutomaticDisableChannelEnabled === 'true'}
-              label='失败时自动禁用通道'
+              label='失败时自动禁用渠道'
               name='AutomaticDisableChannelEnabled'
               onChange={handleInputChange}
             />
             <Form.Checkbox
               checked={inputs.AutomaticEnableChannelEnabled === 'true'}
-              label='成功时自动启用通道'
+              label='成功时自动启用渠道'
               name='AutomaticEnableChannelEnabled'
               onChange={handleInputChange}
             />

web/default/src/pages/Channel/EditChannel.js

@@ -83,6 +83,7 @@ const EditChannel = () => {
         data.model_mapping = JSON.stringify(JSON.parse(data.model_mapping), null, 2);
       }
       setInputs(data);
+      setBasicModels(getChannelModels(data.type));
     } else {
       showError(message);
     }
@@ -99,9 +100,6 @@ const EditChannel = () => {
       }));
       setOriginModelOptions(localModelOptions);
       setFullModels(res.data.data.map((model) => model.id));
-      setBasicModels(res.data.data.filter((model) => {
-        return model.id.startsWith('gpt-3') || model.id.startsWith('text-');
-      }).map((model) => model.id));
     } catch (error) {
       showError(error.message);
     }
@@ -137,6 +135,9 @@ const EditChannel = () => {
   useEffect(() => {
     if (isEdit) {
       loadChannel().then();
+    } else {
+      let localModels = getChannelModels(inputs.type);
+      setBasicModels(localModels);
     }
     fetchModels().then();
     fetchGroups().then();
@@ -355,7 +356,7 @@ const EditChannel = () => {
           <div style={{ lineHeight: '40px', marginBottom: '12px' }}>
             <Button type={'button'} onClick={() => {
               handleInputChange(null, { name: 'models', value: basicModels });
-            }}>填入基础模型</Button>
+            }}>填入相关模型</Button>
             <Button type={'button'} onClick={() => {
               handleInputChange(null, { name: 'models', value: fullModels });
             }}>填入所有模型</Button>