feat: Trigger task tag

zhanweizhang7 · zhanweizhang7 · commit 0851cc23e656 · 2026-01-22T10:55:16.000+08:00
diff --git a/apps/trigger/serializers/trigger.py b/apps/trigger/serializers/trigger.py
@@ -43,6 +43,7 @@ def is_valid(self, *, model=None, raise_exception=False):
                 raise AppApiException(500, _('The following id does not exist: {error_id_list}').format(
                     error_id_list=error_id_list))
 
+
 class InputField(serializers.Serializer):
     source = serializers.CharField(required=True, label=_("source"), validators=[
         validators.RegexValidator(regex=re.compile("^custom|reference$"),
@@ -121,6 +122,7 @@ def validate(self, attrs):
 
         return attrs
 
+
 class TriggerTaskEditRequest(serializers.Serializer):
     source_type = serializers.ChoiceField(required=False, choices=TriggerTaskTypeChoices)
     source_id = serializers.CharField(required=False, label=_('source_id'))
@@ -142,6 +144,7 @@ def validate(self, attrs):
 
         return attrs
 
+
 class TriggerEditRequest(serializers.Serializer):
     name = serializers.CharField(required=False, label=_('trigger name'))
     desc = serializers.CharField(required=False, allow_null=True, allow_blank=True, label=_('trigger description'))
@@ -392,9 +395,11 @@ def batch_switch(self, instance: Dict, with_valid=True):
             workspace_id = self.data.get("workspace_id")
             trigger_id_list = instance.get("id_list")
             is_active = instance.get("is_active")
-            Trigger.objects.filter(workspace_id=workspace_id, id__in=trigger_id_list, is_active= not is_active).update(is_active=is_active)
+            Trigger.objects.filter(workspace_id=workspace_id, id__in=trigger_id_list, is_active=not is_active).update(
+                is_active=is_active)
             return True
 
+
 class TriggerOperateSerializer(serializers.Serializer):
     trigger_id = serializers.UUIDField(required=True, label=_('trigger id'))
     user_id = serializers.UUIDField(required=True, label=_("User ID"))
@@ -426,9 +431,9 @@ def edit(self, instance: Dict, with_valid=True):
                 trigger.__setattr__(field, instance.get(field))
         trigger.save()
         # 处理trigger task
-        TriggerTask.objects.filter(trigger_id=trigger_id).delete()
         trigger_tasks = instance.get('trigger_task')
         if trigger_tasks:
+            TriggerTask.objects.filter(trigger_id=trigger_id).delete()
             trigger_task_model_list = [TriggerTask(
                 id=uuid.uuid7(),
                 trigger_id=trigger_id,
@@ -453,18 +458,20 @@ def one(self, with_valid=True):
         if with_valid:
             self.is_valid()
         trigger_id = self.data.get('trigger_id')
-        trigger = QuerySet(Trigger).filter(id=trigger_id).first()
+        workspace_id = self.data.get('workspace_id')
+        trigger = QuerySet(Trigger).filter(workspace_id=workspace_id, id=trigger_id).first()
 
         trigger_tasks = QuerySet(TriggerTask).filter(trigger_id=trigger_id)
         application_ids = [str(task.source_id) for task in trigger_tasks if
                            task.source_type == TriggerTaskTypeChoices.APPLICATION]
         tool_ids = [str(task.source_id) for task in trigger_tasks if task.source_type == TriggerTaskTypeChoices.TOOL]
 
-        trigger_task_list  = [TriggerTaskModelSerializer(task).data for task in trigger_tasks]
+        trigger_task_list = [TriggerTaskModelSerializer(task).data for task in trigger_tasks]
         application_task_list = [ApplicationTriggerTaskSerializer(application).data for application in
-                                 QuerySet(Application).filter(id__in=application_ids)]
+                                 QuerySet(Application).filter(workspace_id=workspace_id, id__in=application_ids)]
 
-        tool_task_list = [ToolTriggerTaskSerializer(tool).data for tool in QuerySet(Tool).filter(id__in=tool_ids)]
+        tool_task_list = [ToolTriggerTaskSerializer(tool).data for tool in
+                          QuerySet(Tool).filter(workspace_id=workspace_id, id__in=tool_ids)]
 
         return {
             **TriggerModelSerializer(trigger).data,
@@ -477,7 +484,7 @@ def one(self, with_valid=True):
 class TriggerQuerySerializer(serializers.Serializer):
     name = serializers.CharField(required=False, allow_null=True, allow_blank=True, label=_('Trigger name'))
     type = serializers.CharField(required=False, allow_blank=True, allow_null=True, label=_('Trigger type'))
-    is_active = serializers.BooleanField(required=False,allow_null=True, label=_('Is active'))
+    is_active = serializers.BooleanField(required=False, allow_null=True, label=_('Is active'))
     task = serializers.CharField(required=False, allow_blank=True, allow_null=True, label=_('Trigger task'))
     create_user = serializers.CharField(required=False, allow_blank=True, allow_null=True, label=_('Create user'))
     workspace_id = serializers.CharField(required=True, label=_('workspace id'))
@@ -488,34 +495,35 @@ def get_query_set(self):
                 'name': models.CharField(),
                 'trigger_type': models.CharField(),
                 't.workspace_id': models.CharField(),
-                'is_active': models.BooleanField(),
-                'task_str': models.CharField(),
-                'create_user': models.CharField(),
+                't.is_active': models.BooleanField(),
+                't.user_id': models.CharField(),
             }))
-        trigger_query_set = trigger_query_set.filter(**{'t.workspace_id':self.data.get("workspace_id")})
-        user_query_set = QuerySet(model=get_dynamics_model({'nick_name': models.CharField()}))
+        task_query_set = QuerySet(model=get_dynamics_model({
+            'trigger_task_str': models.CharField(),
+        }))
+        trigger_query_set = trigger_query_set.filter(**{'t.workspace_id': self.data.get("workspace_id")})
         if self.data.get("name"):
             trigger_query_set = trigger_query_set.filter(name__contains=self.data.get("name"))
         if self.data.get("type"):
             trigger_query_set = trigger_query_set.filter(trigger_type=self.data.get("type"))
         if self.data.get("is_active") is not None:
-            trigger_query_set = trigger_query_set.filter(is_active=self.data.get("is_active"))
+            trigger_query_set = trigger_query_set.filter(**{"t.is_active": self.data.get("is_active")})
         if self.data.get("task"):
-            trigger_query_set = trigger_query_set.filter(task_str__icontains=self.data.get("task"))
+            task_query_set = task_query_set.filter(trigger_task_str__icontains=self.data.get("task"))
         if self.data.get("create_user"):
-            user_query_set = user_query_set.filter(create_user__icontains=self.data.get("create_user"))
+            trigger_query_set = trigger_query_set.filter(**{"t.user_id": self.data.get("create_user")})
 
-        return {"trigger_query_set": trigger_query_set, "user_query_set": user_query_set}
+        return {"trigger_query_set": trigger_query_set, "task_query_set": task_query_set}
 
     def page(self, current_page: int, page_size: int, with_valid=True):
         if with_valid:
             self.is_valid(raise_exception=True)
-        return native_page_search(current_page, page_size, self.get_query_set(),get_file_content(
-            os.path.join(PROJECT_DIR, "apps","trigger","sql","get_trigger_page_list.sql")
+        return native_page_search(current_page, page_size, self.get_query_set(), get_file_content(
+            os.path.join(PROJECT_DIR, "apps", "trigger", "sql", "get_trigger_page_list.sql")
         ))
 
     def list(self, with_valid=True):
         if with_valid:
             self.is_valid(raise_exception=True)
-        return native_search(self.get_query_set(),select_string=get_file_content(
-            os.path.join(PROJECT_DIR, "apps","trigger","sql","get_trigger_page_list.sql")))
+        return native_search(self.get_query_set(), select_string=get_file_content(
+            os.path.join(PROJECT_DIR, "apps", "trigger", "sql", "get_trigger_page_list.sql")))
diff --git a/apps/trigger/sql/get_trigger_page_list.sql b/apps/trigger/sql/get_trigger_page_list.sql
@@ -1,32 +1,33 @@
-SELECT t.id,
-       t.workspace_id,
-       t.name,
-       t.desc,
-       t.trigger_type,
-       t.trigger_setting,
-       t.meta::JSON,
-       t.is_active,
-       t.create_time,
-       t.update_time,
-       t.user_id,
-       u.nick_name                                   AS create_user,
-       COALESCE(
-               JSON_AGG(
-                       JSON_BUILD_OBJECT(
-                               'type', tt.source_type,
-                               'name', COALESCE(app.name, tool.name),
-                               'icon', COALESCE(app.icon, tool.icon)
-                       )
-               ), '[]'::JSON
-       )                                             AS trigger_task,
-       STRING_AGG(COALESCE(app.name, tool.name), ' ') AS trigger_task_str
-FROM event_trigger t
-         LEFT JOIN public."user" u ON u.id = t.user_id
-         LEFT JOIN event_trigger_task tt ON t.id = tt.trigger_id
-         LEFT JOIN application app ON tt.source_type = 'APPLICATION' AND tt.source_id = app.id
-         LEFT JOIN tool ON tt.source_type = 'TOOL' AND tt.source_id = tool.id
-${trigger_query_set}
-${user_query_set}
-GROUP BY t.id, t.workspace_id, t.name, t.desc, t.trigger_type, t.trigger_setting, t.meta, t.is_active, t.create_time,
-         t.update_time, t.user_id, u.nick_name
-ORDER BY t.create_time DESC
+
+SELECT *
+FROM (SELECT t.id,
+             t.workspace_id,
+             t.name,
+             t."desc",
+             t.trigger_type,
+             t.trigger_setting,
+             t.meta::JSON,
+             t.is_active,
+             t.create_time,
+             t.update_time,
+             t.user_id,
+             COALESCE(
+                     JSON_AGG(
+                             JSON_BUILD_OBJECT(
+                                     'type', tt.source_type,
+                                     'name', COALESCE(app.name, tool.name),
+                                     'icon', COALESCE(app.icon, tool.icon)
+                             )
+                     ), '[]'::JSON
+             )                                              AS trigger_task,
+             STRING_AGG(COALESCE(app.name, tool.name), ' ') AS trigger_task_str
+      FROM event_trigger t
+               LEFT JOIN event_trigger_task tt ON t.id = tt.trigger_id
+               LEFT JOIN application app ON tt.source_type = 'APPLICATION' AND tt.source_id = app.id
+               LEFT JOIN tool ON tt.source_type = 'TOOL' AND tt.source_id = tool.id
+          ${trigger_query_set}
+      GROUP BY t.id, t.workspace_id, t.name, t.desc, t.trigger_type, t.trigger_setting, t.meta, t.is_active,
+               t.create_time,
+               t.update_time, t.user_id) AS sub
+    ${task_query_set}
+ORDER BY sub.create_time DESC
diff --git a/ui/src/views/trigger/component/ApplicationParameter.vue b/ui/src/views/trigger/component/ApplicationParameter.vue
@@ -168,7 +168,7 @@ const options = computed(() => {
 })
 
 const base_node = computed(() => {
-  return props.application?.work_flow.nodes.find((n: any) => n.type === 'base-node')
+  return (props.application?.work_flow?.nodes || []).find((n: any) => n.type === 'base-node')
 })
 const api_input_field_list = computed(() => {
   const result: Array<any> = []
diff --git a/ui/src/views/trigger/index.vue b/ui/src/views/trigger/index.vue
@@ -29,7 +29,7 @@
                 <el-option :label="$t('common.name', '名称')" value="name" />
                 <el-option :label="$t('view.trigger.type', '类型')" value="type" />
                 <el-option :label="$t('view.trigger.task', '任务')" value="task" />
-                <el-option :label="$t('view.trigger.status', '状态')" value="status" />
+                <el-option :label="$t('view.trigger.status', '状态')" value="is_active" />
                 <el-option :label="$t('view.trigger.createUser', '创建者')" value="create_user" />
               </el-select>
               <el-input
@@ -48,8 +48,19 @@
                 clearable
                 style="width: 220px"
               >
-                <el-option :label="$t('view.trigger.scheduled')" value="SCHEDULED" />
-                <el-option :label="$t('view.trigger.event')" value="unpublished" />
+                <el-option :label="$t('view.trigger.scheduled', '定时触发')" value="SCHEDULED" />
+                <el-option :label="$t('view.trigger.event', '事件触发')" value="EVENT" />
+              </el-select>
+              <el-select
+                v-else-if="search_type === 'is_active'"
+                v-model="search_form.is_active"
+                @change="searchHandle"
+                filterable
+                clearable
+                style="width: 220px"
+              >
+                <el-option :label="$t('view.trigger.active', '启用')" value="true" />
+                <el-option :label="$t('view.trigger.ban', '禁用')" value="false" />
               </el-select>
               <el-select
                 v-else-if="search_type === 'create_user'"
@@ -123,6 +134,28 @@
                 {{ datetimeFormat(row.update_time) }}
               </template>
             </el-table-column>
+            <el-table-column
+              prop="trigger_task"
+              :label="$t('views.trigger.table.task', '任务')"
+              width="180"
+            >
+              <template #default="{ row }">
+                <div class="flex">
+                  <el-check-tag type="info" class="mr-8"
+                    >智能体
+                    {{
+                      row.trigger_task.filter((item: any) => item.type === 'APPLICATION').length
+                    }}</el-check-tag
+                  >
+                  <el-check-tag type="info"
+                    >工具
+                    {{
+                      row.trigger_task.filter((item: any) => item.type === 'TOOL').length
+                    }}</el-check-tag
+                  >
+                </div>
+              </template>
+            </el-table-column>
             <el-table-column align="left" width="160" fixed="right" :label="$t('common.operation')">
               <template #default="{ row }">
                 <span @click.stop>
@@ -292,8 +325,10 @@ function updateData(triggerId: string, data: TriggerData, msg: string) {
   triggerAPI
     .putTrigger(triggerId, data, loading)
     .then((res: any) => {
-      const index = triggerData.value.findIndex((v) => v.id === triggerId)
-      triggerData.value.splice(index, 1, res.data)
+      const trigger: TriggerData = triggerData.value.find((v) => v.id === triggerId)
+      if (trigger) {
+        trigger.is_active = res.data.is_active
+      }
       MsgSuccess(msg)
       return true
     })
@@ -314,7 +349,10 @@ function handleSizeChange() {
 }
 
 function getList(bool?: boolean) {
-  const param = {}
+  const param: any = {}
+  if (search_form.value[search_type.value]) {
+    param[search_type.value] = search_form.value[search_type.value]
+  }
   triggerAPI
     .pageTrigger(paginationConfig.value, param, bool ? undefined : loading)
     .then((res: any) => {
