From 3afe543c2c3600238e9c3a340ef1b6eb09492f70 Mon Sep 17 00:00:00 2001 From: wb-672209 Date: Fri, 12 May 2023 19:20:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8E=9F=E6=9C=AC=E9=80=9A?= =?UTF-8?q?=E8=BF=87=E7=9B=B4=E6=8E=A5=E5=9C=A8=E8=BE=93=E5=85=A5=E6=A1=86?= =?UTF-8?q?=E5=86=85=E8=BE=93=E5=85=A5=E8=A7=84=E5=88=99=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=91=BD=E4=BB=A4=E6=94=B9=E6=88=90=E6=94=B9=E6=88=90=20?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=A7=84=E5=88=99=E8=84=9A=E6=9C=AC=E6=96=87?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=96=87=E4=BB=B6=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 为同步操作部分添加tooltip提示 解决git_rule在获取文件名时候的报错问题 --- sysom_web/config/routes.js | 4 -- .../Version/VersionConfig/KernelVersion.jsx | 46 +++++++++++++++---- .../hotfix/components/KernelConfigForm.jsx | 3 ++ sysom_web/src/pages/hotfix/service.js | 2 +- 4 files changed, 42 insertions(+), 13 deletions(-) diff --git a/sysom_web/config/routes.js b/sysom_web/config/routes.js index d207487a..e6aa9963 100644 --- a/sysom_web/config/routes.js +++ b/sysom_web/config/routes.js @@ -273,10 +273,6 @@ export default [ name: 'config', component: './hotfix/Version/VersionConfig' }, - { - path: '/hotfix/version/config', - redirect: '/hotfix/Version/VersionConfig', - }, { path: '/hotfix/version/customize', name: 'customize', diff --git a/sysom_web/src/pages/hotfix/Version/VersionConfig/KernelVersion.jsx b/sysom_web/src/pages/hotfix/Version/VersionConfig/KernelVersion.jsx index b313bb6f..d71cfbba 100644 --- a/sysom_web/src/pages/hotfix/Version/VersionConfig/KernelVersion.jsx +++ b/sysom_web/src/pages/hotfix/Version/VersionConfig/KernelVersion.jsx @@ -3,8 +3,8 @@ import { useIntl, FormattedMessage } from 'umi'; import { PageContainer } from '@ant-design/pro-layout'; import ProTable from '@ant-design/pro-table'; import { Popconfirm, message, Upload, Button, Select, Form, Switch, Tag} from 'antd'; -import { delOSType, delKernelVersion, getOSTypeList, getKernelVersionList, submitOSType, submitKernelVersion, postChangeOsType, PostWhetherSyncRequest, downloadHotfixFile, downloadHotfixFileregular } from '../../service'; -import { ProForm, ModalForm, ProFormText, ProFormTextArea, ProFormSelect, ProFormSwitch } from '@ant-design/pro-form'; +import { delOSType, delKernelVersion, getOSTypeList, getKernelVersionList, submitOSType, submitKernelVersion, postChangeOsType, PostWhetherSyncRequest, downloadHotfixFile, downloadHotfixFileregular, regularuploadProps, normFile, getEditUpload } from '../../service'; +import { ProForm, ModalForm, ProFormText, ProFormTextArea, ProFormSelect, ProFormSwitch, ProFormUploadButton } from '@ant-design/pro-form'; import { async } from '@antv/x6/lib/registry/marker/async'; import { PropertySafetyFilled, DownloadOutlined } from '@ant-design/icons'; import KernelConfigForm from '../../components/KernelConfigForm' @@ -56,6 +56,25 @@ const OSTypeConfigList = React.forwardRef((props, ref) => { const onPostTask = () => { oslistRef.current.reload(); } + const [fileList, setFileList] = useState([]); + const UploadOnChange = (data) => { + if(data.length === 1){ + setFileList([{ + uid: data[0].uid, + name: data[0].name, + status: data[0].status, + url: data[0].name, + }]); + }else{ + setFileList([{ + uid: data[1].uid, + name: data[1].name, + status: data[1].status, + url: data[1].name, + }]); + } + } + const columns = [ { title: , @@ -166,7 +185,7 @@ const OSTypeConfigList = React.forwardRef((props, ref) => { os_type_name: values.os_type_name, git_repo_link: values.git_repo_link, image: values.building_image, - git_rule: values.git_rule, + git_rule: values.patch_file ? values.patch_file[0].response.data.patch_name : record.git_rule, source_devel: values.source_devel, source_debuginfo: values.source_debuginfo } @@ -201,11 +220,22 @@ const OSTypeConfigList = React.forwardRef((props, ref) => { placeholder="请输入git仓库地址" initialValue={record.source_repo} /> - 0 ? fileList : [{ + uid: record.git_rule, + name: record.git_rule, + status: "uploading", + url: record.git_rule, + }]} + onChange={(data)=>UploadOnChange(data.fileList)} /> } diff --git a/sysom_web/src/pages/hotfix/components/KernelConfigForm.jsx b/sysom_web/src/pages/hotfix/components/KernelConfigForm.jsx index 79397879..cf3272a7 100644 --- a/sysom_web/src/pages/hotfix/components/KernelConfigForm.jsx +++ b/sysom_web/src/pages/hotfix/components/KernelConfigForm.jsx @@ -79,6 +79,7 @@ export default (props, ref) => { fieldProps={{ name: 'file', }} + tooltip="上传用于从内核版本号生成对应源码分支的规则脚本，支持shell和py，模版可在教程页面下载" /> } @@ -111,6 +112,7 @@ export default (props, ref) => { checkedChildren="是" unCheckedChildren="否" onChange={KernelConfigChange} + tooltip="使用.src.rpm的内核源码包进行内核源码管理，仓库为.src.rpm的仓库地址" /> { checkedChildren="是" unCheckedChildren="否" onChange={ConfigSynchronizationChange} + tooltip="选择是否需要自动同步仓库下的内核版本信息" /> diff --git a/sysom_web/src/pages/hotfix/service.js b/sysom_web/src/pages/hotfix/service.js index 34ba6a49..27518cf5 100644 --- a/sysom_web/src/pages/hotfix/service.js +++ b/sysom_web/src/pages/hotfix/service.js @@ -267,7 +267,7 @@ export async function submitOSType(params, options) { "source_repo":params.source_repo, "src_pkg_mark": params.src_pkg_mark, "image": params.image, - "git_rule": params.patch_file[0].response.data.patch_name || "", + "git_rule": params.patch_file && params.patch_file.length > 0 ? params.patch_file[0].response.data.patch_name : "" || "", "source_devel": params.source_devel, "source_debuginfo": params.source_debuginfo, "sync_conf": params.sync_conf, -- Gitee