修复创建脚本可能失败

back/loaders/initFile.ts

@@ -116,7 +116,9 @@ export default async () => {
           `Neither content nor source specified for ${item.target}`,
         );
       }
-      const content = item.content || (await fs.readFile(item.source!));
+      const content =
+        item.content ||
+        (await fs.readFile(item.source!, { encoding: 'utf-8' }));
       await writeFileWithLock(item.target, content);
     }
   }

back/services/cron.ts

@@ -560,7 +560,10 @@ export default class CronService {
     if (logFileExist) {
       return await getFileContentByName(`${absolutePath}`);
     } else {
-      return '任务未运行';
+      return typeof doc.status === 'number' &&
+        [CrontabStatus.queued, CrontabStatus.running].includes(doc.status)
+        ? '运行中...'
+        : '任务空闲中';
     }
   }
 

back/shared/utils.ts

@@ -13,7 +13,7 @@ function getUniqueLockPath(filePath: string) {
 
 export async function writeFileWithLock(
   filePath: string,
-  content: string | Buffer,
+  content: string,
   options: Parameters<typeof writeFile>[2] = {},
 ) {
   if (typeof options === 'string') {

src/pages/crontab/detail.tsx

@@ -56,12 +56,10 @@ interface LogItem {
 const CronDetailModal = ({
   cron = {},
   handleCancel,
-  visible,
   theme,
   isPhone,
 }: {
   cron?: any;
-  visible: boolean;
   handleCancel: (needUpdate?: boolean) => void;
   theme: string;
   isPhone: boolean;
@@ -440,7 +438,7 @@ const CronDetailModal = ({
         </div>
       }
       centered
-      open={visible}
+      open={true}
       forceRender
       footer={false}
       onCancel={() => handleCancel()}
@@ -559,15 +557,16 @@ const CronDetailModal = ({
           {contentList[activeTabKey]}
         </Card>
       </div>
-      <CronLogModal
+      {isLogModalVisible && (
-        visible={isLogModalVisible}
+        <CronLogModal
-        handleCancel={() => {
+          handleCancel={() => {
-          setIsLogModalVisible(false);
+            setIsLogModalVisible(false);
-        }}
+          }}
-        cron={cron}
+          cron={cron}
-        data={log}
+          data={log}
-        logUrl={logUrl}
+          logUrl={logUrl}
-      />
+        />
+      )}
     </Modal>
   );
 };

src/pages/crontab/index.tsx

@@ -1037,55 +1037,58 @@ const Crontab = () => {
           components={isPhone || pageConf.size < 50 ? undefined : vt}
         />
       </div>
-      <CronLogModal
+      {isLogModalVisible && (
-        visible={isLogModalVisible}
+        <CronLogModal
-        handleCancel={() => {
+          handleCancel={() => {
-          getCronDetail(logCron);
+            getCronDetail(logCron);
-          setIsLogModalVisible(false);
+            setIsLogModalVisible(false);
-        }}
+          }}
-        cron={logCron}
+          cron={logCron}
-      />
+        />
-      <CronModal
+      )}
-        visible={isModalVisible}
+      {isModalVisible && (
-        handleCancel={handleCancel}
+        <CronModal handleCancel={handleCancel} cron={editedCron} />
-        cron={editedCron}
+      )}
-      />
+      {isLabelModalVisible && (
-      <CronLabelModal
+        <CronLabelModal
-        visible={isLabelModalVisible}
+          handleCancel={(needUpdate?: boolean) => {
-        handleCancel={(needUpdate?: boolean) => {
+            setIsLabelModalVisible(false);
-          setIsLabelModalVisible(false);
+            if (needUpdate) {
-          if (needUpdate) {
+              getCrons();
-            getCrons();
+            }
-          }
+          }}
-        }}
+          ids={selectedRowIds}
-        ids={selectedRowIds}
+        />
-      />
+      )}
-      <CronDetailModal
+      {isDetailModalVisible && (
-        visible={isDetailModalVisible}
+        <CronDetailModal
-        handleCancel={() => {
+          handleCancel={() => {
-          setIsDetailModalVisible(false);
+            setIsDetailModalVisible(false);
-        }}
+          }}
-        cron={detailCron}
+          cron={detailCron}
-        theme={theme}
+          theme={theme}
-        isPhone={isPhone}
+          isPhone={isPhone}
-      />
+        />
-      <ViewCreateModal
+      )}
-        visible={isCreateViewModalVisible}
+      {isCreateViewModalVisible && (
-        handleCancel={(data) => {
+        <ViewCreateModal
-          setIsCreateViewModalVisible(false);
+          handleCancel={(data) => {
-          getCronViews();
+            setIsCreateViewModalVisible(false);
-        }}
+            getCronViews();
-      />
+          }}
-      <ViewManageModal
+        />
-        cronViews={cronViews}
+      )}
-        visible={isViewManageModalVisible}
+      {isViewManageModalVisible && (
-        handleCancel={() => {
+        <ViewManageModal
-          setIsViewManageModalVisible(false);
+          cronViews={cronViews}
-        }}
+          handleCancel={() => {
-        cronViewChange={(data) => {
+            setIsViewManageModalVisible(false);
-          getCronViews();
+          }}
-        }}
+          cronViewChange={(data) => {
-      />
+            getCronViews();
+          }}
+        />
+      )}
     </PageContainer>
   );
 };

src/pages/crontab/logModal.tsx

@@ -25,12 +25,10 @@ const { Countdown } = Statistic;
 const CronLogModal = ({
   cron,
   handleCancel,
-  visible,
   data,
   logUrl,
 }: {
   cron?: any;
-  visible: boolean;
   handleCancel: () => void;
   data?: string;
   logUrl?: string;
@@ -120,11 +118,10 @@ const CronLogModal = ({
   };
 
   useEffect(() => {
-    if (cron && cron.id && visible) {
+    if (cron && cron.id) {
       getCronLog(true);
-      scrollInfoRef.current.down = true;
     }
-  }, [cron, visible]);
+  }, [cron]);
 
   useEffect(() => {
     if (data) {
@@ -139,7 +136,7 @@ const CronLogModal = ({
   return (
     <Modal
       title={titleElement()}
-      open={visible}
+      open={true}
       centered
       className="log-modal"
       forceRender

src/pages/crontab/modal.tsx

@@ -12,10 +12,8 @@ import { ScheduleType } from './type';
 const CronModal = ({
   cron,
   handleCancel,
-  visible,
 }: {
   cron?: any;
-  visible: boolean;
   handleCancel: (needUpdate?: boolean) => void;
 }) => {
   const [form] = Form.useForm();
@@ -58,11 +56,6 @@ const CronModal = ({
     }
   };
 
-  useEffect(() => {
-    form.resetFields();
-    setScheduleType(getScheduleType(cron?.schedule));
-  }, [cron, visible]);
-
   const handleScheduleTypeChange = (type: ScheduleType) => {
     setScheduleType(type);
     form.setFieldValue('schedule', '');
@@ -146,7 +139,7 @@ const CronModal = ({
   return (
     <Modal
       title={cron?.id ? intl.get('编辑任务') : intl.get('创建任务')}
-      open={visible}
+      open={true}
       forceRender
       centered
       maskClosable={false}
@@ -251,10 +244,8 @@ const CronModal = ({
 const CronLabelModal = ({
   ids,
   handleCancel,
-  visible,
 }: {
   ids: Array<string>;
-  visible: boolean;
   handleCancel: (needUpdate?: boolean) => void;
 }) => {
   const [form] = Form.useForm();
@@ -290,10 +281,6 @@ const CronLabelModal = ({
       });
   };
 
-  useEffect(() => {
-    form.resetFields();
-  }, [ids, visible]);
-
   const buttons = [
     <Button onClick={() => handleCancel(false)}>{intl.get('取消')}</Button>,
     <Button type="primary" danger onClick={() => update('delete')}>
@@ -307,7 +294,7 @@ const CronLabelModal = ({
   return (
     <Modal
       title={intl.get('批量修改标签')}
-      open={visible}
+      open={true}
       footer={buttons}
       centered
       maskClosable={false}

src/pages/crontab/viewCreateModal.tsx

@@ -56,10 +56,8 @@ enum ViewFilterRelation {
 const ViewCreateModal = ({
   view,
   handleCancel,
-  visible,
 }: {
   view?: any;
-  visible: boolean;
   handleCancel: (param?: any) => void;
 }) => {
   const [form] = Form.useForm();
@@ -101,17 +99,6 @@ const ViewCreateModal = ({
     }
   };
 
-  useEffect(() => {
-    if (!view) {
-      form.resetFields();
-    }
-    form.setFieldsValue(
-      view || {
-        filters: [{ property: 'command' }],
-      },
-    );
-  }, [view, visible]);
-
   const OperationElement = ({ name, ...others }: { name: number }) => {
     const property = form.getFieldValue(['filters', name, 'property']);
     return (
@@ -172,7 +159,7 @@ const ViewCreateModal = ({
   return (
     <Modal
       title={view ? intl.get('编辑视图') : intl.get('创建视图')}
-      open={visible}
+      open={true}
       forceRender
       width={580}
       centered
@@ -190,7 +177,16 @@ const ViewCreateModal = ({
       onCancel={() => handleCancel()}
       confirmLoading={loading}
     >
-      <Form form={form} layout="vertical" name="env_modal">
+      <Form
+        form={form}
+        layout="vertical"
+        initialValues={
+          view || {
+            filters: [{ property: 'command' }],
+          }
+        }
+        name="env_modal"
+      >
         <Form.Item
           name="name"
           label={intl.get('视图名称')}

src/pages/crontab/viewManageModal.tsx

@@ -68,11 +68,9 @@ const DragableBodyRow = ({
 const ViewManageModal = ({
   cronViews,
   handleCancel,
-  visible,
   cronViewChange,
 }: {
   cronViews: any[];
-  visible: boolean;
   handleCancel: () => void;
   cronViewChange: (data?: any) => void;
 }) => {
@@ -218,7 +216,7 @@ const ViewManageModal = ({
   return (
     <Modal
       title={intl.get('视图管理')}
-      open={visible}
+      open={true}
       centered
       width={620}
       onCancel={() => handleCancel()}
@@ -263,14 +261,15 @@ const ViewManageModal = ({
           }}
         />
       </DndProvider>
-      <ViewCreateModal
+      {isCreateViewModalVisible && (
-        view={editedView}
+        <ViewCreateModal
-        visible={isCreateViewModalVisible}
+          view={editedView}
-        handleCancel={(data) => {
+          handleCancel={(data) => {
-          setIsCreateViewModalVisible(false);
+            setIsCreateViewModalVisible(false);
-          cronViewChange(data);
+            cronViewChange(data);
-        }}
+          }}
-      />
+        />
+      )}
     </Modal>
   );
 };

src/pages/dependence/index.tsx

@@ -618,15 +618,15 @@ const Dependence = () => {
         ]}
       />
       {children}
-      <DependenceModal
+      {isModalVisible && (
-        visible={isModalVisible}
+        <DependenceModal
-        handleCancel={handleCancel}
+          handleCancel={handleCancel}
-        dependence={editedDependence}
+          dependence={editedDependence}
-        defaultType={type}
+          defaultType={type}
-      />
+        />
-      {logDependence && (
+      )}
+      {logDependence && isLogModalVisible && (
         <DependenceLogModal
-          visible={isLogModalVisible}
           handleCancel={(needRemove?: boolean) => {
             setIsLogModalVisible(false);
             if (needRemove) {

src/pages/dependence/logModal.tsx

@@ -15,10 +15,8 @@ import { Status } from './type';
 const DependenceLogModal = ({
   dependence,
   handleCancel,
-  visible,
 }: {
   dependence?: any;
-  visible: boolean;
   handleCancel: (needRemove?: boolean) => void;
 }) => {
   const [value, setValue] = useState<string>('');
@@ -128,7 +126,7 @@ const DependenceLogModal = ({
   return (
     <Modal
       title={titleElement()}
-      open={visible}
+      open={true}
       centered
       className="log-modal"
       forceRender

src/pages/dependence/modal.tsx

@@ -14,11 +14,9 @@ enum DependenceTypes {
 const DependenceModal = ({
   dependence,
   handleCancel,
-  visible,
   defaultType,
 }: {
   dependence?: any;
-  visible: boolean;
   handleCancel: (cks?: any[]) => void;
   defaultType: string;
 }) => {
@@ -61,14 +59,10 @@ const DependenceModal = ({
     }
   };
 
-  useEffect(() => {
-    form.resetFields();
-  }, [dependence, visible]);
-
   return (
     <Modal
       title={dependence ? intl.get('编辑依赖') : intl.get('创建依赖')}
-      open={visible}
+      open={true}
       forceRender
       centered
       maskClosable={false}

src/pages/env/editNameModal.tsx

@@ -7,10 +7,8 @@ import config from '@/utils/config';
 const EditNameModal = ({
   ids,
   handleCancel,
-  visible,
 }: {
   ids?: string[];
-  visible: boolean;
   handleCancel: () => void;
 }) => {
   const [form] = Form.useForm();
@@ -34,14 +32,10 @@ const EditNameModal = ({
     }
   };
 
-  useEffect(() => {
-    form.resetFields();
-  }, [ids, visible]);
-
   return (
     <Modal
       title={intl.get('修改环境变量名称')}
-      open={visible}
+      open={true}
       forceRender
       centered
       maskClosable={false}

src/pages/env/index.tsx

@@ -616,16 +616,15 @@ const Env = () => {
           />
         </DndProvider>
       </div>
-      <EnvModal
+      {isModalVisible && (
-        visible={isModalVisible}
+        <EnvModal handleCancel={handleCancel} env={editedEnv} />
-        handleCancel={handleCancel}
+      )}
-        env={editedEnv}
+      {isEditNameModalVisible && (
-      />
+        <EditNameModal
-      <EditNameModal
+          handleCancel={handleEditNameCancel}
-        visible={isEditNameModalVisible}
+          ids={selectedRowIds}
-        handleCancel={handleEditNameCancel}
+        />
-        ids={selectedRowIds}
+      )}
-      />
     </PageContainer>
   );
 };

src/pages/env/modal.tsx

@@ -7,10 +7,8 @@ import config from '@/utils/config';
 const EnvModal = ({
   env,
   handleCancel,
-  visible,
 }: {
   env?: any;
-  visible: boolean;
   handleCancel: (cks?: any[]) => void;
 }) => {
   const [form] = Form.useForm();
@@ -55,14 +53,10 @@ const EnvModal = ({
     }
   };
 
-  useEffect(() => {
-    form.resetFields();
-  }, [env, visible]);
-
   return (
     <Modal
       title={env ? intl.get('编辑变量') : intl.get('创建变量')}
-      open={visible}
+      open={true}
       forceRender
       centered
       maskClosable={false}

src/pages/error/index.tsx

@@ -14,6 +14,17 @@ const Error = () => {
   const [data, setData] = useState(intl.get('暂无日志'));
   const retryTimes = useRef(1);
 
+  const loopStatus = (message: string) => {
+    if (retryTimes.current > 3) {
+      setData(message);
+      return;
+    }
+    retryTimes.current += 1;
+    setTimeout(() => {
+      getHealthStatus(false);
+    }, 3000);
+  };
+
   const getHealthStatus = (needLoading: boolean = true) => {
     needLoading && setLoading(true);
     request
@@ -27,19 +38,15 @@ const Error = () => {
           }
           return;
         }
-        if (retryTimes.current > 3) {
+
-          setData(error?.details);
+        loopStatus(error?.details);
-          return;
-        }
-        retryTimes.current += 1;
-        setTimeout(() => {
-          getHealthStatus(false);
-        }, 3000);
       })
       .catch((error) => {
         const responseStatus = error.response.status;
         if (responseStatus === 401) {
           history.push('/login');
+        } else {
+          loopStatus(error.response?.message || error?.message);
         }
       })
       .finally(() => needLoading && setLoading(false));

src/pages/script/editModal.tsx

@@ -25,11 +25,9 @@ const EditModal = ({
   currentNode,
   content,
   handleCancel,
-  visible,
 }: {
   treeData?: any;
   content?: string;
-  visible: boolean;
   currentNode: any;
   handleCancel: () => void;
 }) => {
@@ -223,7 +221,7 @@ const EditModal = ({
       width={'100%'}
       headerStyle={{ padding: '11px 24px' }}
       onClose={cancel}
-      open={visible}
+      open={true}
     >
       {/* @ts-ignore */}
       <SplitPane
@@ -256,24 +254,26 @@ const EditModal = ({
           <Ansi>{log}</Ansi>
         </pre>
       </SplitPane>
-      <SaveModal
+      {saveModalVisible && (
-        visible={saveModalVisible}
+        <SaveModal
-        handleCancel={() => {
+          handleCancel={() => {
-          setSaveModalVisible(false);
+            setSaveModalVisible(false);
-        }}
+          }}
-        file={{
+          file={{
-          content:
+            content:
-            editorRef.current &&
+              editorRef.current &&
-            editorRef.current.getValue().replace(/\r\n/g, '\n'),
+              editorRef.current.getValue().replace(/\r\n/g, '\n'),
-          ...cNode,
+            ...cNode,
-        }}
+          }}
-      />
+        />
-      <SettingModal
+      )}
-        visible={settingModalVisible}
+      {settingModalVisible && (
-        handleCancel={() => {
+        <SettingModal
-          setSettingModalVisible(false);
+          handleCancel={() => {
-        }}
+            setSettingModalVisible(false);
-      />
+          }}
+        />
+      )}
     </Drawer>
   );
 };

src/pages/script/editNameModal.tsx

@@ -19,9 +19,7 @@ const { Option } = Select;
 const EditScriptNameModal = ({
   handleCancel,
   treeData,
-  visible,
 }: {
-  visible: boolean;
   treeData: any[];
   handleCancel: (file?: {
     filename: string;
@@ -53,7 +51,7 @@ const EditScriptNameModal = ({
             directory ? intl.get('创建文件夹成功') : intl.get('创建文件成功'),
           );
           const key = path ? `${path}/` : '';
-          const filename = file ? file.name : (directory || inputFilename);
+          const filename = file ? file.name : directory || inputFilename;
           handleCancel({
             filename,
             path,
@@ -95,14 +93,10 @@ const EditScriptNameModal = ({
     setDirs(dirs);
   }, [treeData]);
 
-  useEffect(() => {
-    form.resetFields();
-  }, [visible]);
-
   return (
     <Modal
       title={intl.get('创建')}
-      open={visible}
+      open={true}
       forceRender
       centered
       maskClosable={false}

src/pages/script/index.tsx

@@ -710,9 +710,8 @@ const Script = () => {
             }}
           />
         )}
-        {isLogModalVisible && (
+        {isLogModalVisible && isLogModalVisible && (
           <EditModal
-            visible={isLogModalVisible}
             treeData={data}
             currentNode={currentNode}
             content={value}
@@ -721,16 +720,18 @@ const Script = () => {
             }}
           />
         )}
-        <EditScriptNameModal
+        {isAddFileModalVisible && (
-          visible={isAddFileModalVisible}
+          <EditScriptNameModal
-          treeData={data}
+            treeData={data}
-          handleCancel={addFileModalClose}
+            handleCancel={addFileModalClose}
-        />
+          />
-        <RenameModal
+        )}
-          visible={isRenameFileModalVisible}
+        {isRenameFileModalVisible && (
-          handleCancel={handleRenameFileCancel}
+          <RenameModal
-          currentNode={currentNode}
+            handleCancel={handleRenameFileCancel}
-        />
+            currentNode={currentNode}
+          />
+        )}
       </div>
     </PageContainer>
   );

src/pages/script/renameModal.tsx

@@ -7,10 +7,8 @@ import config from '@/utils/config';
 const RenameModal = ({
   currentNode,
   handleCancel,
-  visible,
 }: {
   currentNode?: any;
-  visible: boolean;
   handleCancel: () => void;
 }) => {
   const [form] = Form.useForm();
@@ -38,14 +36,10 @@ const RenameModal = ({
     }
   };
 
-  useEffect(() => {
-    form.resetFields();
-  }, [currentNode, visible]);
-
   return (
     <Modal
       title={intl.get('重命名')}
-      open={visible}
+      open={true}
       forceRender
       centered
       maskClosable={false}

src/pages/script/saveModal.tsx

@@ -7,10 +7,8 @@ import config from '@/utils/config';
 const SaveModal = ({
   file,
   handleCancel,
-  visible,
 }: {
   file?: any;
-  visible: boolean;
   handleCancel: (cks?: any[]) => void;
 }) => {
   const [form] = Form.useForm();
@@ -32,15 +30,10 @@ const SaveModal = ({
       });
   };
 
-  useEffect(() => {
-    form.resetFields();
-    setLoading(false);
-  }, [file, visible]);
-
   return (
     <Modal
       title={intl.get('保存文件')}
-      open={visible}
+      open={true}
       forceRender
       centered
       maskClosable={false}

src/pages/script/setting.tsx

@@ -7,10 +7,8 @@ import config from '@/utils/config';
 const SettingModal = ({
   file,
   handleCancel,
-  visible,
 }: {
   file?: any;
-  visible: boolean;
   handleCancel: (cks?: any[]) => void;
 }) => {
   const [form] = Form.useForm();
@@ -30,15 +28,10 @@ const SettingModal = ({
       });
   };
 
-  useEffect(() => {
-    form.resetFields();
-    setLoading(false);
-  }, [file, visible]);
-
   return (
     <Modal
       title={intl.get('运行设置')}
-      open={visible}
+      open={true}
       forceRender
       centered
       onCancel={() => handleCancel()}

src/pages/setting/appModal.tsx

@@ -7,10 +7,8 @@ import config from '@/utils/config';
 const AppModal = ({
   app,
   handleCancel,
-  visible,
 }: {
   app?: any;
-  visible: boolean;
   handleCancel: (needUpdate?: boolean) => void;
 }) => {
   const [form] = Form.useForm();
@@ -41,14 +39,10 @@ const AppModal = ({
     }
   };
 
-  useEffect(() => {
-    form.resetFields();
-  }, [app, visible]);
-
   return (
     <Modal
       title={app ? intl.get('编辑应用') : intl.get('创建应用')}
-      open={visible}
+      open={true}
       forceRender
       centered
       maskClosable={false}

src/pages/setting/index.tsx

@@ -363,11 +363,9 @@ const Setting = () => {
           ]}
         />
       </div>
-      <AppModal
+      {isModalVisible && (
-        visible={isModalVisible}
+        <AppModal handleCancel={handleCancel} app={editedApp} />
-        handleCancel={handleCancel}
+      )}
-        app={editedApp}
-      />
     </PageContainer>
   );
 };

src/pages/subscription/index.tsx

@@ -579,18 +579,20 @@ const Subscription = () => {
         loading={loading}
         rowClassName={getRowClassName}
       />
-      <SubscriptionModal
+      {isModalVisible && (
-        visible={isModalVisible}
+        <SubscriptionModal
-        handleCancel={handleCancel}
+          handleCancel={handleCancel}
-        subscription={editedSubscription}
+          subscription={editedSubscription}
-      />
+        />
-      <SubscriptionLogModal
+      )}
-        visible={isLogModalVisible}
+      {isLogModalVisible && (
-        handleCancel={() => {
+        <SubscriptionLogModal
-          setIsLogModalVisible(false);
+          handleCancel={() => {
-        }}
+            setIsLogModalVisible(false);
-        subscription={logSubscription}
+          }}
-      />
+          subscription={logSubscription}
+        />
+      )}
     </PageContainer>
   );
 };

src/pages/subscription/logModal.tsx

@@ -14,12 +14,10 @@ import Ansi from 'ansi-to-react';
 const SubscriptionLogModal = ({
   subscription,
   handleCancel,
-  visible,
   data,
   logUrl,
 }: {
   subscription?: any;
-  visible: boolean;
   handleCancel: () => void;
   data?: string;
   logUrl?: string;
@@ -79,10 +77,10 @@ const SubscriptionLogModal = ({
   };
 
   useEffect(() => {
-    if (subscription && subscription.id && visible) {
+    if (subscription && subscription.id) {
       getCronLog(true);
     }
-  }, [subscription, visible]);
+  }, [subscription]);
 
   useEffect(() => {
     if (data) {
@@ -97,7 +95,7 @@ const SubscriptionLogModal = ({
   return (
     <Modal
       title={titleElement()}
-      open={visible}
+      open={true}
       centered
       className="log-modal"
       forceRender

src/pages/subscription/modal.tsx

@@ -22,17 +22,19 @@ const fileUrlRegx = /([^\/\:]+\/[^\/\.]+)\.[a-z]+$/;
 const SubscriptionModal = ({
   subscription,
   handleCancel,
-  visible,
 }: {
   subscription?: any;
-  visible: boolean;
   handleCancel: (needUpdate?: boolean) => void;
 }) => {
   const [form] = Form.useForm();
   const [loading, setLoading] = useState(false);
-  const [type, setType] = useState('public-repo');
+  const [type, setType] = useState(subscription?.type || 'public-repo');
-  const [scheduleType, setScheduleType] = useState('crontab');
+  const [scheduleType, setScheduleType] = useState(
-  const [pullType, setPullType] = useState<'ssh-key' | 'user-pwd'>('ssh-key');
+    subscription?.schedule_type || 'crontab',
+  );
+  const [pullType, setPullType] = useState<'ssh-key' | 'user-pwd'>(
+    subscription?.pull_type || 'ssh-key',
+  );
 
   const handleOk = async (values: any) => {
     setLoading(true);
@@ -255,29 +257,17 @@ const SubscriptionModal = ({
   };
 
   useEffect(() => {
-    if (visible) {
+    window.addEventListener('paste', onPaste);
-      window.addEventListener('paste', onPaste);
-    } else {
-      window.removeEventListener('paste', onPaste);
-    }
-  }, [visible]);
 
-  useEffect(() => {
+    return () => {
-    form.setFieldsValue(
+      window.removeEventListener('paste', onPaste);
-      { ...subscription, ...formatParams(subscription) } || {},
+    };
-    );
+  }, []);
-    setType((subscription && subscription.type) || 'public-repo');
-    setScheduleType((subscription && subscription.schedule_type) || 'crontab');
-    setPullType((subscription && subscription.pull_type) || 'ssh-key');
-    if (!subscription) {
-      form.resetFields();
-    }
-  }, [subscription, visible]);
 
   return (
     <Modal
       title={subscription ? intl.get('编辑订阅') : intl.get('创建订阅')}
-      open={visible}
+      open={true}
       forceRender
       centered
       maskClosable={false}
@@ -294,7 +284,12 @@ const SubscriptionModal = ({
       onCancel={() => handleCancel()}
       confirmLoading={loading}
     >
-      <Form form={form} name="form_in_modal" layout="vertical">
+      <Form
+        form={form}
+        name="form_in_modal"
+        layout="vertical"
+        initialValues={{ ...subscription, ...formatParams(subscription) }}
+      >
         <Form.Item
           name="name"
           label={intl.get('名称')}

src/utils/http.tsx

@@ -14,7 +14,7 @@ export interface IResponseData {
   code?: number;
   data?: any;
   message?: string;
-  errors?: any[];
+  error?: any;
 }
 
 export type Override<