Merge pull request #230 from SuanmoSuanyangTechnology/feature/model_zy

fix(web): model bugfix

web/src/components/RbCard/Card.tsx

@@ -50,7 +50,7 @@ const RbCard: FC<RbCardProps> = ({
     <Card
       {...props}
       title={typeof title === 'function' ? title() : title ?
-        <div className="rb:flex rb:items-center">
+        <div className="rb:flex rb:items-center rb:gap-2">
           {avatarUrl 
             ? <img src={avatarUrl} className="rb:mr-3.25 rb:w-12 rb:h-12 rb:rounded-lg" />
             : avatar ? avatar : null
@@ -59,7 +59,7 @@ const RbCard: FC<RbCardProps> = ({
             clsx(
               {
                 'rb:max-w-full': !avatarUrl && !avatar,
-                'rb:max-w-[calc(100%-60px)]': avatarUrl || avatar,
+                'rb:max-w-[calc(100%-80px)]': avatarUrl || avatar,
               }
             )
           }>

web/src/views/ModelManagement/Group.tsx

@@ -31,12 +31,7 @@ const Group = forwardRef <BaseRef,{ query: any; handleEdit: (data: ModelListItem
       {
         key: 'type',
         label: t(`modelNew.type`),
-        children: data.type || '-',
+        children: data.type ? t(`modelNew.${data.type}`) : '-',
-      },
-      {
-        key: 'provider',
-        label: t(`modelNew.provider`),
-        children: data.provider || '-',
       },
       {
         key: 'is_active',

web/src/views/ModelManagement/List.tsx

@@ -46,11 +46,11 @@ const ModelList: FC<{ query: any }> = ({ query }) => {
             {list.map(item => (
               <RbCard
                 key={item.provider}
-                title={item.provider}
+                title={t(`modelNew.${item.provider}`)}
                 avatarUrl={getLogoUrl(item.logo)}
                 avatar={
                   <div className="rb:w-12 rb:h-12 rb:rounded-lg rb:mr-3.25 rb:bg-[#155eef] rb:flex rb:items-center rb:justify-center rb:text-[28px] rb:text-[#ffffff]">
-                    {item.provider[0]}
+                    {item.provider[0].toUpperCase()}
                   </div>
                 }
                 bodyClassName="rb:relative rb:pb-[64px]! rb:h-[calc(100%-64px)]!"

web/src/views/ModelManagement/Square.tsx

@@ -56,7 +56,7 @@ const ModelSquare = forwardRef <BaseRef, { query: any; handleEdit: (vo?: ModelPl
                 <RbCard
                   key={item.id}
                   title={item.name}
-                  subTitle={<Tag>{t(`modelNew.${item.type}`)}</Tag>}
+                  subTitle={<Tag className="rb:mt-1">{t(`modelNew.${item.type}`)}</Tag>}
                   avatarUrl={getLogoUrl(item.logo)}
                   avatar={
                     <div className="rb:w-12 rb:h-12 rb:rounded-lg rb:mr-3.25 rb:bg-[#155eef] rb:flex rb:items-center rb:justify-center rb:text-[28px] rb:text-[#ffffff]">

web/src/views/ModelManagement/components/ModelImplement/index.tsx

@@ -89,7 +89,7 @@ const ModelImplement: FC<ModelImplementProps> = ({ type, value, onChange }) => {
                   ></div>
                 </Space>
               </Flex>
-              <Tag className="rb:mb-2">{provider}</Tag>
+              <Tag className="rb:mb-2">{t(`modelNew.${provider}`)}</Tag>
             </div>
           )
         })}

web/src/views/ModelManagement/components/ModelListDetail.tsx

@@ -66,7 +66,7 @@ const ModelListDetail = forwardRef<ModelListDetailRef, ModelListDetailProps>(({
 
   return (
     <RbDrawer
-      title={<>{data.provider} {t('modelNew.modelList')} ({list.length}{t('modelNew.item')})</>}
+      title={<>{t(`modelNew.${data.provider}`)} {t('modelNew.modelList')} ({list.length}{t('modelNew.item')})</>}
       open={open}
       onClose={handleClose}
     >
@@ -77,7 +77,7 @@ const ModelListDetail = forwardRef<ModelListDetailRef, ModelListDetailProps>(({
             <RbCard
               key={item.id}
               title={item.name}
-              subTitle={<Space>
+              subTitle={<Space className="rb:mt-1!">
                 <Tag>{t(`modelNew.${item.type}`)}</Tag>
                 <Tag color="warning">{item.api_keys.length}{t('modelNew.apiKeyNum')}</Tag>
               </Space>}

web/src/views/ModelManagement/components/ModelSquareDetail.tsx

@@ -65,7 +65,7 @@ const ModelSquareDetail = forwardRef<ModelSquareDetailRef, ModelSquareDetailProp
               <RbCard
                 key={item.id}
                 title={item.name}
-                subTitle={<Tag>{t(`modelNew.${item.type}`)}</Tag>}
+                subTitle={<Tag className="rb:mt-1">{t(`modelNew.${item.type}`)}</Tag>}
                 avatarUrl={getLogoUrl(item.logo)}
                 avatar={
                   <div className="rb:w-12 rb:h-12 rb:rounded-lg rb:mr-3.25 rb:bg-[#155eef] rb:flex rb:items-center rb:justify-center rb:text-[28px] rb:text-[#ffffff]">

web/src/views/ModelManagement/components/MultiKeyConfigModal.tsx

@@ -50,7 +50,7 @@ const MultiKeyConfigModal = forwardRef<MultiKeyConfigModalRef, MultiKeyConfigMod
             form.resetFields();
             getData(model)
           })
-          .catch(() => {
+          .finally(() => {
             setLoading(false)
           });
       })