fix: export tasks

Author: sylingd

docs/docs/en-US/guide/task.md

@@ -169,5 +169,5 @@ interface Task {
   };
   // Custom function code
   code?: string;
-  }
+}
 ```

src/pages/options/sections/import-and-export/import-drawer/index.tsx

@@ -324,6 +324,7 @@ export default class ImportDrawer extends React.Component<
           dataSource={this.state.rules}
           pagination={false}
           loading={this.state.loading}
+          size="small"
           columns={[
             {
               title: t('name'),
@@ -369,6 +370,7 @@ export default class ImportDrawer extends React.Component<
               render: (_v: any, item: ImportRuleInfo) => (
                 <Select
                   value={item.action}
+                  size="small"
                   onChange={value =>
                     this.handleActionChange(item, value as IMPORT_ACTION)
                   }
@@ -386,10 +388,37 @@ export default class ImportDrawer extends React.Component<
             },
           ]}
         />
+        <Space>
+          <span>{t('save_to')}</span>
+          <BoolRadioGroup
+            onChange={this.handleRecommendChange}
+            value={this.state.useRecommend}
+            options={[
+              { label: t('suggested_group'), value: true },
+              {
+                label: (
+                  <span>
+                    <span>{this.state.group}</span>
+                    &nbsp;
+                    <Button
+                      className="select-group"
+                      size="small"
+                      onClick={this.handleSelectAll}
+                    >
+                      {t('choose')}
+                    </Button>
+                  </span>
+                ),
+                value: false,
+              },
+            ]}
+          />
+        </Space>
         <Table
           dataSource={this.state.tasks}
           pagination={false}
           loading={this.state.loading}
+          size="small"
           columns={[
             {
               title: t('name'),
@@ -400,6 +429,7 @@ export default class ImportDrawer extends React.Component<
               render: (_v: any, item: ImportTaskInfo) => (
                 <Select
                   value={item.action}
+                  size="small"
                   onChange={value =>
                     this.handleActionChange(item, value as IMPORT_ACTION)
                   }
@@ -417,45 +447,6 @@ export default class ImportDrawer extends React.Component<
             },
           ]}
         />
-        <div
-          className={css`
-            display: flex;
-            flex-direction: row;
-            align-items: center;
-            margin-top: 8px;
-            gap: 8px;
-            .semi-radio-content {
-              display: flex;
-              flex-direction: row;
-              align-items: center;
-            }
-          `}
-        >
-          <span>{t('save_to')}</span>
-          <BoolRadioGroup
-            onChange={this.handleRecommendChange}
-            value={this.state.useRecommend}
-            options={[
-              { label: t('suggested_group'), value: true },
-              {
-                label: (
-                  <span>
-                    <span>{this.state.group}</span>
-                    &nbsp;
-                    <Button
-                      className="select-group"
-                      size="small"
-                      onClick={this.handleSelectAll}
-                    >
-                      {t('choose')}
-                    </Button>
-                  </span>
-                ),
-                value: false,
-              },
-            ]}
-          />
-        </div>
       </SideSheet>
     );
   }

src/pages/options/sections/import-and-export/index.tsx

@@ -100,7 +100,8 @@ export default class ImportAndExport extends React.Component<{}, IEState> {
 
   async handleExport() {
     const result = await Api.getAllRules();
-    batchShare(Object.values(result).flat());
+    const tasks = await Api.getTasks();
+    batchShare(Object.values(result).flat(), tasks);
   }
 
   handleOpenThird() {

src/pages/options/sections/rules/utils.ts

@@ -1,5 +1,5 @@
 import { TABLE_NAMES_ARR } from '@/share/core/constant';
-import type { Rule } from '@/share/core/types';
+import type { Rule, Task } from '@/share/core/types';
 import { getTableName } from '@/share/core/utils';
 import Api from '@/share/pages/api';
 import file from '@/share/pages/file';
@@ -19,12 +19,16 @@ export function save(rule: Rule) {
   return Api.saveRule(rule);
 }
 
-export async function batchShare(rules: Rule[]) {
+export async function batchShare(rules: Rule[], tasks?: Task[]) {
   const result: any = {};
   TABLE_NAMES_ARR.forEach(tb => {
     result[tb] = [];
   });
   rules.forEach(e => result[getTableName(e.ruleType)].push(e));
+  if (tasks) {
+    result.tasks = {};
+    tasks.forEach(x => (result.tasks[x.key] = x));
+  }
   file.save(
     JSON.stringify(await createExport(result), null, '\t'),
     getExportName(),

src/pages/options/utils/index.ts

@@ -1,4 +1,5 @@
 import dayjs from 'dayjs';
+import { TABLE_NAMES, TABLE_NAMES_ARR } from '@/share/core/constant';
 import emitter from '@/share/core/emitter';
 import { convertToBasicRule } from '@/share/core/rule-utils';
 import { collectRulesUsedTasks } from '@/share/core/tasks';
@@ -10,35 +11,53 @@ export function getExportName(additional?: string) {
   return `HE_${date}${additional ? '_' + additional : ''}.json`;
 }
 
-export async function createTaskExport(task: Task) {
-  if (task.isFunction && task.code) {
-  }
+export function createTaskExport(x: Task) {
+  delete x.lastRun;
+  delete x._func;
+  return x;
 }
 
-export async function createExport(arr: {
-  [key: string]: Array<Rule | InitdRule>;
-}) {
+export async function createExport(
+  arr: Partial<{
+    [TABLE_NAMES.receiveHeader]: Array<Rule | InitdRule>;
+    [TABLE_NAMES.receiveBody]: Array<Rule | InitdRule>;
+    [TABLE_NAMES.request]: Array<Rule | InitdRule>;
+    [TABLE_NAMES.sendHeader]: Array<Rule | InitdRule>;
+    tasks: Record<string, Task>;
+  }>,
+) {
   const result: any = {};
   const tasks = new Set<string>();
-  Object.keys(arr).forEach(k => {
-    result[k] = arr[k].map(e => convertToBasicRule(e));
-    const t = collectRulesUsedTasks(arr[k]);
+
+  TABLE_NAMES_ARR.forEach(tb => {
+    if (!arr[tb]) {
+      return;
+    }
+    result[tb] = arr[tb].map(e => convertToBasicRule(e));
+    const t = collectRulesUsedTasks(arr[tb]);
     t.forEach(e => tasks.add(e));
   });
+
   // 一并导出任务
-  if (tasks.size) {
+  if (tasks.size || arr.tasks) {
     const allTasks = await Api.getTasks();
-    result.tasks = Object.fromEntries(
-      (
-        Array.from(tasks)
-          .map(x => allTasks.find(y => y.key === x))
-          .filter(Boolean) as Task[]
-      ).map(x => {
-        delete x.lastRun;
-        delete x._func;
-        return [x.key, x];
-      }),
-    );
+    if (!result.tasks) {
+      result.tasks = {};
+    }
+    if (arr.tasks) {
+      Object.keys(arr.tasks).forEach(x => {
+        result.tasks[x] = createTaskExport(arr.tasks![x]);
+      });
+    }
+    const tasksArr = Array.from(tasks)
+      .map(x => allTasks.find(y => y.key === x))
+      .filter(Boolean) as Task[];
+    tasksArr.forEach(x => {
+      if (result.tasks[x.key]) {
+        return;
+      }
+      result.tasks[x.key] = createTaskExport(x);
+    });
   }
   return result;
 }

src/share/core/tasks.ts

@@ -10,7 +10,7 @@ function collectTaskUsage(text: string) {
   if (!matches) {
     return [];
   }
-  return matches.map(x => x.substring(7, x.indexOf('.')));
+  return matches.map(x => x.substring(7, x.indexOf('.', 7)));
 }
 
 export function collectTaskFromCode(code: string) {