From c03f8b883f4930851a8f8e71f3ed667b612b3670 Mon Sep 17 00:00:00 2001
From: tianweiweiliang <875658254@qq.com>
Date: Thu, 31 Oct 2024 11:34:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=9C=BA=E5=99=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=96=B0=E5=A2=9E=E6=9C=BA=E5=99=A8?=
 =?UTF-8?q?=E7=9A=84=E7=89=88=E6=9C=AC=E5=AD=97=E6=AE=B5=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E6=97=B6split=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Agent/Module/AddModal.tsx | 85 +++++++++++++++--------------
 1 file changed, 43 insertions(+), 42 deletions(-)

diff --git a/src/pages/Agent/Module/AddModal.tsx b/src/pages/Agent/Module/AddModal.tsx
index dd40f18..e4759fa 100644
--- a/src/pages/Agent/Module/AddModal.tsx
+++ b/src/pages/Agent/Module/AddModal.tsx
@@ -22,19 +22,19 @@ export default forwardRef((props: any, ref: any) => {
   // 1.请求数据
   const getVersionData = async () => {
     try {
-      const res: any = await queryVersionList({ page_num: 1, page_size: 100000  });
-      const { code, msg, data=[] } = res || {}
+      const res: any = await queryVersionList({ page_num: 1, page_size: 100000 });
+      const { code, msg, data = [] } = res || {}
       if (code === 200) {
         setVersionData(data)
       } else {
-        message.error(msg || formatMessage({id: 'request.version.fai'}) );
+        message.error(msg || formatMessage({ id: 'request.version.fai' }));
       }
     } catch (e) {
       // setLoading(false)
     }
   }
 
-  useEffect(()=> {
+  useEffect(() => {
     // 请求版本列表数据
     getVersionData()
   }, [])
@@ -42,12 +42,12 @@ export default forwardRef((props: any, ref: any) => {
   useImperativeHandle(
     ref,
     () => ({
-        show: ({ title= '', detailData}: any) => {
-          setVisible(true)
-          // setTitle(title);
-          setEditData(detailData)
-          form.setFieldsValue({ ...detailData, version: detailData.version && `${detailData.version}|${detailData.os}|${detailData.arch}` })
-        }
+      show: ({ title = '', detailData }: any) => {
+        setVisible(true)
+        // setTitle(title);
+        setEditData(detailData)
+        form.setFieldsValue({ ...detailData, version: detailData.version && `${detailData.version}|${detailData.os}|${detailData.arch}` })
+      }
     })
   )
 
@@ -56,21 +56,21 @@ export default forwardRef((props: any, ref: any) => {
       setLoading(true);
 
       const { version, ...otherParam } = values
-      const list = version.split('|')
-      const field = ['version','os','arch']
+      const list = version?.split('|') || []
+      const field = ['version', 'os', 'arch']
       field.forEach((n: any, i: number) => {
         otherParam[n] = list[i]
       })
 
       const { code, msg } = values.id ? await agentEdit(otherParam) : await agentAdd(otherParam);
       if (code === 200) {
-        message.success(values.id? formatMessage({id: 'modified.succeeded'}): formatMessage({id: 'created.succeeded'}));
-        setVisible(false); 
+        message.success(values.id ? formatMessage({ id: 'modified.succeeded' }) : formatMessage({ id: 'created.succeeded' }));
+        setVisible(false);
         form.resetFields();
         props.callback();
-      } 
+      }
       else {
-        message.error(msg || formatMessage({id: 'created.failed'}));
+        message.error(msg || formatMessage({ id: 'created.failed' }));
       }
       setLoading(false);
     }).catch(() => {
@@ -86,23 +86,23 @@ export default forwardRef((props: any, ref: any) => {
 
   const { formatMessage } = useIntl();
   const placeholder = formatMessage({ id: "Form.select.placeholder" });
-  const requiredMessage = formatMessage({ id: 'Form.select.message'});
-
-	return (
-      <div>
-        <Modal title={formatMessage({ id: (editData.id ? 'agent.modal.edit.title' : 'agent.modal.add.title') }) }
-          visible={visible}
-          maskClosable={false}
-          width={460}
-          confirmLoading={loading}
-          onOk={handleOk}
-          onCancel={handleCancel}
-        >
-          <div>
+  const requiredMessage = formatMessage({ id: 'Form.select.message' });
+
+  return (
+    <div>
+      <Modal title={formatMessage({ id: (editData.id ? 'agent.modal.edit.title' : 'agent.modal.add.title') })}
+        visible={visible}
+        maskClosable={false}
+        width={460}
+        confirmLoading={loading}
+        onOk={handleOk}
+        onCancel={handleCancel}
+      >
+        <div>
           <Form form={form} layout="vertical">
-            <Form.Item style={{ display: 'none'}}
+            <Form.Item style={{ display: 'none' }}
               name="id">
-              <Input type="hidden"/>
+              <Input type="hidden" />
             </Form.Item>
 
             <Form.Item label="IP"
@@ -141,7 +141,7 @@ export default forwardRef((props: any, ref: any) => {
                 }
               ]}
             >
-              <Input placeholder={formatMessage({ id: "Form.input.placeholder" })}/>
+              <Input placeholder={formatMessage({ id: "Form.input.placeholder" })} />
             </Form.Item>
 
             <Form.Item label="Mode" name="mode"
@@ -151,12 +151,12 @@ export default forwardRef((props: any, ref: any) => {
                 <Radio value="active">
                   active
                   <Popover placement="topLeft" content={formatMessage({ id: "mode.popover.active" })}>
-                    <QuestionCircleOutlined style={{ opacity:0.65, marginLeft:4 }}/></Popover>
+                    <QuestionCircleOutlined style={{ opacity: 0.65, marginLeft: 4 }} /></Popover>
                 </Radio>
                 <Radio value="passive">
                   passive
                   <Popover placement="topLeft" content={formatMessage({ id: "mode.popover.passive" })}>
-                    <QuestionCircleOutlined style={{ opacity:0.65, marginLeft:4 }}/></Popover>
+                    <QuestionCircleOutlined style={{ opacity: 0.65, marginLeft: 4 }} /></Popover>
                 </Radio>
               </Radio.Group>
             </Form.Item>
@@ -164,22 +164,23 @@ export default forwardRef((props: any, ref: any) => {
             <Form.Item label={<FormattedMessage id="agent.modal.Version" />}
               name="version"
               rules={[{
-                required: false,
+                required: true,
                 message: requiredMessage,
               }]}>
               <Select placeholder={placeholder}
                 showSearch
                 optionFilterProp="children"
-                filterOption={(input, option:any) =>
+                filterOption={(input, option: any) =>
                   option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
                 }>
                 {versionData.map((item: any) => {
-                  const tagState = item.is_new ? 'new': (item.is_stable ? 'stable': null)
+                  const tagState = item.is_new ? 'new' : (item.is_stable ? 'stable' : null)
                   return (
                     <Select.Option key={item.id} value={`${item.version}|${item.os}|${item.arch}`}>
                       {item.version}（{item.os} | {item.arch}）{tagState && <div className={styles.common}>{tagState}</div>}
                     </Select.Option>
-                  )}
+                  )
+                }
                 )}
               </Select>
             </Form.Item>
@@ -203,8 +204,8 @@ export default forwardRef((props: any, ref: any) => {
             </Form.Item>
           </Form>
 
-          </div>
-        </Modal>
-      </div>
-	);
+        </div>
+      </Modal>
+    </div>
+  );
 });
\ No newline at end of file
-- 
Gitee


From 67ae0f6ef5e43bcd15ad477d244274b9997a3d59 Mon Sep 17 00:00:00 2001
From: tianweiweiliang <875658254@qq.com>
Date: Thu, 31 Oct 2024 11:38:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=8C=B9=E9=85=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Agent/Module/AddModal.tsx | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/pages/Agent/Module/AddModal.tsx b/src/pages/Agent/Module/AddModal.tsx
index e4759fa..3ad059d 100644
--- a/src/pages/Agent/Module/AddModal.tsx
+++ b/src/pages/Agent/Module/AddModal.tsx
@@ -170,9 +170,15 @@ export default forwardRef((props: any, ref: any) => {
               <Select placeholder={placeholder}
                 showSearch
                 optionFilterProp="children"
-                filterOption={(input, option: any) =>
-                  option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-                }>
+                filterOption={(input, option: any) => {
+                  // console.log('option:', option)
+                  const { children } = option
+                  let matchOption = ''
+                  if (typeof children === 'string') matchOption = children
+                  if (Array.isArray(children)) matchOption = children.join('')
+
+                  return matchOption.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                }}>
                 {versionData.map((item: any) => {
                   const tagState = item.is_new ? 'new' : (item.is_stable ? 'stable' : null)
                   return (
-- 
Gitee