From f7b62373553c054f3b085378e28c468b23ade1a9 Mon Sep 17 00:00:00 2001
From: whyour <imwhyour@gmail.com>
Date: Tue, 6 Sep 2022 00:40:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=BB=BA=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E8=A7=86=E5=9B=BE=E4=BA=A4=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/crontab/index.less          |  8 ++++++++
 src/pages/crontab/viewCreateModal.tsx | 17 ++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/pages/crontab/index.less b/src/pages/crontab/index.less
index 9dfa9cbb..0fc9239a 100644
--- a/src/pages/crontab/index.less
+++ b/src/pages/crontab/index.less
@@ -161,6 +161,14 @@
   }
 }
 
+.view-create-modal-sorts {
+  display: flex;
+
+  .ant-space-item:nth-child(2) {
+    flex: 1;
+  }
+}
+
 tr.drop-over-downward td {
   border-bottom: 2px dashed #1890ff;
 }
diff --git a/src/pages/crontab/viewCreateModal.tsx b/src/pages/crontab/viewCreateModal.tsx
index ae95e9d1..8fea2c65 100644
--- a/src/pages/crontab/viewCreateModal.tsx
+++ b/src/pages/crontab/viewCreateModal.tsx
@@ -101,9 +101,9 @@ const ViewCreateModal = ({
     </Select>
   );
 
-  const propertyElement = (props: any) => {
+  const propertyElement = (props: any, style: React.CSSProperties = {}) => {
     return (
-      <Select style={{ width: 120 }}>
+      <Select style={style}>
         {props.map((x) => (
           <Select.Option key={x.name} value={x.value}>
             {x.name}
@@ -114,7 +114,7 @@ const ViewCreateModal = ({
   };
 
   const typeElement = (
-    <Select style={{ width: 120 }}>
+    <Select>
       {SORTTYPES.map((x) => (
         <Select.Option key={x.name} value={x.value}>
           {x.name}
@@ -170,6 +170,7 @@ const ViewCreateModal = ({
                   label={index === 0 ? '筛选条件' : ''}
                   key={key}
                   style={{ marginBottom: 0 }}
+                  required
                 >
                   <Space className="view-create-modal-filters" align="baseline">
                     <Form.Item
@@ -177,7 +178,7 @@ const ViewCreateModal = ({
                       name={[name, 'property']}
                       rules={[{ required: true }]}
                     >
-                      {propertyElement(PROPERTIES)}
+                      {propertyElement(PROPERTIES, { width: 120 })}
                     </Form.Item>
                     <Form.Item
                       {...restField}
@@ -225,13 +226,13 @@ const ViewCreateModal = ({
                   key={key}
                   style={{ marginBottom: 0 }}
                 >
-                  <Space className="view-create-modal-filters" align="baseline">
+                  <Space className="view-create-modal-sorts" align="baseline">
                     <Form.Item
                       {...restField}
                       name={[name, 'property']}
                       rules={[{ required: true }]}
                     >
-                      {propertyElement(PROPERTIES)}
+                      {propertyElement(PROPERTIES, { width: 240 })}
                     </Form.Item>
                     <Form.Item
                       {...restField}
@@ -240,9 +241,7 @@ const ViewCreateModal = ({
                     >
                       {typeElement}
                     </Form.Item>
-                    {index !== 0 && (
-                      <MinusCircleOutlined onClick={() => remove(name)} />
-                    )}
+                    <MinusCircleOutlined onClick={() => remove(name)} />
                   </Space>
                 </Form.Item>
               ))}