From ccfac06645b0a249f2c922f800f0a1a21f8edad7 Mon Sep 17 00:00:00 2001 From: IllTamer Date: Mon, 10 Mar 2025 22:16:02 +0800 Subject: [PATCH 1/2] fix: the pricing available popover display anyway --- web/src/components/ModelPricing.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/src/components/ModelPricing.js b/web/src/components/ModelPricing.js index 299d39cb..8d9bfd81 100644 --- a/web/src/components/ModelPricing.js +++ b/web/src/components/ModelPricing.js @@ -81,7 +81,7 @@ const ModelPricing = () => { } function renderAvailable(available) { - return ( + return available ? ( {t('您的分组可以使用该模型')} @@ -98,7 +98,7 @@ const ModelPricing = () => { > - ) + ) : null; } const columns = [ From 3223c7e18129c464e3fcd344016b6ed93c760f76 Mon Sep 17 00:00:00 2001 From: IllTamer Date: Mon, 10 Mar 2025 22:39:21 +0800 Subject: [PATCH 2/2] feat & fix: fix the pricing available sort, set defaultSortOrder descend --- web/src/components/ModelPricing.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/web/src/components/ModelPricing.js b/web/src/components/ModelPricing.js index 8d9bfd81..902335be 100644 --- a/web/src/components/ModelPricing.js +++ b/web/src/components/ModelPricing.js @@ -109,7 +109,12 @@ const ModelPricing = () => { // if record.enable_groups contains selectedGroup, then available is true return renderAvailable(record.enable_groups.includes(selectedGroup)); }, - sorter: (a, b) => a.available - b.available, + sorter: (a, b) => { + const aAvailable = a.enable_groups.includes(selectedGroup); + const bAvailable = b.enable_groups.includes(selectedGroup); + return Number(aAvailable) - Number(bAvailable); + }, + defaultSortOrder: 'descend', }, { title: t('模型名称'),