diff --git a/react-ui/src/components/ParameterSelect/config.tsx b/react-ui/src/components/ParameterSelect/config.tsx index 3f9eb0fb..757e2a11 100644 --- a/react-ui/src/components/ParameterSelect/config.tsx +++ b/react-ui/src/components/ParameterSelect/config.tsx @@ -17,7 +17,7 @@ const filterResourceStandard: SelectProps['filterOpti const convertId = (item: any) => ({ ...item, id: JSON.stringify({ - id: item.id, + id: `${item.id}`, name: item.name, identifier: item.identifier, owner: item.owner, @@ -37,7 +37,7 @@ export const paramSelectConfig: Record = { const res = await getDatasetList({ page: 0, size: 1000, - available_range: 0, + is_public: false, }); return res?.data?.content?.map(convertId) ?? []; }, @@ -52,7 +52,7 @@ export const paramSelectConfig: Record = { const res = await getModelList({ page: 0, size: 1000, - available_range: 0, + is_public: false, }); return res?.data?.content?.map(convertId) ?? []; }, diff --git a/react-ui/src/global.less b/react-ui/src/global.less index 8b1b44f9..62a7a90a 100644 --- a/react-ui/src/global.less +++ b/react-ui/src/global.less @@ -101,15 +101,18 @@ body { ::-webkit-scrollbar { width: 8px; + height: 8px; background: transparent; } ::-webkit-scrollbar-thumb { width: 8px; + height: 8px; background: rgba(0, 0, 0, 0.5); border-radius: 99px; } ::-webkit-scrollbar-track { width: 8px; + height: 8px; background: transparent; } ul, diff --git a/react-ui/src/pages/CodeConfig/components/CodeConfigItem/index.less b/react-ui/src/pages/CodeConfig/components/CodeConfigItem/index.less index 09543c19..1f1a9a92 100644 --- a/react-ui/src/pages/CodeConfig/components/CodeConfigItem/index.less +++ b/react-ui/src/pages/CodeConfig/components/CodeConfigItem/index.less @@ -14,35 +14,43 @@ } &__name { - position: relative; - display: inline-block; - height: 24px; - margin: 0 10px 0 0 !important; + margin-right: 10px; + margin-bottom: 0 !important; color: @text-color; font-size: 16px; } &__tag { - padding: 4px; - color: @primary-color; + padding: 2px 11px; font-size: 12px; - background-color: .addAlpha(@primary-color, 0.1) []; - border-radius: 4px; + border-radius: 1000px; + + &--public { + color: @primary-color; + background-color: .addAlpha(@primary-color, 0.08) []; + border-color: .addAlpha(@primary-color, 0.5) []; + } + + &--private { + color: @warning-color; + background-color: .addAlpha(@warning-color, 0.08) []; + border-color: .addAlpha(@warning-color, 0.5) []; + } } &__url { + margin-bottom: 10px; color: @text-color-secondary; font-size: 14px; } - &__description { - height: 44px; + &__branch { margin-bottom: 20px; - color: @text-color-secondary; + color: @text-color-tertiary; font-size: 14px; - .multiLine(2); } + &__user, &__time { display: flex; flex: 0 1 content; @@ -55,21 +63,9 @@ &:hover { border-color: @primary-color; box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.1); - - .resource-item__name { - color: @primary-color; - } } -} -.resource-item__name { - &::after { - position: absolute; - top: 14px; - left: 0; - width: 100%; - height: 6px; - background: linear-gradient(to right, rgba(22, 100, 255, 0.3) 0, rgba(22, 100, 255, 0) 100%); - content: ''; + &:hover &__name { + color: @primary-color; } } diff --git a/react-ui/src/pages/CodeConfig/components/CodeConfigItem/index.tsx b/react-ui/src/pages/CodeConfig/components/CodeConfigItem/index.tsx index 70fcea51..fe062bac 100644 --- a/react-ui/src/pages/CodeConfig/components/CodeConfigItem/index.tsx +++ b/react-ui/src/pages/CodeConfig/components/CodeConfigItem/index.tsx @@ -5,6 +5,7 @@ import { AvailableRange } from '@/enums'; import { type CodeConfigData } from '@/pages/CodeConfig/List'; import { formatDate } from '@/utils/date'; import { Button, Flex, Typography } from 'antd'; +import classNames from 'classnames'; import styles from './index.less'; type CodeConfigItemProps = { @@ -24,10 +25,16 @@ function CodeConfigItem({ item, onClick, onEdit, onRemove }: CodeConfigItemProps > {item.code_repo_name} -
+
{item.code_repo_vis === AvailableRange.Public ? '公开' : '私有'}
-