修复定时任务页面样式

.prettierignore

@@ -20,7 +20,7 @@ src/.umi
 src/.umi-production
 src/.umi-test
 .env.local
-env
+.env
 history
 version.ts
 config

src/pages/crontab/index.tsx

@@ -69,7 +69,7 @@ const Crontab = () => {
       dataIndex: 'name',
       key: 'name',
       fixed: 'left',
-      width: 120,
+      width: 140,
       render: (text: string, record: any) => (
         <>
           <a
@@ -124,7 +124,7 @@ const Crontab = () => {
       title: intl.get('命令/脚本'),
       dataIndex: 'command',
       key: 'command',
-      width: 200,
+      width: 220,
       render: (text, record) => {
         return (
           <Paragraph
@@ -214,7 +214,7 @@ const Crontab = () => {
     },
     {
       title: intl.get('最后运行时长'),
-      width: 180,
+      width: 167,
       dataIndex: 'last_running_time',
       key: 'last_running_time',
       sorter: {
@@ -232,7 +232,7 @@ const Crontab = () => {
       title: intl.get('最后运行时间'),
       dataIndex: 'last_execution_time',
       key: 'last_execution_time',
-      width: 150,
+      width: 141,
       sorter: {
         compare: (a, b) => {
           return (a.last_execution_time || 0) - (b.last_execution_time || 0);
@@ -259,7 +259,7 @@ const Crontab = () => {
     },
     {
       title: intl.get('下次运行时间'),
-      width: 150,
+      width: 144,
       sorter: {
         compare: (a: any, b: any) => {
           return a.nextRunTime - b.nextRunTime;
@@ -276,7 +276,7 @@ const Crontab = () => {
     },
     {
       title: intl.get('关联订阅'),
-      width: 190,
+      width: 185,
       render: (text, record: any) =>
         record.sub_id ? (
           <Name
@@ -292,46 +292,40 @@ const Crontab = () => {
     {
       title: intl.get('操作'),
       key: 'action',
-      width: 130,
+      width: 140,
       fixed: isPhone ? undefined : 'right',
       render: (text, record, index) => {
         const isPc = !isPhone;
         return (
           <Space size="middle">
             {record.status === CrontabStatus.idle && (
-              <Tooltip title={isPc ? intl.get('运行') : ''}>
-                <a
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    runCron(record, index);
-                  }}
-                >
-                  <PlayCircleOutlined />
-                </a>
-              </Tooltip>
-            )}
-            {record.status !== CrontabStatus.idle && (
-              <Tooltip title={isPc ? intl.get('停止') : ''}>
-                <a
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    stopCron(record, index);
-                  }}
-                >
-                  <PauseCircleOutlined />
-                </a>
-              </Tooltip>
-            )}
-            <Tooltip title={isPc ? intl.get('日志') : ''}>
               <a
                 onClick={(e) => {
                   e.stopPropagation();
-                  setLogCron({ ...record, timestamp: Date.now() });
+                  runCron(record, index);
                 }}
               >
-                <FileTextOutlined />
+                {intl.get('运行')}
               </a>
-            </Tooltip>
+            )}
+            {record.status !== CrontabStatus.idle && (
+              <a
+                onClick={(e) => {
+                  e.stopPropagation();
+                  stopCron(record, index);
+                }}
+              >
+                {intl.get('停止')}
+              </a>
+            )}
+            <a
+              onClick={(e) => {
+                e.stopPropagation();
+                setLogCron({ ...record, timestamp: Date.now() });
+              }}
+            >
+              {intl.get('日志')}
+            </a>
             <MoreBtn key="more" record={record} index={index} />
           </Space>
         );
@@ -1041,7 +1035,7 @@ const Crontab = () => {
           dataSource={value}
           rowKey="id"
           size="middle"
-          scroll={{ x: 1000, y: tableScrollHeight }}
+          scroll={{ x: 1200, y: tableScrollHeight }}
           loading={loading}
           rowSelection={rowSelection}
           rowClassName={getRowClassName}

src/pages/env/index.tsx

@@ -1,4 +1,4 @@
-import intl from 'react-intl-universal'
+import intl from 'react-intl-universal';
 import React, {
   useCallback,
   useRef,
@@ -149,7 +149,7 @@ const Env = () => {
       title: intl.get('状态'),
       key: 'status',
       dataIndex: 'status',
-      width: 80,
+      width: 100,
       filters: [
         {
           text: intl.get('已启用'),
@@ -186,7 +186,11 @@ const Env = () => {
             </Tooltip>
             <Tooltip
               title={
-                isPc ? (record.status === Status.已禁用 ? intl.get('启用') : intl.get('禁用')) : ''
+                isPc
+                  ? record.status === Status.已禁用
+                    ? intl.get('启用')
+                    : intl.get('禁用')
+                  : ''
               }
             >
               <a onClick={() => enabledOrDisabledEnv(record, index)}>
@@ -232,10 +236,15 @@ const Env = () => {
 
   const enabledOrDisabledEnv = (record: any, index: number) => {
     Modal.confirm({
-      title: `确认${record.status === Status.已禁用 ? intl.get('启用') : intl.get('禁用')}`,
+      title: `确认${
+        record.status === Status.已禁用 ? intl.get('启用') : intl.get('禁用')
+      }`,
       content: (
         <>
-          {intl.get('确认')}{record.status === Status.已禁用 ? intl.get('启用') : intl.get('禁用')}
+          {intl.get('确认')}
+          {record.status === Status.已禁用
+            ? intl.get('启用')
+            : intl.get('禁用')}
           Env{' '}
           <Text style={{ wordBreak: 'break-all' }} type="warning">
             {record.value}
@@ -254,7 +263,11 @@ const Env = () => {
           .then(({ code, data }) => {
             if (code === 200) {
               message.success(
-                `${record.status === Status.已禁用 ? intl.get('启用') : intl.get('禁用')}${intl.get('成功')}`,
+                `${
+                  record.status === Status.已禁用
+                    ? intl.get('启用')
+                    : intl.get('禁用')
+                }${intl.get('成功')}`,
               );
               const newStatus =
                 record.status === Status.已禁用 ? Status.已启用 : Status.已禁用;
@@ -435,7 +448,13 @@ const Env = () => {
   const operateEnvs = (operationStatus: number) => {
     Modal.confirm({
       title: `确认${OperationName[operationStatus]}`,
-      content: <>{intl.get('确认')}{OperationName[operationStatus]}{intl.get('选中的变量吗')}</>,
+      content: (
+        <>
+          {intl.get('确认')}
+          {OperationName[operationStatus]}
+          {intl.get('选中的变量吗')}
+        </>
+      ),
       onOk() {
         request
           .put(
@@ -567,7 +586,8 @@ const Env = () => {
             </Button>
             <span style={{ marginLeft: 8 }}>
               {intl.get('已选择')}
-              <a>{selectedRowIds?.length}</a>{intl.get('项')}
+              <a>{selectedRowIds?.length}</a>
+              {intl.get('项')}
             </span>
           </div>
         )}
@@ -579,7 +599,7 @@ const Env = () => {
             dataSource={value}
             rowKey="id"
             size="middle"
-            scroll={{ x: 1000, y: tableScrollHeight }}
+            scroll={{ x: 1200, y: tableScrollHeight }}
             components={vt}
             loading={loading}
             onRow={(record: any, index: number | undefined) => {

src/pages/subscription/index.tsx

@@ -184,45 +184,39 @@ const Subscription = () => {
     {
       title: intl.get('操作'),
       key: 'action',
-      width: 130,
+      width: 140,
       render: (text: string, record: any, index: number) => {
         const isPc = !isPhone;
         return (
           <Space size="middle">
             {record.status === SubscriptionStatus.idle && (
-              <Tooltip title={isPc ? intl.get('运行') : ''}>
-                <a
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    runSubscription(record, index);
-                  }}
-                >
-                  <PlayCircleOutlined />
-                </a>
-              </Tooltip>
-            )}
-            {record.status !== SubscriptionStatus.idle && (
-              <Tooltip title={isPc ? intl.get('停止') : ''}>
-                <a
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    stopSubsciption(record, index);
-                  }}
-                >
-                  <PauseCircleOutlined />
-                </a>
-              </Tooltip>
-            )}
-            <Tooltip title={isPc ? intl.get('日志') : ''}>
               <a
                 onClick={(e) => {
                   e.stopPropagation();
-                  setLogSubscription({ ...record, timestamp: Date.now() });
+                  runSubscription(record, index);
                 }}
               >
-                <FileTextOutlined />
+                {intl.get('运行')}
               </a>
-            </Tooltip>
+            )}
+            {record.status !== SubscriptionStatus.idle && (
+              <a
+                onClick={(e) => {
+                  e.stopPropagation();
+                  stopSubsciption(record, index);
+                }}
+              >
+                {intl.get('停止')}
+              </a>
+            )}
+            <a
+              onClick={(e) => {
+                e.stopPropagation();
+                setLogSubscription({ ...record, timestamp: Date.now() });
+              }}
+            >
+              {intl.get('日志')}
+            </a>
             <MoreBtn key="more" record={record} index={index} />
           </Space>
         );