fix: restore editor edit form loading

Author: xbingW

ui/front/package.json

@@ -111,6 +111,9 @@
     "onlyBuiltDependencies": [
       "sharp",
       "core-js"
-    ]
+    ],
+    "patchedDependencies": {
+      "@tiptap/react@3.14.0": "patches/@tiptap__react@3.14.0.patch"
+    }
   }
 }

ui/front/patches/@tiptap__react@3.14.0.patch

@@ -0,0 +1,26 @@
+diff --git a/dist/index.cjs b/dist/index.cjs
+index 91cbf849c7d96511557d726db4aeb83f6f42f057..4db027cc4054282475c1b97e5cd1fff509c462e1 100644
+--- a/dist/index.cjs
++++ b/dist/index.cjs
+@@ -727,7 +727,7 @@ var ReactRenderer = class {
+     if (className) {
+       this.element.classList.add(...className.split(" "));
+     }
+-    if (this.editor.isInitialized) {
++    if (this.editor.isInitialized && !isReact19Plus()) {
+       (0, import_react_dom2.flushSync)(() => {
+         this.render();
+       });
+diff --git a/dist/index.js b/dist/index.js
+index bf7aa68812a0eb3a00b5bb4689d2cf5a1959ccc3..6562bb1e453b8b9530567400a2f2ab114d6d4f71 100644
+--- a/dist/index.js
++++ b/dist/index.js
+@@ -671,7 +671,7 @@ var ReactRenderer = class {
+     if (className) {
+       this.element.classList.add(...className.split(" "));
+     }
+-    if (this.editor.isInitialized) {
++    if (this.editor.isInitialized && !isReact19Plus()) {
+       flushSync(() => {
+         this.render();
+       });

ui/front/pnpm-lock.yaml

@@ -239,10 +239,11 @@ const Content = (props: { data: ModelDiscussionDetail }) => {
     setSelfAnswerModalVisible(false)
     const parts = pathname.split('/').filter(Boolean)
     const routeName = parts[0] || ''
-    if (routeName && data.uuid) {
-      router.push(`/${routeName}/edit?id=${data.uuid}&type=${data.type}`)
+    const discId = data.uuid || id
+    if (routeName && discId) {
+      router.push(`/${routeName}/edit?id=${discId}&type=${data.type}`)
     }
-  }, [pathname, data.uuid, router])
+  }, [pathname, data.uuid, data.type, id, router])
 
   const handleAcceptComment = () => {
     setAnchorEl(null)

ui/front/src/app/[route_name]/[id]/ui/content.tsx

@@ -73,7 +73,7 @@ const TitleCard = ({ data, menuAnchorEl, onMenuClose }: TitleCardProps) => {
   const theme = useTheme()
   const isMobile = useMediaQuery(theme.breakpoints.down('lg'))
   const forums = useForumStore((s) => s.forums)
-  const { route_name }: { route_name?: string } = (useParams() as any) || {}
+  const { route_name, id }: { route_name?: string; id?: string } = (useParams() as any) || {}
 
   // 刷新页面但不增加浏览次数
   const refreshWithoutView = useCallback(() => {
@@ -261,7 +261,7 @@ const TitleCard = ({ data, menuAnchorEl, onMenuClose }: TitleCardProps) => {
         {!(data.type === ModelDiscussionType.DiscussionTypeQA && isClosed) && (
           <MenuItem
             onClick={() => {
-              router.push(`/${route_name}/edit?id=${data.uuid}&type=${data.type}`)
+              router.push(`/${route_name}/edit?id=${data.uuid || id}&type=${data.type}`)
               menuClose()
             }}
           >

ui/front/src/app/[route_name]/[id]/ui/titleCard.tsx

@@ -2,7 +2,7 @@
 
 import { getDiscussionDiscId, ModelDiscussionType } from '@/api'
 import { postDiscussion, putDiscussionDiscId } from '@/api/Discussion'
-import { ModelGroupItemInfo, SvcDiscussionCreateReq, SvcDiscussionUpdateReq } from '@/api/types'
+import { ModelDiscussionDetail, ModelGroupItemInfo, SvcDiscussionCreateReq, SvcDiscussionUpdateReq } from '@/api/types'
 import { Card } from '@/components'
 import EditorWrap, { EditorWrapRef } from '@/components/editor'
 import Modal from '@/components/modal'
@@ -25,7 +25,6 @@ import {
   TextField,
   Typography,
 } from '@mui/material'
-import { useRequest } from 'ahooks'
 import { useParams, useSearchParams } from 'next/navigation'
 import { useEffect, useMemo, useRef, useState } from 'react'
 import { Controller, useForm } from 'react-hook-form'
@@ -92,8 +91,8 @@ export default function EditPage() {
   const { getFilteredGroups } = useGroupData()
   const [summaryModalOpen, setSummaryModalOpen] = useState(false)
   const [summaryDraft, setSummaryDraft] = useState('')
-  const requestedDiscussionIdRef = useRef<string | undefined>(undefined)
-  const hasUserEditedRef = useRef(false)
+  const [loading, setLoading] = useState(false)
+  const [discussion, setDiscussion] = useState<ModelDiscussionDetail | null>(null)
   const schema = useMemo(
     () =>
       z.object({
@@ -132,26 +131,39 @@ export default function EditPage() {
     },
   })
 
-  const {
-    run,
-    loading,
-    data: discussion,
-  } = useRequest((discId: string) => getDiscussionDiscId({ discId }), {
-    manual: true,
-    onSuccess: (result) => {
-      if (hasUserEditedRef.current) return
+  useEffect(() => {
+    if (!queryId) {
+      setDiscussion(null)
+      return
+    }
 
-      const discussionData = ((result as any)?.data || result) as any
+    let ignore = false
+    setLoading(true)
+    getDiscussionDiscId({ discId: queryId })
+      .then((result) => {
+        if (ignore) return
 
-      reset({
-        title: discussionData.title || '',
-        summary: discussionData.summary || '',
-        content: discussionData.content || '',
-        group_ids: discussionData.group_ids || [],
-        type: (discussionData.type as ModelDiscussionType) || ModelDiscussionType.DiscussionTypeBlog,
+        const discussionData = ((result as any)?.data || result) as ModelDiscussionDetail
+        setDiscussion(discussionData)
+        reset({
+          title: discussionData.title || '',
+          summary: discussionData.summary || '',
+          content: discussionData.content || '',
+          group_ids: discussionData.group_ids || [],
+          type: (discussionData.type as ModelDiscussionType) || ModelDiscussionType.DiscussionTypeBlog,
+        })
+      })
+      .catch(() => {
+        if (!ignore) setDiscussion(null)
+      })
+      .finally(() => {
+        if (!ignore) setLoading(false)
       })
-    },
-  })
+
+    return () => {
+      ignore = true
+    }
+  }, [queryId, reset])
 
   // summary 字段没有显式输入框，依赖侧边栏 setValue 写入；
   // 这里主动 register，确保 handleSubmit 的 vals 中能拿到最新的 summary。
@@ -194,22 +206,6 @@ export default function EditPage() {
     setValue('group_ids', defaultGroupIds, { shouldDirty: true, shouldValidate: true })
   }, [defaultGroupIds, queryId, getValues, setValue])
 
-  useEffect(() => {
-    if (!queryId) return
-    if (requestedDiscussionIdRef.current === queryId) return
-    requestedDiscussionIdRef.current = queryId
-    hasUserEditedRef.current = false
-    run(queryId)
-  }, [queryId, run])
-
-  useEffect(() => {
-    const subscription = watch(() => {
-      hasUserEditedRef.current = true
-    })
-
-    return () => subscription.unsubscribe()
-  }, [watch])
-
   // 当systemConfig加载完成时，如果是新建Q&A帖子且内容为空，则设置默认内容
   useEffect(() => {
     if (
@@ -272,6 +268,8 @@ export default function EditPage() {
     }
   })
 
+  const shouldRenderEditor = !loading && (!queryId || Boolean(discussion))
+
   return (
     <Box
       sx={{
@@ -433,7 +431,7 @@ export default function EditPage() {
               },
             }}
           >
-            {!loading && (
+            {shouldRenderEditor && (
               <EditorWrap
                 ref={editorRef}
                 aiWriting