提交

web-admin/src/api/oaApproval.ts

@@ -332,12 +332,18 @@ export function fetchOaInstanceDetail(id: string) {
 }
 
 export type OaCommentAttachmentRef = {
-  fieldKey: string
+  source?: 'form' | 'upload' | string
+  fieldKey?: string
   fieldLabel?: string
   url: string
   fileName: string
 }
 
+export type OaCommentMention = {
+  userId: string
+  userName: string
+}
+
 export type OaInstanceComment = {
   id: string
   instanceId?: string
@@ -349,6 +355,7 @@ export type OaInstanceComment = {
   createByName?: string
   createTime: string
   canRevoke?: boolean
+  mentions?: OaCommentMention[]
 }
 
 export function fetchOaFormAttachments(instanceId: string) {
@@ -365,7 +372,11 @@ export function fetchOaInstanceComments(instanceId: string) {
 
 export function fetchCreateOaComment(
   instanceId: string,
-  data: { content: string; attachmentRefs?: OaCommentAttachmentRef[] }
+  data: {
+    content?: string
+    attachmentRefs?: OaCommentAttachmentRef[]
+    mentionUserIds?: string[]
+  }
 ) {
   return request.post<OaInstanceComment>({
     url: `${BASE}/instances/${instanceId}/comments`,
@@ -380,7 +391,7 @@ export function fetchRevokeOaComment(instanceId: string, commentId: string) {
 }
 
 export function fetchOaTasks(
-  kind: 'pending' | 'done' | 'mine' | 'cc',
+  kind: 'pending' | 'done' | 'mine' | 'cc' | 'mention',
   params?: {
     readStatus?: 'unread' | 'read' | 'all'
     appName?: string