From 2f78065ba506d08b9d9626002a4a42c7f2ffd112 Mon Sep 17 00:00:00 2001 From: wulibaibao <13366578180@163.com> Date: Fri, 15 Apr 2022 11:34:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=EF=BC=8C=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app.tsx | 5 ++- src/pages/Demand/components/AddDemand.tsx | 3 +- .../Plan/components/RightContent/index.tsx | 5 ++- .../components/RightContent/FilterForm.tsx | 38 +++++++++++-------- .../Suite/components/RightContent/index.tsx | 7 ++-- src/pages/Task/Detail/index.tsx | 3 +- src/pages/Task/components/AddTaskModal.tsx | 22 ++++++----- 7 files changed, 51 insertions(+), 32 deletions(-) diff --git a/src/app.tsx b/src/app.tsx index f02f89c..6caf8af 100644 --- a/src/app.tsx +++ b/src/app.tsx @@ -39,11 +39,14 @@ const HeaderWrapper = styled.div` } } + .ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-item-active::after { border-bottom: none; } - .ant-menu-horizontal > .ant-menu-item::after, .ant-menu-horizontal > .ant-menu-submenu::after { + .ant-menu-horizontal > .ant-menu-item::after, + .ant-menu-horizontal > .ant-menu-submenu::after { + transition: unset; &:hover { transition: unset; border-bottom: none; diff --git a/src/pages/Demand/components/AddDemand.tsx b/src/pages/Demand/components/AddDemand.tsx index 981755d..4040a46 100644 --- a/src/pages/Demand/components/AddDemand.tsx +++ b/src/pages/Demand/components/AddDemand.tsx @@ -6,6 +6,7 @@ import { requestCodeMessage, isQuestRight, requestNotTableFn, setFormFieldsValue import StatusTag from "@/components/Public/StatusTag" import { createEditor } from '@wangeditor/editor' import { isArray, get } from "lodash" +import { EditorBox } from "@/components/CustomStyled" type IProps = { onOk: () => void; onCancel?: () => void; @@ -182,7 +183,7 @@ const ReactComponent: React.ForwardRefRenderFunction = (props, re defaultValue={textEditorRef.current || source?.content} onEditorChange={handleEditorChange} /> : -
= () => { 测试需求 - {data.req_id} + {data?.req_title} @@ -143,7 +144,7 @@ const PlanRightContent: React.FC = () => { 描述 -
= (props, ref) => { const { onOk } = props @@ -113,7 +120,8 @@ const FilterForm: React.ForwardRefRenderFunction = (props, ref) = { label: "创建时间", name: "created_at", - children: + rowCol: 10, + children: } ] @@ -146,7 +154,7 @@ const FilterForm: React.ForwardRefRenderFunction = (props, ref) = { renderJson.map((row: any) => ( - + { row.list ? : diff --git a/src/pages/Suite/components/RightContent/index.tsx b/src/pages/Suite/components/RightContent/index.tsx index 77efdee..ed409bd 100644 --- a/src/pages/Suite/components/RightContent/index.tsx +++ b/src/pages/Suite/components/RightContent/index.tsx @@ -1,5 +1,5 @@ import React from "react" -import { Button, Divider, Empty, Input, Row, Space, Spin, Typography, message } from "antd" +import { Button, Divider, Empty, Input, Row, Space, Typography, message } from "antd" import { DownOutlined, UpOutlined } from "@ant-design/icons" import SuiteList from "./SuiteList" @@ -10,7 +10,7 @@ import FilterForm from "./FilterForm" import AddModal from "../AddModal" import ExportCase from "./ExportCase" -import { exportCases, queryCases, queryModalCases } from "../../services" +import { exportCases, queryModalCases } from "../../services" import { useParams } from "umi" import CaseChild from "@/pages/Suite/components/Case" @@ -80,12 +80,13 @@ const RightContent: React.FC = (props) => { } const handleOkFilter = (vals: any) => { - const params = { ...pageParams, mod_id, ...vals } + const params = { mod_id, ...vals } setPageParams(params) getModalCase(params) } const exportExcel = async () => { + if (!selectCases.length) return message.warning("请选择需要导出的用例！") const data = await exportCases(selectCases) const fileAppType = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' const blob = new Blob([data], { diff --git a/src/pages/Task/Detail/index.tsx b/src/pages/Task/Detail/index.tsx index 538c2cb..4304ab7 100644 --- a/src/pages/Task/Detail/index.tsx +++ b/src/pages/Task/Detail/index.tsx @@ -6,6 +6,7 @@ import { viewTask } from "../services" import InsertRunResult from "../components/InsertRunResult" import TestResultTable from "../components/TestResultTable" import { createEditor } from "@wangeditor/editor" +import { EditorBox } from "@/components/CustomStyled" const TaskDetail: React.FC = () => { const { task_id } = useParams() as any @@ -93,7 +94,7 @@ const TaskDetail: React.FC = () => { data.run_method === "manual" && ( data.run_result ? -
: diff --git a/src/pages/Task/components/AddTaskModal.tsx b/src/pages/Task/components/AddTaskModal.tsx index b901966..713c555 100644 --- a/src/pages/Task/components/AddTaskModal.tsx +++ b/src/pages/Task/components/AddTaskModal.tsx @@ -1,7 +1,6 @@ import React from "react" import { Modal, Form, Input, Space, Button, Select, Radio, message } from "antd" -import { useRequest } from "ahooks"; -import { request } from "umi"; +import { useRequest, request } from "umi"; import { runMethodOptions } from "@/pages/Suite/utils" import styled from "styled-components" import { createTask } from "../services"; @@ -24,26 +23,31 @@ const ReactComponent: React.ForwardRefRenderFunction = (props, re const [source, setSource] = React.useState(undefined) const [runMethod, setRunMethod] = React.useState("auto") - const { data: plans } = useRequest(() => request(`/api/plan`), {}) - const { data: cases } = useRequest(() => request(`/api/case/`), {}) + const { data: plans } = useRequest(() => request(`/api/plan`), { initialData: [] }) + const { data: cases } = useRequest(() => request(`/api/case/`), { initialData: [] }) const plansOptions = React.useMemo(() => { - if (plans && plans.data.length > 0) - return plans.data.map((i: any) => ({ label: i.name, value: i.id })) + if (plans && plans.length > 0) + return plans.map((i: any) => ({ label: i.title, value: i.id })) return [] }, [plans]) const casesOptions = React.useMemo(() => { - if (cases && cases.data.length > 0) - return cases.data.map((i: any) => ({ label: i.name, value: i.id })) + if (cases && cases.length > 0) + return cases.map((i: any) => ({ label: i.name, value: i.id })) return [] }, [cases]) + console.log(plansOptions) + React.useImperativeHandle(ref, () => ({ show(_: any) { setSource(_) setVisible(true) - form.setFieldsValue(_) + if (JSON.stringify(_) !== "{}") { + const { cases: caseIds } = _ + form.setFieldsValue({ ..._, cases: caseIds.split(",").map((i: any) => +i) }) + } } })) -- Gitee