修复任务脚本快捷跳转

src/pages/crontab/detail.tsx

@@ -29,6 +29,7 @@ import config from '@/utils/config';
 import CronLogModal from './logModal';
 import Editor from '@monaco-editor/react';
 import IconFont from '@/components/iconfont';
+import { getCommandScript } from '@/utils';
 
 const { Text } = Typography;
 
@@ -147,22 +148,10 @@ const CronDetailModal = ({
   };
 
   const getScript = () => {
-    const cmd = cron.command.split(' ') as string[];
+    const result = getCommandScript(cron.command);
-    if (cmd[0] === 'task') {
+    if (Array.isArray(result)) {
       setValidTabs(validTabs);
-      if (cmd[1].startsWith('/ql/data/scripts')) {
+      const [s, p] = result;
-        cmd[1] = cmd[1].replace('/ql/data/scripts/', '');
-      }
-
-      let p: string, s: string;
-      let index = cmd[1].lastIndexOf('/');
-      if (index >= 0) {
-        s = cmd[1].slice(index + 1);
-        p = cmd[1].slice(0, index);
-      } else {
-        s = cmd[1];
-        p = '';
-      }
       setScriptInfo({ parent: p, filename: s });
       request
         .get(`${config.apiPrefix}scripts/${s}?path=${p || ''}`)
@@ -171,7 +160,7 @@ const CronDetailModal = ({
             setValue(data);
           }
         });
-    } else {
+    } else if (result) {
       setValidTabs([validTabs[0]]);
     }
   };

src/pages/crontab/index.tsx

@@ -50,6 +50,7 @@ import ViewManageModal from './viewManageModal';
 import { FilterValue, SorterResult } from 'antd/lib/table/interface';
 import { SharedContext } from '@/layouts';
 import useTableScrollHeight from '@/hooks/useTableScrollHeight';
+import { getCommandScript } from '@/utils';
 
 const { Text, Paragraph } = Typography;
 const { Search } = Input;
@@ -390,24 +391,12 @@ const Crontab = () => {
   const tableScrollHeight = useTableScrollHeight(tableRef);
 
   const goToScriptManager = (record: any) => {
-    const cmd = record.command.split(' ') as string[];
+    const result = getCommandScript(record.command);
-    if (cmd[0] === 'task') {
+    if (Array.isArray(result)) {
-      if (cmd[1].startsWith('/ql/data/scripts')) {
+      const [s, p] = result;
-        cmd[1] = cmd[1].replace('/ql/data/scripts/', '');
-      }
-
-      let p: string, s: string;
-      let index = cmd[1].lastIndexOf('/');
-      if (index >= 0) {
-        s = cmd[1].slice(index + 1);
-        p = cmd[1].slice(0, index);
-      } else {
-        s = cmd[1];
-        p = '';
-      }
       history.push(`/script?p=${p}&s=${s}`);
-    } else if (cmd[1] === 'repo') {
+    } else if (result) {
-      location.href = cmd[2];
+      location.href = result;
     }
   };
 

src/utils/index.ts

@@ -276,3 +276,31 @@ export function logEnded(log: string): boolean {
   const endTips = [LOG_END_SYMBOL, '执行结束'];
   return endTips.some((x) => log.includes(x));
 }
+
+export function getCommandScript(
+  command: string,
+): [string, string] | string | undefined {
+  const cmd = command.split(' ') as string[];
+  if (cmd[0] === 'task') {
+    let scriptsPart = cmd.find((x) =>
+      ['.js', '.ts', '.sh', '.py'].some((y) => x.endsWith(y)),
+    );
+    if (!scriptsPart) return;
+    if (scriptsPart.startsWith('/ql/data/scripts')) {
+      scriptsPart = scriptsPart.replace('/ql/data/scripts/', '');
+    }
+
+    let p: string, s: string;
+    let index = scriptsPart.lastIndexOf('/');
+    if (index >= 0) {
+      s = scriptsPart.slice(index + 1);
+      p = scriptsPart.slice(0, index);
+    } else {
+      s = scriptsPart;
+      p = '';
+    }
+    return [s, p];
+  } else if (cmd[1] === 'repo') {
+    return cmd[2];
+  }
+}