From 0a6c7e371973ae8d7be078e28ca3fffe77a075ca Mon Sep 17 00:00:00 2001
From: hanhh <18330117883@163.com>
Date: Sun, 27 Jun 2021 00:19:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=B9=E5=87=BA=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=8D=E9=87=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/index.less          | 10 ++++++++++
 src/pages/crontab/modal.tsx     | 16 ++++++++--------
 src/pages/env/editNameModal.tsx | 10 ++--------
 src/pages/env/index.tsx         |  6 +++---
 src/pages/env/modal.tsx         | 11 ++---------
 5 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/src/layouts/index.less b/src/layouts/index.less
index 1804cb2a..f276b33e 100644
--- a/src/layouts/index.less
+++ b/src/layouts/index.less
@@ -60,6 +60,16 @@ body {
   }
 }
 
+input:-webkit-autofill,
+input:-webkit-autofill:hover,
+input:-webkit-autofill:focus,
+input:-webkit-autofill:active {
+  transition-delay: 99999s;
+  transition: color 99999s ease-out, background-color 99999s ease-out;
+  -webkit-transition-delay: 99999s;
+  -webkit-transition: color 99999s ease-out, background-color 99999s ease-out;
+}
+
 @media (max-width: 768px) {
   .ant-pro-grid-content.wide {
     .ant-pro-page-container-children-content {
diff --git a/src/pages/crontab/modal.tsx b/src/pages/crontab/modal.tsx
index f365ee3e..38146192 100644
--- a/src/pages/crontab/modal.tsx
+++ b/src/pages/crontab/modal.tsx
@@ -36,12 +36,8 @@ const CronModal = ({
   };
 
   useEffect(() => {
-    if (cron) {
-      form.setFieldsValue(cron);
-    } else {
-      form.resetFields();
-    }
-  }, [cron]);
+    form.resetFields();
+  }, [cron, visible]);
 
   return (
     <Modal
@@ -60,9 +56,13 @@ const CronModal = ({
       }}
       onCancel={() => handleCancel()}
       confirmLoading={loading}
-      destroyOnClose
     >
-      <Form form={form} layout="vertical" name="form_in_modal" preserve={false}>
+      <Form
+        form={form}
+        layout="vertical"
+        name="form_in_modal"
+        initialValues={cron}
+      >
         <Form.Item name="name" label="名称">
           <Input placeholder="请输入任务名称" />
         </Form.Item>
diff --git a/src/pages/env/editNameModal.tsx b/src/pages/env/editNameModal.tsx
index 4e0c7e08..b13a3a09 100644
--- a/src/pages/env/editNameModal.tsx
+++ b/src/pages/env/editNameModal.tsx
@@ -34,7 +34,7 @@ const EditNameModal = ({
 
   useEffect(() => {
     form.resetFields();
-  }, [ids]);
+  }, [ids, visible]);
 
   return (
     <Modal
@@ -53,14 +53,8 @@ const EditNameModal = ({
       }}
       onCancel={() => handleCancel()}
       confirmLoading={loading}
-      destroyOnClose
     >
-      <Form
-        form={form}
-        layout="vertical"
-        name="edit_name_modal"
-        preserve={false}
-      >
+      <Form form={form} layout="vertical" name="edit_name_modal">
         <Form.Item
           name="name"
           rules={[{ required: true, message: '请输入新的环境变量名称' }]}
diff --git a/src/pages/env/index.tsx b/src/pages/env/index.tsx
index 99f227e6..2e9e134b 100644
--- a/src/pages/env/index.tsx
+++ b/src/pages/env/index.tsx
@@ -274,7 +274,7 @@ const Env = () => {
       title: '确认删除',
       content: (
         <>
-          确认删除Env{' '}
+          确认删除变量{' '}
           <Text style={{ wordBreak: 'break-all' }} type="warning">
             {record.value}
           </Text>{' '}
@@ -365,7 +365,7 @@ const Env = () => {
   const delEnvs = () => {
     Modal.confirm({
       title: '确认删除',
-      content: <>确认删除选中的Env吗</>,
+      content: <>确认删除选中的变量吗</>,
       onOk() {
         request
           .delete(`${config.apiPrefix}envs`, { data: selectedRowIds })
@@ -388,7 +388,7 @@ const Env = () => {
   const operateEnvs = (operationStatus: number) => {
     Modal.confirm({
       title: `确认${OperationName[operationStatus]}`,
-      content: <>确认{OperationName[operationStatus]}选中的Env吗</>,
+      content: <>确认{OperationName[operationStatus]}选中的变量吗</>,
       onOk() {
         request
           .put(`${config.apiPrefix}envs/${OperationPath[operationStatus]}`, {
diff --git a/src/pages/env/modal.tsx b/src/pages/env/modal.tsx
index 86003855..f0a5ff6c 100644
--- a/src/pages/env/modal.tsx
+++ b/src/pages/env/modal.tsx
@@ -33,7 +33,7 @@ const EnvModal = ({
 
   useEffect(() => {
     form.resetFields();
-  }, [env]);
+  }, [env, visible]);
 
   return (
     <Modal
@@ -52,15 +52,8 @@ const EnvModal = ({
       }}
       onCancel={() => handleCancel()}
       confirmLoading={loading}
-      destroyOnClose
     >
-      <Form
-        form={form}
-        layout="vertical"
-        name="env_modal"
-        preserve={false}
-        initialValues={env}
-      >
+      <Form form={form} layout="vertical" name="env_modal" initialValues={env}>
         <Form.Item
           name="name"
           label="名称"