Merge remote-tracking branch 'origin/master'

src/views/taskScheduling/taskFlowDesign/designData.ts

@@ -58,6 +58,55 @@ export const designData = [
     type: 'theme',
     themeId: '1-2',
   },
+  {
+    businessId: 9,
+    name: '超时',
+    task: null,
+    type: 'twoLevel',
+    themeId: '1-1-1',
+  },
+  {
+    businessId: 10,
+    name: 'test',
+    task: null,
+    type: 'twoLevel',
+    themeId: '1-1-2',
+  },
+  {
+    businessId: 11,
+    name: 'sql',
+    task: null,
+    type: 'twoLevel',
+    themeId: '1-1-3',
+  },
+  {
+    businessId: 13,
+    name: 'SLA-沟通流水',
+    task: null,
+    type: 'twoLevel',
+    themeId: '1-2-2',
+  },
+  {
+    businessId: 14,
+    name: 'SLA-实时指标计算',
+    task: null,
+    type: 'twoLevel',
+    themeId: '1-2-3',
+  },
+  {
+    businessId: 15,
+    name: 'sla分组件指标日批统计历史',
+    task: null,
+    type: 'twoLevel',
+    themeId: '1-2-4',
+  },
+  {
+    businessId: 16,
+    name: 'SLA',
+    task: null,
+    type: 'twoLevel',
+    themeId: '1-2-5',
+  },
 ];
 export const dataLoadConfigData = [
   {
@@ -85,9 +134,9 @@ export const taskTreeData: TreeItem[] = [
         level: '1',
         icon: 'ion:desktop-outline',
         children: [
-          { title: '超时', key: '1-1-1', icon: 'ion:git-branch-outline' },
-          { title: 'test', key: '1-1-2', icon: 'ion:git-branch-outline' },
-          { title: 'sql', key: '1-1-3', icon: 'ion:git-branch-outline' },
+          { title: '超时', level: '2', key: '1-1-1', icon: 'ion:git-branch-outline' },
+          { title: 'test', level: '2', key: '1-1-2', icon: 'ion:git-branch-outline' },
+          { title: 'sql', level: '2', key: '1-1-3', icon: 'ion:git-branch-outline' },
         ],
       },
       {

src/views/taskScheduling/taskFlowDesign/index.vue

@@ -359,13 +359,21 @@
     } else {
       modelLevel.value = 0;
     }
-    if (modelLevel.value > 1) {
+    if (modelLevel.value === 2) {
       const regex = new RegExp(key, 'i');
       const data = tableData.value.filter(
         (item) => item.type === 'model' && regex.test(item.themeId),
       );
       setTableData(data);
-    } else {
+    }
+    if (modelLevel.value === 1) {
+      const regex = new RegExp(key, 'i');
+      const data = tableData.value.filter(
+        (item) => item.type === 'twoLevel' && regex.test(item.themeId),
+      );
+      setTableData(data);
+    }
+    if (modelLevel.value === 0) {
       const regex = new RegExp(key, 'i');
       const data = tableData.value.filter(
         (item) => item.type === 'theme' && regex.test(item.themeId),