diff --git a/config/config.ts b/config/config.ts index 99282e541f545f78c1f4cd1ceb5fad4319d8f69b..e691edd6f079a44d6d2d642a625072bf5ed49805 100644 --- a/config/config.ts +++ b/config/config.ts @@ -9,6 +9,7 @@ export default defineConfig({ runtimePublicPath: isPro ? {} : undefined, publicPath, antd: {}, + hash: true, access: {}, model: {}, initialState: {}, diff --git a/src/pages/Suite/components/FilterForm/CaseFilter.tsx b/src/pages/Suite/components/FilterForm/CaseFilter.tsx index 65b5aa0d23464a323aa382c5e0df112e36494922..ec4d01d132ad2a0d404242ab293b2aaf3d0eaad8 100644 --- a/src/pages/Suite/components/FilterForm/CaseFilter.tsx +++ b/src/pages/Suite/components/FilterForm/CaseFilter.tsx @@ -1,10 +1,12 @@ -import React, { useEffect, useState } from "react" +import React from "react" import { runMethodOptions, runModelOptions, isAvailableOptions, serviceTypeOptions, testTypeOptions, priorityListOptions, deviceArchOptions } from "@/pages/Suite/utils" import { Input, Select, DatePicker, message } from "antd" import FilterForm from "." import { useCaseProvider } from "../../provider"; import styled from "styled-components" import { useSize } from "ahooks"; +import lodash from "lodash" +import { queryReviewer } from "../../services" const dateFormat = 'YYYY-MM-DD'; @@ -17,10 +19,47 @@ const FilterFormWrapper = styled.div` background-color: #FAFAFA; ` +const ReviewerSelect: React.FC = (props) => { + const [users, setUsers] = React.useState([]) + + const queryUsers = async (user_name: any = undefined) => { + const { data, code, msg } = await queryReviewer({ page_num: 1, page_size: 100, user_name }) + if (code !== 200) return message.error(msg) + try { + let arr = data?.splice(0) + arr = arr.map((item: any) => ({ + label: item, + value: item + })) + setUsers(arr) + return + } catch (err) { + console.log(err) + } + } + + React.useEffect(() => { + queryUsers() + }, []) + + return ( + + children: ( + + ) }, { label: "创建时间", diff --git a/src/pages/Suite/components/RightContent/index.tsx b/src/pages/Suite/components/RightContent/index.tsx index 66f7e708d9f7ce10e9f7650d2cc020d2a01cdf24..ba5fdea002618b67da2321810a6e512ed428f1a0 100644 --- a/src/pages/Suite/components/RightContent/index.tsx +++ b/src/pages/Suite/components/RightContent/index.tsx @@ -7,7 +7,7 @@ import BatchDeleteCase from "./BatchDeleteCase" // import FilterForm from "./FilterForm" import AddModal from "../AddModal" import ExportCase from "./ExportCase" -import { exportCases, queryModalCases, queryReviewer } from "../../services" +import { exportCases, queryModalCases } from "../../services" import { useParams, useAccess } from "@umijs/max" import CaseChild from "@/pages/Suite/components/Case" @@ -95,7 +95,6 @@ const RightContent: React.FC = () => { const [cases, setCases] = React.useState([]) const [selectCases, setSelectCases] = React.useState([]) const [activeCase, setActiveCase] = React.useState(null) - const [users, setUsers] = React.useState([]) const [source, setSource] = React.useState(undefined) const [filter, setFilter] = React.useState(false) @@ -123,24 +122,6 @@ const RightContent: React.FC = () => { setSource(response) } - const queryUsers = async () => { - const { data, code, msg } = await queryReviewer({ page_num: 1, page_size: 100 }) - try { - if( code === 200 && !!data.length) { - let arr = data.splice(0) - arr = arr.map((item:any) => ({ - label: item.user_name, - value: item.user_name - })) - setUsers(arr) - return - } - return message.error(msg) - } catch (err) { - console.log(err) - } - } - React.useEffect(() => { if (cases.length > 0) { if (activeCase && typeof activeCase.id === "number") { @@ -202,7 +183,6 @@ const RightContent: React.FC = () => { }, [source]) const handleFilterChange = (val: any) => { - queryUsers() const params = Object.keys(val).reduce((pre: any, cur: any) => { const ctx = val[cur] if (cur === "created_at" && ctx) { @@ -320,7 +300,7 @@ const RightContent: React.FC = () => { filter && <> - + } diff --git a/src/pages/Suite/services.ts b/src/pages/Suite/services.ts index 9483715915849c1c44f19b43b3785dce061b16b3..196277df6efce0c8d6b9eeb1e22437168a6857f6 100644 --- a/src/pages/Suite/services.ts +++ b/src/pages/Suite/services.ts @@ -175,5 +175,5 @@ export const asyncToneSuite = async () => { } export const queryReviewer = async (params:any) => { - return request(`/api/user/user-list`, { params }) + return request(`/api/user/reviewer`, { params }) } \ No newline at end of file