Merge branch 'v2' into pr@v2@fix_trigger

Author: shaohuzhang1

apps/chat/serializers/chat.py

@@ -289,7 +289,7 @@ class ChatSerializers(serializers.Serializer):
     application_id = serializers.UUIDField(required=True, allow_null=True,
                                            label=_("Application ID"))
     debug = serializers.BooleanField(required=False, label=_("Debug"))
-    ip_address = serializers.CharField(required=False, label=_("IP Address"))
+    ip_address = serializers.CharField(required=False, label=_("IP Address"), allow_null=True, allow_blank=True)
     source = serializers.JSONField(required=False, label=_("Source"))
 
     def is_valid_application_workflow(self, *, raise_exception=False):

apps/trigger/sql/get_trigger_page_list.sql

@@ -11,6 +11,7 @@ FROM (SELECT t.id,
              t.create_time,
              t.update_time,
              t.user_id,
+             (SELECT nick_name FROM "user" WHERE id = t.user_id) AS create_user,
              COALESCE(
                      JSON_AGG(
                              JSON_BUILD_OBJECT(

ui/src/views/trigger/index.vue

@@ -245,6 +245,8 @@
                 </el-popover>
               </template>
             </el-table-column>
+            <el-table-column prop="create_user" :label="$t('common.creator')" width="150">
+            </el-table-column>
             <el-table-column
               prop="create_time"
               :label="$t('common.createTime')"