From 7bb5cdcd385aeea7b2258a0f5266255da77f9426 Mon Sep 17 00:00:00 2001
From: wb-cy860729 <wb-cy860729@alibaba-inc.com>
Date: Fri, 15 Apr 2022 16:37:31 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ColorPicker/index.tsx          |  4 +-
 src/components/Public/DelModal.tsx            |  4 ++
 src/components/Public/StatusTag.tsx           |  6 +-
 .../Server/components/AddServerModal.tsx      |  2 +-
 .../components/CheckboxSearchSelect.tsx       | 68 +++++++++++--------
 src/pages/Server/index.less                   | 13 ++--
 6 files changed, 55 insertions(+), 42 deletions(-)

diff --git a/src/components/ColorPicker/index.tsx b/src/components/ColorPicker/index.tsx
index 91c1b75..c8e17d9 100644
--- a/src/components/ColorPicker/index.tsx
+++ b/src/components/ColorPicker/index.tsx
@@ -65,7 +65,7 @@ const colorPicker: React.FC<any> = ({ value, onChange }) => {
 		}
 	}
 
-	const styles = reactCSS({
+	const styles:any = reactCSS({
 		'default': {
 			color: {
 				position: 'relative',
@@ -103,6 +103,8 @@ const colorPicker: React.FC<any> = ({ value, onChange }) => {
 				borderRadius: '2px',
 				zIndex: 9999,
 				marginTop: 5,
+				top: -135,
+				left: 32,
 			}
 		},
 	});
diff --git a/src/components/Public/DelModal.tsx b/src/components/Public/DelModal.tsx
index 5fb0cd7..d3662bb 100644
--- a/src/components/Public/DelModal.tsx
+++ b/src/components/Public/DelModal.tsx
@@ -12,6 +12,10 @@ const ModalComponent = styled(Modal)`
     .ant-btn-primary{
         border-color: #FF4E50;
         background: #FF4E50;
+        &:hover,&:focus{
+                border-color: #FF4E50;
+                background: #FF4E50;
+              }
     }
     .ant-modal-title{
         font-weight: 700;
diff --git a/src/components/Public/StatusTag.tsx b/src/components/Public/StatusTag.tsx
index 39e2e55..ba5da97 100644
--- a/src/components/Public/StatusTag.tsx
+++ b/src/components/Public/StatusTag.tsx
@@ -8,6 +8,7 @@ type IProps = {
 const stateWordsMap = new Map([
     ["init", "新建"],
     ["analyzing", "分析中"],
+    ["reviewing", "评审中"],
     ["running", "运行中"],
     ["finish", "已完成"],
     ["accepted", "已接受"],
@@ -16,6 +17,7 @@ const stateWordsMap = new Map([
 
 const stateColorMap = new Map([
     ["init", "rgba(0,0,0,0.03)"],
+    ["reviewing", "rgba(24,144,255,0.1)"],
     ["analyzing", "rgba(250,173,21,0.1)"],
     ["running", "rgba(24,144,255,0.1)"],
     ["finish", "rgba(34,188,61,0.1)"],
@@ -24,6 +26,7 @@ const stateColorMap = new Map([
 ])
 const stateWordsColorMap = new Map([
     ["init", "rgba(0,0,0,0.45)"],
+    ["reviewing", "rgba(24,144,255,1)"],
     ["analyzing", "rgba(228,155,9,1)"],
     ["running", "rgba(24,144,255,1)"],
     ["finish", "rgba(34,188,61,1)"],
@@ -37,9 +40,6 @@ const StateTag: React.FC<IProps> = (props) => {
         <Tag
             color={stateColorMap.get(state)}
             style={{
-                // width: 54,
-                // margin: 0,
-                // textAlign: "center",
                 color: stateWordsColorMap.get(state) || "rgba(0,0,0,0.45)",
             }}
         >
diff --git a/src/pages/Server/components/AddServerModal.tsx b/src/pages/Server/components/AddServerModal.tsx
index aab0290..27db63f 100644
--- a/src/pages/Server/components/AddServerModal.tsx
+++ b/src/pages/Server/components/AddServerModal.tsx
@@ -148,7 +148,7 @@ const ReactComponent: React.ForwardRefRenderFunction<IRefs, IProps> = (props, re
                             <Radio value={'physics'}>物理机</Radio>
                         </Radio.Group>
                     </Form.Item>
-                    <Form.Item name="label" label="标签" labelCol={{span: 3}}>
+                    <Form.Item name="label" label="标签" labelCol={{span: 3}} className="tag_label">
                         <CheckboxSearchSelect
                             setIsLoading={setLoading}
                             effect={source}
diff --git a/src/pages/Server/components/CheckboxSearchSelect.tsx b/src/pages/Server/components/CheckboxSearchSelect.tsx
index ec3a8e4..dbabb2c 100644
--- a/src/pages/Server/components/CheckboxSearchSelect.tsx
+++ b/src/pages/Server/components/CheckboxSearchSelect.tsx
@@ -66,9 +66,9 @@ const MultipleSelect: React.FC<MultipleSelectProp> = (props) => {
             if (isQuestRight(code)) {
                 const formValusCopy = _.cloneDeep(formReact.getFieldsValue())
                 formValusCopy[dataIndex] = _.isArray(formValusCopy[dataIndex]) ? [...formValusCopy[dataIndex], data?.id] : [data?.id]
-                formReact.setFieldsValue(formValusCopy)
                 let checkedListCopy = [..._.cloneDeep(checkedList),,data?.name]
-               
+
+                formReact.setFieldsValue(formValusCopy)
                 setCheckedList(checkedListCopy)
                 resultData?.data.unshift(data)
                 setSelectOptions([data,...selectOptions])
@@ -108,7 +108,19 @@ const MultipleSelect: React.FC<MultipleSelectProp> = (props) => {
         setCheckedList(newSel)
     }
     const handleSearch = (value:string) => setInp(value)
-  
+
+    const handleTagClose = (e:any, tagObj:any) => {
+        e.preventDefault()
+        // e.stopPropagation();
+        // e.nativeEvent.stopImmediatePropagation();
+        const formValusCopy = _.cloneDeep(formReact.getFieldsValue())
+        formValusCopy[dataIndex] = formValusCopy[dataIndex].filter((val:number) => val !== tagObj?.id)     
+        const checkedListNew = checkedList.filter((val:string) => val !== tagObj?.name)
+        formReact.setFieldsValue(formValusCopy)
+        setCheckedList(checkedListNew)      
+    }
+
+ 
     return (
         <Select
             mode="multiple"
@@ -116,43 +128,40 @@ const MultipleSelect: React.FC<MultipleSelectProp> = (props) => {
             getPopupContainer={node => node.parentNode}
             placeholder={placeholder || "请选择"}
             value={checkedList}
-            tagRender={(props:any) => {
-                 const targetValue: any = _.find(selectOptions, { name: props?.value })
-                 console.log(targetValue,'targetValue')
-                 if(!targetValue) return <></>
-                return <Tag color={targetValue?.color}>{props?.value}</Tag>
+            tagRender={(props: any) => {
+                const targetValue: any = _.find(selectOptions, { name: props?.value })
+                if (!targetValue) return <></>
+                return <Tag color={targetValue?.color} closable={false} onClose={_.partial(handleTagClose, _, targetValue)}>{props?.value}</Tag>
             }}
             showArrow={true}
             allowClear
             onChange={handleChecked}
             onSearch={handleSearch}
             onDropdownVisibleChange={handleDropdown}
-            dropdownStyle={{ width: 320 }}
+            dropdownStyle={{ width: 320,paddingTop: 0 }}
             menuItemSelectedIcon={<CheckOutlined style={{ color: '#52C41A' }} />}
             dropdownRender={() => (
                 <div style={{ maxHeight: 300, overflow: 'hidden', position: 'relative' }}>
                     <Scrollbars className={styles.scrollbars} autoHeightMax={260} autoHeight style={{ overflow: 'hidden' }}>
-                    <Col span={24}>
-                        {loading ? <Spin size="small" style={{ width: '100%' }} /> : <Checkbox.Group value={checkedList} onChange={handleChecked} style={{ width: '100%' }}>
-                            {
-                                _.isArray(_.get(resultData, 'data')) && _.get(resultData, 'data').length ? _.get(resultData, 'data').map(
-                                    (i: any) => {
-                                        if (!i) return ''
-                                        return (
-                                            <Row key={i.id} align="middle" className="cb-row">
-                                                <Checkbox value={i.name} >
-                                                    {/* <Row justify='space-between' > */}
+                        <Col span={24}>
+                            {loading ? <Spin size="small" style={{ width: '100%' }} /> : <Checkbox.Group value={checkedList} onChange={handleChecked} style={{ width: '100%' }}>
+                                {
+                                    _.isArray(_.get(resultData, 'data')) && _.get(resultData, 'data').length ? _.get(resultData, 'data').map(
+                                        (i: any) => {
+                                            if (!i) return ''
+                                            return (
+                                                <Row key={i.id} align="middle" className="cb-row">
+                                                    <Checkbox value={i.name} >
                                                         <Tag color={i?.color} className="tag_checked">{i.name}</Tag>
-                                                        {checkedList.includes(i.name) && <CheckOutlined style={{ color: '#52C41A' }} className="icon_checked"/>}
-                                                    {/* </Row> */}
-                                                </Checkbox>
-                                            </Row>
-                                        )
-                                    }
-                                ) : <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
-                            }
-                        </Checkbox.Group>}
-                    </Col>
+                                                        {checkedList.includes(i.name) && <CheckOutlined style={{ color: '#52C41A' }} className="icon_checked" />}
+                                                    </Checkbox>
+                                                </Row>
+                                            )
+                                        }
+                                    ) : <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
+                                }
+                            </Checkbox.Group>}
+                        </Col>
                     </Scrollbars>
                     <Divider style={{ margin: '2px 0' }} />
                     {isButton ? <div
@@ -195,7 +204,6 @@ const MultipleSelect: React.FC<MultipleSelectProp> = (props) => {
                     </div>}
                 </div>
             )}
-
         />
     )
 }
diff --git a/src/pages/Server/index.less b/src/pages/Server/index.less
index b4acf0f..2c9411b 100644
--- a/src/pages/Server/index.less
+++ b/src/pages/Server/index.less
@@ -39,14 +39,11 @@
                 white-space: nowrap;
                 display: inline-block;
                 max-width: 370px;
+                transform: translateY(3px);
             }
         }
-        .cb-row{
-            margin-bottom: 4px;
-        }
-
+      
     }
-    
 }
 .addForm{
     :global{
@@ -56,8 +53,10 @@
         .ant-form-item-label > label{
             margin-bottom: 16px;
         }
-        label[title="��ǩ"]{
-            margin-bottom: 0 !important;
+        .tag_label{
+            label{
+                margin-bottom: 0 !important;
+            }
         }
     }
 }
-- 
Gitee


From f8a36bad606577da9f7c5be7cd9e13e450eb1474 Mon Sep 17 00:00:00 2001
From: wb-cy860729 <wb-cy860729@alibaba-inc.com>
Date: Mon, 18 Apr 2022 17:08:00 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=8F=96=E8=89=B2=E5=99=A8=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Demand/index.tsx                    |  2 +-
 .../components/CheckboxSearchSelect.tsx       | 34 +++++++++++++++----
 src/pages/Server/index.less                   | 12 +++----
 3 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/src/pages/Demand/index.tsx b/src/pages/Demand/index.tsx
index a81dff2..dca7ad8 100644
--- a/src/pages/Demand/index.tsx
+++ b/src/pages/Demand/index.tsx
@@ -1,6 +1,6 @@
 import { useState, useRef } from "react"
 import { Table, Space, Typography, Row, Button, Layout } from "antd"
-import { getDemandList, queryTableList, deleteDemand } from "./services"
+import { getDemandList, deleteDemand } from "./services"
 import AddModal from "./components/AddDemand"
 import { requestFn, defaultParams } from "@/utils"
 import { useUpdateEffect } from 'ahooks'
diff --git a/src/pages/Server/components/CheckboxSearchSelect.tsx b/src/pages/Server/components/CheckboxSearchSelect.tsx
index dbabb2c..8653e9d 100644
--- a/src/pages/Server/components/CheckboxSearchSelect.tsx
+++ b/src/pages/Server/components/CheckboxSearchSelect.tsx
@@ -32,6 +32,9 @@ const MultipleSelect: React.FC<MultipleSelectProp> = (props) => {
     const [isButton, setIsButton] = useState<boolean>(true)
     const [inputVal,setInputVal] = useState('')
     const [selColor,setSelColor] = useState('rgb(255,157,78)')
+
+    const [offsetYVal,setOffsetYVal] = useState(0)
+    const box:any = useRef(null)
     const { data: resultData, loading, run } = requestNotTableFn(questLink,'',true)
 
 
@@ -83,7 +86,7 @@ const MultipleSelect: React.FC<MultipleSelectProp> = (props) => {
     const handleAddCancle = () => {
         setInputVal('')
         setSelColor('rgb(255,157,78)')
-        setIsButton(!isButton)
+        setIsButton(true)
     }
     const handleDropdown = (open:boolean) => {
         if(!open) handleAddCancle()
@@ -111,16 +114,34 @@ const MultipleSelect: React.FC<MultipleSelectProp> = (props) => {
 
     const handleTagClose = (e:any, tagObj:any) => {
         e.preventDefault()
-        // e.stopPropagation();
-        // e.nativeEvent.stopImmediatePropagation();
         const formValusCopy = _.cloneDeep(formReact.getFieldsValue())
         formValusCopy[dataIndex] = formValusCopy[dataIndex].filter((val:number) => val !== tagObj?.id)     
         const checkedListNew = checkedList.filter((val:string) => val !== tagObj?.name)
         formReact.setFieldsValue(formValusCopy)
         setCheckedList(checkedListNew)      
     }
+    const onPreventMouseDown = (event:any) => {
+        event.preventDefault();
+        event.stopPropagation();
+    };
+    const getScollOffsetY = () => {
+        if (box.current) {
+            let val = box.current.scrollTop
+            setOffsetYVal(val)
+        }
+    }
 
- 
+    useEffect(() => {
+        box.current = document.querySelector('.ant-modal-wrap')
+        box.current.addEventListener('scroll', () => {
+            getScollOffsetY()
+        })
+        return () => {
+            box.current.removeEventListener('scroll', () => {
+                getScollOffsetY()
+            })
+        }
+    }, [])
     return (
         <Select
             mode="multiple"
@@ -131,7 +152,7 @@ const MultipleSelect: React.FC<MultipleSelectProp> = (props) => {
             tagRender={(props: any) => {
                 const targetValue: any = _.find(selectOptions, { name: props?.value })
                 if (!targetValue) return <></>
-                return <Tag color={targetValue?.color} closable={false} onClose={_.partial(handleTagClose, _, targetValue)}>{props?.value}</Tag>
+                return <Tag onMouseDown={onPreventMouseDown} color={targetValue?.color} closable={true} onClose={_.partial(handleTagClose, _, targetValue)}>{props?.value}</Tag>
             }}
             showArrow={true}
             allowClear
@@ -177,12 +198,11 @@ const MultipleSelect: React.FC<MultipleSelectProp> = (props) => {
                         flexWrap: 'nowrap',
                         paddingLeft: 10,
                         width: '100%',
-
                     }}>
                         <div style={{
                             position: 'fixed',
                             zIndex: 999,
-                            transform: 'translateX(305px)'
+                            transform: `translate(305px,-${offsetYVal}px)`,
                         }}>
                             <ColorPicker onChange={handleChangeColor} />
                         </div>
diff --git a/src/pages/Server/index.less b/src/pages/Server/index.less
index 2c9411b..d687bbc 100644
--- a/src/pages/Server/index.less
+++ b/src/pages/Server/index.less
@@ -1,10 +1,3 @@
-
-.select_baseline {
-    :global(.ant-select-selection-search) {
-        // min-width: 5px;
-    }   
-}
-
 .create_tag{
     cursor: pointer;
     color: rgba(0,0,0,0.65);
@@ -42,7 +35,10 @@
                 transform: translateY(3px);
             }
         }
-      
+        .ant-select-dropdown{
+            top: initial !important;
+            bottom: 4px !important;
+        }
     }
 }
 .addForm{
-- 
Gitee


From d1a2ee7895371220928a1796563552a4fdad7a2d Mon Sep 17 00:00:00 2001
From: wb-cy860729 <wb-cy860729@alibaba-inc.com>
Date: Mon, 18 Apr 2022 17:16:40 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=99=A8=E4=BD=8D=E7=BD=AE=E5=9B=BA=E5=AE=9A=E5=88=B0=E4=B8=8A?=
 =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F=E5=8F=96=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Server/index.less | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Server/index.less b/src/pages/Server/index.less
index d687bbc..b5cc777 100644
--- a/src/pages/Server/index.less
+++ b/src/pages/Server/index.less
@@ -36,8 +36,8 @@
             }
         }
         .ant-select-dropdown{
-            top: initial !important;
-            bottom: 4px !important;
+            // top: initial !important;
+            // bottom: 4px !important;
         }
     }
 }
-- 
Gitee


From 20021ca0fa3d1e5ec1fd8be61f07950ad7fcafc0 Mon Sep 17 00:00:00 2001
From: wulibaibao <13366578180@163.com>
Date: Tue, 19 Apr 2022 17:48:06 +0800
Subject: [PATCH 4/4] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/defaultSettings.ts                     |   2 +-
 config/proxy.ts                               |   2 +-
 public/favicon.ico                            | Bin 4286 -> 285478 bytes
 public/favicon.png                            | Bin 0 -> 2157 bytes
 public/icons/icon-128x128.png                 | Bin 1329 -> 0 bytes
 public/icons/icon-192x192.png                 | Bin 1856 -> 0 bytes
 public/icons/icon-512x512.png                 | Bin 5082 -> 0 bytes
 src/app.tsx                                   |   2 +
 .../components/SelectModal/Task.select.tsx    |   2 +-
 src/pages/Server/index.tsx                    |  44 ++++----
 src/pages/Suite/components/AddModal.tsx       |  97 +----------------
 src/pages/Suite/components/Case/Edit.tsx      |  21 +---
 src/pages/Suite/components/Case/index.tsx     |   1 +
 src/pages/Suite/components/FormItems.tsx      | 101 ++++++++++++++++++
 .../RightContent/SelectSuiteModal.tsx         |   6 +-
 src/pages/Suite/services.ts                   |   2 +
 src/pages/Task/components/AddTaskModal.tsx    |   3 +-
 17 files changed, 140 insertions(+), 143 deletions(-)
 create mode 100644 public/favicon.png
 delete mode 100644 public/icons/icon-128x128.png
 delete mode 100644 public/icons/icon-192x192.png
 delete mode 100644 public/icons/icon-512x512.png
 create mode 100644 src/pages/Suite/components/FormItems.tsx

diff --git a/config/defaultSettings.ts b/config/defaultSettings.ts
index d0d1d04..a12c90a 100644
--- a/config/defaultSettings.ts
+++ b/config/defaultSettings.ts
@@ -14,7 +14,7 @@ const Settings: LayoutSettings & {
     colorWeak: false,
     title: 'TestLib',
     pwa: false,
-    logo: 'https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg',
+    logo: "",
     iconfontUrl: '',
 };
 
diff --git a/config/proxy.ts b/config/proxy.ts
index f1b427a..85e3c92 100644
--- a/config/proxy.ts
+++ b/config/proxy.ts
@@ -7,7 +7,7 @@
  * https://pro.ant.design/docs/deploy
  */
 
-const ip = `30.225.24.75`
+const ip = `30.225.24.43`
 const port = `8005`
 
 const devTargetUri = `http://${ip}:${port}`;
diff --git a/public/favicon.ico b/public/favicon.ico
index e2e93252988b5bed120ddeb168eb577bf0caa881..77d325d1a52ad108a0630e6668d92cd402a0b611 100644
GIT binary patch
literal 285478
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

literal 4286
zcmeHLO(?8k6#ga#Gs=ufvobTd=q@y~nOLdYlqL%nQY4WqC`)z}3y~cqOAAF4VkQd~
z^3$wrC}~D1l%!eMp!|gA&U5sN?~b{2>)yNg-s#Lc-+9k_p7Y<=XqqYcDJs(Vt%dBG
z=F~Lpdy<kY?MITxmz6yG=6#_ThNfj_XTu;P21X4SHSoXGfZ1#YDJv`M!`YNhhWFB)
zr}NWdvB2eWp`@e)`T6-N@vT-X+-^6Di;Iz$m-kL4Gcyx*yB%d^WhgH%M?pb>*pd!Y
zozZT}udJ-#<m3d6jg832$atrpGKGbOSYKa9EEYp`bv1~obOeJztgf!&{QMjj7Z->|
zqiAVq0sT@kAMMobbULxOw+F6{j*egO8CQ?TgTuo^+}_@zrlv;l$*-)e#PRVl?(Xgo
zi9`?zg>ZFsh0DuJ)Ya9!von<qdi>7LPN@OfP9IfH_4tet&&I~a#O{TK1<3*LO-xJ(
zZ*Fc5%v&m4#Z&mZySs8{XJ-fV^Yh@{p`ju8d_J)w6+U%`!(qAC+uJK~qg_o+O|QC`
zTVg0Y{jSHqzP^^&G0t4^cwF+$`egj?@9$AtTMLuPB>7!lUKY8&zP?xd=H_PM(U;HS
ztNi!(_oJes0<5X6tu4{BxVR{FO<TC8rl!DnI2;a)j*bd%X=zD%hcTI)oD|;7%*=0V
zQ2DR$+uPfbd`}UgAJ5Ov;&)Y5mBixV;Q^<or$QqmBk=qEI669#xUh$qyPKOEBoYbn
z;ccJjW6x(jep_4HD?WRH>)_x3UauFkv$I%RTSHe@7dAIHF+4mhc?|>t(!XbCXVQZk
z8yje7Xh2R*&WCwdw&?N4$H!4$Uyq)i9_;V$3;y)<G;(uuW$tj!@Gj?+npNxro6UyO
z(o)G2^Fp4&NVh9|RsW3l)6<jSK0ZETdwW}ar#{M(sPFA>^-LKhmkv{Z#(CP^-7Wn#
zI5-H>z`y`nTU%u=f7Tbh-mg5fPT0G8`Wx6^vD1(>-r0;AFlyjWYC!!D@UQlt)%}4^

diff --git a/public/favicon.png b/public/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..a89059b9a83f2644327b34a4feda5a1ce4b6ea70
GIT binary patch
literal 2157
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

literal 0
HcmV?d00001

diff --git a/public/icons/icon-128x128.png b/public/icons/icon-128x128.png
deleted file mode 100644
index 48d0e2339a60a637b94319c65e8654289b4f4b6c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1329
zcmV-11<v}3P)<h;3K|Lk000e1NJLTq004jh004jp0{{R3^x%>C0002qP)t-s01zMl
z|Nj6D8~_Fu01Fxg6ePmN$p8o!Wo~x>2^n*Hg!uURG(b#MUupdO{0J2!4IC;FATIs>
z{@dN(0umtr1r+b_@!;a*CNn?_87S=S?pR`MN>yMYFg?=M*UQe)wYk2qw7Hs~re<$=
zUubdX=<2(_!=9w6l9``_ijrw^dn`Fc6(TV7_4V=c^R2SBrmV4+ouiMHoQsl~euj;D
zf{I&ZZXPQ+87DQ^+ugv!$3;(CLQPmWL{HY)+rGlaqNuHRe}`^&fKXdyK1x+FK1#;P
z&4`be_4fDT<mMDxr)~fM1P)0=K~#9!?U~tDA~6s^t1H0}wr1b=O<83XP;hsg`Trjp
zKuJQ|I0&cv%tP*DwVvFrBvl1~Mx)VaG#ZUYqtR$I8jVKt-+>muWjt2mKnbI+d3dfa
z_PK3Vs;zn;Ot~u#==o*X;a^nmOa{(_o(tmup<lT;1q-eSNXltz5?mHAQg;>uw*`!>
z#lUp|BbBD0;J$!S0To9DO4Z9XkCjq#?=s{WNE{XLCFmLibLLfxLm3nt7Wj-&k{L;X
zo_Y$L6(Ax^@lhJo2uNHK09we3_>jt`DV`HX8L^}WDJO|ULbS4T1b_}iycq`oGqNH4
zQJi@^@H`%ly#;k8%FIH(J#9^VH>(ITJX3)9M7)?mVD;pNM){2bV!rABC{yFeZXJ$q
ztx`Yw*~<P5a$$yN39uVki^2$`w!5n)HAf-w?3Kd?<blC&V~=9Z<Yx)w_65AVKHV{|
z4MB2-+w7Z@r16D^4m)QHY9hYKC<4Y!RejCOMu0}7lS(7c&d9)6#4kLGK=eLjNUmWG
zhRcRM$vit%0L_w!KOzVL3-8+nE{#JpI{ZWd5|l6cL=Fmg*N<2|Y8>Rj#FGR_Att-g
zD?cO<T~VO(lnlhK+QIs?sq9jX{iGM*7E187s2nu&>lXM^rD8S|s+a(LB7MePP8cKc
zywqQW@o0gm8Qu`-)UW-9#K*uQ5WQT5&CGnc%phPyF4p1{wj=@#5xikX3uI#(QrZ2A
z66>Nxz+a;r*Km#iEGXxR4BFJu%9#^UG{?XqFlA~7sH!J&2X_C6*P7#50#^tYfm`)p
zW2Pupno-5;QoKQ)pCj;SS_MKc4Ai#W7h-YyLi$8b7l@8b3KjwX8wCk}6<4mh7hj6_
z@bnBUa)|InAVBSV)+C{3Cf$?e`b2@nQ<nk!OTcU2N^stn^UTi$qP_cSFw7DDDL~rd
zpW1r@k)${q9z0UuVsy1;^ge07q%&09weJOF2A=mbko<WDo)dfnNf0h(JzD|$!D*VX
zza5pId@hh2DZuZ<X&*6FVC9#$<AiQ_tblsj%V3|G32{;Y!=e|ZB4{^IMT5*q0l<N*
zxlBe)QK9<<N4G$|1{IXimyno=;^1rsW)0CLa=TN^yCr$In6m;vhjO3@BB7LWGAqlm
zbdF97bdqv>ysp0$(swOoN^Eg(SO9p-Q1JJAAwzQCMaKm&bGV`U^9&pp0Gf^+nkRf5
zTo3@>xi{<xO%YuY04|QbN~11&+W7)C8vzORv}4xoABZoSoy&j(S+{-LlgUpFS4iO)
z;>%p{gIpTF5iJBic@aIws^IC=-v{M~W@Y%aj8G0o!r2b|HdROb8D$LP+n;<mf<~j!
nXfzs)Mx)VaG#ZUYqdCZ5-SbtG{yBcd00000NkvXXu0mjfakXIe

diff --git a/public/icons/icon-192x192.png b/public/icons/icon-192x192.png
deleted file mode 100644
index 938e9b53f6850d97c693b3e3107968fbced5050c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1856
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

diff --git a/public/icons/icon-512x512.png b/public/icons/icon-512x512.png
deleted file mode 100644
index 21fc108f00294d66855a6c10af022b9d6d0f23b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5082
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

diff --git a/src/app.tsx b/src/app.tsx
index 6caf8af..2eb1e46 100644
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -8,6 +8,7 @@ import { currentUser as queryCurrentUser } from './services/ant-design-pro/api';
 import { BookOutlined, LinkOutlined } from '@ant-design/icons';
 import menuItemRender from "@/components/MenuItemRender"
 import styled from "styled-components"
+import logo from "@/assets/logo.png"
 
 const HeaderWrapper = styled.div`
     #logo a h1 {
@@ -96,6 +97,7 @@ export const layout: RunTimeLayoutConfig = ({ initialState }) => {
         waterMarkProps: {
             content: initialState?.currentUser?.name,
         },
+        logo,
         footerRender: () => <Footer />,
         onPageChange: () => {
             const { location } = history;
diff --git a/src/pages/Plan/components/SelectModal/Task.select.tsx b/src/pages/Plan/components/SelectModal/Task.select.tsx
index fd17081..e4237b9 100644
--- a/src/pages/Plan/components/SelectModal/Task.select.tsx
+++ b/src/pages/Plan/components/SelectModal/Task.select.tsx
@@ -44,7 +44,7 @@ const ReactComponent: React.ForwardRefRenderFunction<IRefs, IProps> = (props, re
     return (
         <Modal
             visible={visible}
-            title={"选择任务"}
+            title={"创建任务"}
             width={"30%"}
             footer={
                 <Space align="end">
diff --git a/src/pages/Server/index.tsx b/src/pages/Server/index.tsx
index 68815af..7e4b957 100644
--- a/src/pages/Server/index.tsx
+++ b/src/pages/Server/index.tsx
@@ -1,8 +1,8 @@
-import React,{useState} from "react"
+import React, { useState } from "react"
 import { Table, Space, Typography, Row, Button, Layout, Badge, Tag, message } from "antd"
-import { queryTableList, deleteDevice, getDeviceList, getDevicePing } from "./services"
+import { deleteDevice, getDeviceList, getDevicePing } from "./services"
 
-import { requestFn, defaultParams,isQuestRight,requestCodeMessage } from "@/utils"
+import { requestFn, defaultParams, isQuestRight, requestCodeMessage } from "@/utils"
 import { useUpdateEffect } from 'ahooks'
 import CustomPagination from "@/components/CustomPagination"
 import AddModal from "./components/AddServerModal"
@@ -43,27 +43,27 @@ const TableList: React.FC = () => {
     const handleDelete = (id: number) => {
         delModalRef.current?.show(id)
     }
-    const delCallback= async () => {
+    const delCallback = async () => {
         const parmasCopy = cloneDeep(questParmas)
-            const { page_size = 10, page_num = 1 } = parmasCopy
-            const totalPage: number = Math.ceil((get(tableSource, 'total') - 1) / page_size) || 1
+        const { page_size = 10, page_num = 1 } = parmasCopy
+        const totalPage: number = Math.ceil((get(tableSource, 'total') - 1) / page_size) || 1
 
-            if (totalPage <= page_num) {
-                parmasCopy.page_num = totalPage
-                setQuestParmas(parmasCopy)
-            } else {
-                await refresh()
-            }
+        if (totalPage <= page_num) {
+            parmasCopy.page_num = totalPage
+            setQuestParmas(parmasCopy)
+        } else {
+            await refresh()
+        }
     }
-    const getSatus = (status:boolean) => {
-        if(status) return {color: 'green',text: '可用'}
+    const getSatus = (status: boolean) => {
+        if (status) return { color: 'green', text: '可用' }
         return { color: 'red', text: '不可用' }
     }
-    const getType = (type:string) => {
-        if(type === 'vm') return 'VM'
-        if(type === 'docker') return 'Docker'
-        if(type === 'physics') return '物理机'
-        if(type === 'unlimit') return '不限制'
+    const getType = (type: string) => {
+        if (type === 'vm') return 'VM'
+        if (type === 'docker') return 'Docker'
+        if (type === 'physics') return '物理机'
+        if (type === 'unlimit') return '不限制'
         return '-'
     }
 
@@ -108,10 +108,10 @@ const TableList: React.FC = () => {
         key: 'label',
         ellipsis: true,
         render: (row: any) => {
-            if(isArray(row) && row.length){
-                return row.map((item:{name:string,color:string}) =><Tag color={item?.color}>{item?.name}</Tag>)
+            if (isArray(row) && row.length) {
+                return row.map((item: { name: string, color: string }) => <Tag color={item?.color}>{item?.name}</Tag>)
             }
-            if(isString(row) && row) return <Tag>{row}</Tag>
+            if (isString(row) && row) return <Tag>{row}</Tag>
             return '-'
         }
     },
diff --git a/src/pages/Suite/components/AddModal.tsx b/src/pages/Suite/components/AddModal.tsx
index 5360c50..0075ff4 100644
--- a/src/pages/Suite/components/AddModal.tsx
+++ b/src/pages/Suite/components/AddModal.tsx
@@ -1,18 +1,11 @@
 import React from "react"
 import { Modal, Space, Typography, Button, Form, Input, Select, Radio, Switch, Divider, message, Row } from "antd"
 import RichTextEditor from "@/components/RichTextEditor"
-import { useCaseProvider } from "../provider";
 import { deviceTypeOptions, priorityListOptions, runMethodOptions, runModelOptions, testTypeOptions } from "../utils";
-import styled from "styled-components"
-import SelectSuiteModal from "@/pages/Suite/components/RightContent/SelectSuiteModal"
-import { CloseOutlined, PlusOutlined } from "@ant-design/icons"
 import { createCases } from "../services";
-import { createModule } from "@/pages/Suite/services"
-import { ReactComponent as CancelIcon } from "@/assets/case/cancel.svg"
-import { ReactComponent as ConfirmIcon } from "@/assets/case/confirm.svg"
 import { ToneCaseItem } from "@/pages/Suite/components/ToneCase"
 import { CustomForm } from "@/components/CustomStyled";
-
+import { ModuleSelect, PrioritySelect } from "@/pages/Suite/components/FormItems"
 type IProps = {
     onOk: () => void;
     onCancel?: () => void;
@@ -22,85 +15,7 @@ type IRefs = {
     [k: string]: any
 }
 
-const ModuleSelect: React.FC = () => {
-    const { state: { modules }, refreshModules } = useCaseProvider()
-
-    const [editing, setEditing] = React.useState(false)
-    const [inp, setInp] = React.useState("")
-    const [pendding, setPendding] = React.useState(false)
-
-    const defaultState = () => {
-        setEditing(false)
-        setInp("")
-        setPendding(false)
-    }
-
-    const onOk = async () => {
-        if (!inp) return
-        if (pendding) return
-        setPendding(true)
-        const { code, msg } = await createModule({ name: inp, level: 0, parent: 0 })
-        if (code !== 200) {
-            setPendding(false)
-            message.error(msg)
-            return
-        }
-        refreshModules()
-        defaultState()
-    }
 
-    React.useEffect(() => {
-        () => {
-            defaultState()
-        }
-    }, [])
-
-    return (
-        <Form.Item label="模块分类" name="parent" rules={[{ required: true, message: "请选择模块分类" }]}>
-            <Select
-                placeholder="请选择"
-                dropdownRender={
-                    menu => (
-                        <>
-                            {menu}
-                            {
-                                editing ?
-                                    <Row align="middle" style={{ height: 32, padding: "5px 12px 0" }}>
-                                        <Input size="small" onChange={({ target }) => setInp(target.value)} style={{ width: "70%", marginRight: 12 }} />
-                                        <div style={{ cursor: "pointer", marginRight: 12, display: "flex", alignItems: "center" }} onClick={onOk}>
-                                            <ConfirmIcon />
-                                        </div>
-                                        <div style={{ cursor: "pointer", display: "flex", alignItems: "center" }} onClick={defaultState}>
-                                            <CancelIcon />
-                                        </div>
-                                    </Row> :
-                                    <>
-                                        <Divider style={{ margin: '8px 0' }} />
-                                        <Space
-                                            align="center"
-                                            style={{ padding: '0 8px 4px', cursor: "pointer", width: "100%" }}
-                                            onClick={() => setEditing(true)}
-                                        >
-                                            <Typography.Link style={{ whiteSpace: 'nowrap' }}>
-                                                <PlusOutlined />
-                                            </Typography.Link>
-                                            新建分类
-                                        </Space>
-                                    </>
-                            }
-                        </>
-                    )
-                }
-            >
-                {
-                    modules.map((mod: any) => (
-                        <Select.Option key={mod.id} value={mod.id}>{mod.name}</Select.Option>
-                    ))
-                }
-            </Select>
-        </Form.Item>
-    )
-}
 
 const RICH_EDITER_DEFAULT_TEXT = [
     {
@@ -275,15 +190,7 @@ const ReactComponent: React.ForwardRefRenderFunction<IRefs, IProps> = (props, re
                 {/* 模块分类 */}
                 <ModuleSelect />
 
-                <Form.Item label="优先级" name="priority" rules={[{ required: true, message: "请选择优先级" }]}>
-                    <Select placeholder="请选择">
-                        {
-                            priorityListOptions.map((i: any) => (
-                                <Select.Option key={i} value={i}>{`P${i}`}</Select.Option>
-                            ))
-                        }
-                    </Select>
-                </Form.Item>
+                <PrioritySelect />
 
                 <Form.Item label="运行模式" name="run_model" >
                     <Radio.Group options={runModelOptions} />
diff --git a/src/pages/Suite/components/Case/Edit.tsx b/src/pages/Suite/components/Case/Edit.tsx
index 74b9d5f..0161c6f 100644
--- a/src/pages/Suite/components/Case/Edit.tsx
+++ b/src/pages/Suite/components/Case/Edit.tsx
@@ -3,8 +3,8 @@ import { Divider, Typography, Input, Switch, Form, Select, Radio } from "antd"
 import styled from "styled-components"
 import { deviceArchOptions, deviceTypeOptions, runMethodOptions, runModelOptions, testTypeOptions } from "../../utils"
 import RichTextEditor from "@/components/RichTextEditor"
-import { SlateTransforms } from '@wangeditor/editor'
 import { ToneCaseItem } from "@/pages/Suite/components/ToneCase"
+import { PrioritySelect } from "@/pages/Suite/components/FormItems"
 
 type IProps = {
     [k: string]: any
@@ -77,21 +77,6 @@ const EditChild: React.ForwardRefRenderFunction<{}, IProps> = (props, ref) => {
         vm.current = editor
     }
 
-    React.useImperativeHandle(ref, () => {
-        return {
-            ...form,
-        }
-    })
-
-    console.log(currentCase)
-    React.useEffect(() => {
-        if (JSON.stringify(currentCase) !== "{}")
-            form.setFieldsValue(currentCase)
-        return () => {
-            form.resetFields()
-        }
-    }, [currentCase])
-
     return (
         <CustomFilterForm
             form={form}
@@ -106,6 +91,8 @@ const EditChild: React.ForwardRefRenderFunction<{}, IProps> = (props, ref) => {
                 <Typography.Text strong>基础信息</Typography.Text>
             </Form.Item>
 
+            <PrioritySelect />
+
             <Form.Item label="运行方式" name="run_method">
                 <Radio.Group
                     options={runMethodOptions}
@@ -121,7 +108,7 @@ const EditChild: React.ForwardRefRenderFunction<{}, IProps> = (props, ref) => {
                     <ToneCaseItem onChange={setCheckCase} defaultValue={checkCase} />
             }
 
-            <Form.Item label="状态" name="is_available">
+            <Form.Item label="状态" name="is_available" valuePropName="checked">
                 <Switch checkedChildren="开启" unCheckedChildren="关闭" defaultChecked />
             </Form.Item>
 
diff --git a/src/pages/Suite/components/Case/index.tsx b/src/pages/Suite/components/Case/index.tsx
index 39b6bc9..9498405 100644
--- a/src/pages/Suite/components/Case/index.tsx
+++ b/src/pages/Suite/components/Case/index.tsx
@@ -49,6 +49,7 @@ const Case: React.FC<IProps> = (props) => {
 
     const handleSave = () => {
         const infoForm: FormInstance & any = editInfoRef.current
+        console.log(infoForm)
         infoForm.validateFields()
             .then(async (values: any) => {
                 const params = infoForm?.formResultChangeValue()
diff --git a/src/pages/Suite/components/FormItems.tsx b/src/pages/Suite/components/FormItems.tsx
new file mode 100644
index 0000000..c2d8458
--- /dev/null
+++ b/src/pages/Suite/components/FormItems.tsx
@@ -0,0 +1,101 @@
+import React from "react"
+import { Form, Select, message, Row, Divider, Space, Typography, Input } from "antd"
+import { priorityListOptions } from "@/pages/Suite/utils"
+import { useCaseProvider } from "../provider";
+
+import { createModule } from "@/pages/Suite/services"
+import { ReactComponent as CancelIcon } from "@/assets/case/cancel.svg"
+import { ReactComponent as ConfirmIcon } from "@/assets/case/confirm.svg"
+import { PlusOutlined } from "@ant-design/icons"
+
+export const PrioritySelect: React.FC = () => (
+    <Form.Item label="优先级" name="priority" rules={[{ required: true, message: "请选择优先级" }]}>
+        <Select placeholder="请选择">
+            {
+                priorityListOptions.map((i: any) => (
+                    <Select.Option key={i} value={i}>{`P${i}`}</Select.Option>
+                ))
+            }
+        </Select>
+    </Form.Item>
+)
+
+export const ModuleSelect: React.FC = () => {
+    const { state: { modules }, refreshModules } = useCaseProvider()
+
+    const [editing, setEditing] = React.useState(false)
+    const [inp, setInp] = React.useState("")
+    const [pendding, setPendding] = React.useState(false)
+
+    const defaultState = () => {
+        setEditing(false)
+        setInp("")
+        setPendding(false)
+    }
+
+    const onOk = async () => {
+        if (!inp) return
+        if (pendding) return
+        setPendding(true)
+        const { code, msg } = await createModule({ name: inp, level: 0, parent: 0 })
+        if (code !== 200) {
+            setPendding(false)
+            message.error(msg)
+            return
+        }
+        refreshModules()
+        defaultState()
+    }
+
+    React.useEffect(() => {
+        () => {
+            defaultState()
+        }
+    }, [])
+
+    return (
+        <Form.Item label="模块分类" name="parent" rules={[{ required: true, message: "请选择模块分类" }]}>
+            <Select
+                placeholder="请选择"
+                dropdownRender={
+                    menu => (
+                        <>
+                            {menu}
+                            {
+                                editing ?
+                                    <Row align="middle" style={{ height: 32, padding: "5px 12px 0" }}>
+                                        <Input size="small" onChange={({ target }) => setInp(target.value)} style={{ width: "70%", marginRight: 12 }} />
+                                        <div style={{ cursor: "pointer", marginRight: 12, display: "flex", alignItems: "center" }} onClick={onOk}>
+                                            <ConfirmIcon />
+                                        </div>
+                                        <div style={{ cursor: "pointer", display: "flex", alignItems: "center" }} onClick={defaultState}>
+                                            <CancelIcon />
+                                        </div>
+                                    </Row> :
+                                    <>
+                                        <Divider style={{ margin: '8px 0' }} />
+                                        <Space
+                                            align="center"
+                                            style={{ padding: '0 8px 4px', cursor: "pointer", width: "100%" }}
+                                            onClick={() => setEditing(true)}
+                                        >
+                                            <Typography.Link style={{ whiteSpace: 'nowrap' }}>
+                                                <PlusOutlined />
+                                            </Typography.Link>
+                                            新建分类
+                                        </Space>
+                                    </>
+                            }
+                        </>
+                    )
+                }
+            >
+                {
+                    modules.map((mod: any) => (
+                        <Select.Option key={mod.id} value={mod.id}>{mod.name}</Select.Option>
+                    ))
+                }
+            </Select>
+        </Form.Item>
+    )
+}
\ No newline at end of file
diff --git a/src/pages/Suite/components/RightContent/SelectSuiteModal.tsx b/src/pages/Suite/components/RightContent/SelectSuiteModal.tsx
index 69ec32c..7d8326f 100644
--- a/src/pages/Suite/components/RightContent/SelectSuiteModal.tsx
+++ b/src/pages/Suite/components/RightContent/SelectSuiteModal.tsx
@@ -1,6 +1,5 @@
 import React from "react"
-import { Modal, Form, Input, Space, Button, Tree, Row, Col, Typography, Radio, Spin } from "antd"
-import { DownOutlined, UpOutlined } from "@ant-design/icons"
+import { Modal, Input, Space, Button, Tree, Row, Col, Typography, Radio, Spin } from "antd"
 import { useRequest } from "umi"
 import { queryDomainList, querySuiteCase } from "../../services"
 
@@ -34,12 +33,9 @@ const SelectSuiteModal: React.ForwardRefRenderFunction<IRefs, IProps> = (props,
         show(_: any) {
             setIsCheckedCaseKey(_)
             setVisible(true)
-            form.setFieldsValue(_)
         }
     }))
 
-    const [form] = Form.useForm()
-
     const handleCancel = () => {
         setVisible(false)
         setParams({ domain: "", name: "" })
diff --git a/src/pages/Suite/services.ts b/src/pages/Suite/services.ts
index 5cfa5d1..41c0aa8 100644
--- a/src/pages/Suite/services.ts
+++ b/src/pages/Suite/services.ts
@@ -106,10 +106,12 @@ export const queryCases = async (params: CaseSearchQuery) => {
     return request(`/api/case/`, { params })
 }
 
+//获取workspace用例
 export const querySuiteCase = async (params: any) => {
     return request(`/tone/api/case/workspace/case/`, { params: { ...params, ws_id: "s63u44w7" } })
 }
 
+//获取领域
 export const queryDomainList = async () => {
     return request(`/tone/api/case/test_domain/?test_type=domainconf`)
 }
diff --git a/src/pages/Task/components/AddTaskModal.tsx b/src/pages/Task/components/AddTaskModal.tsx
index 713c555..cd57753 100644
--- a/src/pages/Task/components/AddTaskModal.tsx
+++ b/src/pages/Task/components/AddTaskModal.tsx
@@ -42,9 +42,10 @@ const ReactComponent: React.ForwardRefRenderFunction<IRefs, IProps> = (props, re
 
     React.useImperativeHandle(ref, () => ({
         show(_: any) {
+            console.log(_)
             setSource(_)
             setVisible(true)
-            if (JSON.stringify(_) !== "{}") {
+            if (_ && JSON.stringify(_) !== "{}") {
                 const { cases: caseIds } = _
                 form.setFieldsValue({ ..._, cases: caseIds.split(",").map((i: any) => +i) })
             }
-- 
Gitee