diff --git a/react-ui/config/defaultSettings.ts b/react-ui/config/defaultSettings.ts index ada98f3e..65b0fcf5 100644 --- a/react-ui/config/defaultSettings.ts +++ b/react-ui/config/defaultSettings.ts @@ -19,7 +19,7 @@ const Settings: ProLayoutProps & { title: '智能软件开发平台', pwa: true, logo: '/assets/images/left-top-logo.png', - iconfontUrl: '//at.alicdn.com/t/c/font_4511326_t634djsqobs.js', + iconfontUrl: '//at.alicdn.com/t/c/font_4511326_a182r7rksx5.js', token: { // 参见ts声明，demo 见文档，通过token 修改样式 //https://procomponents.ant.design/components/layout#%E9%80%9A%E8%BF%87-token-%E4%BF%AE%E6%94%B9%E6%A0%B7%E5%BC%8F diff --git a/react-ui/src/components/KFModal/index.less b/react-ui/src/components/KFModal/index.less index d2810cab..5e1f1239 100644 --- a/react-ui/src/components/KFModal/index.less +++ b/react-ui/src/components/KFModal/index.less @@ -17,14 +17,12 @@ margin-top: 40px; .ant-btn { - height: 42px; + height: 40px; padding: 0 30px; font-size: @font-size-content; border-radius: 10px; } .ant-btn-default { - color: @text-color; - background: rgba(22, 100, 255, 0.06); border-color: transparent; } .ant-btn + .ant-btn { diff --git a/react-ui/src/overrides.less b/react-ui/src/overrides.less index eb4722e9..4072038f 100644 --- a/react-ui/src/overrides.less +++ b/react-ui/src/overrides.less @@ -129,8 +129,6 @@ border-radius: 10px; } .ant-btn-default { - color: @text-color; - background: rgba(22, 100, 255, 0.06); border-color: transparent; } .ant-btn + .ant-btn { @@ -139,6 +137,7 @@ } } +// 表单类型为large时，font-size为15px .ant-form-large { .ant-form-item-label { label { diff --git a/react-ui/src/pages/Dataset/datasetIntro.jsx b/react-ui/src/pages/Dataset/datasetIntro.jsx index 91aee652..b43ddd32 100644 --- a/react-ui/src/pages/Dataset/datasetIntro.jsx +++ b/react-ui/src/pages/Dataset/datasetIntro.jsx @@ -9,10 +9,10 @@ import { } from '@/services/dataset/index.js'; import { downLoadZip } from '@/utils/downloadfile'; import { UploadOutlined } from '@ant-design/icons'; +import { useParams, useSearchParams } from '@umijs/max'; import { Button, Form, Input, Modal, Select, Table, Tabs, Upload, message } from 'antd'; import moment from 'moment'; import { useEffect, useRef, useState } from 'react'; -import { useParams } from 'react-router-dom'; import Styles from './index.less'; const { Search } = Input; const { TabPane } = Tabs; @@ -53,9 +53,11 @@ const Dataset = () => { const [version, setVersion] = useState(null); const [versionList, setVersionList] = useState([]); const locationParams = useParams(); //新版本获取路由参数接口 + const [searchParams] = useSearchParams(); const [wordList, setWordList] = useState([]); const [activeTabKey, setActiveTabKey] = useState('1'); const [uuid, setUuid] = useState(Date.now()); + const isPublic = searchParams.get('isPublic') === 'true'; const getDatasetByDetail = () => { getDatasetById(locationParams.id).then((ret) => { console.log(ret); @@ -264,15 +266,17 @@ const Dataset = () => {
- + {!isPublic && ( + + )} + {!isPublic && ( + + )} +
*/} - ,
{item.description}
+
{item.description}
{ const routeToIntro = (e, record) => { e.stopPropagation(); console.log(record); - navgite({ pathname: `/dataset/model/${record.id}` }); + navgite({ pathname: `/dataset/model/${record.id}?isPublic=true` }); }; const onFinishFailed = (errorInfo) => { console.log('Failed:', errorInfo); @@ -233,28 +231,6 @@ const PublicData = () => { }} > {item.name} - { - e.stopPropagation(); - modalConfirm({ - title: '确定删除该条模型实例吗？', - onOk: () => { - deleteModel(item.id).then((ret) => { - if (ret.code === 200) { - message.success('删除成功'); - getModelLists(queryFlow); - } else { - message.error(ret.msg); - } - }); - }, - }); - }} - className={Styles.dropdown} - style={{ width: '17px', marginRight: '6px' }} - src={deleteIcon} - alt="" - />
{item.description}
{ const [form] = Form.useForm(); @@ -254,17 +256,10 @@ const Pipeline = () => { scroll={{ y: 'calc(100% - 55px)' }} />
- - - {dialogTitle} -
- } + { /> - + ); }; diff --git a/react-ui/src/pages/Pipeline/index.less b/react-ui/src/pages/Pipeline/index.less index bff7318c..102a37ef 100644 --- a/react-ui/src/pages/Pipeline/index.less +++ b/react-ui/src/pages/Pipeline/index.less @@ -8,60 +8,17 @@ padding-right: 30px; background-image: url(/assets/images/pipeline-back.png); background-size: 100% 100%; - } -.modal { - :global { - .ant-modal-content { - width: 825px; - padding: 20px 67px; - background-image: url(/assets/images/modal-back.png); - background-repeat: no-repeat; - background-position: top center; - background-size: 100%; - border-radius: 21px; - } - .ant-modal-header { - margin: 20px 0; - background-color: transparent; - } - .ant-input { - height: 40px; - border-color: #e6e6e6; - } - .ant-form-item .ant-form-item-label > label { - color: rgba(29, 29, 32, 0.8); - } - .ant-modal-footer { - display: flex; - justify-content: center; - margin: 40px 0 30px 0; - } - .ant-btn { - width: 110px; - height: 40px; - font-size: 18px; - background: rgba(22, 100, 255, 0.06); - border-color: transparent; - border-radius: 10px; - } - .ant-btn-primary { - background: #1664ff; - } - } -} -.PipelineBox{ +.PipelineBox { height: calc(100% - 20px); - .PipelineTable{ + .PipelineTable { height: calc(100% - 60px); - :global{ - .ant-table-wrapper .ant-table{ + :global { + .ant-table-wrapper .ant-table { // overflow-y: auto; height: calc(100% - 48px); } } } - } -